Merge pull request #29 from cabinetoffice/downing-fix

Fixes issues for those on No.10 platforms

app/models/email_address.rb

@@ -26,11 +26,19 @@ def valid_address?
   end
 
   def inferred_last_name
-    capitalise(local.split('.')[(multipart_local? ? 1 : 0)])
+    if domain.end_with? "no10.x.gsi.gov.uk"
+      capitalise(local[1..-1])
+    else 
+      capitalise(local.split('.')[(multipart_local? ? 1 : 0)])
+    end
   end
 
   def inferred_first_name
-    capitalise(local.split('.')[0]) if multipart_local?
+    if domain.end_with? "no10.x.gsi.gov.uk"
+      capitalise(local[0])
+    else 
+      capitalise(local.split('.')[0]) if multipart_local?
+    end
   end
 
   def multipart_local?

app/views/sessions/failed.html.haml

@@ -1,3 +1,13 @@
-%h1.visuallyhidden= @page_title = 'Login failure'
-%h2.h3.no-line You need to log in with a Cabinet Office email address
-%p= link_to 'Return to the log in screen', '/'
+- content_for :body_classes, 'failed-page'
+
+%h1.no-line Sorry, that didn't work
+
+%h2.h3.no-line We couldn't verify your details, so we couldn't log you in.
+
+%p It might be that you haven't logged in using your Cabinet Office email address, or perhaps something else isn't right.
+
+.spacer-5
+.spacer-5
+.spacer-5
+
+%p= link_to 'Go back', '/', class: 'button login-button'

config/initializers/session_store.rb

@@ -1,3 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_moj_peoplefinder_session'
+if  Rails.env.production? or Rails.env.staging?
+	Rails.application.config.session_store :cookie_store, :key => '_co_peoplefinder_session', :domain => 'peoplefinder.cabinetoffice.gov.uk'
+else
+	Rails.application.config.session_store :cookie_store, :key => '_co_peoplefinder_session'
+end

config/routes.rb

@@ -27,6 +27,7 @@
   resources :tokens, only: [:create, :destroy, :show]
 
   match '/auth/:provider/callback', to: 'sessions#create', via: [:get, :post]
+  match '/auth/failure', to: 'sessions#failed', via: [:get, :post]
   match '/audit_trail', to: 'versions#index', via: [:get]
   match '/audit_trail/undo/:id', to: 'versions#undo', via: [:post]
   match '/search', to: 'search#index', via: [:get]

spec/features/omni_auth_authentication_spec.rb

@@ -30,10 +30,10 @@
     expect(login_page).to be_displayed
 
     click_link 'Log in'
-    expect(page).to have_title("Login failure - #{ app_title }")
-    expect(page).to have_text(/log in with a Cabinet Office email address/)
+    expect(page).to have_title("#{ app_title }")
+    expect(page).to have_text(/We couldn't verify your details, so we couldn't log you in./)
 
-    click_link 'Return to the log in screen'
+    click_link 'Go back'
     expect(login_page).to be_displayed
   end