Refactor to have scopes passed through an auth provider instead of GraphSession. Moves AuthorizationHandler and TokenCredentialAuthProvider to the same module

Author: jobala

msgraphcore/__init__.py

@@ -1,9 +1,7 @@
 """msgraph-core"""
 
 from msgraphcore.graph_session import GraphSession
-from .middleware.authorization_handler import AuthorizationHandler
-from .middleware.authorization_provider import AuthProviderBase, TokenCredentialAuthProvider
-from .middleware.options.auth_middleware_options import AuthMiddlewareOptions
+from .middleware.authorization import AuthProviderBase, TokenCredentialAuthProvider
 from .constants import SDK_VERSION
 
 __version__ = SDK_VERSION

msgraphcore/graph_session.py

@@ -7,7 +7,7 @@
 from msgraphcore.middleware._middleware import MiddlewarePipeline, BaseMiddleware
 from msgraphcore.middleware.options.auth_middleware_options import AuthMiddlewareOptions
 from msgraphcore.middleware._base_auth import AuthProviderBase
-from msgraphcore.middleware.authorization_handler import AuthorizationHandler
+from msgraphcore.middleware.authorization import AuthorizationHandler
 
 
 class GraphSession(Session):

msgraphcore/middleware/authorization_handler.py renamed to msgraphcore/middleware/authorization.py

@@ -1,4 +1,4 @@
-from ._base_auth import AuthProviderBase
+from ._base_auth import AuthProviderBase, TokenCredential
 from ..constants import AUTH_MIDDLEWARE_OPTIONS
 from ._middleware import BaseMiddleware
 
@@ -26,3 +26,12 @@ def send(self, request, **kwargs):
 
     def _get_middleware_options(self, request):
         return request.middleware_control.get(AUTH_MIDDLEWARE_OPTIONS)
+
+
+class TokenCredentialAuthProvider(AuthProviderBase):
+    def __init__(self, scopes: str, credential: TokenCredential):
+        self.credential = credential
+        self.scopes = scopes
+
+    def get_access_token(self):
+        return self.credential.get_token(self.scopes)[0]

msgraphcore/middleware/authorization_provider.py

@@ -1,22 +1,5 @@
-from msgraphcore.constants import BASE_URL
-
 
 class AuthMiddlewareOptions:
-    def __init__(self, scopes=[]):
+    def __init__(self, scopes: str):
         self.scopes = scopes
 
-    @property
-    def scopes(self):
-        return self._scopes
-
-    @scopes.setter
-    def scopes(self, list_of_scopes):
-        if type(list_of_scopes) == list:
-            graph_scopes = BASE_URL + '?scopes='
-
-            for scope in list_of_scopes:
-                graph_scopes += scope + '%20'
-
-            self._scopes = graph_scopes
-        elif type(list_of_scopes) == str:
-            self._scopes = list_of_scopes

msgraphcore/middleware/options/auth_middleware_options.py

@@ -2,8 +2,7 @@
 from unittest import TestCase
 
 from msgraphcore.graph_session import GraphSession
-
-from msgraphcore.middleware.authorization_provider import AuthProviderBase
+from msgraphcore.middleware.authorization import AuthProviderBase
 
 
 class MiddlewarePipelineTest(TestCase):