3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '4.0'

Browse source
This commit is contained in:
Ghostkeeper 2019-02-08 11:28:06 +01:00
commit 473633de2c
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/OAuth2/AuthorizationService.py
View file

@ -5,6 +5,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
@ -49,7 +51,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.
self._user_profile = self._parseJWT()
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.