samschott/maestral
1
1
Fork 0
mirror of https://github.com/samschott/maestral.git synced 2024-10-07 02:47:56 +03:00
Code Issues Projects Releases Wiki Activity

[errors] added TokenRevokedError, cleaned up auth errors

Browse Source
This commit is contained in:
Sam Schott 2020-04-17 23:11:40 +02:00
parent 2630827c6d
commit 99c258c56f
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
maestral/errors.py
View File

@ -167,6 +167,11 @@ class TokenExpiredError(DropboxAuthError):
pass
class TokenRevokedError(DropboxAuthError):
"""Raised when authentication fails because the user's token has been revoked."""
pass
class CursorResetError(MaestralApiError):
"""Raised when the cursor used for a longpoll or list-folder request has been
invalidated. Dropbox will very rarely invalidate a cursor. If this happens, a new
@ -486,16 +491,33 @@ def dropbox_to_maestral_error(exc, dbx_path=None, local_path=None):
# ----------------------- Authentication errors --------------------------------------
elif isinstance(exc, dropbox.exceptions.AuthError):
error = exc.error
if isinstance(error, dropbox.auth.AuthError) and error.is_expired_access_token():
if isinstance(error, dropbox.auth.AuthError):
if error.is_expired_access_token():
err_cls = TokenExpiredError
title = 'Expired Dropbox access'
title = 'Authentication error'
text = ('Maestral\'s access to your Dropbox has expired. Please relink '
'to continue syncing.')
else:
err_cls = DropboxAuthError
elif error.is_invalid_access_token():
err_cls = TokenRevokedError
title = 'Authentication error'
text = ('Maestral\'s access to your Dropbox has been revoked. Please '
'relink to continue syncing.')
elif error.is_user_suspended():
err_cls = DropboxAuthError
title = 'Authentication error'
text = 'Your user account has been suspended.'
else:
# Other tags are invalid_select_admin, invalid_select_user, missing_scope,
# route_access_denied. Neither should occur in our SDK usage.
err_cls = MaestralApiError
title = 'An unexpected error occurred'
text = ('Please contact the developer with the traceback '
'information from the logs.')
else:
err_cls = DropboxAuthError
title = 'Authentication error'
text = 'Please check if you can log into your account on the Dropbox website.'
# -------------------------- OAuth2 flow errors --------------------------------------
elif isinstance(exc, requests.HTTPError):
@ -516,12 +538,6 @@ def dropbox_to_maestral_error(exc, dbx_path=None, local_path=None):
# ----------------------------- Bad input errors -------------------------------------
# should only occur due to user input from console scripts
elif isinstance(exc, dropbox.exceptions.BadInputError):
if ('The given OAuth 2 access token is malformed' in exc.message
or 'Invalid authorization value in HTTP header' in exc.message):
err_cls = DropboxAuthError
title = 'Authentication failed'
text = 'Please make sure that you entered the correct authentication code.'
else:
err_cls = BadInputError
title = 'Bad input to API call'
text = exc.message
@ -664,14 +680,15 @@ SYNC_ERRORS = (
FATAL_ERRORS = (
NotLinkedError,
KeyringAccessError,
NoDropboxDirError,
InotifyError,
RestrictedContentError,
RevFileError,
DropboxAuthError,
TokenExpiredError,
TokenRevokedError,
CursorResetError,
BadInputError,
OutOfMemoryError,
KeyringAccessError,
)