Skip to content

Populate id_token into credentials from oauth2 session #20

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

Merged
merged 3 commits into from
Nov 10, 2017
Merged

Populate id_token into credentials from oauth2 session #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5bb83d
carry token expiry into Credentials object (#18)
andytzeng Nov 6, 2017
9e63e86
Merge remote-tracking branch 'upstream/master'
andytzeng Nov 10, 2017
b6a60ba
populate id_token into credentials (#9)
andytzeng Nov 10, 2017
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
1 change: 1 addition & 0 deletions google_auth_oauthlib/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def credentials_from_session(session, client_config=None):
credentials = google.oauth2.credentials.Credentials(
session.token['access_token'],
refresh_token=session.token.get('refresh_token'),
id_token=session.token.get('id_token'),
token_uri=client_config.get('token_uri'),
client_id=client_config.get('client_id'),
client_secret=client_config.get('client_secret'),
Expand Down
6 changes: 6 additions & 0 deletions tests/test_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def test_credentials(self, instance):
instance.oauth2session.token = {
'access_token': mock.sentinel.access_token,
'refresh_token': mock.sentinel.refresh_token,
'id_token': mock.sentinel.id_token,
'expires_at': 643969200.0
}

Expand All @@ -143,6 +144,7 @@ def test_credentials(self, instance):
assert credentials.token == mock.sentinel.access_token
assert credentials.expiry == datetime.datetime(1990, 5, 29, 8, 20, 0)
assert credentials._refresh_token == mock.sentinel.refresh_token
assert credentials.id_token == mock.sentinel.id_token
assert (credentials._client_id ==
CLIENT_SECRETS_INFO['web']['client_id'])
assert (credentials._client_secret ==
Expand All @@ -154,6 +156,7 @@ def test_authorized_session(self, instance):
instance.oauth2session.token = {
'access_token': mock.sentinel.access_token,
'refresh_token': mock.sentinel.refresh_token,
'id_token': mock.sentinel.id_token,
'expires_at': 643969200.0
}

Expand All @@ -177,6 +180,7 @@ def set_token(*args, **kwargs):
instance.oauth2session.token = {
'access_token': mock.sentinel.access_token,
'refresh_token': mock.sentinel.refresh_token,
'id_token': mock.sentinel.id_token,
'expires_at': 643969200.0
}

Expand All @@ -195,6 +199,7 @@ def test_run_console(self, input_mock, instance, mock_fetch_token):

assert credentials.token == mock.sentinel.access_token
assert credentials._refresh_token == mock.sentinel.refresh_token
assert credentials.id_token == mock.sentinel.id_token

mock_fetch_token.assert_called_with(
CLIENT_SECRETS_INFO['web']['token_uri'],
Expand Down Expand Up @@ -223,6 +228,7 @@ def test_run_local_server(

assert credentials.token == mock.sentinel.access_token
assert credentials._refresh_token == mock.sentinel.refresh_token
assert credentials.id_token == mock.sentinel.id_token
assert webbrowser_mock.open.called

expected_auth_response = auth_redirect_url.replace('http', 'https')
Expand Down
2 changes: 2 additions & 0 deletions tests/test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def test_credentials_from_session(session):
session.token = {
'access_token': mock.sentinel.access_token,
'refresh_token': mock.sentinel.refresh_token,
'id_token': mock.sentinel.id_token,
'expires_at': 643969200.0
}

Expand All @@ -84,6 +85,7 @@ def test_credentials_from_session(session):
assert credentials.token == mock.sentinel.access_token
assert credentials.expiry == datetime.datetime(1990, 5, 29, 8, 20, 0)
assert credentials._refresh_token == mock.sentinel.refresh_token
assert credentials.id_token == mock.sentinel.id_token
assert credentials._client_id == CLIENT_SECRETS_INFO['web']['client_id']
assert (credentials._client_secret ==
CLIENT_SECRETS_INFO['web']['client_secret'])
Expand Down