GraphClient: support for MSAL library introduced, Model type builder implementation

Author: vvgrem@gmail.com

README.md

@@ -112,9 +112,57 @@ the following clients are available:
 
 #### Authentication
 
-[ADAL Python](https://adal-python.readthedocs.io/en/latest/#) 
-library is utilized to authenticate users to Active Directory (AD) and obtain tokens
+In terms of Microsoft Graph API authentication, there is no any dependency to any particular library implementation, 
+the following libraries are supported at least:
+
+> Note: access token is getting acquired  via [Client Credential flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow)
+> in the provided examples
 
+[Microsoft Authentication Library (MSAL) for Python](https://pypi.org/project/msal/)
+
+```python
+import msal
+from office365.graph_client import GraphClient
+
+def acquire_token():
+    """
+    Acquire token via MSAL
+    """
+    authority_url = 'https://login.microsoftonline.com/{tenant_id_or_name}'
+    app = msal.ConfidentialClientApplication(
+        authority=authority_url,
+        client_id='{client_id}',
+        client_credential='{client_secret}'
+    )
+    result = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
+    return result
+
+
+client = GraphClient(acquire_token)
+
+```
+
+
+[ADAL Python](https://adal-python.readthedocs.io/en/latest/#)
+
+Usage
+
+```python
+import adal
+from office365.graph_client import GraphClient
+
+def get_token():
+    authority_url = 'https://login.microsoftonline.com/{tenant_id_or_name}'
+    auth_ctx = adal.AuthenticationContext(authority_url)
+    token = auth_ctx.acquire_token_with_client_credentials(
+        "https://graph.microsoft.com",
+        "{client_id}",
+        "{client_secret}")
+    return token
+
+client = GraphClient(get_token)
+
+```
 
 #### Example
 
@@ -123,17 +171,19 @@ The example demonstrates how to send an email via [Microsoft Graph endpoint](htt
 > Note: access token is getting acquired  via [Client Credential flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow)
 
 ```python
+import adal
 from office365.graph_client import GraphClient
-def get_token(auth_ctx):
+
+def get_token():
+    authority_url = 'https://login.microsoftonline.com/{tenant_id_or_name}'
+    auth_ctx = adal.AuthenticationContext(authority_url)
     token = auth_ctx.acquire_token_with_client_credentials(
         "https://graph.microsoft.com",
         "{client_id}",
         "{client_secret}")
     return token
 
-
-tenant_name = "{your-tenant-prefix}.onmicrosoft.com"
-client = GraphClient(tenant_name, get_token)
+client = GraphClient(get_token)
 
 message_json = {
     "Message": {
@@ -191,7 +241,7 @@ def get_token(auth_ctx):
 
 
 tenant_name = "contoso.onmicrosoft.com"
-client = GraphClient(tenant_name, get_token)
+client = GraphClient(get_token)
 drives = client.drives
 client.load(drives)
 client.execute_query()
@@ -204,7 +254,7 @@ for drive in drives:
 
 ```python
 from office365.graph_client import GraphClient
-client = GraphClient("{tenant_name}", get_token)
+client = GraphClient(get_token)
 # retrieve drive properties 
 drive = client.users["{user_id_or_principal_name}"].drive
 client.load(drive)

examples/directory/clear_directory.py

@@ -16,7 +16,7 @@ def get_token_for_user():
     return token
 
 
-client = GraphClient(settings['tenant'], get_token_for_user)
+client = GraphClient(get_token_for_user)
 
 deleted_groups = client.directory.deletedGroups.get().execute_query()
 # deleted_users = client.directory.deletedUsers.get().execute_query()

examples/directory/import_users.py

@@ -36,7 +36,7 @@ def generate_user_profile():
     return UserProfile(**user_json)
 
 
-client = GraphClient(settings['tenant'], acquire_token)
+client = GraphClient(acquire_token)
 
 for idx in range(0, 5):
     user_profile = generate_user_profile()

examples/onedrive/export_files.py

@@ -41,7 +41,7 @@ def download_files(remote_folder, local_path):
 # --------------------------------------------------------------------------
 
 # connect
-client = GraphClient(settings['tenant'], get_token)
+client = GraphClient(get_token)
 
 # load drive properties
 drive = client.users["jdoe@mediadev8.onmicrosoft.com"].drive

examples/onedrive/import_files.py

@@ -37,7 +37,7 @@ def upload_files(remote_drive, local_root_path):
 
 
 # get target drive
-client = GraphClient(settings['tenant'], get_token)
+client = GraphClient(get_token)
 target_drive = client.users["jdoe@mediadev8.onmicrosoft.com"].drive
 # import local files into OneDrive
 upload_files(target_drive, "../data")

examples/onedrive/print_folders_and_files.py

@@ -30,6 +30,6 @@ def enum_folders_and_files(root_folder):
             enum_folders_and_files(drive_item)
 
 
-client = GraphClient(settings['tenant'], get_token_for_user)
+client = GraphClient(get_token_for_user)
 root = client.me.drive.root
 enum_folders_and_files(root)

examples/outlook/send_message.py

@@ -16,7 +16,7 @@ def get_token():
     return token
 
 
-client = GraphClient(settings['tenant'], get_token)
+client = GraphClient(get_token)
 message_json = {
     "Message": {
         "Subject": "Meet for lunch?",

examples/teams/connect_with_client_secret.py

@@ -19,7 +19,7 @@ def acquire_token_msal():
     return result
 
 
-client = GraphClient(settings['tenant'], acquire_token_msal)
+client = GraphClient(acquire_token_msal)
 teams = client.teams.get_all().execute_query()
 for team in teams:
     print(team.id)

examples/teams/provision_team.py

@@ -32,7 +32,7 @@ def print_failure(retry_number):
     print(f"{retry_number}: trying to create a team...")
 
 
-client = GraphClient(settings['tenant'], acquire_token)
+client = GraphClient(acquire_token)
 
 group_name = "Team_" + uuid.uuid4().hex
 result = client.teams.create(group_name)

generator/builders/type_builder.py

@@ -1,25 +1,47 @@
 import ast
+import os
+
 
 import astunparse
 
 
-class TypeBuilder(object):
+class TypeBuilder(ast.NodeTransformer):
 
-    def __init__(self, schema):
-        self._schema = schema
-        self._node = None
+    def __init__(self, options):
+        self._schema = None
+        self._options = options
+
+    def generic_visit(self, node):
+        if isinstance(node, ast.ClassDef):
+            node.name = self._schema["name"].title()
+        ast.NodeVisitor.generic_visit(self, node)
 
-    def build(self, options):
-        if self._schema['state'] == 'attached':
-            with open(self._schema['file']) as f:
-                self._node = ast.parse(f.read())
-            return True
+    def build(self, schema):
+        result = dict(status=None, output_file=None, source_tree=None)
+        if schema['state'] == 'attached':
+            result.output_file = schema['file']
+            with open(schema['file']) as f:
+                result["source_tree"] = ast.parse(f.read())
+            result["status"] = "updated"
         else:
-            with open(options['complexTypeFile']) as f:
-                self._node = ast.parse(f.read())
-            return False
+            template_file = self._resolve_template_file(schema['baseType'])
+            result["output_file"] = os.path.join(self._options['outputPath'], schema["name"] + ".py")
+            with open(template_file) as f:
+                result["source_tree"] = ast.parse(f.read())
+            result["status"] = "created"
+        self._schema = schema
+        self.visit(result["source_tree"])
+        return result
 
-    def save(self):
-        code = astunparse.unparse(self._node)
-        with open(self._schema['file']) as f:
+    def save(self, result):
+        code = astunparse.unparse(result["source_tree"])
+        with open(result["output_file"], 'w') as f:
             f.write(code)
+
+    def _resolve_template_file(self, type_name):
+        file_mapping = {
+            "ComplexType": "complex_type.py",
+            "EntityType": "entity_type.py"
+        }
+        path = os.path.join(self._options['templatePath'], file_mapping[type_name])
+        return path