Merge branch 'mk-328692-refactor-find-for-git-client-git-controller-part-2' into 'master'

Refactor git http controller to stop referencing auth::result.actor directly - refactor auth result class

See merge request gitlab-org/gitlab!68162

app/controllers/repositories/git_http_client_controller.rb

@@ -33,7 +33,7 @@ module Repositories
     end
 
     def authenticate_user
-      @authentication_result = Gitlab::Auth::Result.new
+      @authentication_result = Gitlab::Auth::Result::EMPTY
 
       if allow_basic_auth? && basic_auth_provided?
         login, password = user_name_and_password(request)

lib/gitlab/auth.rb

@@ -53,7 +53,7 @@ module Gitlab
           personal_access_token_check(password, project) ||
           deploy_token_check(login, password, project) ||
           user_with_password_for_git(login, password) ||
-          Gitlab::Auth::Result.new
+          Gitlab::Auth::Result::EMPTY
 
         rate_limit!(rate_limiter, success: result.success?, login: login)
         look_to_limit_user(result.actor)

lib/gitlab/auth/result.rb

@@ -2,8 +2,17 @@
 
 module Gitlab
   module Auth
-    Result = Struct.new(:actor, :project, :type, :authentication_abilities) do
-      self::EMPTY = self.new(nil, nil, nil, nil).freeze
+    class Result
+      attr_reader :actor, :project, :type, :authentication_abilities
+
+      def initialize(actor, project, type, authentication_abilities)
+        @actor = actor
+        @project = project
+        @type = type
+        @authentication_abilities = authentication_abilities
+      end
+
+      EMPTY = self.new(nil, nil, nil, nil).freeze
 
       def ci?(for_project)
         type == :ci &&
@@ -27,6 +36,7 @@ module Gitlab
       def auth_user
         actor.is_a?(User) ? actor : nil
       end
+      alias_method :user, :auth_user
 
       def deploy_token
         actor.is_a?(DeployToken) ? actor : nil