From 88ffd647063fce1d800fdd9f91bc3a5cdb84166f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 17 Oct 2017 12:16:56 +0200 Subject: [PATCH] get_blender_id_oauth_token() now consistently returns a str Before it could return either of str, tuple, or None. --- pillar/api/utils/authentication.py | 2 -- pillar/auth/__init__.py | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pillar/api/utils/authentication.py b/pillar/api/utils/authentication.py index c26aca69..b84bf468 100644 --- a/pillar/api/utils/authentication.py +++ b/pillar/api/utils/authentication.py @@ -126,8 +126,6 @@ def validate_token(): from pillar import auth token = auth.get_blender_id_oauth_token() - if token and isinstance(token, (tuple, list)): - token = token[0] oauth_subclient = None if not token: diff --git a/pillar/auth/__init__.py b/pillar/auth/__init__.py index 7aed21b9..91337013 100644 --- a/pillar/auth/__init__.py +++ b/pillar/auth/__init__.py @@ -212,8 +212,8 @@ def login_user(oauth_token: str, *, load_from_db=False): g.current_user = user -def get_blender_id_oauth_token(): - """Returns a tuple (token, ''), for use with flask_oauthlib.""" +def get_blender_id_oauth_token() -> str: + """Returns the Blender ID auth token, or an empty string if there is none.""" from flask import request @@ -221,10 +221,10 @@ def get_blender_id_oauth_token(): if token: return token - if request.authorization: - return request.authorization.username, '' + if request.authorization and request.authorization.username: + return request.authorization.username - return None + return '' def get_current_user() -> UserClass: