refactor auth module: azure env

Author: vgrem

office365/azure_env.py

@@ -3,17 +3,54 @@ class AzureEnvironment(object):
     Global = "Global"
     """Referred to as Azure or Azure Global."""
 
-    GCC = "GCC"
+    USGovernment = "GCC"
     """Government Community Cloud"""
 
-    GCC_High = "GCC High"
+    USGovernmentHigh = "GCC High"
     """Government Community Cloud High."""
 
-    CN = "CN"
+    China = "CN"
     """Operated by 21Vianet under Chinese regulations."""
 
-    Azure_DE = "Azure DE"
+    Germany = "Azure DE"
     """Legacy; for data sovereignty in Germany."""
 
-    DoD = "DoD"
+    USGovernmentDoD = "DoD"
     """Azure for U.S. Department of Defense (DoD)"""
+
+    _authority_endpoints = {
+        Global: {
+            "graph": "https://graph.microsoft.com",
+            "login": "https://login.microsoftonline.com",
+        },
+        USGovernment: {
+            "graph": "https://graph.microsoft.com",
+            "login": "https://login.microsoftonline.com",
+        },
+        USGovernmentHigh: {
+            "graph": "https://graph.microsoft.us",
+            "login": "https://login.microsoftonline.us",
+        },
+        USGovernmentDoD: {
+            "graph": "https://dod-graph.microsoft.us",
+            "login": "https://login.microsoftonline.us",
+        },
+        Germany: {
+            "graph": "https://graph.microsoft.de",
+            "login": "https://login.microsoftonline.de",
+        },
+        China: {
+            "graph": "https://microsoftgraph.chinacloudapi.cn",
+            "login": "https://login.chinacloudapi.cn",
+        },
+    }
+
+    @classmethod
+    def get_graph_authority(cls, env):
+        # type: (str) -> str
+        return cls._authority_endpoints.get(env)["graph"]
+
+    @classmethod
+    def get_login_authority(cls, env):
+        # type: (str) -> str
+        return cls._authority_endpoints.get(env)["login"]

office365/graph_request.py

@@ -15,12 +15,6 @@ def __init__(
         super(GraphRequest, self).__init__(V4JsonFormat())
         self._version = version
         self._environment = environment
-        self._endpoints = {
-            AzureEnvironment.Global: "https://graph.microsoft.com",
-            AzureEnvironment.GCC: "https://graph.microsoft.us",
-            AzureEnvironment.GCC_High: "https://graph.microsoft.us",
-            AzureEnvironment.DoD: "https://dod-graph.microsoft.us",
-        }
         self._auth_context = AuthenticationContext(
             environment=environment, tenant=tenant
         )
@@ -90,4 +84,6 @@ def authenticate_request(self, request):
     @property
     def service_root_url(self):
         # type: () -> str
-        return "{0}/{1}".format(self._endpoints.get(self._environment), self._version)
+        return "{0}/{1}".format(
+            AzureEnvironment.get_graph_authority(self._environment), self._version
+        )

office365/runtime/auth/entra/authentication_context.py

@@ -22,17 +22,13 @@ def __init__(
         """
         self._tenant = tenant
         if scopes is None:
-            scopes = ["https://graph.microsoft.com/.default"]
+            scopes = [
+                "{0}/.default".format(AzureEnvironment.get_graph_authority(environment))
+            ]
         self._scopes = scopes
         self._token_cache = token_cache
         self._token_callback = None
         self._environment = environment
-        self._authority_urls = {
-            AzureEnvironment.Global: "https://login.microsoftonline.com",
-            AzureEnvironment.GCC: "https://login.microsoftonline.us",
-            AzureEnvironment.GCC_High: "https://login.microsoftonline.us",
-            AzureEnvironment.CN: "https://login.chinacloudapi.cn",
-        }
 
     def acquire_token(self):
         # type: () -> TokenResponse
@@ -165,5 +161,5 @@ def _acquire_token():
     @property
     def authority_url(self):
         return "{0}/{1}".format(
-            self._authority_urls.get(self._environment), self._tenant
+            AzureEnvironment.get_login_authority(self._environment), self._tenant
         )

tests/sharepoint/test_tenant.py

@@ -226,7 +226,7 @@ def test_32_get_admin_endpoints(self):
         result = self.tenant.admin_endpoints.get().execute_query()
         self.assertIsNotNone(result.resource_path)
 
-    #def test_33_get_top_files_sharing_insights(self):
+    # def test_33_get_top_files_sharing_insights(self):
     #    result = self.tenant.get_top_files_sharing_insights().execute_query()
     #    self.assertIsNotNone(result.resource_path)