Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

2 files changed, 11 insertions, 1 deletions

diff --git a/lib/gitlab/auth/o_auth/auth_hash.rb b/lib/gitlab/auth/o_auth/auth_hash.rb
index 2ec75669d24..a45778159c7 100644
--- a/lib/gitlab/auth/o_auth/auth_hash.rb
+++ b/lib/gitlab/auth/o_auth/auth_hash.rb
@@ -7,6 +7,7 @@ module Gitlab
     module OAuth
       class AuthHash
         attr_reader :auth_hash
+
         def initialize(auth_hash)
           @auth_hash = auth_hash
         end
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb
index 9f142727ebb..200f1a843e6 100644
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
@@ -46,7 +46,7 @@ module Gitlab
           valid? && persisted?
         end
 
-        def save(provider = 'OAuth')
+        def save(provider = protocol_name)
           raise SigninDisabledForProviderError if oauth_provider_disabled?
           raise SignupDisabledError unless gl_user
 
@@ -55,6 +55,7 @@ module Gitlab
           Users::UpdateService.new(gl_user, user: gl_user).execute!
 
           gl_user.block_pending_approval if block_after_save
+          activate_user_if_user_cap_not_reached
 
           log.info "(#{provider}) saving user #{auth_hash.email} from login with admin => #{gl_user.admin}, extern_uid => #{auth_hash.uid}"
           gl_user
@@ -96,8 +97,16 @@ module Gitlab
           end
         end
 
+        def protocol_name
+          'OAuth'
+        end
+
         protected
 
+        def activate_user_if_user_cap_not_reached
+          nil
+        end
+
         def should_save?
           true
         end