archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Added some type checks before assigning to session['blender_id_oauth_token']

Browse Source 
There were some sporadic TypeErrors where the session var was set to a
tuple instead of a string; this is a way to figure out where that happens.
This commit is contained in:
Sybren A. Stüvel 2017-10-17 12:16:20 +02:00
parent cfbb05530a
commit a897282400
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/api/blender_id.py
View File

@ -189,6 +189,8 @@ def fetch_blenderid_user() -> dict:
credentials = current_app.config['OAUTH_CREDENTIALS']['blender-id'] credentials = current_app.config['OAUTH_CREDENTIALS']['blender-id']
oauth_token = session['blender_id_oauth_token'] oauth_token = session['blender_id_oauth_token']
assert isinstance(oauth_token, str), f'oauth token must be str, not {type(oauth_token)}'
oauth_session = OAuth2Session( oauth_session = OAuth2Session(
credentials['id'], credentials['secret'], credentials['id'], credentials['secret'],
access_token=oauth_token) access_token=oauth_token)

5
pillar/auth/oauth.py
View File

@ -154,7 +154,10 @@ class BlenderIdSignIn(OAuthSignIn):
oauth_session = self.make_oauth_session() oauth_session = self.make_oauth_session()
# TODO handle exception for failed oauth or not authorized # TODO handle exception for failed oauth or not authorized
session['blender_id_oauth_token'] = oauth_session.access_token access_token = oauth_session.access_token
assert isinstance(access_token, str), f'oauth token must be str, not {type(access_token)}'
session['blender_id_oauth_token'] = access_token
me = oauth_session.get('user').json() me = oauth_session.get('user').json()
return OAuthUserResponse(str(me['id']), me['email']) return OAuthUserResponse(str(me['id']), me['email'])