1 files changed, 10 insertions, 9 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 1b0398d18ee..821c0ef87e9 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -117,15 +117,16 @@ module Gitlab
       end
 
       def lfs_token_check(login, password)
-        if login.include?('lfs-deploy-key')
-          key = DeployKey.find(login.gsub('lfs-deploy-key-', ''))
-          token = Gitlab::LfsToken.new(key).value
-          Result.new(key, :lfs_deploy_token) if key && token == password
-        else
-          user = User.by_login(login)
-          token = Gitlab::LfsToken.new(user).value
-          Result.new(user, :lfs_token) if user && token == password
-        end
+        actor =
+          if login.include?('lfs-deploy-key')
+            DeployKey.find(login.gsub('lfs-deploy-key-', ''))
+          else
+            User.by_login(login)
+          end
+
+        token_handler = Gitlab::LfsToken.new(actor)
+
+        Result.new(actor, token_handler.type) if actor && token_handler.value == password
       end
     end
   end