Merge branch '201893-resolve-soft-email-confirmation-flow' into 'master'

Remove the soft_email_confirmation feature flag

See merge request gitlab-org/gitlab!24371

app/controllers/concerns/confirm_email_warning.rb

@@ -10,7 +10,7 @@ module ConfirmEmailWarning
   protected
 
   def show_confirm_warning?
-    html_request? && request.get? && Feature.enabled?(:soft_email_confirmation)
+    html_request? && request.get?
   end
 
   def set_confirm_warning

app/controllers/confirmations_controller.rb

@@ -11,7 +11,7 @@ class ConfirmationsController < Devise::ConfirmationsController
   protected
 
   def after_resending_confirmation_instructions_path_for(resource)
-    Feature.enabled?(:soft_email_confirmation) ? stored_location_for(resource) || dashboard_projects_path : users_almost_there_path
+    stored_location_for(resource) || dashboard_projects_path
   end
 
   def after_confirmation_path_for(resource_name, resource)

app/controllers/registrations_controller.rb

@@ -53,7 +53,7 @@ class RegistrationsController < Devise::RegistrationsController
 
   def welcome
     return redirect_to new_user_registration_path unless current_user
-    return redirect_to stored_location_or_dashboard_or_almost_there_path(current_user) if current_user.role.present? && !current_user.setup_for_company.nil?
+    return redirect_to stored_location_or_dashboard(current_user) if current_user.role.present? && !current_user.setup_for_company.nil?
 
     current_user.name = nil if current_user.name == current_user.username
   end
@@ -65,7 +65,7 @@ class RegistrationsController < Devise::RegistrationsController
     if result[:status] == :success
       track_experiment_event(:signup_flow, 'end') # We want this event to be tracked when the user is _in_ the experimental group
       set_flash_message! :notice, :signed_up
-      redirect_to stored_location_or_dashboard_or_almost_there_path(current_user)
+      redirect_to stored_location_or_dashboard(current_user)
     else
       render :welcome
     end
@@ -112,12 +112,12 @@ class RegistrationsController < Devise::RegistrationsController
 
     return users_sign_up_welcome_path if experiment_enabled?(:signup_flow)
 
-    stored_location_or_dashboard_or_almost_there_path(user)
+    stored_location_or_dashboard(user)
   end
 
   def after_inactive_sign_up_path_for(resource)
     Gitlab::AppLogger.info(user_created_message)
-    Feature.enabled?(:soft_email_confirmation) ? dashboard_projects_path : users_almost_there_path
+    dashboard_projects_path
   end
 
   private
@@ -179,18 +179,10 @@ class RegistrationsController < Devise::RegistrationsController
     Gitlab::Utils.to_boolean(params[:terms_opt_in])
   end
 
-  def confirmed_or_unconfirmed_access_allowed(user)
-    user.confirmed? || Feature.enabled?(:soft_email_confirmation) || experiment_enabled?(:signup_flow)
-  end
-
   def stored_location_or_dashboard(user)
     stored_location_for(user) || dashboard_projects_path
   end
 
-  def stored_location_or_dashboard_or_almost_there_path(user)
-    confirmed_or_unconfirmed_access_allowed(user) ? stored_location_or_dashboard(user) : users_almost_there_path
-  end
-
   # Part of an experiment to build a new sign up flow. Will be resolved
   # with https://gitlab.com/gitlab-org/growth/engineering/issues/64
   def choose_layout

app/models/user.rb

@@ -1638,13 +1638,6 @@ class User < ApplicationRecord
     super
   end
 
-  # override from Devise::Confirmable
-  def confirmation_period_valid?
-    return false if Feature.disabled?(:soft_email_confirmation)
-
-    super
-  end
-
   private
 
   def default_private_profile_to_false

changelogs/unreleased/201893-resolve-soft-email-confirmation-flow.yml

+---
+title: Allow a grace period for new users to confirm their email
+merge_request: 24371
+author:
+type: added

spec/controllers/concerns/confirm_email_warning_spec.rb

@@ -3,10 +3,6 @@
 require 'spec_helper'
 
 describe ConfirmEmailWarning do
-  before do
-    stub_feature_flags(soft_email_confirmation: true)
-  end
-
   controller(ApplicationController) do
     # `described_class` is not available in this context
     include ConfirmEmailWarning

spec/controllers/registrations_controller_spec.rb

@@ -77,34 +77,14 @@ describe RegistrationsController do
       context 'when send_user_confirmation_email is true' do
         before do
           stub_application_setting(send_user_confirmation_email: true)
+          allow(User).to receive(:allow_unconfirmed_access_for).and_return 2.days
         end
 
-        context 'when soft email confirmation is not enabled' do
-          before do
-            stub_feature_flags(soft_email_confirmation: false)
-            allow(User).to receive(:allow_unconfirmed_access_for).and_return 0
-          end
-
-          it 'does not authenticate the user and sends a confirmation email' do
-            post(:create, params: user_params)
-
-            expect(ActionMailer::Base.deliveries.last.to.first).to eq(user_params[:user][:email])
-            expect(subject.current_user).to be_nil
-          end
-        end
+        it 'authenticates the user and sends a confirmation email' do
+          post(:create, params: user_params)
 
-        context 'when soft email confirmation is enabled' do
-          before do
-            stub_feature_flags(soft_email_confirmation: true)
-            allow(User).to receive(:allow_unconfirmed_access_for).and_return 2.days
-          end
-
-          it 'authenticates the user and sends a confirmation email' do
-            post(:create, params: user_params)
-
-            expect(ActionMailer::Base.deliveries.last.to.first).to eq(user_params[:user][:email])
-            expect(response).to redirect_to(dashboard_projects_path)
-          end
+          expect(ActionMailer::Base.deliveries.last.to.first).to eq(user_params[:user][:email])
+          expect(response).to redirect_to(dashboard_projects_path)
         end
       end
 

spec/features/invites_spec.rb

@@ -153,24 +153,6 @@ describe 'Invites' do
     context 'email confirmation enabled' do
       let(:send_email_confirmation) { true }
 
-      context 'when soft email confirmation is not enabled' do
-        before do
-          # stub_feature_flags(soft_email_confirmation: false)
-          allow(User).to receive(:allow_unconfirmed_access_for).and_return 0
-        end
-
-        it 'signs up and redirects to root page with all the project/groups invitation automatically accepted' do
-          fill_in_sign_up_form(new_user)
-          confirm_email(new_user)
-          fill_in_sign_in_form(new_user)
-
-          expect(current_path).to eq(root_path)
-          expect(page).to have_content(project.full_name)
-          visit group_path(group)
-          expect(page).to have_content(group.full_name)
-        end
-      end
-
       context 'when soft email confirmation is enabled' do
         before do
           allow(User).to receive(:allow_unconfirmed_access_for).and_return 2.days
@@ -198,32 +180,14 @@ describe 'Invites' do
       context 'the user sign-up using a different email address' do
         let(:invite_email) { build_stubbed(:user).email }
 
-        context 'when soft email confirmation is not enabled' do
-          before do
-            stub_feature_flags(soft_email_confirmation: false)
-            allow(User).to receive(:allow_unconfirmed_access_for).and_return 0
-          end
-
-          it 'signs up and redirects to the invitation page' do
-            fill_in_sign_up_form(new_user)
-            confirm_email(new_user)
-            fill_in_sign_in_form(new_user)
-
-            expect(current_path).to eq(invite_path(group_invite.raw_invite_token))
-          end
+        before do
+          allow(User).to receive(:allow_unconfirmed_access_for).and_return 2.days
         end
 
-        context 'when soft email confirmation is enabled' do
-          before do
-            stub_feature_flags(soft_email_confirmation: true)
-            allow(User).to receive(:allow_unconfirmed_access_for).and_return 2.days
-          end
-
-          it 'signs up and redirects to the invitation page' do
-            fill_in_sign_up_form(new_user)
+        it 'signs up and redirects to the invitation page' do
+          fill_in_sign_up_form(new_user)
 
-            expect(current_path).to eq(invite_path(group_invite.raw_invite_token))
-          end
+          expect(current_path).to eq(invite_path(group_invite.raw_invite_token))
         end
       end
     end

spec/features/users/login_spec.rb

@@ -797,7 +797,6 @@ describe 'Login' do
 
     before do
       stub_application_setting(send_user_confirmation_email: true)
-      stub_feature_flags(soft_email_confirmation: true)
       allow(User).to receive(:allow_unconfirmed_access_for).and_return grace_period
     end
 

spec/features/users/signup_spec.rb

@@ -129,63 +129,29 @@ shared_examples 'Signup' do
         stub_application_setting(send_user_confirmation_email: true)
       end
 
-      context 'when soft email confirmation is not enabled' do
-        before do
-          stub_feature_flags(soft_email_confirmation: false)
-        end
-
-        it 'creates the user account and sends a confirmation email' do
-          visit new_user_registration_path
-
-          fill_in 'new_user_username', with: new_user.username
-          fill_in 'new_user_email', with: new_user.email
-
-          if Gitlab::Experimentation.enabled?(:signup_flow)
-            fill_in 'new_user_first_name', with: new_user.first_name
-            fill_in 'new_user_last_name', with: new_user.last_name
-          else
-            fill_in 'new_user_name', with: new_user.name
-            fill_in 'new_user_email_confirmation', with: new_user.email
-          end
-
-          fill_in 'new_user_password', with: new_user.password
-
-          expect { click_button 'Register' }.to change { User.count }.by(1)
+      it 'creates the user account and sends a confirmation email' do
+        visit new_user_registration_path
 
-          expect(current_path).to eq users_almost_there_path
-          expect(page).to have_content('Please check your email to confirm your account')
-        end
-      end
+        fill_in 'new_user_username', with: new_user.username
+        fill_in 'new_user_email', with: new_user.email
 
-      context 'when soft email confirmation is enabled' do
-        before do
-          stub_feature_flags(soft_email_confirmation: true)
+        if Gitlab::Experimentation.enabled?(:signup_flow)
+          fill_in 'new_user_first_name', with: new_user.first_name
+          fill_in 'new_user_last_name', with: new_user.last_name
+        else
+          fill_in 'new_user_name', with: new_user.name
+          fill_in 'new_user_email_confirmation', with: new_user.email
         end
 
-        it 'creates the user account and sends a confirmation email' do
-          visit new_user_registration_path
-
-          fill_in 'new_user_username', with: new_user.username
-          fill_in 'new_user_email', with: new_user.email
-
-          if Gitlab::Experimentation.enabled?(:signup_flow)
-            fill_in 'new_user_first_name', with: new_user.first_name
-            fill_in 'new_user_last_name', with: new_user.last_name
-          else
-            fill_in 'new_user_name', with: new_user.name
-            fill_in 'new_user_email_confirmation', with: new_user.email
-          end
-
-          fill_in 'new_user_password', with: new_user.password
+        fill_in 'new_user_password', with: new_user.password
 
-          expect { click_button 'Register' }.to change { User.count }.by(1)
+        expect { click_button 'Register' }.to change { User.count }.by(1)
 
-          if Gitlab::Experimentation.enabled?(:signup_flow)
-            expect(current_path).to eq users_sign_up_welcome_path
-          else
-            expect(current_path).to eq dashboard_projects_path
-            expect(page).to have_content("Please check your email (#{new_user.email}) to verify that you own this address and unlock the power of CI/CD.")
-          end
+        if Gitlab::Experimentation.enabled?(:signup_flow)
+          expect(current_path).to eq users_sign_up_welcome_path
+        else
+          expect(current_path).to eq dashboard_projects_path
+          expect(page).to have_content("Please check your email (#{new_user.email}) to verify that you own this address and unlock the power of CI/CD.")
         end
       end
     end