GraphClient client refactorings in terms of authentication

Author: vgrem

examples/auth/interactive.py

@@ -13,7 +13,7 @@
 from office365.graph_client import GraphClient
 from tests import test_client_id, test_tenant
 
-client = GraphClient.with_token_interactive(test_tenant, test_client_id)
+client = GraphClient(tenant=test_tenant).with_token_interactive(test_client_id)
 me = client.me.get().execute_query()
 print("Welcome,  {0}!".format(me.given_name))
 site = client.sites.root.get().execute_query()

examples/auth/register_sharepoint_apponly.py

@@ -17,6 +17,6 @@
 from office365.graph_client import GraphClient
 from tests import test_client_id, test_password, test_tenant, test_username
 
-admin_client = GraphClient.with_username_and_password(
-    test_tenant, test_client_id, test_username, test_password
+admin_client = GraphClient(tenant=test_tenant).with_username_and_password(
+    test_client_id, test_username, test_password
 )

examples/auth/with_client_secret.py

@@ -2,7 +2,7 @@
 Acquires a token by using application secret
 
 The following options are supported:
-   - utilize built in GraphClient.with_client_secret(tenant, client_id, client_secret, scopes, token_cache) method
+   - utilize built in GraphClient(tenant=tenant).with_client_secret(client_id, client_secret) method
    - or provide a custom callback function to GraphClient constructor as demonstrated below
 
 https://learn.microsoft.com/en-us/entra/identity-platform/msal-authentication-flows#client-credentials

examples/auth/with_user_creds.py

@@ -7,8 +7,8 @@
 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
+client = GraphClient(tenant=test_tenant).with_username_and_password(
+    test_client_id, test_username, test_password
 )
 me = client.me.get().execute_query()
-print(me.user_principal_name)
+print(me)

examples/communications/create_call.py

@@ -5,7 +5,9 @@
 from office365.graph_client import GraphClient
 from tests import test_client_id, test_client_secret, test_tenant
 
-client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
+client = GraphClient(tenant=test_tenant).with_client_secret(
+    test_client_id, test_client_secret
+)
 call = client.communications.calls.create(
     "https://mediadev8.com/teamsapp/api/calling"
 ).execute_query()

examples/directory/applications/add_cert.py

@@ -12,8 +12,8 @@
 
 cert_path = "../../selfsigncert.pem"
 
-client = GraphClient.with_username_and_password(
-    test_tenant, test_client_id, test_username, test_password
+client = GraphClient(tenant=test_tenant).with_username_and_password(
+    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:

examples/directory/applications/app_password.py

@@ -12,8 +12,8 @@
     test_username,
 )
 
-client = GraphClient.with_username_and_password(
-    test_tenant, test_client_id, test_username, test_password
+client = GraphClient(tenant=test_tenant).with_username_and_password(
+    test_client_id, test_username, test_password
 )
 target_app = client.applications.get_by_app_id(test_client_credentials.clientId)
 result = target_app.add_password("Password friendly name").execute_query()

examples/directory/applications/get_by_app_id.py

@@ -10,6 +10,8 @@
 from office365.graph_client import GraphClient
 from tests import test_client_id, test_client_secret, test_tenant
 
-client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
+client = GraphClient(tenant=test_tenant).with_client_secret(
+    test_client_id, test_client_secret
+)
 app = client.applications.get_by_app_id(test_client_id).get().execute_query()
 print(app)

examples/directory/applications/grant_application_perms.py

@@ -22,10 +22,9 @@
     test_tenant,
 )
 
-client = GraphClient.with_token_interactive(
-    test_tenant, test_client_id, test_admin_principal_name
+client = GraphClient(tenant=test_tenant).with_token_interactive(
+    test_client_id, test_admin_principal_name
 )
-# client = GraphClient.with_client_secret(test_tenant, test_client_id, test_client_secret)
 
 # Step 1: Get the resource service principal
 resource = client.service_principals.get_by_name("Microsoft Graph")

examples/directory/applications/grant_delegated_perms.py

@@ -15,8 +15,8 @@
     test_user_principal_name,
 )
 
-client = GraphClient.with_token_interactive(
-    test_tenant, test_client_id, test_admin_principal_name
+client = GraphClient(tenant=test_tenant).with_token_interactive(
+    test_client_id, test_admin_principal_name
 )