diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2be9690400b..5b2de75be1a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -411,12 +411,6 @@ def sp_session_request_url_with_updated_params url = if request_url.path.match?('saml') sp_session[:final_auth_request] = true complete_saml_url - elsif IdentityConfig.store.rewrite_oidc_request_prompt - # Login.gov redirects to the orginal request_url after a user authenticates - # replace prompt=login with prompt=select_account to prevent sign_out - # which should only ever occur once when the user - # lands on Login.gov with prompt=login - sp_session[:request_url]&.gsub('prompt=login', 'prompt=select_account') else sp_session[:request_url] end diff --git a/config/application.yml.default b/config/application.yml.default index c428faaddfa..9eccfa1f67f 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -281,7 +281,6 @@ requests_per_ip_period: 300 requests_per_ip_track_only_mode: false reset_password_email_max_attempts: 20 reset_password_email_window_in_minutes: 60 -rewrite_oidc_request_prompt: true risc_notifications_local_enabled: false risc_notifications_active_job_enabled: false risc_notifications_rate_limit_interval: 60 diff --git a/lib/identity_config.rb b/lib/identity_config.rb index 27a1d873a69..0b43e1cbbf7 100644 --- a/lib/identity_config.rb +++ b/lib/identity_config.rb @@ -387,7 +387,6 @@ def self.build_store(config_map) config.add(:requests_per_ip_track_only_mode, type: :boolean) config.add(:reset_password_email_max_attempts, type: :integer) config.add(:reset_password_email_window_in_minutes, type: :integer) - config.add(:rewrite_oidc_request_prompt, type: :boolean) config.add(:risc_notifications_local_enabled, type: :boolean) config.add(:risc_notifications_active_job_enabled, type: :boolean) config.add(:risc_notifications_rate_limit_interval, type: :integer) diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index b7104b005d1..137d81e9ea3 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -442,13 +442,6 @@ def index end end - context 'with a url that has prompt=login' do - let(:sp_session_request_url) { '/authorize?prompt=login' } - it 'changes it to prompt=select_account' do - expect(url_with_updated_params).to eq('/authorize?prompt=select_account') - end - end - context 'when the locale has been changed' do before { I18n.locale = :es } let(:sp_session_request_url) { '/authorize' } diff --git a/spec/features/openid_connect/openid_connect_spec.rb b/spec/features/openid_connect/openid_connect_spec.rb index 3149846a8d6..c55cb3619fe 100644 --- a/spec/features/openid_connect/openid_connect_spec.rb +++ b/spec/features/openid_connect/openid_connect_spec.rb @@ -24,12 +24,7 @@ expect(certs_response[:keys].find { |key| key[:kid] == kid }).to be end - context 'with client_secret_jwt and disabling rewrite_oidc_request_prompt' do - before do - allow(IdentityConfig.store).to receive(:rewrite_oidc_request_prompt). - and_return(false) - end - + context 'with client_secret_jwt' do it 'succeeds with prompt login and no prior session' do oidc_end_client_secret_jwt(prompt: 'login') end