Simplified initialization of GraphServiceClient

Author: jasonjoh

app-auth/graphapponlytutorial/graph.py

@@ -4,16 +4,12 @@
 # <AppAuthConfigSnippet>
 from configparser import SectionProxy
 from azure.identity.aio import ClientSecretCredential
-from kiota_authentication_azure.azure_identity_authentication_provider import (
-    AzureIdentityAuthenticationProvider
-)
-from msgraph import GraphRequestAdapter, GraphServiceClient
+from msgraph import GraphServiceClient
 from msgraph.generated.users.users_request_builder import UsersRequestBuilder
 
 class Graph:
     settings: SectionProxy
     client_credential: ClientSecretCredential
-    adapter: GraphRequestAdapter
     app_client: GraphServiceClient
 
     def __init__(self, config: SectionProxy):
@@ -23,9 +19,7 @@ def __init__(self, config: SectionProxy):
         client_secret = self.settings['clientSecret']
 
         self.client_credential = ClientSecretCredential(tenant_id, client_id, client_secret)
-        auth_provider = AzureIdentityAuthenticationProvider(self.client_credential) # type: ignore
-        self.adapter = GraphRequestAdapter(auth_provider)
-        self.app_client = GraphServiceClient(self.adapter)
+        self.app_client = GraphServiceClient(self.client_credential) # type: ignore
 # </AppAuthConfigSnippet>
 
     # <GetAppOnlyTokenSnippet>

user-auth/graphtutorial/graph.py

@@ -4,13 +4,11 @@
 # <UserAuthConfigSnippet>
 from configparser import SectionProxy
 from azure.identity import DeviceCodeCredential
-from kiota_authentication_azure.azure_identity_authentication_provider import (
-    AzureIdentityAuthenticationProvider)
-from msgraph import GraphRequestAdapter, GraphServiceClient
-from msgraph.generated.me.me_request_builder import MeRequestBuilder
-from msgraph.generated.me.mail_folders.item.messages.messages_request_builder import (
+from msgraph import GraphServiceClient
+from msgraph.generated.users.item.user_item_request_builder import UserItemRequestBuilder
+from msgraph.generated.users.item.mail_folders.item.messages.messages_request_builder import (
     MessagesRequestBuilder)
-from msgraph.generated.me.send_mail.send_mail_post_request_body import SendMailPostRequestBody
+from msgraph.generated.users.item.send_mail.send_mail_post_request_body import SendMailPostRequestBody
 from msgraph.generated.models.message import Message
 from msgraph.generated.models.item_body import ItemBody
 from msgraph.generated.models.body_type import BodyType
@@ -20,7 +18,6 @@
 class Graph:
     settings: SectionProxy
     device_code_credential: DeviceCodeCredential
-    adapter: GraphRequestAdapter
     user_client: GraphServiceClient
 
     def __init__(self, config: SectionProxy):
@@ -30,11 +27,7 @@ def __init__(self, config: SectionProxy):
         graph_scopes = self.settings['graphUserScopes'].split(' ')
 
         self.device_code_credential = DeviceCodeCredential(client_id, tenant_id = tenant_id)
-        auth_provider = AzureIdentityAuthenticationProvider(
-            self.device_code_credential,
-            scopes=graph_scopes)
-        self.adapter = GraphRequestAdapter(auth_provider)
-        self.user_client = GraphServiceClient(self.adapter)
+        self.user_client = GraphServiceClient(self.device_code_credential, graph_scopes)
 # </UserAuthConfigSnippet>
 
     # <GetUserTokenSnippet>
@@ -47,10 +40,11 @@ async def get_user_token(self):
     # <GetUserSnippet>
     async def get_user(self):
         # Only request specific properties using $select
-        query_params = MeRequestBuilder.MeRequestBuilderGetQueryParameters(
+        query_params = UserItemRequestBuilder.UserItemRequestBuilderGetQueryParameters(
             select=['displayName', 'mail', 'userPrincipalName']
         )
-        request_config = MeRequestBuilder.MeRequestBuilderGetRequestConfiguration(
+
+        request_config = UserItemRequestBuilder.UserItemRequestBuilderGetRequestConfiguration(
             query_parameters=query_params
         )