Create One Login bridging page

app/assets/stylesheets/application.scss

@@ -135,14 +135,6 @@ pre.code-tip {
     margin-bottom: govuk-spacing(6);
   }
 
-  &.enrol-box {
-    border-radius: 6px;
-
-    .govuk-button {
-      margin: 0;
-    }
-  }
-
 }
 
 .float-right {
@@ -190,7 +182,3 @@ ul>li>ul>li {
 .govuk-footer__copyright-logo {
   display: none;
 }
-
-.white-space-pre-wrap {
-  white-space: pre-wrap;
-}

app/controllers/gov_one_controller.rb

@@ -1,3 +1,7 @@
 class GovOneController < ApplicationController
-  def info; end
+  layout 'hero'
+
+  def show
+    redirect_to my_modules_path if current_user
+  end
 end

app/helpers/application_helper.rb

@@ -11,14 +11,14 @@ def navigation
       header.with_navigation_item(text: 'Home', href: root_path, classes: %w[dfe-header__navigation-item])
       if user_signed_in?
         header.with_action_link(text: 'My Account', href: user_path, options: { inverse: true })
-        header.with_action_link(text: 'Sign out', href: destroy_user_session_path, options: { id: 'sign-out-desktop', data: { turbo_method: :get }, inverse: true })
+        header.with_action_link(text: 'Sign out', href: logout_path, options: { id: 'sign-out-desktop', data: { turbo_method: :get }, inverse: true })
         header.with_navigation_item(text: 'My modules', href: my_modules_path, classes: %w[dfe-header__navigation-item])
         header.with_navigation_item(text: 'Learning log', href: user_notes_path, classes: %w[dfe-header__navigation-items]) if current_user.course_started?
         header.with_navigation_item(text: 'My account', href: user_path, classes: %w[dfe-header__navigation-item dfe-header-f-mob])
-        header.with_navigation_item(text: 'Sign out', href: destroy_user_session_path, options: { data: { turbo_method: :get } }, classes: %w[dfe-header__navigation-item dfe-header-f-mob], html_attributes: { id: 'sign-out-f-mob' })
+        header.with_navigation_item(text: 'Sign out', href: logout_path, options: { data: { turbo_method: :get } }, classes: %w[dfe-header__navigation-item dfe-header-f-mob], html_attributes: { id: 'sign-out-f-mob' })
       else
-        header.with_action_link(text: 'Sign in', href: new_user_session_path, options: { inverse: true })
-        header.with_navigation_item(text: 'Sign in', href: new_user_session_path, classes: %w[dfe-header__navigation-item dfe-header-f-mob])
+        header.with_action_link(text: 'Sign in', href: login_path, options: { inverse: true })
+        header.with_navigation_item(text: 'Sign in', href: login_path, classes: %w[dfe-header__navigation-item dfe-header-f-mob])
       end
     end
   end
@@ -59,4 +59,14 @@ def html_title(*parts)
   def calculate_module_state
     CalculateModuleState.new(user: current_user).call
   end
+
+  # @return [String]
+  def login_path
+    Rails.application.gov_one_login? ? gov_one_info_path : new_user_session_path
+  end
+
+  # @return [String]
+  def logout_path
+    Rails.application.gov_one_login? ? logout_uri.to_s : destroy_user_session_path
+  end
 end

app/helpers/gov_one_helper.rb

@@ -29,12 +29,7 @@ def logout_uri
 
   # @return [String]
   def login_button
-    govuk_button_link_to t('gov_one_info.sign_in_button'), login_uri.to_s
-  end
-
-  # @return [String]
-  def logout_button
-    govuk_button_link_to t('gov_one_info.sign_out_button'), logout_uri.to_s
+    govuk_button_link_to t('gov_one_info.button.sign_in'), login_uri.to_s
   end
 
 private

app/views/gov_one/show.html.slim

@@ -0,0 +1,28 @@
+- content_for :page_title do
+  = html_title t('home.title')
+
+- content_for :hero do
+  .govuk-grid-row class='govuk-!-padding-top-9'
+    .govuk-grid-column-three-quarters
+      h1.dfe-heading-xl class='govuk-!-margin-bottom-4'
+        = t('gov_one_info.hero.header')
+      p.govuk-body-l = t('gov_one_info.hero.body')
+
+
+.govuk-grid-row
+  .govuk-grid-column-full
+    . class='govuk-!-margin-bottom-5'
+        = m('gov_one_info.body')
+        hr
+
+    = login_button
+
+.govuk-grid-row
+  .govuk-grid-column-three-quarters class='govuk-!-margin-top-4 govuk-!-margin-bottom-9'
+    details.govuk-details data-module='govuk-details'
+        summary.govuk-details__summary
+          span.govuk-details__summary-text
+            = t('gov_one_info.details_summary')
+        .govuk-details__text
+          = t('gov_one_info.details_text')
+

app/views/home/_chevron.html.slim

@@ -0,0 +1,2 @@
+svg.govuk-button__start-icon xmlns='http://www.w3.org/2000/svg' width='17.5' height='19' viewBox='0 0 33 40' aria-hidden='true' focusable='false'
+    path fill='currentColor' d='M0 0h13l20 20-20 20H0l20-20z'

app/views/home/_hero.html.slim

@@ -7,15 +7,12 @@
     p.govuk-body-l
       = t('home.hero')
 
-    = govuk_button_link_to course_overview_path, class: 'govuk-button--start govuk-!-margin-bottom-4' do
+    = link_to course_overview_path, class: 'govuk-!-margin-bottom-4 govuk-link--no-visited-state govuk-!-font-weight-bold govuk-body' do
       - if current_user
         | Learn more
       - else
-        | Learn more and enrol
+        | Learn more about this training
         p.govuk-visually-hidden on the course
 
-      svg.govuk-button__start-icon xmlns='http://www.w3.org/2000/svg' width='17.5' height='19' viewBox='0 0 33 40' aria-hidden='true' focusable='false'
-        path fill='currentColor' d='M0 0h13l20 20-20 20H0l20-20z'
-
   .govuk-grid-column-one-third class='govuk-!-text-align-right'
     = m('home.thumb')

app/views/home/index.html.slim

@@ -11,20 +11,17 @@
   .govuk-grid-column-one-half
     = m('home.about', headings_start_with: 'xl')
 
-  - unless current_user
-    .govuk-grid-column-one-half
-      .light-grey-box.enrol-box
-        = m('home.login', headings_start_with: 'xl')
-
-        .govuk-button-group
-          = govuk_button_link_to 'Sign in', new_user_session_path
-          .white-space-pre-wrap= ' or '
-          = govuk_link_to 'create an account', new_user_registration_path
-
 .prompt.prompt-home
   .govuk-grid-row
     .govuk-grid-column-one-quarter
       i.fa-2x.fa-solid.fa-circle-info aria-describedby='info icon'
 
     .govuk-grid-column-three-quarters
       = m('home.prompt', headings_start_with: 'xl')
+
+- unless current_user
+  .govuk-grid-row class="govuk-!-margin-top-9"
+    .govuk-grid-column-full
+      = govuk_button_link_to gov_one_info_path, class: "govuk-button--start" do
+        | #{t('home.gov_one_button')}
+        = render 'chevron'

config/application.rb

@@ -101,6 +101,11 @@ def maintenance?
       Types::Params::Bool[ENV.fetch('MAINTENANCE', false)]
     end
 
+    # @return [Boolean]
+    def gov_one_login?
+      Types::Params::Bool[ENV.fetch('GOV_ONE_LOGIN', false)]
+    end
+
     # @return [ActiveSupport::TimeWithZone]
     def public_beta_launch_date
       Time.zone.local(2023, 2, 9, 15, 0, 0)

config/locales/en.yml

@@ -534,6 +534,7 @@ en:
       ## Return to your training
 
       Sign in to continue learning, see your progress and download certificates.
+    gov_one_button: Start your training now
 
   # /about-training
   about:
@@ -577,9 +578,14 @@ en:
   # /gov-one/info
   gov_one_info:
     title: Gov One Info
-    body: This is some information about Gov One Login.
-    sign_in_button: Continue to GOV.UK One Login
-    sign_out_button: Sign out of Gov One Login
+    hero:
+      header: How to access this training course
+      body: This service uses GOV.UK One Login which is managed by the Government Digital Service.
+    body: You will be asked to sign in to your account, or create a One Login account, in this service
+    button:
+      sign_in: Continue to GOV.UK One Login
+    details_summary: How to access an existing training account
+    details_text: If you have an existing early years child development training account but you do not yet have a GOV.UK One Login, you must use the same email address for both accounts. This will ensure that any progress you have made through the training is retained.
 
   # /settings/cookie-policy
   cookie_policy:

config/routes.rb

@@ -5,7 +5,7 @@
 
   get 'my-modules', to: 'learning#show' # @see User#course
   get 'about-training', to: 'training/modules#index', as: :course_overview
-  get 'gov-one/info', to: 'gov_one#info'
+  get 'gov-one/info', to: 'gov_one#show'
 
   get '/404', to: 'errors#not_found', via: :all
   get '/422', to: 'errors#unprocessable_entity', via: :all

spec/helpers/gov_one_helper_spec.rb

@@ -36,14 +36,4 @@
       expect(login_button).to include 'href="https://oidc.test.account.gov.uk/authorize?redirect_uri=http%3A%2F%2Frecovery.app%2Fusers%2Fauth%2Fopenid_connect%2Fcallback&client_id=some_client_id&response_type=code&scope=email+openid&nonce='
     end
   end
-
-  describe '#logout_button' do
-    subject(:logout_button) { helper.logout_button }
-
-    it 'returns a button link to the gov one logout uri' do
-      expect(logout_button).to include 'govuk-button'
-      expect(logout_button).to include 'Sign out of Gov One Login'
-      expect(logout_button).to include 'href="https://oidc.test.account.gov.uk/logout?post_logout_redirect_uri=http%3A%2F%2Frecovery.app%2Fusers%2Fsign_out&id_token_hint&state='
-    end
-  end
 end

spec/lib/seed_snippets_spec.rb

@@ -5,7 +5,7 @@
   subject(:locales) { described_class.new.call }
 
   it 'converts all translations' do
-    expect(locales.count).to be 191
+    expect(locales.count).to be 195
   end
 
   it 'dot separated key -> Page::Resource#name' do

spec/system/front_page_spec.rb

@@ -7,16 +7,16 @@
     it 'logged in content' do
       visit '/'
       expect(page).to have_text 'Learn more'
-      expect(page).not_to have_text 'Learn more and enrol'
-      expect(page).not_to have_text 'Sign in to continue learning'
+      expect(page).not_to have_text 'Learn more about this training'
+      expect(page).not_to have_text 'Start your training now'
     end
   end
 
   context 'with an unauthenticated visitor' do
     it 'log in content' do
       visit '/'
-      expect(page).to have_text('Learn more and enrol')
-        .and have_text('Sign in to continue learning')
+      expect(page).to have_text('Learn more about this training')
+        .and have_text('Start your training now')
     end
   end
 end

spec/system/gov_one_info_spec.rb

@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+RSpec.describe 'Gov One Info' do
+  before do
+    allow(Rails.application).to receive(:gov_one_login?).and_return(false)
+    visit '/gov-one/info'
+  end
+
+  context 'with an unauthenticated visitor' do
+    it 'displays the correct content' do
+      expect(page).to have_css('h1', text: 'How to access this training course')
+      expect(page).to have_css('p', text: 'This service uses GOV.UK One Login which is managed by the Government Digital Service.')
+      expect(page).to have_css('p', text: 'You will be asked to sign in to your account, or create a One Login account, in this service')
+      expect(page).to have_css('a', text: 'Continue to GOV.UK One Login')
+    end
+  end
+
+  context 'with an authenticated user' do
+    include_context 'with user'
+
+    it 'redirects to the my modules page' do
+      expect(page).to have_current_path('/my-modules')
+    end
+  end
+end