Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarkus Koller <markus-koller@gmx.ch>2017-01-31 13:21:29 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2017-03-07 17:00:29 +0300
commiteefbc837301acc49a33617063faafa97adee307e (patch)
treeb46f35df1792744897dfe1d31d9a519d19f09669 /lib
parent93daeee16428707fc348f8c45215854aed6e117a (diff)
Only use API scopes for personal access tokens
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/auth.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index c6f9d0d7b82..92fe770728b 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -2,9 +2,14 @@ module Gitlab
module Auth
MissingPersonalTokenError = Class.new(StandardError)
- SCOPES = [:api, :read_user, :openid, :profile, :email].freeze
+ # Scopes used for GitLab API access
+ API_SCOPES = [:api, :read_user].freeze
+
+ # Scopes used by doorkeeper-openid_connect
+ OPENID_SCOPES = [:openid].freeze
+
DEFAULT_SCOPES = [:api].freeze
- OPTIONAL_SCOPES = SCOPES - DEFAULT_SCOPES
+ OPTIONAL_SCOPES = (API_SCOPES + OPENID_SCOPES - DEFAULT_SCOPES).freeze
class << self
def find_for_git_client(login, password, project:, ip:)