Move UltimakerCloudAuthentication and UltimakerCloudScope

...to their own module
Fixes an import error where UltimakerCloudScope was used my both the
Toolbox and CuraDrive plugins

CURA-7150

plugins/CuraDrive/src/CreateBackupJob.py

@@ -14,7 +14,7 @@ from UM.TaskManagement.HttpRequestManager import HttpRequestManager
 from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
 from UM.i18n import i18nCatalog
 from cura.CuraApplication import CuraApplication
-from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
+from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
 
 catalog = i18nCatalog("cura")
 

plugins/CuraDrive/src/DriveApiService.py

@@ -11,9 +11,9 @@ from UM.TaskManagement.HttpRequestManager import HttpRequestManager
 from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
 from UM.i18n import i18nCatalog
 from cura.CuraApplication import CuraApplication
-from plugins.CuraDrive.src.RestoreBackupJob import RestoreBackupJob
-from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
+from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
 from .CreateBackupJob import CreateBackupJob
+from .RestoreBackupJob import RestoreBackupJob
 from .Settings import Settings
 
 catalog = i18nCatalog("cura")

plugins/CuraDrive/src/RestoreBackupJob.py

@@ -40,7 +40,7 @@ class RestoreBackupJob(Job):
         assert url is not None
 
         HttpRequestManager.getInstance().get(
-            url =url,
+            url = url,
             callback = self._onRestoreRequestCompleted,
             error_callback = self._onRestoreRequestCompleted
         )

plugins/CuraDrive/src/Settings.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from cura import UltimakerCloudAuthentication
+from cura.UltimakerCloud import UltimakerCloudAuthentication
 
 
 class Settings:

plugins/Toolbox/src/CloudApiModel.py

@@ -1,6 +1,7 @@
 from typing import Union
 
-from cura import ApplicationMetadata, UltimakerCloudAuthentication
+from cura import ApplicationMetadata
+from cura.UltimakerCloud import UltimakerCloudAuthentication
 
 
 class CloudApiModel:

plugins/Toolbox/src/CloudSync/CloudApiClient.py

@@ -2,8 +2,8 @@ from UM.Logger import Logger
 from UM.TaskManagement.HttpRequestManager import HttpRequestManager
 from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
 from cura.CuraApplication import CuraApplication
+from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
 from ..CloudApiModel import CloudApiModel
-from ..UltimakerCloudScope import UltimakerCloudScope
 
 
 class CloudApiClient:

plugins/Toolbox/src/CloudSync/CloudPackageChecker.py

@@ -2,6 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import json
+from typing import List, Dict, Any
 from typing import Optional
 
 from PyQt5.QtCore import QObject
@@ -13,11 +14,9 @@ from UM.Message import Message
 from UM.Signal import Signal
 from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
 from cura.CuraApplication import CuraApplication, ApplicationMetadata
-from ..CloudApiModel import CloudApiModel
+from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
 from .SubscribedPackagesModel import SubscribedPackagesModel
-from ..UltimakerCloudScope import UltimakerCloudScope
-
-from typing import List, Dict, Any
+from ..CloudApiModel import CloudApiModel
 
 
 class CloudPackageChecker(QObject):

plugins/Toolbox/src/CloudSync/DownloadPresenter.py

@@ -13,8 +13,8 @@ from UM.Signal import Signal
 from UM.TaskManagement.HttpRequestManager import HttpRequestManager
 from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
 from cura.CuraApplication import CuraApplication
+from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
 from .SubscribedPackagesModel import SubscribedPackagesModel
-from ..UltimakerCloudScope import UltimakerCloudScope
 
 
 ## Downloads a set of packages from the Ultimaker Cloud Marketplace

plugins/Toolbox/src/Toolbox.py

@@ -9,23 +9,20 @@ from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional, U
 from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 
+from UM.Extension import Extension
 from UM.Logger import Logger
 from UM.PluginRegistry import PluginRegistry
-from UM.Extension import Extension
 from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
-from UM.i18n import i18nCatalog
 from UM.Version import Version
-
+from UM.i18n import i18nCatalog
 from cura import ApplicationMetadata
-
 from cura.CuraApplication import CuraApplication
 from cura.Machines.ContainerTree import ContainerTree
-
-from .CloudApiModel import CloudApiModel
+from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
 from .AuthorsModel import AuthorsModel
+from .CloudApiModel import CloudApiModel
 from .CloudSync.LicenseModel import LicenseModel
 from .PackagesModel import PackagesModel
-from .UltimakerCloudScope import UltimakerCloudScope
 
 if TYPE_CHECKING:
     from UM.TaskManagement.HttpRequestData import HttpRequestData

plugins/Toolbox/src/UltimakerCloudScope.py

@@ -1,31 +0,0 @@
-from PyQt5.QtNetwork import QNetworkRequest
-
-from UM.Logger import Logger
-from UM.TaskManagement.HttpRequestScope import DefaultUserAgentScope
-from cura.API import Account
-from cura.CuraApplication import CuraApplication
-
-
-class UltimakerCloudScope(DefaultUserAgentScope):
-    """Add an Authorization header to the request for Ultimaker Cloud Api requests.
-
-    When the user is not logged in or a token is not available, a warning will be logged
-    Also add the user agent headers (see DefaultUserAgentScope)
-    """
-
-    def __init__(self, application: CuraApplication):
-        super().__init__(application)
-        api = application.getCuraAPI()
-        self._account = api.account  # type: Account
-
-    def requestHook(self, request: QNetworkRequest):
-        super().requestHook(request)
-        token = self._account.accessToken
-        if not self._account.isLoggedIn or token is None:
-            Logger.warning("Cannot add authorization to Cloud Api request")
-            return
-
-        header_dict = {
-            "Authorization": "Bearer {}".format(token)
-        }
-        self.addHeaders(request, header_dict)

plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py

@@ -9,18 +9,16 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager
 
 from UM.Logger import Logger
-from cura import UltimakerCloudAuthentication
 from cura.API import Account
-
+from cura.UltimakerCloud import UltimakerCloudAuthentication
 from .ToolPathUploader import ToolPathUploader
 from ..Models.BaseModel import BaseModel
 from ..Models.Http.CloudClusterResponse import CloudClusterResponse
-from ..Models.Http.CloudError import CloudError
 from ..Models.Http.CloudClusterStatus import CloudClusterStatus
+from ..Models.Http.CloudError import CloudError
+from ..Models.Http.CloudPrintJobResponse import CloudPrintJobResponse
 from ..Models.Http.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest
 from ..Models.Http.CloudPrintResponse import CloudPrintResponse
-from ..Models.Http.CloudPrintJobResponse import CloudPrintJobResponse
-
 
 ## The generic type variable used to document the methods below.
 CloudApiClientModel = TypeVar("CloudApiClientModel", bound=BaseModel)