Update tests

Author: jobala

msgraphcore/middleware/authorization.py

@@ -1,5 +1,5 @@
 from ._base_auth import AuthProviderBase, TokenCredential
-from ..constants import AUTH_MIDDLEWARE_OPTIONS
+from ..constants import AUTH_MIDDLEWARE_OPTIONS, BASE_URL
 from ._middleware import BaseMiddleware
 
 
@@ -29,9 +29,25 @@ def _get_middleware_options(self, request):
 
 
 class TokenCredentialAuthProvider(AuthProviderBase):
-    def __init__(self, scopes: str, credential: TokenCredential):
+    def __init__(self, credential: TokenCredential, scopes: [str] = BASE_URL + '.default'):
         self.credential = credential
         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
+
     def get_access_token(self):
         return self.credential.get_token(self.scopes)[0]

tests/integration/test_middleware_pipeline.py

@@ -11,16 +11,17 @@ def setUp(self):
 
     def test_middleware_pipeline(self):
         url = 'https://proxy.apisandbox.msdn.microsoft.com/svc?url=https://graph.microsoft.com/v1.0/me'
-
-        auth_provider = _CustomAuthProvider()
         scopes = ['user.read']
-        graph_session = GraphSession(scopes, auth_provider)
+        auth_provider = _CustomAuthProvider(scopes)
+        graph_session = GraphSession(auth_provider)
         result = graph_session.get(url)
 
         self.assertEqual(result.status_code, 200)
 
 
 class _CustomAuthProvider(AuthProviderBase):
+    def __init__(self, scopes):
+        pass
 
     def get_access_token(self):
         return '{token:https://graph.microsoft.com/}'

tests/unit/test_graph_session.py

@@ -11,8 +11,8 @@
 
 class GraphSessionTest(TestCase):
     def setUp(self) -> None:
-        self.auth_provider = _CustomAuthProvider()
-        self.requests = GraphSession(['user.read'], self.auth_provider)
+        self.auth_provider = _CustomAuthProvider(['user.read'])
+        self.requests = GraphSession(self.auth_provider)
 
     def tearDown(self) -> None:
         self.requests = None
@@ -27,7 +27,7 @@ def test_has_sdk_version_header(self):
         self.assertEqual(self.requests.headers.get('sdkVersion'), 'graph-python-'+SDK_VERSION)
 
     def test_initialized_with_middlewares(self):
-        graph_session = GraphSession(['user.read'], self.auth_provider)
+        graph_session = GraphSession(self.auth_provider)
         mocked_middleware = graph_session.get_adapter('https://')
 
         self.assertIsInstance(mocked_middleware, HTTPAdapter)
@@ -54,6 +54,8 @@ def test_does_not_build_graph_urls_for_full_urls(self):
 
 
 class _CustomAuthProvider(AuthProviderBase):
+    def __init__(self, scopes):
+        pass
 
     def get_access_token(self):
         return '{token:https://graph.microsoft.com/}'

tests/unit/test_middleware_options.py

@@ -6,5 +6,5 @@
 class TestMiddlewareOptions(TestCase):
     def test_multiple_scopes(self):
         graph_scopes = 'https://graph.microsoft.com/v1.0?scopes=mail.read%20user.read%20'
-        auth_options = AuthMiddlewareOptions(scopes=['mail.read', 'user.read'])
+        auth_options = AuthMiddlewareOptions(graph_scopes)
         self.assertEqual(auth_options.scopes, graph_scopes)