From ce497b953836cad31c41d61f8ca184717b34cb59 Mon Sep 17 00:00:00 2001 From: Matt Hinz Date: Mon, 12 Jun 2023 12:27:03 -0700 Subject: [PATCH 1/3] Move GPO routes under /verify - Move GPO routes previously under /account to /verify - Add redirects for old paths changelog: Internal, GPO, Move GPO paths under /verify --- config/routes.rb | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 4db943f727f..06f7ea1f8f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -394,22 +394,26 @@ get '/in_person/:step' => 'in_person#show', as: :in_person_step put '/in_person/:step' => 'in_person#update' - # deprecated routes - get '/confirmations' => 'personal_key#show' - post '/confirmations' => 'personal_key#update' - end + get '/by_mail' => 'gpo_verify#index', as: :gpo_verify + post '/by_mail' => 'gpo_verify#create' + get '/by_mail/confirm_start_over' => 'confirm_start_over#index', + as: :confirm_start_over - get '/account/verify' => 'idv/gpo_verify#index', as: :idv_gpo_verify - post '/account/verify' => 'idv/gpo_verify#create' - get '/account/verify/confirm_start_over' => 'idv/confirm_start_over#index', as: :idv_confirm_start_over - if FeatureManagement.gpo_verification_enabled? - scope '/verify', module: 'idv', as: 'idv' do + if FeatureManagement.gpo_verification_enabled? get '/usps' => 'gpo#index', as: :gpo put '/usps' => 'gpo#create' post '/usps' => 'gpo#update' end + + # deprecated routes + get '/confirmations' => 'personal_key#show' + post '/confirmations' => 'personal_key#update' end + # Old paths to GPO outside of IdV. + get '/account/verify', to: redirect('/verify/by_mail') + get '/account/verify/confirm_start_over', to: redirect('/verify/by_mail/confirm_start_over') + root to: 'users/sessions#new' end From bf7757408b4edfd61f465797eb332e9202810307 Mon Sep 17 00:00:00 2001 From: Matt Hinz Date: Mon, 12 Jun 2023 15:36:39 -0700 Subject: [PATCH 2/3] Fix GPO presenter spec --- spec/presenters/idv/gpo_presenter_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/presenters/idv/gpo_presenter_spec.rb b/spec/presenters/idv/gpo_presenter_spec.rb index dba1de3f88e..6a36c0358c2 100644 --- a/spec/presenters/idv/gpo_presenter_spec.rb +++ b/spec/presenters/idv/gpo_presenter_spec.rb @@ -67,7 +67,7 @@ context 'when the user has a pending profile' do it 'returns the verify account path' do create(:profile, user: user, gpo_verification_pending_at: 1.day.ago) - expect(subject.fallback_back_path).to eq('/account/verify') + expect(subject.fallback_back_path).to eq('/verify/by_mail') end end From 970a89689b1e16e29d50cb069263e70ad3fc6778 Mon Sep 17 00:00:00 2001 From: Matt Hinz Date: Mon, 12 Jun 2023 16:54:28 -0700 Subject: [PATCH 3/3] Add specs for redirects --- spec/requests/redirects_spec.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spec/requests/redirects_spec.rb b/spec/requests/redirects_spec.rb index 7f0c11a47d0..f89d4996334 100644 --- a/spec/requests/redirects_spec.rb +++ b/spec/requests/redirects_spec.rb @@ -24,4 +24,20 @@ expect(response).to redirect_to('/account/verify') end end + + describe '/account/verify' do + it 'redirects to /verify/by_mail' do + get '/account/verify' + + expect(response).to redirect_to('/verify/by_mail') + end + end + + describe '/account/verify/confirm_start_over' do + it 'redirects to /verify/by_mail/confirm_start_over' do + get '/account/verify/confirm_start_over' + + expect(response).to redirect_to('/verify/by_mail/confirm_start_over') + end + end end