Merge branch '24576_cant_stop_impersonating' into 'master'

Allow admins to stop impersonating users without e-mail addresses

Closes #24576

See merge request !7550

app/controllers/application_controller.rb

@@ -224,7 +224,7 @@ class ApplicationController < ActionController::Base
   end
 
   def require_email
-    if current_user && current_user.temp_oauth_email?
+    if current_user && current_user.temp_oauth_email? && session[:impersonator_id].nil?
       redirect_to profile_path, notice: 'Please complete your profile with email address' and return
     end
   end

changelogs/unreleased/24576_cant_stop_impersonating.yml

+---
+title: Allow admins to stop impersonating users without e-mail addresses
+merge_request: 7550
+author: Oren Kanner

spec/controllers/admin/impersonations_controller_spec.rb

@@ -76,6 +76,7 @@ describe Admin::ImpersonationsController do
           end
 
           context "when the impersonator is not blocked" do
+            shared_examples_for "successfully stops impersonating" do
               it "redirects to the impersonated user's page" do
                 expect(Gitlab::AppLogger).to receive(:info).with("User #{impersonator.username} has stopped impersonating #{user.username}").and_call_original
 
@@ -90,6 +91,19 @@ describe Admin::ImpersonationsController do
                 expect(warden.user).to eq(impersonator)
               end
             end
+
+            # base case
+            it_behaves_like "successfully stops impersonating"
+
+            context "and the user has a temporary oauth e-mail address" do
+              before do
+                allow(user).to receive(:temp_oauth_email?).and_return(true)
+                allow(controller).to receive(:current_user).and_return(user)
+              end
+
+              it_behaves_like "successfully stops impersonating"
+            end
+          end
         end
       end
     end