summaryrefslogtreecommitdiff
path: root/lib/gitlab/auth
diff options
context:
space:
mode:
authorFrancisco Lopez <fjlopez@gitlab.com>2017-11-08 10:13:22 +0100
committerFrancisco Lopez <fjlopez@gitlab.com>2017-11-17 10:01:21 +0100
commit374179a97042da3a4d5312afcdb0dc90a44634f0 (patch)
tree32c75aada478c764f4ebdd36f3b981f968d4f452 /lib/gitlab/auth
parent41ebd06ddc837c80ba6ca95c6d5fea2b76cef8d2 (diff)
downloadgitlab-ce-374179a97042da3a4d5312afcdb0dc90a44634f0.tar.gz
Removing private token
Diffstat (limited to 'lib/gitlab/auth')
-rw-r--r--lib/gitlab/auth/user_auth_finders.rb16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/gitlab/auth/user_auth_finders.rb b/lib/gitlab/auth/user_auth_finders.rb
index 93f3cae0a95..86f1c13d4b8 100644
--- a/lib/gitlab/auth/user_auth_finders.rb
+++ b/lib/gitlab/auth/user_auth_finders.rb
@@ -29,7 +29,9 @@ module Gitlab
private
def handle_return_value!(value, &block)
- return unless value
+ unless value
+ raise_unauthorized_error? ? raise_unauthorized_error! : return
+ end
block_given? ? yield(value) : value
end
@@ -75,6 +77,18 @@ module Gitlab
ActionDispatch::Request.new(request.env)
end
+
+ def raise_unauthorized_error?
+ defined?(@raise_unauthorized_error) ? @raise_unauthorized_error : false
+ end
+
+ def set_raise_unauthorized_error
+ @raise_unauthorized_error = true
+ end
+
+ def raise_unauthorized_error!
+ raise API::APIGuard::UnauthorizedError
+ end
end
end
end