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

Consider auto_refresh_kwargs for token refresh authentication. #412

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

Consider auto_refresh_kwargs for token refresh authentication. #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2c61bc
Consider auto_refresh_kwargs for token refresh authentication.
fodinabor Apr 21, 2020
52c19be
Add test case for using auto_refresh_kwargs for authentication.
fodinabor Apr 21, 2020
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
25 changes: 16 additions & 9 deletions requests_oauthlib/oauth2_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,18 @@ def refresh_token(
"Adding auto refresh key word arguments %s.", self.auto_refresh_kwargs
)
kwargs.update(self.auto_refresh_kwargs)

auth = auth or kwargs.pop("auth", None)
client_id = kwargs.get("client_id")
client_secret = kwargs.get("client_secret", "")

if client_id and (auth is None):
log.debug(
'Encoding client_id "%s" with client_secret as Basic auth credentials.',
client_id,
)
auth = requests.auth.HTTPBasicAuth(client_id, client_secret)

body = self._client.prepare_refresh_body(
body=body, refresh_token=refresh_token, scope=self.scope, **kwargs
)
Expand Down Expand Up @@ -491,16 +503,11 @@ def request(
self.auto_refresh_url,
)

# We mustn't pass auth twice.
auth = kwargs.pop("auth", None)
if client_id and client_secret and (auth is None):
log.debug(
'Encoding client_id "%s" with client_secret as Basic auth credentials.',
client_id,
)
auth = requests.auth.HTTPBasicAuth(client_id, client_secret)
token = self.refresh_token(
self.auto_refresh_url, auth=auth, **kwargs
self.auto_refresh_url,
client_id=client_id,
client_secret=client_secret,
**kwargs
)
if self.token_updater:
log.debug(
Expand Down
15 changes: 15 additions & 0 deletions tests/test_oauth2_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,21 @@ def fake_refresh_with_auth(r, **kwargs):
client_secret=self.client_secret,
)

# auto refresh with auth from auto_refresh_kwargs
for client in self.clients:
sess = OAuth2Session(
client=client,
token=self.expired_token,
auto_refresh_url="https://i.b/refresh",
token_updater=token_updater,
auto_refresh_kwargs={
"client_id": self.client_id,
"client_secret": self.client_secret,
},
)
sess.send = fake_refresh_with_auth
sess.get("https://i.b")

@mock.patch("time.time", new=lambda: fake_time)
def test_token_from_fragment(self):
mobile = MobileApplicationClient(self.client_id)
Expand Down