18F · mitchellhenke · Mar 24, 2021 · Feb 26, 2021 · Mar 10, 2021
diff --git 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
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
diff --git a/app/views/users/piv_cac_login/temporary_error.html.erb b/app/views/users/piv_cac_login/temporary_error.html.erb
diff --git 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
@@ -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
@@ -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
@@ -59,8 +59,6 @@ en:
         step_3_info_html: You'll need to <strong>choose a certificate</strong> (the
           right one likely has your name in it) and <strong>enter your PIN</strong>
           (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
@@ -61,8 +61,6 @@ es:
         step_3_info_html: Tendrá que <strong> elegir un certificado </strong> (el
           correcto probablemente tenga su nombre) e <strong> ingrese su PIN </strong>
           (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
@@ -69,8 +69,6 @@ fr:
           de droite contient probablement votre nom) et <strong> entrer votre code
           PIN </strong> (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
@@ -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