ulysia/szurubooru
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
rr- 2018-03-22 09:17:26 +01:00
parent a0ea1dc64a
commit 472f153960
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/szurubooru/api/user_token_api.py
View file

@ -19,7 +19,7 @@ def get_user_tokens(
auth.verify_privilege(ctx.user, 'user_tokens:list:%s' % infix) auth.verify_privilege(ctx.user, 'user_tokens:list:%s' % infix)
user_token_list = user_tokens.get_user_tokens(user) user_token_list = user_tokens.get_user_tokens(user)
return { return {
"results": [_serialize(ctx, token) for token in user_token_list] 'results': [_serialize(ctx, token) for token in user_token_list]
} }

10
server/szurubooru/tests/middleware/test_authenticator.py
View file

@ -18,7 +18,7 @@ def test_process_request_bump_login(context_factory, user_factory):
db.session.flush() db.session.flush()
ctx = context_factory( ctx = context_factory(
headers={ headers={
'Authorization': "Basic dGVzdFVzZXI6dGVzdFRva2Vu" 'Authorization': 'Basic dGVzdFVzZXI6dGVzdFRva2Vu'
}, },
params={ params={
'bump-login': 'true' 'bump-login': 'true'
@ -38,7 +38,7 @@ def test_process_request_bump_login_with_token(
db.session.flush() db.session.flush()
ctx = context_factory( ctx = context_factory(
headers={ headers={
'Authorization': "Token dGVzdFVzZXI6dGVzdFRva2Vu" 'Authorization': 'Token dGVzdFVzZXI6dGVzdFRva2Vu'
}, },
params={ params={
'bump-login': 'true' 'bump-login': 'true'
@ -58,7 +58,7 @@ def test_process_request_basic_auth_valid(context_factory, user_factory):
user = user_factory() user = user_factory()
ctx = context_factory( ctx = context_factory(
headers={ headers={
'Authorization': "Basic dGVzdFVzZXI6dGVzdFBhc3N3b3Jk" 'Authorization': 'Basic dGVzdFVzZXI6dGVzdFBhc3N3b3Jk'
}) })
with patch('szurubooru.func.auth.is_valid_password'), \ with patch('szurubooru.func.auth.is_valid_password'), \
patch('szurubooru.func.users.get_user_by_name'): patch('szurubooru.func.users.get_user_by_name'):
@ -72,7 +72,7 @@ def test_process_request_token_auth_valid(context_factory, user_token_factory):
user_token = user_token_factory() user_token = user_token_factory()
ctx = context_factory( ctx = context_factory(
headers={ headers={
'Authorization': "Token dGVzdFVzZXI6dGVzdFRva2Vu" 'Authorization': 'Token dGVzdFVzZXI6dGVzdFRva2Vu'
}) })
with patch('szurubooru.func.auth.is_valid_token'), \ with patch('szurubooru.func.auth.is_valid_token'), \
patch('szurubooru.func.users.get_user_by_name'), \ patch('szurubooru.func.users.get_user_by_name'), \
@ -87,7 +87,7 @@ def test_process_request_token_auth_valid(context_factory, user_token_factory):
def test_process_request_bad_header(context_factory): def test_process_request_bad_header(context_factory):
ctx = context_factory( ctx = context_factory(
headers={ headers={
'Authorization': "Secret SuperSecretValue" 'Authorization': 'Secret SuperSecretValue'
}) })
with pytest.raises(errors.HttpBadRequest): with pytest.raises(errors.HttpBadRequest):
authenticator.process_request(ctx) authenticator.process_request(ctx)