Skip to content

3.5.0: extra_id_token_claims callable is now invoked in stateless mode, where there is no user_db #73

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

Open
alisonnRB wants to merge 1 commit into
base: master
Choose a base branch
from
Open

3.5.0: extra_id_token_claims callable is now invoked in stateless mode, where there is no user_db #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions src/pyop/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,19 +449,20 @@ def _do_code_exchange(self, request, # type: Dict[str, str]
if refresh_token is not None:
response['refresh_token'] = refresh_token

extra_id_token_claims = (
extra_id_token_claims(user_id, authentication_request['client_id'])
if callable(extra_id_token_claims)
else {}
if not extra_id_token_claims
else extra_id_token_claims
)
extra_id_token_claims_in_code = (
self.authz_state.get_extra_id_token_claims_for_code(token_request['code'])
if self.stateless
else {}
)
extra_id_token_claims.update(extra_id_token_claims_in_code)
if callable(extra_id_token_claims):
# In stateless mode there is no user_db for the callable to consult, and its
# result would be overwritten by the claims stored in the code below.
extra_id_token_claims = (
{} if self.stateless
else extra_id_token_claims(user_id, authentication_request['client_id'])
)
elif not extra_id_token_claims:
extra_id_token_claims = {}

if self.stateless:
extra_id_token_claims.update(
self.authz_state.get_extra_id_token_claims_for_code(token_request['code'])
)

requested_claims = self._get_requested_claims_in(authentication_request, 'id_token')
if self.stateless:
Expand Down
2 changes: 1 addition & 1 deletion src/pyop/userinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ def get_claims_for(self, user_id, requested_claims, userinfo=None):
"""

if not userinfo:
userinfo = self._db[user_id] if user_id else {}
userinfo = self._db.get(user_id, {}) if user_id else {}
claims = {claim: userinfo[claim] for claim in requested_claims if claim in userinfo}
return claims