Revert "One login auth"

app/views/candidate_interface/start_page/create_account_or_sign_in.html.erb

@@ -4,39 +4,31 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <h1 class="govuk-heading-xl">
-      <%= t('page_titles.create_account_or_sign_in') %>
-    </h1>
+    <%= form_with(
+      model: @create_account_or_sign_in_form,
+      url: candidate_interface_create_account_or_sign_in_path(providerCode: params[:providerCode], courseCode: params[:courseCode]),
+      method: :post,
+    ) do |f| %>
+      <%= f.govuk_error_summary %>
 
-    <% if FeatureFlag.active?(:one_login_candidate_sign_in) %>
-      <p class="govuk-body">
-        <%= t('govuk.one_login_account_guidance') %>
-      </p>
+      <h1 class="govuk-heading-xl">
+        <%= t('page_titles.create_account_or_sign_in') %>
+      </h1>
 
-      <%= govuk_button_to(t('continue'), OneLogin.bypass? ? '/auth/one-login-developer' : '/auth/one_login') %>
-    <% else %>
-     <%= form_with(
-        model: @create_account_or_sign_in_form,
-        url: candidate_interface_create_account_or_sign_in_path(providerCode: params[:providerCode], courseCode: params[:courseCode]),
-        method: :post,
-      ) do |f| %>
-        <%= f.govuk_error_summary %>
-
-        <%= f.govuk_radio_buttons_fieldset :existing_account, legend: { text: 'Do you already have an account?' } do %>
-          <%= f.govuk_radio_button :existing_account, true, label: { text: 'Yes, sign in' }, link_errors: true do %>
-            <%= f.govuk_email_field :email, label: { text: 'Email address', size: 's' }, hint: { text: 'Enter the email address you used to register, and we will send you a link to sign in.' }, width: 'two-thirds', autocomplete: 'email', spellcheck: false %>
-          <% end %>
-          <%= f.govuk_radio_button :existing_account, false, label: { text: 'No, I need to create an account' } %>
+      <%= f.govuk_radio_buttons_fieldset :existing_account, legend: { text: 'Do you already have an account?' } do %>
+        <%= f.govuk_radio_button :existing_account, true, label: { text: 'Yes, sign in' }, link_errors: true do %>
+          <%= f.govuk_email_field :email, label: { text: 'Email address', size: 's' }, hint: { text: 'Enter the email address you used to register, and we will send you a link to sign in.' }, width: 'two-thirds', autocomplete: 'email', spellcheck: false %>
         <% end %>
-        <%= f.govuk_submit t('continue') %>
+        <%= f.govuk_radio_button :existing_account, false, label: { text: 'No, I need to create an account' } %>
       <% end %>
-
-      <p class="govuk-body">
-        You can usually start applying for teacher training in October, the
-        year before your course starts. Courses can fill up quickly, so apply
-        as soon as you can.
-        <%= govuk_link_to 'Read how the application process works', candidate_interface_guidance_path %>.
-      </p>
+      <%= f.govuk_submit t('continue') %>
     <% end %>
+
+    <p class="govuk-body">
+      You can usually start applying for teacher training in October, the
+      year before your course starts. Courses can fill up quickly, so apply
+      as soon as you can.
+      <%= govuk_link_to 'Read how the application process works', candidate_interface_guidance_path %></a>.
+    </p>
   </div>
 </div>

app/views/layouts/_header.html.erb

@@ -7,10 +7,9 @@
             )) %>
   <%= render PhaseBannerComponent.new(no_border: current_candidate.present?) %>
   <% if current_candidate %>
-    <% sign_out_path = FeatureFlag.active?(:one_login_candidate_sign_in) ? auth_one_login_sign_out_path : candidate_interface_sign_out_path %>
     <%= render(PrimaryNavigationComponent.new(
                 items: NavigationItems.candidate_primary_navigation(current_candidate:, current_controller: controller),
-                items_right: [NavigationItems::NavigationItem.new('Sign out', sign_out_path)],
+                items_right: [NavigationItems::NavigationItem.new('Sign out', candidate_interface_sign_out_path)],
               )) %>
   <% end %>
 <% when 'support_interface' %>

config/application.rb

@@ -40,7 +40,7 @@ class Application < Rails::Application
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
     # Common ones are `templates`, `generators`, or `middleware`, for example.
-    config.autoload_lib(ignore: %w[assets tasks generators rubocop omniauth])
+    config.autoload_lib(ignore: %w[assets tasks generators rubocop])
 
     # Configuration for the application, engines, and railties goes here.
     #

config/initializers/omniauth.rb

@@ -1,6 +1,4 @@
 OmniAuth.config.logger = Rails.logger
-require 'omniauth/strategies/one_login_developer'
-require 'omniauth/one_login_setup'
 
 dfe_sign_in_identifier = ENV['DFE_SIGN_IN_CLIENT_ID']
 dfe_sign_in_secret = ENV['DFE_SIGN_IN_SECRET']
@@ -34,12 +32,6 @@ def self.bypass?
   end
 end
 
-module ::OneLogin
-  def self.bypass?
-    HostingEnvironment.review? || HostingEnvironment.loadtest? || Rails.env.development?
-  end
-end
-
 if DfESignIn.bypass?
   Rails.application.config.middleware.use OmniAuth::Builder do
     provider :developer,
@@ -49,17 +41,3 @@ def self.bypass?
 else
   Rails.application.config.middleware.use OmniAuth::Strategies::OpenIDConnect, options
 end
-
-if OneLogin.bypass?
-  Rails.application.config.middleware.use OmniAuth::Builder do
-    provider :one_login_developer,
-             request_path: '/auth/one-login-developer',
-             callback_path: '/auth/one-login-developer/callback',
-             fields: %i[uid],
-             uid_field: :uid
-  end
-else
-  Rails.application.config.middleware.use OmniAuth::Builder do |builder|
-    OneLoginSetup.configure(builder)
-  end
-end

config/locales/en.yml

@@ -24,7 +24,6 @@ en:
   national_careers_service:
     find_a_course_url: https://nationalcareers.service.gov.uk/find-a-course/search
   govuk:
-    one_login_account_guidance: You need a GOV.UK One Login to sign in to this service. You can create one if you do not already have one.
     url: https://www.gov.uk
     terms_conditions_url: https://www.gov.uk/help/terms-conditions
     safeguarding: https://www.gov.uk/tell-employer-or-college-about-criminal-record

config/routes.rb

@@ -23,12 +23,6 @@
   get '/auth/developer/callback' => 'dfe_sign_in#bypass_callback'
   get '/auth/dfe/sign-out' => 'dfe_sign_in#redirect_after_dsi_signout'
 
-  get '/auth/one-login/callback', to: 'one_login#callback'
-  get '/auth/one-login-developer/callback' => 'one_login#bypass_callback'
-  get '/auth/one-login/sign-out', to: 'one_login#sign_out'
-  get '/auth/one-login/sign-out-complete', to: 'one_login#sign_out_complete'
-  get '/auth/failure', to: 'one_login#failure'
-
   direct :find do
     if HostingEnvironment.sandbox_mode?
       I18n.t('find_teacher_training.sandbox_url')
@@ -62,6 +56,6 @@
     get '/404', to: 'errors#not_found'
     get '/406', to: 'errors#not_acceptable'
     get '/422', to: 'errors#unprocessable_entity'
-    get '/500', to: 'errors#internal_server_error', as: :internal_server_error
+    get '/500', to: 'errors#internal_server_error'
   end
 end

lib/tasks/local_dev.rake

@@ -14,13 +14,6 @@ task setup_local_dev_data: %i[environment copy_feature_flags_from_production syn
     first_name: 'Susan',
     last_name: 'Upport',
   )
-  candidate = Candidate.create!(
-    email_address: '[email protected]',
-  )
-  candidate.create_one_login_auth!(
-    token: 'dev-candidate',
-    email_address: candidate.email_address,
-  )
 
   puts 'Creating various provider users...'
   CreateExampleProviderUsersWithPermissions.call