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

get_blender_id_oauth_token() now consistently returns a str

Browse Source 
Before it could return either of str, tuple, or None.
This commit is contained in:
Sybren A. Stüvel
2017-10-17 12:16:56 +02:00
parent a897282400
commit 88ffd64706
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/api/utils/authentication.py
View File

@@ -126,8 +126,6 @@ def validate_token():
from pillar import auth from pillar import auth
token = auth.get_blender_id_oauth_token() token = auth.get_blender_id_oauth_token()
if token and isinstance(token, (tuple, list)):
token = token[0]
oauth_subclient = None oauth_subclient = None
if not token: if not token:

10
pillar/auth/__init__.py
View File

@@ -212,8 +212,8 @@ def login_user(oauth_token: str, *, load_from_db=False):
g.current_user = user g.current_user = user
def get_blender_id_oauth_token(): def get_blender_id_oauth_token() -> str:
"""Returns a tuple (token, ''), for use with flask_oauthlib.""" """Returns the Blender ID auth token, or an empty string if there is none."""
from flask import request from flask import request
@@ -221,10 +221,10 @@ def get_blender_id_oauth_token():
if token: if token:
return token return token
if request.authorization: if request.authorization and request.authorization.username:
return request.authorization.username, '' return request.authorization.username
return None return ''
def get_current_user() -> UserClass: def get_current_user() -> UserClass: