Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f20ea1f5
Commit
f20ea1f5
authored
Dec 14, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix BB authentication[ci skip]
parent
e39f0240
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
lib/omniauth/strategies/bitbucket.rb
lib/omniauth/strategies/bitbucket.rb
+2
-6
No files found.
lib/omniauth/strategies/bitbucket.rb
View file @
f20ea1f5
...
@@ -11,10 +11,6 @@ module OmniAuth
...
@@ -11,10 +11,6 @@ module OmniAuth
token_url:
'https://bitbucket.org/site/oauth2/access_token'
token_url:
'https://bitbucket.org/site/oauth2/access_token'
}
}
def
callback_url
full_host
+
script_name
+
callback_path
end
uid
do
uid
do
raw_info
[
'username'
]
raw_info
[
'username'
]
end
end
...
@@ -28,7 +24,7 @@ module OmniAuth
...
@@ -28,7 +24,7 @@ module OmniAuth
end
end
def
raw_info
def
raw_info
@raw_info
||=
access_token
.
get
(
'user'
).
parsed
@raw_info
||=
access_token
.
get
(
'
api/2.0/
user'
).
parsed
end
end
def
primary_email
def
primary_email
...
@@ -37,7 +33,7 @@ module OmniAuth
...
@@ -37,7 +33,7 @@ module OmniAuth
end
end
def
emails
def
emails
email_response
=
access_token
.
get
(
'user/emails'
).
parsed
email_response
=
access_token
.
get
(
'
api/2.0/
user/emails'
).
parsed
@emails
||=
email_response
&&
email_response
[
'values'
]
||
nil
@emails
||=
email_response
&&
email_response
[
'values'
]
||
nil
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment