Add AuthorizationHandler tests

Author: jobala

msgraphcore/constants.py

@@ -4,7 +4,7 @@
 REQUEST_TIMEOUT = 100
 CONNECTION_TIMEOUT = 30
 BASE_URL = 'https://graph.microsoft.com/v1.0'
-SDK_VERSION = '0.0.1-0'
+SDK_VERSION = '0.0.3'
 
 # Used as the key for AuthMiddlewareOption in MiddlewareControl
 AUTH_MIDDLEWARE_OPTIONS = 'AUTH_MIDDLEWARE_OPTIONS'

msgraphcore/middleware/authorization.py

@@ -1,18 +1,17 @@
+from .abc_token_credential import TokenCredential
 from ..constants import AUTH_MIDDLEWARE_OPTIONS
 from .middleware import BaseMiddleware
 from .options.middleware_control import middleware_control
 
 
 class AuthorizationHandler(BaseMiddleware):
-    def __init__(self, credential, scopes):
+    def __init__(self, credential: TokenCredential, scopes: [str]):
         super().__init__()
         self.credential = credential
         self.scopes = scopes
         self.retry_count = 0
 
     def send(self, request, **kwargs):
-        self._update_scopes_from_middleware_options()
-
         request.headers.update({'Authorization': 'Bearer {}'.format(self._get_access_token())})
         response = super().send(request, **kwargs)
 
@@ -22,12 +21,14 @@ def send(self, request, **kwargs):
             return self.send(request, **kwargs)
         return response
 
-    def _update_scopes_from_middleware_options(self):
+    def _get_access_token(self):
+        return self.credential.get_token(*self.get_scopes())[0]
+
+    def get_scopes(self):
         # Checks if there are any options for this middleware
         auth_options_present = middleware_control.get(AUTH_MIDDLEWARE_OPTIONS)
         # If there is, get the scopes from the options
         if auth_options_present:
-            self.scopes = auth_options_present.scopes
-
-    def _get_access_token(self):
-        return self.credential.get_token(*self.scopes)[0]
+            return auth_options_present.scopes
+        else:
+            return self.scopes

tests/unit/test_auth_handler.py

@@ -0,0 +1,29 @@
+import unittest
+
+from msgraphcore.constants import AUTH_MIDDLEWARE_OPTIONS
+from msgraphcore.middleware.authorization import AuthorizationHandler
+from msgraphcore.middleware.options.middleware_control import middleware_control
+from msgraphcore.middleware.options.auth_middleware_options import AuthMiddlewareOptions
+
+
+class TestAuthorizationHandler(unittest.TestCase):
+    def test_uses_scopes_from_auth_options(self):
+        auth_option = ['email.read']
+        default_scopes = ['.default']
+
+        middleware_control.set(AUTH_MIDDLEWARE_OPTIONS, AuthMiddlewareOptions(auth_option))
+        auth_handler = AuthorizationHandler(None, default_scopes)
+
+        auth_handler_scopes = auth_handler.get_scopes()
+        self.assertEqual(auth_option, auth_handler_scopes)
+
+    def test_auth_option_does_not_overwrite_default_scopes(self):
+        auth_option = ['email.read']
+        default_scopes = ['.default']
+
+        middleware_control.set(AUTH_MIDDLEWARE_OPTIONS, AuthMiddlewareOptions(auth_option))
+        auth_handler = AuthorizationHandler(None, default_scopes)
+
+        self.assertEqual(auth_handler.scopes, default_scopes)
+
+