LG 14404 Add email at confirmation to share with service provider

app/controllers/sign_up/completions_controller.rb

@@ -28,6 +28,7 @@ def update
       if decider.go_back_to_mobile_app?
         sign_user_out_and_instruct_to_go_back_to_mobile_app
       else
+        user_session.delete(:pending_completions_consent)
         redirect_to(
           sp_session_request_url_with_updated_params || account_url,
           allow_other_host: true,

app/controllers/users/email_confirmations_controller.rb

@@ -44,7 +44,11 @@ def process_successful_confirmation(email_address)
       confirm_and_notify(email_address)
       if current_user
         flash[:success] = t('devise.confirmations.confirmed')
-        redirect_to account_url
+        if user_session[:pending_completions_consent] == true
+          redirect_to sign_up_select_email_url
+        else
+          redirect_to account_url
+        end
       else
         flash[:success] = t('devise.confirmations.confirmed_but_sign_in')
         redirect_to root_url

app/controllers/users/emails_controller.rb

@@ -22,6 +22,10 @@ def add
       result = @add_user_email_form.submit(current_user, permitted_params)
       analytics.add_email_request(**result.to_h)
 
+      if pending_completions_consent?
+        user_session[:pending_completions_consent] = true
+      end
+
       if result.success?
         process_successful_creation
       else

spec/controllers/users/email_confirmations_controller_spec.rb

@@ -67,5 +67,39 @@
         expect(flash[:error]).to eq t('errors.messages.confirmation_invalid_token')
       end
     end
+
+    describe '#process_successful_confirmation' do
+      let(:user) { create(:user) }
+
+      before do
+        stub_sign_in(user)
+      end
+
+      it 'adds an email from the service provider consent flow' do
+        new_email = Faker::Internet.email
+
+        controller.user_session[:pending_completions_consent] = true
+
+        add_email_form = AddUserEmailForm.new
+        add_email_form.submit(user, email: new_email)
+        email_record = add_email_form.email_address_record(new_email)
+
+        get :create, params: { confirmation_token: email_record.reload.confirmation_token }
+
+        expect(response).to redirect_to(sign_up_select_email_url)
+      end
+
+      it 'adds an email from the account page' do
+        new_email = Faker::Internet.email
+
+        add_email_form = AddUserEmailForm.new
+        add_email_form.submit(user, email: new_email)
+        email_record = add_email_form.email_address_record(new_email)
+
+        get :create, params: { confirmation_token: email_record.reload.confirmation_token }
+
+        expect(response).to redirect_to(account_url)
+      end
+    end
   end
 end