clean up old authtoken support

just use Bearer tokens - those are the only type of tokens we support
This commit is contained in:
Ryan Petrello
2020-08-19 12:21:32 -04:00
parent fb66766463
commit 815d691622
3 changed files with 5 additions and 6 deletions

View File

@@ -15,12 +15,11 @@ class ConnectionException(exc.Common):
class Token_Auth(requests.auth.AuthBase): class Token_Auth(requests.auth.AuthBase):
def __init__(self, token, auth_type='Token'): def __init__(self, token):
self.token = token self.token = token
self.auth_type = auth_type
def __call__(self, request): def __call__(self, request):
request.headers['Authorization'] = '{0.auth_type} {0.token}'.format(self) request.headers['Authorization'] = 'Bearer {0.token}'.format(self)
return request return request
@@ -57,7 +56,7 @@ class Connection(object):
else: else:
self.session.auth = (username, password) self.session.auth = (username, password)
elif token: elif token:
self.session.auth = Token_Auth(token, auth_type=kwargs.get('auth_type', 'Token')) self.session.auth = Token_Auth(token)
else: else:
self.session.auth = None self.session.auth = None

View File

@@ -90,7 +90,7 @@ def as_user(v, username, password=None):
if session_id: if session_id:
del connection.session.cookies['sessionid'] del connection.session.cookies['sessionid']
if access_token: if access_token:
kwargs = dict(token=access_token, auth_type='Bearer') kwargs = dict(token=access_token)
else: else:
kwargs = connection.get_session_requirements() kwargs = connection.get_session_requirements()
else: else:

View File

@@ -88,7 +88,7 @@ class CLI(object):
token = self.get_config('token') token = self.get_config('token')
if token: if token:
self.root.connection.login( self.root.connection.login(
None, None, token=token, auth_type='Bearer' None, None, token=token,
) )
else: else:
config.use_sessions = True config.use_sessions = True