3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Get user profile asynchronously when restoring from preferences

Browse source 
Do not stop the start-up process for it. Let the callback handle the updating if necessary.

Contributes to issue CURA-8539.
This commit is contained in:
Ghostkeeper 2021-11-19 16:20:00 +01:00
parent 92437a920d
commit bfb8440a04
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
cura/OAuth2/AuthorizationService.py
View file

@ -62,13 +62,13 @@ class AuthorizationService:
if self._preferences: if self._preferences:
self._preferences.addPreference(self._settings.AUTH_DATA_PREFERENCE_KEY, "{}") self._preferences.addPreference(self._settings.AUTH_DATA_PREFERENCE_KEY, "{}")
def getUserProfile(self, callback: Callable[["UserProfile"], None]) -> None: def getUserProfile(self, callback: Callable[[Optional["UserProfile"]], None] = None) -> None:
""" """
Get the user profile as obtained from the JWT (JSON Web Token). Get the user profile as obtained from the JWT (JSON Web Token).
If the JWT is not yet checked and parsed, calling this will take care of that. If the JWT is not yet checked and parsed, calling this will take care of that.
:param callback: Once the user profile is obtained, this function will be called with the given user profile. If :param callback: Once the user profile is obtained, this function will be called with the given user profile. If
the profile fails to be obtained, this will never be called. the profile fails to be obtained, this function will be called with None.
See also: :py:method:`cura.OAuth2.AuthorizationService.AuthorizationService._parseJWT` See also: :py:method:`cura.OAuth2.AuthorizationService.AuthorizationService._parseJWT`
""" """
@ -86,6 +86,7 @@ class AuthorizationService:
# If there is no user profile from the JWT, we have to log in again. # If there is no user profile from the JWT, we have to log in again.
Logger.warning("The user profile could not be loaded. The user must log in again!") Logger.warning("The user profile could not be loaded. The user must log in again!")
self.deleteAuthData() self.deleteAuthData()
callback(None)
self._parseJWT(callback = store_profile) self._parseJWT(callback = store_profile)
@ -244,21 +245,22 @@ class AuthorizationService:
preferences_data = json.loads(self._preferences.getValue(self._settings.AUTH_DATA_PREFERENCE_KEY)) preferences_data = json.loads(self._preferences.getValue(self._settings.AUTH_DATA_PREFERENCE_KEY))
if preferences_data: if preferences_data:
self._auth_data = AuthenticationResponse(**preferences_data) self._auth_data = AuthenticationResponse(**preferences_data)
# Also check if we can actually get the user profile information.
user_profile = self.getUserProfile()
if user_profile is not None:
self.onAuthStateChanged.emit(logged_in = True)
Logger.log("d", "Auth data was successfully loaded")
else:
if self._unable_to_get_data_message is not None:
self._unable_to_get_data_message.hide()
self._unable_to_get_data_message = Message(i18n_catalog.i18nc("@info", # Also check if we can actually get the user profile information.
"Unable to reach the Ultimaker account server."), def callback(profile: Optional[UserProfile]):
title = i18n_catalog.i18nc("@info:title", "Warning"), if profile is not None:
message_type = Message.MessageType.ERROR) self.onAuthStateChanged.emit(logged_in = True)
Logger.log("w", "Unable to load auth data from preferences") Logger.debug("Auth data was successfully loaded")
self._unable_to_get_data_message.show() else:
if self._unable_to_get_data_message is not None:
self._unable_to_get_data_message.show()
else:
self._unable_to_get_data_message = Message(i18n_catalog.i18nc("@info", "Unable to reach the Ultimaker account server."),
title = i18n_catalog.i18nc("@info:title", "Log-in failed"),
message_type = Message.MessageType.ERROR)
Logger.warning("Unable to get user profile using auth data from preferences.")
self._unable_to_get_data_message.show()
self.getUserProfile(callback)
except (ValueError, TypeError): except (ValueError, TypeError):
Logger.logException("w", "Could not load auth data from preferences") Logger.logException("w", "Could not load auth data from preferences")
@ -272,7 +274,7 @@ class AuthorizationService:
self._auth_data = auth_data self._auth_data = auth_data
if auth_data: if auth_data:
self._user_profile = self.getUserProfile() 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")