-
-
Notifications
You must be signed in to change notification settings - Fork 104
Store and manage lifecycle of access tokens beyond authentication #362
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
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
eed1f4f
Token lifecycle management
tnware d9b3018
Optimize token middleware
tnware 2a9f4e7
TokenManager class (#3)
tnware 63009a0
Cleanup implementation
tnware d9214e3
remove unused imports
tnware 285717e
fix flake8 feedback
tnware 0d821b7
cleanup (#5)
tnware 7cdeb9b
actually middleware
tnware a43b087
docs update
tnware 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 hidden or 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 |
---|---|---|
|
@@ -4,4 +4,4 @@ | |
Adding imports here will break setup.py | ||
""" | ||
|
||
__version__ = '1.15.0' | ||
__version__ = "1.16.0" | ||
This file contains hidden or 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 |
---|---|---|
|
@@ -181,7 +181,7 @@ def validate_access_token(self, access_token): | |
logger.info(str(error)) | ||
raise PermissionDenied | ||
|
||
def process_access_token(self, access_token, adfs_response=None): | ||
def process_access_token(self, access_token, adfs_response=None, request=None): | ||
if not access_token: | ||
raise PermissionDenied | ||
|
||
|
@@ -197,6 +197,10 @@ def process_access_token(self, access_token, adfs_response=None): | |
if not claims: | ||
raise PermissionDenied | ||
|
||
# Store tokens in session if middleware is enabled | ||
if request and adfs_response and hasattr(request, "token_storage"): | ||
request.token_storage.store_tokens(request, access_token, adfs_response) | ||
Comment on lines
+200
to
+202
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would it be better to pull this out into a separate method that's called after |
||
|
||
groups = self.process_user_groups(claims, access_token) | ||
user = self.create_user(claims) | ||
self.update_user_attributes(user, claims) | ||
|
@@ -420,7 +424,7 @@ def authenticate(self, request=None, authorization_code=None, **kwargs): | |
|
||
adfs_response = self.exchange_auth_code(authorization_code, request) | ||
access_token = adfs_response["access_token"] | ||
user = self.process_access_token(access_token, adfs_response) | ||
user = self.process_access_token(access_token, adfs_response, request) | ||
return user | ||
|
||
|
||
|
@@ -440,7 +444,7 @@ def authenticate(self, request=None, access_token=None, **kwargs): | |
return | ||
|
||
access_token = access_token.decode() | ||
user = self.process_access_token(access_token) | ||
user = self.process_access_token(access_token, request=request) | ||
return user | ||
|
||
|
||
|
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
This doesn't need to be incremented. We'll do that when we cut a release.