Browse Source

Revert "Add some kaizen changes from #5328"

This reverts commit 09fe06b8bf463fd0805fa767bbe34087adc0c700.
Ian Paschal 6 years ago
parent
commit
cb8804b86a

+ 5 - 1
cura/OAuth2/AuthorizationService.py

@@ -66,7 +66,11 @@ class AuthorizationService:
     #   \sa _parseJWT
     def getUserProfile(self) -> Optional["UserProfile"]:
         if not self._user_profile:
-            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.

+ 1 - 5
plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py

@@ -159,13 +159,9 @@ class CloudApiClient:
                      model: Type[CloudApiClientModel],
                      ) -> None:
         def parse() -> None:
-            # Don't try to parse the reply if we didn't get one
-            if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) is None:
-                return
             status_code, response = self._parseReply(reply)
             self._anti_gc_callbacks.remove(parse)
-            self._parseModels(response, on_finished, model)
-            return
+            return self._parseModels(response, on_finished, model)
 
         self._anti_gc_callbacks.append(parse)
         reply.finished.connect(parse)