GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 19:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into optimized-prime-tower

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-01-18 13:02:15 +01:00 committed by GitHub
commit 27698332e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/OAuth2/AuthorizationService.py
View File

@ -34,7 +34,7 @@ class AuthorizationService:
def __init__(self, def __init__(self,
settings: "OAuth2Settings", settings: "OAuth2Settings",
preferences: Optional["Preferences"] = None, preferences: Optional["Preferences"] = None,
callback_auth_data_retrieved: Callable[[], None] = None) -> None: get_user_profile: bool = True) -> None:
# Emit signal when authentication is completed. # Emit signal when authentication is completed.
self.onAuthStateChanged = Signal() self.onAuthStateChanged = Signal()
@ -48,7 +48,7 @@ class AuthorizationService:
self._auth_url = "{}/authorize".format(self._settings.OAUTH_SERVER_URL) self._auth_url = "{}/authorize".format(self._settings.OAUTH_SERVER_URL)
self._auth_data: Optional[AuthenticationResponse] = None self._auth_data: Optional[AuthenticationResponse] = None
self._user_profile: Optional["UserProfile"] = None self._user_profile: Optional["UserProfile"] = None
self._callback_auth_data_retrieved = self.getUserProfile if callback_auth_data_retrieved is None else callback_auth_data_retrieved self._get_user_profile: bool = get_user_profile
self._preferences = preferences self._preferences = preferences
self._server = LocalAuthorizationServer(self._auth_helpers, self._onAuthStateChanged, daemon=True) self._server = LocalAuthorizationServer(self._auth_helpers, self._onAuthStateChanged, daemon=True)
self._currently_refreshing_token = False # Whether we are currently in the process of refreshing auth. Don't make new requests while busy. self._currently_refreshing_token = False # Whether we are currently in the process of refreshing auth. Don't make new requests while busy.
@ -298,7 +298,8 @@ class AuthorizationService:
self._auth_data = auth_data self._auth_data = auth_data
self._currently_refreshing_token = False self._currently_refreshing_token = False
if auth_data: if auth_data:
self._callback_auth_data_retrieved() if self._get_user_profile:
self.getUserProfile()
self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(auth_data.dump())) self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(auth_data.dump()))
else: else:
Logger.log("d", "Clearing the user profile") Logger.log("d", "Clearing the user profile")