Merge pull request #821 from Frzk/bearer-support
Inverted the order of prefixes in Request.token property.
This commit is contained in:
commit
00d4533022
|
@ -86,13 +86,13 @@ class Request(dict):
|
||||||
|
|
||||||
:return: token related to request
|
:return: token related to request
|
||||||
"""
|
"""
|
||||||
prefixes = ('Token ', 'Bearer ')
|
prefixes = ('Bearer', 'Token')
|
||||||
auth_header = self.headers.get('Authorization')
|
auth_header = self.headers.get('Authorization')
|
||||||
|
|
||||||
if auth_header is not None:
|
if auth_header is not None:
|
||||||
for prefix in prefixes:
|
for prefix in prefixes:
|
||||||
if prefix in auth_header:
|
if prefix in auth_header:
|
||||||
return auth_header.partition(prefix)[-1]
|
return auth_header.partition(prefix)[-1].strip()
|
||||||
|
|
||||||
return auth_header
|
return auth_header
|
||||||
|
|
||||||
|
|
|
@ -172,16 +172,6 @@ def test_token():
|
||||||
|
|
||||||
assert request.token == 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'
|
token = 'a1d895e0-553a-421a-8e22-5ff8ecb48cbf'
|
||||||
headers = {
|
headers = {
|
||||||
'content-type': 'application/json',
|
'content-type': 'application/json',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user