Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use unrestricted API for user info #363

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Use unrestricted API for user info #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8bc9d7
Use unrestricted API for user info
sposs May 13, 2019
e96b958
Fix failing tests.
May 13, 2019
0af4fcb
As id_token and access_token do not yield the same results, try both.
May 20, 2019
5a319cf
Use userinfo instead of tokeninfo for user details.
Jun 20, 2019
4285142
Merge branch 'master' into patch-1
Apr 29, 2021
33d1f57
Fix test
Apr 29, 2021
6493817
Replace quotes
Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions social_core/backends/google.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,21 @@ def get_user_details(self, response):
class BaseGoogleOAuth2API(BaseGoogleAuth):
def user_data(self, access_token, *args, **kwargs):
"""Return user data from Google API"""
return self.get_json(
'https://www.googleapis.com/oauth2/v3/userinfo',
headers={
'Authorization': 'Bearer %s' % access_token,
},
)
try:
res = self.get_json(
'https://www.googleapis.com/oauth2/v3/tokeninfo',
params={
'id_token': access_token,
},
)
except:
res = self.get_json(
'https://www.googleapis.com/oauth2/v3/userinfo',
params={
'access_token': access_token,
},
)
return res

def revoke_token_params(self, token, uid):
return {'token': token}
Expand Down
14 changes: 7 additions & 7 deletions social_core/tests/backends/test_google.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class GoogleOAuth2Test(OAuth2Test):
backend_path = 'social_core.backends.google.GoogleOAuth2'
user_data_url = 'https://www.googleapis.com/oauth2/v3/userinfo'
user_data_url = 'https://www.googleapis.com/oauth2/v3/tokeninfo'
expected_username = 'foo'
access_token_body = json.dumps({
'access_token': 'foobar',
Expand All @@ -35,12 +35,12 @@ def test_login(self):
self.do_login()
last_request = HTTPretty.last_request
self.assertEqual(last_request.method, 'GET')
self.assertTrue(self.user_data_url.endswith(last_request.path))
self.assertEqual(
last_request.headers['Authorization'],
'Bearer foobar',
)
self.assertEqual(last_request.querystring, {})
# self.assertTrue(self.user_data_url in last_request.path)
# self.assertEqual(
# last_request.headers,
# {},
# )
self.assertEqual(last_request.querystring, {'id_token': ['foobar']})

def test_partial_pipeline(self):
self.do_partial_pipeline()
Expand Down