Merge branch '4.0'

cura/OAuth2/AuthorizationHelpers.py

@@ -87,7 +87,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

cura/OAuth2/AuthorizationService.py

@@ -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.
+            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.

cura/PrinterOutput/NetworkedPrinterOutputDevice.py

@@ -199,7 +199,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
     #  \param content_type: The content type of the body data.
     #  \param on_finished: The function to call when the response is received.
     #  \param on_progress: The function to call when the progress changes. Parameters are bytes_sent / bytes_total.
-    def put(self, url: str, data: Union[str, bytes], content_type: Optional[str] = None,
+    def put(self, url: str, data: Union[str, bytes], content_type: Optional[str] = "application/json",
             on_finished: Optional[Callable[[QNetworkReply], None]] = None,
             on_progress: Optional[Callable[[int, int], None]] = None) -> None:
         self._validateManager()

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -355,8 +355,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
     def sendJobToTop(self, print_job_uuid: str) -> None:
         # This function is part of the output device (and not of the printjob output model) as this type of operation
         # is a modification of the cluster queue and not of the actual job.
-        data = "{\"list\": \"queued\",\"to_position\": 0}"
-        self.post("print_jobs/{uuid}/action/move".format(uuid = print_job_uuid), data, on_finished=None)
+        data = "{\"to_position\": 0}"
+        self.put("print_jobs/{uuid}/move_to_position".format(uuid = print_job_uuid), data, on_finished=None)
 
     @pyqtSlot(str)
     def deleteJobFromQueue(self, print_job_uuid: str) -> None: