Skip to content
Snippets Groups Projects
Commit 96621ca0 authored by kaiyou's avatar kaiyou
Browse files

Make generate_user_info a class method

parent 7b9b74f7
No related branches found
No related tags found
No related merge requests found
......@@ -103,16 +103,14 @@ class OpenIDMixin(object):
def exists_nonce(self, nonce, request):
return bool(utils.redis.get("nonce:{}".format(nonce)))
def get_client(self, grant=None):
def get_jwt_config(self, grant=None):
# In the case of AuthorizationCode, the current object is not the grant
# but a grant extension, so the client is retrieved through the grant argument
return self.request.client if grant is None else grant.client
def get_jwt_config(self, grant=None):
return self.get_client().get_jwt_config()
client = self.request.client if grant is None else grant.client
return client.get_jwt_config()
def generate_user_info(self, user, scope):
return self.get_client().generate_user_info(user, scope)
return Client.generate_user_info(user, scope)
class Client(sqla_oauth2.OAuth2ClientMixin):
......@@ -159,7 +157,8 @@ class Client(sqla_oauth2.OAuth2ClientMixin):
'exp': 3600,
}
def generate_user_info(self, user, scope):
@classmethod
def generate_user_info(cls, user, scope):
""" User info generation function used by the oidc code mixin and the userinfo endpoint
"""
return oidc.UserInfo(
......@@ -211,5 +210,5 @@ def oidc_userinfo(service_uuid):
client = Client.get_by_service(service_uuid) or flask.abort(404)
token = client.validate_token(flask.request)
profile = models.Profile.query.get(token["profile_uuid"])
return client.generate_user_info(profile, token["scope"])
return Client.generate_user_info(profile, token["scope"])
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment