Merge pull request #821 from Frzk/bearer-support

Inverted the order of prefixes in Request.token property.
This commit is contained in:
Raphael Deem 2017-06-29 09:43:34 -07:00 committed by GitHub
commit 00d4533022
2 changed files with 2 additions and 12 deletions

View File

@ -86,13 +86,13 @@ class Request(dict):
:return: token related to request
"""
prefixes = ('Token ', 'Bearer ')
prefixes = ('Bearer', 'Token')
auth_header = self.headers.get('Authorization')
if auth_header is not None:
for prefix in prefixes:
if prefix in auth_header:
return auth_header.partition(prefix)[-1]
return auth_header.partition(prefix)[-1].strip()
return auth_header

View File

@ -172,16 +172,6 @@ def test_token():
assert request.token == token
token = 'a1d895e0-553a-421a-8e22-5ff8ecb48cbf'
headers = {
'content-type': 'application/json',
'Authorization': 'Bearer Token {}'.format(token)
}
request, response = app.test_client.get('/', headers=headers)
assert request.token == token
token = 'a1d895e0-553a-421a-8e22-5ff8ecb48cbf'
headers = {
'content-type': 'application/json',