GraphClient: removed dependency to adal

vvgrem@gmail.com · vvgrem@gmail.com · commit 7e51ec8eb432 · 2020-09-11T16:11:50.000+03:00
diff --git a/examples/directory/clear_directory.py b/examples/directory/clear_directory.py
@@ -1,13 +1,13 @@
+import adal
+
 from settings import settings
 
 from office365.graph_client import GraphClient
 
 
-def get_token_for_user(auth_ctx):
-    """
-
-    :type auth_ctx: adal.AuthenticationContext
-    """
+def get_token_for_user():
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_username_password(
         'https://graph.microsoft.com',
         settings['user_credentials']['username'],
diff --git a/examples/directory/import_users.py b/examples/directory/import_users.py
@@ -2,7 +2,7 @@
 from settings import settings
 from tests import random_seed
 
-from office365.directory import UserProfile
+from office365.directory.userProfile import UserProfile
 from office365.graph_client import GraphClient
 
 
diff --git a/examples/onedrive/export_files.py b/examples/onedrive/export_files.py
@@ -1,15 +1,18 @@
 import os
 import tempfile
 
+import adal
+
 from settings import settings
 
 from office365.graph_client import GraphClient
 
 
-def get_token(auth_ctx):
+def get_token():
     """Acquire token via client credential flow (ADAL Python library is utilized)
-    :type auth_ctx: adal.AuthenticationContext
     """
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_client_credentials(
         "https://graph.microsoft.com",
         settings['client_credentials']['client_id'],
diff --git a/examples/onedrive/import_files.py b/examples/onedrive/import_files.py
@@ -1,16 +1,18 @@
 import os
 from os.path import isfile, join
 
+import adal
+
 from settings import settings
 
 from office365.graph_client import GraphClient
 
 
-def get_token(auth_ctx):
+def get_token():
     """Acquire token via client credential flow
-
-    :type auth_ctx: adal.AuthenticationContext
     """
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_client_credentials(
         "https://graph.microsoft.com",
         settings['client_credentials']['client_id'],
diff --git a/examples/onedrive/print_folders_and_files.py b/examples/onedrive/print_folders_and_files.py
@@ -1,14 +1,16 @@
+import adal
+
 from settings import settings
 
 from office365.graph_client import GraphClient
 
 
-def get_token_for_user(auth_ctx):
+def get_token_for_user():
     """
     Acquire token via user credentials
-
-    :type auth_ctx: adal.AuthenticationContext
     """
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_username_password(
         'https://graph.microsoft.com',
         settings['user_credentials']['username'],
diff --git a/examples/outlook/send_message.py b/examples/outlook/send_message.py
@@ -1,10 +1,14 @@
+import adal
+
 from settings import settings
 
 from office365.graph_client import GraphClient
 
 
-def get_token(auth_ctx):
+def get_token():
     """Acquire token via client credential flow (ADAL Python library is utilized)"""
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_client_credentials(
         "https://graph.microsoft.com",
         settings['client_credentials']['client_id'],
diff --git a/examples/requirements.txt b/examples/requirements.txt
@@ -0,0 +1,3 @@
+msal~=1.5.0
+Faker~=4.1.2
+
diff --git a/examples/teams/list_teams.py b/examples/teams/list_teams.py
@@ -0,0 +1,21 @@
+import adal
+
+from settings import settings
+from office365.graph_client import GraphClient
+
+
+def acquire_token():
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
+    token = auth_ctx.acquire_token_with_username_password(
+        'https://graph.microsoft.com',
+        settings['user_credentials']['username'],
+        settings['user_credentials']['password'],
+        settings['client_credentials']['client_id'])
+    return token
+
+
+client = GraphClient(settings['tenant'], acquire_token)
+teams = client.teams.get_all().execute_query()
+for team in teams:
+    print(team.id)
diff --git a/examples/teams/provision_team.py b/examples/teams/provision_team.py
@@ -1,16 +1,16 @@
 import uuid
 
+import adal
+
 from settings import settings
 
 from office365.directory.groupProfile import GroupProfile
 from office365.graph_client import GraphClient
 
 
-def acquire_token(auth_ctx):
-    """
-    Get token
-    :type auth_ctx: adal.AuthenticationContext
-    """
+def acquire_token():
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_username_password(
         'https://graph.microsoft.com',
         settings['user_credentials']['username'],
diff --git a/generator/builders/__init__.py b/generator/builders/__init__.py
diff --git a/generator/builders/template_context.py b/generator/builders/template_context.py
@@ -0,0 +1,6 @@
+class TemplateContext:
+    def __init__(self, template_path):
+        self._template_path = template_path
+
+    def build(self, schema):
+        pass
diff --git a/generator/builders/type_builder.py b/generator/builders/type_builder.py
diff --git a/generator/generate.py b/generator/generate.py
@@ -1,4 +1,4 @@
-from generator.type_builder import TypeBuilder
+from generator.builders.type_builder import TypeBuilder
 
 from office365.runtime.odata.odata_v3_reader import ODataV3Reader
 from office365.runtime.odata.odata_v4_reader import ODataV4Reader
diff --git a/office365/entity.py b/office365/entity.py
@@ -20,9 +20,7 @@ def id(self):
         """The unique identifier of the drive.
         :rtype: str or None
         """
-        if self.is_property_available("id"):
-            return self.properties['id']
-        return None
+        return self.properties.get('id', None)
 
     def set_property(self, name, value, persist_changes=True):
         super(Entity, self).set_property(name, value, persist_changes)
diff --git a/office365/graph_client.py b/office365/graph_client.py
@@ -1,5 +1,3 @@
-import adal
-
 from office365.actions.download_content_query import DownloadContentQuery
 from office365.actions.search_query import SearchQuery
 from office365.actions.upload_content_query import UploadContentQuery
@@ -30,7 +28,7 @@ class GraphClient(ClientRuntimeContext):
     def __init__(self, tenant, acquire_token_callback):
         """
 
-        :param (adal.AuthenticationContext) -> dict acquire_token_callback: Acquire token function
+        :param () -> dict acquire_token_callback: Acquire token function
         :param str tenant: Tenant name
         """
         super(GraphClient, self).__init__()
@@ -70,9 +68,9 @@ def authenticate_request(self, request):
 
         :type request: RequestOptions
         """
-        authority_url = self._authority_host_url + '/' + self._tenant
-        auth_ctx = adal.AuthenticationContext(authority_url)
-        token = self._acquire_token_callback(auth_ctx)
+        # authority_url = self._authority_host_url + '/' + self._tenant
+        # auth_ctx = adal.AuthenticationContext(authority_url)
+        token = self._acquire_token_callback()
         request.set_header('Authorization', 'Bearer {0}'.format(token["accessToken"]))
 
     def execute_request(self, url_or_options):
diff --git a/office365/teams/team.py b/office365/teams/team.py
@@ -17,8 +17,8 @@ class Team(Entity):
     """A team in Microsoft Teams is a collection of channel objects. A channel represents a topic, and therefore a
     logical isolation of discussion, within a team. """
 
-    def __init__(self, context, resource_path=None):
-        super().__init__(context, resource_path)
+    def __init__(self, context, resource_path=None, properties=None):
+        super().__init__(context, resource_path, properties)
         self.memberSettings = TeamMemberSettings()
         self.guestSettings = TeamGuestSettings()
         self.messagingSettings = TeamMessagingSettings()
diff --git a/office365/teams/teamCollection.py b/office365/teams/teamCollection.py
@@ -24,7 +24,9 @@ def get_all(self):
         def _process_response(resp):
             for grp in groups:
                 if "Team" in grp.properties["resourceProvisioningOptions"]:
-                    self.add_child(Team(self.context, ResourcePath(grp.properties["id"], self.resource_path)))
+                    new_team = Team(self.context, ResourcePath(grp.properties["id"], self.resource_path))
+                    new_team.set_property("id", grp.properties["id"])
+                    self.add_child(new_team)
         self.context.after_execute(_process_response)
         return self
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,4 @@
 flake8
 isort
 nose2
-Faker~=4.1.1
 astunparse~=1.6.3
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
 requests~=2.24.0
 requests_ntlm [NTLMAuthentication]
-setuptools~=47.3.2
-adal~=1.2.4
+setuptools~=50.3.0
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     extras_require={
         'NTLMAuthentication': ["requests_ntlm"]
     },
-    tests_require=['nose', 'flake8', 'isort'],
+    tests_require=['nose', 'adal'],
     test_suite='nose.collector',
     license="MIT",
     keywords="git",
diff --git a/tests/graph_case.py b/tests/graph_case.py
@@ -1,15 +1,18 @@
 from unittest import TestCase
 
+import adal
+
 from settings import settings
 
 from office365.graph_client import GraphClient
 
 
-def get_token(auth_ctx):
+def get_token():
     """
     Get token
-    :type auth_ctx: adal.AuthenticationContext
     """
+    authority_url = 'https://login.microsoftonline.com/{0}'.format(settings['tenant'])
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_username_password(
         'https://graph.microsoft.com',
         settings['user_credentials']['username'],
