Intune API support & typings updates

Author: vgrem

examples/data/Financial Sample.csv

@@ -8,12 +8,13 @@
 """
 
 from office365.graph_client import GraphClient
-from tests import test_client_id, test_tenant
-from tests.graph_case import acquire_token_by_username_password
+from tests import test_client_id, test_password, test_tenant, test_username
 
 cert_path = "../../selfsigncert.pem"
 
-client = GraphClient(acquire_token_by_username_password)
+client = GraphClient.with_username_and_password(
+    test_tenant, test_client_id, test_username, test_password
+)
 target_app = client.applications.get_by_app_id(test_client_id)
 with open(cert_path, "rb") as f:
     cert_data = f.read()

examples/directory/applications/add_cert.py

@@ -1,19 +1,18 @@
 """
 Manage an Azure AD application using Microsoft Graph
 
-https://learn.microsoft.com/en-us/graph/tutorial-applications-basics?tabs=http
+https://learn.microsoft.com/en-us/graph/tutorial-applications-basics
 
 You can address an application or a service principal by its ID or by its appId, where ID is referred to
 as Object ID and appId is referred to as Application (client) ID on the Azure portal.
 """
 from office365.graph_client import GraphClient
-from tests import test_client_credentials
-from tests.graph_case import acquire_token_by_client_credentials
-
-client = GraphClient(acquire_token_by_client_credentials)
-app = (
-    client.applications.get_by_app_id(test_client_credentials.clientId)
-    .get()
-    .execute_query()
+from tests import (
+    test_client_id,
+    test_client_secret,
+    test_tenant,
 )
+
+client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
+app = client.applications.get_by_app_id(test_client_id).get().execute_query()
 print(app)

examples/directory/applications/get_by_app_id.py

@@ -1,13 +1,20 @@
 """
 Assign manager
 
-https://learn.microsoft.com/en-us/graph/api/user-post-manager?view=graph-rest-1.0&tabs=http
+https://learn.microsoft.com/en-us/graph/api/user-post-manager?view=graph-rest-1.0
 """
 from office365.graph_client import GraphClient
-from tests import test_user_principal_name
-from tests.graph_case import acquire_token_by_username_password
+from tests import (
+    test_client_id,
+    test_password,
+    test_tenant,
+    test_user_principal_name,
+    test_username,
+)
 
-client = GraphClient(acquire_token_by_username_password)
-user = client.users.get_by_principal_name(test_user_principal_name)
-manager = client.me.assign_manager(user).get().execute_query()
+client = GraphClient.with_username_and_password(
+    test_tenant, test_client_id, test_username, test_password
+)
+manager = client.users.get_by_principal_name(test_user_principal_name)
+client.me.assign_manager(manager).get().execute_query()
 print("User manager has been assigned")

examples/directory/users/assign_manager.py

@@ -4,7 +4,9 @@
 https://learn.microsoft.com/en-us/graph/api/user-exportpersonaldata?view=graph-rest-1.0
 """
 from office365.graph_client import GraphClient
-from tests.graph_case import acquire_token_by_username_password
+from tests import test_client_id, test_password, test_tenant, test_username
 
-client = GraphClient(acquire_token_by_username_password)
+client = GraphClient.with_username_and_password(
+    test_tenant, test_client_id, test_username, test_password
+)
 result = client.me.export_personal_data("storageLocation-value").execute_query()

examples/directory/users/export_personal_data.py

@@ -0,0 +1,19 @@
+"""
+Retrieve a list of licenseDetails objects for enterprise users.
+
+https://learn.microsoft.com/en-us/graph/api/user-list-licensedetails?view=graph-rest-1.0
+"""
+from office365.graph_client import GraphClient
+from tests import (
+    test_client_id,
+    test_password,
+    test_tenant,
+    test_username,
+)
+
+client = GraphClient.with_username_and_password(
+    test_tenant, test_client_id, test_username, test_password
+)
+result = client.me.license_details.get().execute_query()
+for details in result:
+    print(details)

examples/directory/users/get_licenses.py

@@ -1,7 +1,7 @@
 """
 Demonstrates how to upload a small file
 
-https://learn.microsoft.com/en-us/graph/api/driveitem-put-content?view=graph-rest-1.0&tabs=http
+https://learn.microsoft.com/en-us/graph/api/driveitem-put-content?view=graph-rest-1.0
 """
 
 from office365.graph_client import GraphClient

examples/onedrive/files/upload.py

@@ -9,10 +9,14 @@
 
 from office365.graph_client import GraphClient
 from office365.onedrive.driveitems.driveItem import DriveItem
-from tests import test_user_principal_name
-from tests.graph_case import acquire_token_by_client_credentials
+from tests import (
+    test_client_id,
+    test_client_secret,
+    test_tenant,
+    test_user_principal_name,
+)
 
-client = GraphClient(acquire_token_by_client_credentials)
+client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
 drive = client.users[test_user_principal_name].drive
 with tempfile.TemporaryDirectory() as local_path:
     drive_items = drive.root.children.get().execute_query()

examples/onedrive/folders/export.py

@@ -4,8 +4,8 @@
 https://learn.microsoft.com/en-us/graph/api/site-getallsites?view=graph-rest-1.0
 """
 from office365.graph_client import GraphClient
-from tests.graph_case import acquire_token_by_client_credentials
+from tests import test_client_id, test_client_secret, test_tenant
 
-client = GraphClient(acquire_token_by_client_credentials)
+client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
 sites = client.sites.get_all_sites().execute_query()
 print("{0} sites was found".format(len(sites)))

examples/onedrive/sites/get_all.py

@@ -5,10 +5,17 @@
 """
 
 from office365.graph_client import GraphClient
-from tests import test_user_principal_name_alt
-from tests.graph_case import acquire_token_by_username_password
+from tests import (
+    test_client_id,
+    test_password,
+    test_tenant,
+    test_user_principal_name_alt,
+    test_username,
+)
 
-client = GraphClient(acquire_token_by_username_password)
+client = GraphClient.with_username_and_password(
+    test_tenant, test_client_id, test_username, test_password
+)
 client.me.send_mail(
     subject="Meet for lunch?",
     body="The new cafeteria is open.",