use update service on ldap call and updated specs and service

3 files changed, 21 insertions, 6 deletions

diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index ac20473b6eb..866eb070913 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -7,16 +7,32 @@ module Users
       @params = params.dup
     end
 
-    def execute(skip_authorization: false)
-      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_user?
+    def execute(skip_authorization: false, &block)
+      assign_attributes(skip_authorization, &block)
 
-      if @user.update_attributes(params)
+      if @user.save
         success
       else
-        error('Project could not be updated')
+        error('User could not be updated')
       end
     end
 
+    def execute!(skip_authorization: false, &block)
+      assign_attributes(skip_authorization, &block)
+
+      @user.save!
+    end
+
+    private
+
+    def assign_attributes(skip_authorization, &block)
+      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_user?
+
+      yield(@user) if block_given?
+
+      @user.assign_attributes(params) if params.any?
+    end
+
     def can_update_user?
       current_user == @user || current_user&.admin?
     end
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 7307f8c2c87..8f37f96dcab 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -32,7 +32,7 @@ module Gitlab
 
         block_after_save = needs_blocking?
 
-        gl_user.save!
+        Users::UpdateService.new(gl_user, gl_user).execute!
 
         gl_user.block if block_after_save
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 25ce545a1d7..89b0eef6ae1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1900,7 +1900,6 @@ describe User, models: true do
     end
   end
 
-
   describe 'audit changes' do
     let!(:user) { create(:user) }