# HG changeset patch # User Marcin Kuzminski # Date 2017-06-26 11:55:07 # Node ID b52a5a9198234b924a41bb67ea9d8eac9c669637 # Parent b8e3feed21dbae501c8581655c16df6e90425eb1 auth-token: only delete token if it exists. diff --git a/rhodecode/model/auth_token.py b/rhodecode/model/auth_token.py --- a/rhodecode/model/auth_token.py +++ b/rhodecode/model/auth_token.py @@ -71,11 +71,13 @@ class AuthTokenModel(BaseModel): user = self._get_user(user) auth_token = auth_token.filter(UserApiKeys.user_id == user.user_id) auth_token = auth_token.scalar() - try: - Session().delete(auth_token) - except Exception: - log.error(traceback.format_exc()) - raise + + if auth_token: + try: + Session().delete(auth_token) + except Exception: + log.error(traceback.format_exc()) + raise def get_auth_tokens(self, user, show_expired=True): user = self._get_user(user)