diff --git a/app/controllers/users/piv_cac_authentication_setup_controller.rb b/app/controllers/users/piv_cac_authentication_setup_controller.rb
index f7d3f7f41ec..8d6fc3f754a 100644
--- a/app/controllers/users/piv_cac_authentication_setup_controller.rb
+++ b/app/controllers/users/piv_cac_authentication_setup_controller.rb
@@ -15,9 +15,6 @@ class PivCacAuthenticationSetupController < ApplicationController
def new
if params.key?(:token)
process_piv_cac_setup
- # this branch is deprecated, remove it
- elsif flash[:error_type].present?
- render_error
else
render_prompt
end
@@ -74,16 +71,6 @@ def piv_cac_service_url_with_redirect
)
end
- def render_error
- @presenter = PivCacErrorPresenter.new(
- error: flash[:error_type],
- view: view_context,
- try_again_url: setup_piv_cac_url,
- )
-
- render :error
- end
-
def process_piv_cac_setup
result = user_piv_cac_form.submit
analytics.track_event(Analytics::MULTI_FACTOR_AUTH_SETUP, result.to_h)
diff --git a/app/views/users/piv_cac_login/account_not_found.html.erb b/app/views/users/piv_cac_login/account_not_found.html.erb
deleted file mode 100644
index 53ab944f840..00000000000
--- a/app/views/users/piv_cac_login/account_not_found.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% title t('headings.piv_cac_login.account_not_found') %>
-
-<%= t('headings.piv_cac_login.account_not_found') %>
-<%= t('instructions.mfa.piv_cac.account_not_found_html',
- sign_in: link_to(t('headings.sign_in_without_sp'), root_url),
- create_account: link_to(t('links.create_account'), sign_up_email_url),
- )
-%>
diff --git a/app/views/users/piv_cac_login/did_not_work.html.erb b/app/views/users/piv_cac_login/did_not_work.html.erb
deleted file mode 100644
index b5f349a0f9d..00000000000
--- a/app/views/users/piv_cac_login/did_not_work.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% title t('headings.piv_cac.did_not_work') %>
-
-
- <%= t('headings.piv_cac.did_not_work') %>
-
-
-
- <%= t('instructions.mfa.piv_cac.did_not_work_html',
- please_try_again: link_to(I18n.t('instructions.mfa.piv_cac.please_try_again'), login_piv_cac_url)) %>
-
-
-
- <%= link_to t('instructions.mfa.piv_cac.back_to_sign_in'), root_url, class: 'usa-button' %>
-
-
-<%= render 'shared/cancel', link: new_user_session_url %>
diff --git a/app/views/users/piv_cac_login/temporary_error.html.erb b/app/views/users/piv_cac_login/temporary_error.html.erb
deleted file mode 100644
index 6f95291478c..00000000000
--- a/app/views/users/piv_cac_login/temporary_error.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% title t('headings.piv_cac_login.temporary_error') %>
-
- <%= t('headings.piv_cac_login.temporary_error') %>
-
-
- <%= t('instructions.mfa.piv_cac.temporary_error') %>
-
-
- <%= link_to t('instructions.mfa.piv_cac.back_to_sign_in'), root_url, class: 'usa-button' %>
-
-<%= render 'shared/cancel', link: new_user_session_url %>
diff --git a/config/locales/headings/en.yml b/config/locales/headings/en.yml
index 83756e5fd0e..383a19e8077 100644
--- a/config/locales/headings/en.yml
+++ b/config/locales/headings/en.yml
@@ -55,7 +55,6 @@ en:
use it to sign in.
new: Sign in with your PIV or CAC
success: You successfully set up PIV/CAC as an authentication method.
- temporary_error: We're having technical difficulties using your PIV/CAC
piv_cac_setup:
already_associated: The PIV/CAC you presented is associated with another user.
new: Use your PIV/CAC card to secure your account
diff --git a/config/locales/headings/es.yml b/config/locales/headings/es.yml
index cb1a02ac233..74860ecf600 100644
--- a/config/locales/headings/es.yml
+++ b/config/locales/headings/es.yml
@@ -55,7 +55,6 @@ es:
para que pueda usarlo para iniciar sesión.
new: Use su PIV / CAC para iniciar sesión en su cuenta
success: Configuró correctamente PIV/CAC como método de autenticación.
- temporary_error: Estamos teniendo dificultades técnicas para usar su PIV/CAC
piv_cac_setup:
already_associated: La PIV/CAC que has presentado está asociada a otro usuario.
new: Use su tarjeta PIV/CAC para asegurar su cuenta
diff --git a/config/locales/headings/fr.yml b/config/locales/headings/fr.yml
index c71ca574c1c..20ca6924bb4 100644
--- a/config/locales/headings/fr.yml
+++ b/config/locales/headings/fr.yml
@@ -56,7 +56,6 @@ fr:
à deux facteurs pour pouvoir l'utiliser pour vous connecter.
new: Utilisez votre PIV / CAC pour vous connecter à votre compte
success: Vous avez correctement configuré PIV/CAC en tant que méthode d’authentification.
- temporary_error: Nous rencontrons des difficultés techniques avec votre PIV/CAC
piv_cac_setup:
already_associated: La carte PIV/CAC que vous avez présentée est associée à
un autre utilisateur.
diff --git a/config/locales/instructions/en.yml b/config/locales/instructions/en.yml
index 3b82527d1fb..8788379af54 100644
--- a/config/locales/instructions/en.yml
+++ b/config/locales/instructions/en.yml
@@ -59,8 +59,6 @@ en:
step_3_info_html: You'll need to choose a certificate (the
right one likely has your name in it) and enter your PIN
(your PIN was created when you set up your PIV/CAC).
- temporary_error: Please try again later or sign in with your email and password
- instead.
try_again: try again
sms:
confirm_code_html: Need another code? %{resend_code_link}. Message rates may
diff --git a/config/locales/instructions/es.yml b/config/locales/instructions/es.yml
index f7896f31eb4..1468c0f15f9 100644
--- a/config/locales/instructions/es.yml
+++ b/config/locales/instructions/es.yml
@@ -61,8 +61,6 @@ es:
step_3_info_html: Tendrá que elegir un certificado (el
correcto probablemente tenga su nombre) e ingrese su PIN
(su PIN se creó cuando configuró su PIV/CAC)
- temporary_error: Vuelve a intentarlo más tarde o inicia sesión con tu correo
- electrónico y contraseña.
try_again: inténtelo de nuevo
sms:
confirm_code_html: "¿Necesita otro código? %{resend_code_link}. Puede estar
diff --git a/config/locales/instructions/fr.yml b/config/locales/instructions/fr.yml
index f88969a39d5..3bb1f520869 100644
--- a/config/locales/instructions/fr.yml
+++ b/config/locales/instructions/fr.yml
@@ -69,8 +69,6 @@ fr:
de droite contient probablement votre nom) et entrer votre code
PIN (votre code PIN a été créé lors de la configuration de votre
PIV / CAC ).
- temporary_error: Veuillez réessayer ultérieurement ou connectez-vous avec
- votre adresse électronique et votre mot de passe.
try_again: réessayer
sms:
confirm_code_html: Vous avez besoin d'un autre code? %{resend_code_link}.
diff --git a/config/routes.rb b/config/routes.rb
index d58d2cf0586..646de83fe1c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,10 +77,6 @@
get '/login/piv_cac' => 'users/piv_cac_login#new'
get '/login/piv_cac_error' => 'users/piv_cac_login#error'
- # these routes are deprecated
- get '/login/piv_cac_account_not_found' => 'users/piv_cac_login#account_not_found'
- get '/login/piv_cac_did_not_work' => 'users/piv_cac_login#did_not_work'
- get '/login/piv_cac_temporary_error' => 'users/piv_cac_login#temporary_error'
get '/login/present_piv_cac' => 'users/piv_cac_login#redirect_to_piv_cac_service'
get '/login/password' => 'password_capture#new', as: :capture_password