-
-
Notifications
You must be signed in to change notification settings - Fork 423
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.
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
Support non-x-www-form-urlencoded bodies returned from refresh_token_request compliance hook #545
Open
skray
wants to merge
4
commits into
requests:master
Choose a base branch
from
skray:token-refresh-json-body-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4241af8
Support non-x-www-form-urlencoded bodies returned from refresh_token_…
skray 566e685
Merge branch 'requests:master' into token-refresh-json-body-support
skray a2443bb
specifically target application/x-www-form-urlencoded content type in…
skray 6d8b645
add compliance fix to __init__.py
skray File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import json | ||
from oauthlib.common import urldecode | ||
|
||
""" | ||
Wix requires the request body for token requests to be sent in JSON format | ||
instead of x-www-form-urlencoded. | ||
""" | ||
def wix_compliance_fix(session): | ||
|
||
def _non_compliant_access_token_request_body( | ||
url: str, headers: dict, request_kwargs: dict | ||
): | ||
""" | ||
Move the request body from the `data` kwarg to the `json` kwarg, | ||
and set the `Content-Type` header to `application/json`. | ||
""" | ||
headers["Content-Type"] = "application/json" | ||
request_kwargs["json"] = request_kwargs["data"] | ||
del request_kwargs["data"] | ||
return url, headers, request_kwargs | ||
|
||
def _non_compliant_refresh_token_request_body( | ||
token_url: str, headers: dict, body: str | ||
): | ||
""" | ||
Convert the body from a urlencoded string to a JSON string, | ||
and set the `Content-Type` header to `application/json`. | ||
""" | ||
headers["Content-Type"] = "application/json" | ||
body = json.dumps(dict(urldecode(body))) | ||
return token_url, headers, body | ||
|
||
session.register_compliance_hook("access_token_request", _non_compliant_access_token_request_body) | ||
session.register_compliance_hook("refresh_token_request", _non_compliant_refresh_token_request_body) | ||
|
||
return session |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To check the content type instead of catching the ValueError, this could just become: