fix: qr code value #304
Merged
fix: qr code value #304
Conversation
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
peppelinux
reviewed
Nov 11, 2024
| @@ -205,20 +205,18 @@ def pre_request_endpoint(self, context: Context, internal_request, **kwargs) -> | |||
| 'client_id': self.client_id, | |||
| 'request_uri': f"{self.absolute_request_url}?id={state}", | |||
| } | |||
| url_params = urlencode(payload, quote_via=quote_plus) | |||
|
|
|||
| respose_url = self._build_authz_request_url(payload) | |||
There was a problem hiding this comment.
Suggested change
| respose_url = self._build_authz_request_url(payload) | |
| response_url = self._build_authz_request_url(payload) |
peppelinux
reviewed
Nov 11, 2024
|
|
||
| if is_smartphone(context.http_headers.get('HTTP_USER_AGENT')): | ||
| # Same Device flow | ||
| res_url = f'{self.config["authorization"]["url_scheme"]}://authorize?{url_params}' | ||
| return Redirect(res_url) | ||
| return Redirect(respose_url) |
There was a problem hiding this comment.
Suggested change
| return Redirect(respose_url) | |
| return Redirect(response_url) |
peppelinux
reviewed
Nov 11, 2024
| result = self.template.qrcode_page.render( | ||
| { | ||
| "qrcode_color": self.config["qrcode"]["color"], | ||
| "qrcode_text": res_url, | ||
| "qrcode_text": respose_url, |
There was a problem hiding this comment.
Suggested change
| "qrcode_text": respose_url, | |
| "qrcode_text": response_url, |
peppelinux
reviewed
Nov 11, 2024
| # OAuth 2.0 request modified by JAR (RFC9101) | ||
| path = "authorize" | ||
| query_params = urlencode(payload, quote_via=quote_plus) | ||
| return f"{scheme}://{path}?{query_params}" |
There was a problem hiding this comment.
Suggested change
| return f"{scheme}://{path}?{query_params}" | |
| return f"{scheme}://{path}?{query_params}" |
this would work only with custom url schemes, using universal links "://" will be duplicated and wrongly appended
I would suggest something like this
Suggested change
| return f"{scheme}://{path}?{query_params}" | |
| if "://" in scheme: | |
| scheme = scheme | |
| else: | |
| scheme = f"{scheme}://" | |
| return f"{scheme}{path}?{query_params}" |
There was a problem hiding this comment.
to support univesal link, further changes were added; this includes
- added to docs that the same configuration can be used for costum scheme or universal link
- a check for the existance of trailing slash before path component is added (required if universal link does not include them)
- an extension of same device integration test to make it compatible with universal links, as in that case a different exception is raised
peppelinux
requested changes
Nov 11, 2024
peppelinux
reviewed
Nov 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull requests closes #302
The cross device flow now uses the same URL of the same device flow, and the URL value is the very same value that was previously yielded by the same device flow.