Fix crash when user was logged in but there was no internet connection on boot

This commit is contained in:
Jaime van Kessel 2019-02-08 10:50:17 +01:00
parent e869829f10
commit 91f0d76c8a
2 changed files with 8 additions and 2 deletions

View file

@ -85,7 +85,7 @@ class AuthorizationHelpers:
token_request = requests.get("{}/check-token".format(self._settings.OAUTH_SERVER_URL), headers = {
"Authorization": "Bearer {}".format(access_token)
})
except ConnectionError:
except requests.exceptions.ConnectionError:
# Connection was suddenly dropped. Nothing we can do about that.
Logger.logException("e", "Something failed while attempting to parse the JWT token")
return None

View file

@ -4,6 +4,8 @@ import json
import webbrowser
from typing import Optional, TYPE_CHECKING
from urllib.parse import urlencode
import requests.exceptions
from UM.Logger import Logger
from UM.Signal import Signal
@ -51,7 +53,11 @@ class AuthorizationService:
def getUserProfile(self) -> Optional["UserProfile"]:
if not self._user_profile:
# If no user profile was stored locally, we try to get it from JWT.
try:
self._user_profile = self._parseJWT()
except requests.exceptions.ConnectionError:
# Unable to get connection, can't login.
return None
if not self._user_profile and self._auth_data:
# If there is still no user profile from the JWT, we have to log in again.