Merge pull request #210358 from AikoBB/aigerimb/acs-identity/cte-ga-link-to-quickstart

Final code section for CTE Java&Python

Author: prmerger-automator[bot]

articles/communication-services/quickstarts/includes/manage-teams-identity-java.md

@@ -17,6 +17,9 @@ ms.author: gistefan
 - [Java Development Kit (JDK)](/azure/developer/java/fundamentals/java-jdk-install) version 8 or above.
 - [Apache Maven](https://maven.apache.org/download.cgi).
 
+## Final code
+Find the finalized code for this quickstart on [GitHub](https://github.com/Azure-Samples/communication-services-java-quickstarts/tree/main/ManageTeamsIdentityMobileAndDesktop).
+
 ## Set up
 
 ### Create a new Java application
@@ -62,17 +65,17 @@ Use the following code to begin:
 ```java
 package com.communication.quickstart;
 
-import com.azure.communication.common.*;
-import com.azure.communication.identity.*;
-import com.azure.communication.identity.models.*;
-import com.azure.core.credential.*;
+import com.azure.communication.identity.CommunicationIdentityClient;
+import com.azure.communication.identity.CommunicationIdentityClientBuilder;
+import com.azure.communication.identity.models.GetTokenForTeamsUserOptions;
+import com.azure.core.credential.AccessToken;
 import com.microsoft.aad.msal4j.IAuthenticationResult;
 import com.microsoft.aad.msal4j.InteractiveRequestParameters;
 import com.microsoft.aad.msal4j.PublicClientApplication;
 
-import java.io.IOException;
-import java.time.*;
-import java.util.*;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Set;
 
 public class App
 {
@@ -89,9 +92,12 @@ public class App
 The first step in the token exchange flow is getting a token for your Teams user by using [Microsoft.Identity.Client](../../../active-directory/develop/reference-v2-libraries.md).
 
 ```java
+// You need to provide your Azure AD client ID and tenant ID
 String appId = "<contoso_application_id>";
-String authority = "https://login.microsoftonline.com/<contoso_tenant_id>";
+String tenantId = "<contoso_tenant_id>";
+String authority = "https://login.microsoftonline.com/" + tenantId;
 
+// Create an instance of PublicClientApplication
 PublicClientApplication pca = PublicClientApplication.builder(appId)
         .authority(authority)
         .build();
@@ -101,15 +107,18 @@ Set<String> scope = new HashSet<String>();
 scope.add("https://auth.msft.communication.azure.com/Teams.ManageCalls");
 scope.add("https://auth.msft.communication.azure.com/Teams.ManageChats");
 
+// Create an instance of InteractiveRequestParameters for acquiring the AAD token and object ID of a Teams user
 InteractiveRequestParameters parameters = InteractiveRequestParameters
                     .builder(new URI(redirectUri))
                     .scopes(scope)
                     .build();
 
+// Retrieve the AAD token and object ID of a Teams user
 IAuthenticationResult result = pca.acquireToken(parameters).get();
 String teamsUserAadToken = result.accessToken();
 String[] accountIds = result.account().homeAccountId().split("\\.");
 String userObjectId = accountIds[0];
+System.out.println("Teams token: " + teamsUserAadToken);
 ```
 
 ### Step 2: Initialize the CommunicationIdentityClient
@@ -122,6 +131,7 @@ Add the following code to the `main` method:
 //You can find your connection string from your resource in the Azure portal
 String connectionString = "<connection_string>";
 
+// Instantiate the identity client
 CommunicationIdentityClient communicationIdentityClient = new CommunicationIdentityClientBuilder()
     .connectionString(connectionString)
     .buildClient();
@@ -132,14 +142,15 @@ CommunicationIdentityClient communicationIdentityClient = new CommunicationIdent
 Use the `getTokenForTeamsUser` method to issue an access token for the Teams user that can be used with the Azure Communication Services SDKs.
 
 ```java
+// Exchange the Azure AD access token of the Teams User for a Communication Identity access token
 GetTokenForTeamsUserOptions options = new GetTokenForTeamsUserOptions(teamsUserAadToken, appId, userObjectId);
 var accessToken = communicationIdentityClient.getTokenForTeamsUser(options);
 System.out.println("Token: " + accessToken.getToken());
 ```
 
 ## Run the code
 
-Navigate to the directory containing the `pom.xml` file and compile the project by using the following `mvn` command.
+Navigate to the directory containing the `pom.xml` file and compile the project by using the `mvn compile` command.
 
 Then, build the package.
 

articles/communication-services/quickstarts/includes/manage-teams-identity-python.md

@@ -15,7 +15,10 @@ ms.author: gistefan
 
 ## Set up prerequisites
 
-- [Python](https://www.python.org/downloads/) 2.7 or 3.6+.
+- [Python](https://www.python.org/downloads/) 3.7+.
+
+## Final code
+Find the finalized code for this quickstart on [GitHub](https://github.com/Azure-Samples/communication-services-python-quickstarts/tree/main/manage-teams-identity-mobile-and-desktop).
 
 ## Set up
 
@@ -32,13 +35,13 @@ ms.author: gistefan
    ```python
    import os
    from azure.communication.identity import CommunicationIdentityClient, CommunicationUserIdentifier
+   from msal.application import PublicClientApplication
 
    try:
       print("Azure Communication Services - Access Tokens Quickstart")
       # Quickstart code goes here
    except Exception as ex:
-      print("Exception:")
-      print(ex)
+      print(f"Exception: {ex}")
    ```
 
 ### Install the package
@@ -55,18 +58,21 @@ pip install msal
 The first step in the token exchange flow is getting a token for your Teams user by using [Microsoft.Identity.Client](../../../active-directory/develop/reference-v2-libraries.md). In Azure portal, configure the Redirect URI of your "Mobile and Desktop application" as `http://localhost`.
 
 ```python
-from msal.application import PublicClientApplication
-
-client_id = "<contoso_application_id>"
-tenant_id = "<contoso_tenant_id>"
+# This code demonstrates how to fetch your Azure AD client ID and tenant ID
+# from an environment variable.
+client_id = os.environ["AAD_CLIENT_ID"]
+tenant_id = os.environ["AAD_TENANT_ID"]
 authority = "https://login.microsoftonline.com/%s" % tenant_id
 
+# Create an instance of PublicClientApplication
 app = PublicClientApplication(client_id, authority=authority)
 
 scopes = [ 
 "https://auth.msft.communication.azure.com/Teams.ManageCalls",
 "https://auth.msft.communication.azure.com/Teams.ManageChats"
  ]
+
+# Retrieve the AAD token and object ID of a Teams user
 result = app.acquire_token_interactive(scopes)
 aad_token =  result["access_token"]
 user_object_id = result["id_token_claims"]["oid"] 
@@ -92,6 +98,7 @@ client = CommunicationIdentityClient.from_connection_string(connection_string)
 Use the `get_token_for_teams_user` method to issue an access token for the Teams user that can be used with the Azure Communication Services SDKs.
 
 ```python
+# Exchange the Azure AD access token of the Teams User for a Communication Identity access token
 token_result = client.get_token_for_teams_user(aad_token, client_id, user_object_id)
 print("Token: " + token_result.token)
 ```