From 87c9c27fba877101825adf04728af793cc177d4f Mon Sep 17 00:00:00 2001 From: ReAnzu Date: Thu, 1 Mar 2018 07:32:55 -0600 Subject: [PATCH] Address pull request comments * Revised error messages --- server/szurubooru/middleware/authenticator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/szurubooru/middleware/authenticator.py b/server/szurubooru/middleware/authenticator.py index 581c190a..f82d72cf 100644 --- a/server/szurubooru/middleware/authenticator.py +++ b/server/szurubooru/middleware/authenticator.py @@ -14,7 +14,7 @@ def _authenticate(username: str, password: str) -> model.User: def _authenticate_token(username: str, token: str) -> model.User: - """Try to authenticate user. Throw AuthError for invalid users.""" + ''' Try to authenticate user. Throw AuthError for invalid users. ''' user = users.get_user_by_name(username) user_token = user_tokens.get_by_user_and_token(user, token) if not auth.is_valid_token(user_token): @@ -39,10 +39,10 @@ def _get_user(ctx: rest.Context) -> Optional[model.User]: else: raise HttpBadRequest( 'ValidationError', - 'Only basic HTTP authentication is supported.') + 'Only basic or token HTTP authentication is supported.') except ValueError as err: msg = ( - 'Basic authentication header value are not properly formed. ' + 'Authorization header values are not properly formed. ' 'Supplied header {0}. Got error: {1}') raise HttpBadRequest( 'ValidationError',