Support multiple scopes through middleware options

jobala · jobala · commit b1911c77c802 · 2020-04-07T01:21:05.000+03:00
diff --git a/src/core/http_client_factory.py b/src/core/http_client_factory.py
@@ -50,14 +50,6 @@ def delete(self, url, **kwargs):
     def _get_url(self, url):
         return self._base_url+url if (url[0] == '/') else url
 
-    def _prepare_and_send_request(self, method='', url='', **kwargs):
-        request_url = self._get_url(url)
-
-        request = Request(method, request_url, kwargs)
-        prepared_request = self.prepare_request(request)
-
-        return self.send(prepared_request, **kwargs)
-
     def _register(self, middlewares):
         if middlewares:
             middleware_adapter = MiddlewarePipeline()
@@ -66,3 +58,22 @@ def _register(self, middlewares):
                 middleware_adapter.add_middleware(middleware)
 
             self.mount('https://', middleware_adapter)
+
+    def _prepare_and_send_request(self, method='', url='', **kwargs):
+        # Retrieve middleware options
+        list_of_scopes = kwargs.pop('scopes')
+
+        # Prepare request
+        request_url = self._get_url(url)
+        request = Request(method, request_url, kwargs)
+        prepared_request = self.prepare_request(request)
+
+        # prepare scopes middleware option
+        graph_scopes = BASE_URL + '?scopes='
+        for scope in list_of_scopes:
+            graph_scopes += scope + '%20'
+
+        # Append middleware options to the request object, will be used by MiddlewareController
+        prepared_request.scopes = graph_scopes
+
+        return self.send(prepared_request, **kwargs)
diff --git a/src/middleware/_middleware.py b/src/middleware/_middleware.py
@@ -32,7 +32,7 @@ def _attach_middleware_control(self, request, **kwargs):
         request.middleware_control = MiddlewareControl()
 
         try:
-            scopes = kwargs.pop('scopes')
+            scopes = request.scopes
             auth_middleware_options = AuthMiddlewareOptions(scopes)
             request.middleware_control.set(AUTH_MIDDLEWARE_OPTIONS, auth_middleware_options)
         except KeyError:
diff --git a/src/middleware/authorization_handler.py b/src/middleware/authorization_handler.py
@@ -26,4 +26,4 @@ def send(self, request, **kwargs):
         return response
 
     def _get_middleware_options(self, request):
-        return request.middleware_control.get(AUTH_MIDDLEWARE_OPTIONS) or self.auth_provider_options
+        return request.middleware_control.get(AUTH_MIDDLEWARE_OPTIONS)
diff --git a/src/middleware/options/auth_middleware_options.py b/src/middleware/options/auth_middleware_options.py
@@ -2,7 +2,7 @@
 
 
 class AuthMiddlewareOptions:
-    def __init__(self, scopes=''):
+    def __init__(self, scopes=[]):
         self.scopes = scopes
 
     @property
@@ -11,10 +11,12 @@ def scopes(self):
 
     @scopes.setter
     def scopes(self, list_of_scopes):
-        graph_scopes = BASE_URL + '?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
+            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
diff --git a/tests/unit/test_middleware_options.py b/tests/unit/test_middleware_options.py
@@ -0,0 +1,11 @@
+from unittest import TestCase
+
+from src.middleware.options.auth_middleware_options import AuthMiddlewareOptions
+
+
+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'])
+        self.assertEqual(auth_options.scopes, graph_scopes)
+
