Merge pull request #205166 from AikoBB/feature/acs-identity/cte-ga-link-to-quickstart

Final code section for CTE .NET&JS

Author: PMEds28

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

@@ -17,6 +17,9 @@ ms.author: gistefan
 
 - [Node.js](https://nodejs.org/) Active LTS and Maintenance LTS versions (8.11.1 and 10.14.1 recommended).
 
+## Final code
+Find the finalized code for this quickstart on [GitHub](https://github.com/Azure-Samples/communication-services-javascript-quickstarts/tree/main/manage-teams-identity-mobile-and-desktop).
+
 ## Set up
 
 ### Create a new Node.js Application
@@ -42,6 +45,7 @@ Use the `npm install` command to install the Azure Communication Services Identi
 npm install @azure/communication-identity@latest --save
 npm install @azure/msal-node --save
 npm install express --save
+npm install dotenv --save
 
 ```
 
@@ -59,10 +63,13 @@ From the project directory:
     const { CommunicationIdentityClient } = require('@azure/communication-identity');    
     const { PublicClientApplication, CryptoProvider } = require('@azure/msal-node');
     const express = require("express");
-    
+
+    // You will need to set environment variables in .env
     const SERVER_PORT = process.env.PORT || 80;
     const REDIRECT_URI = `http://localhost:${SERVER_PORT}/redirect`;
-    
+    const clientId = process.env['AAD_CLIENT_ID'];
+    const tenantId = process.env['AAD_TENANT_ID'];
+
     // Quickstart code goes here
 
     app.listen(SERVER_PORT, () => console.log(`Communication access token application started on ${SERVER_PORT}!`))
@@ -76,54 +83,53 @@ From the project directory:
 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).
 
 ```javascript
-
-const clientId = "<contoso_application_id>";
-const tenantId = "<contoso_tenant_id>"; 
+// Create configuration object that will be passed to MSAL instance on creation.
 const msalConfig = {
     auth: {
         clientId: clientId,
         authority: `https://login.microsoftonline.com/${tenantId}`,
     }
 };
 
+// Create an instance of PublicClientApplication
 const pca = new PublicClientApplication(msalConfig);
 const provider = new CryptoProvider();
 
 const app = express();
 
 let pkceVerifier = "";
+const scopes = [
+            "https://auth.msft.communication.azure.com/Teams.ManageCalls",
+            "https://auth.msft.communication.azure.com/Teams.ManageChats"
+        ];
 
 app.get('/', async (req, res) => {
+    // Generate PKCE Codes before starting the authorization flow
     const {verifier, challenge} = await provider.generatePkceCodes();
     pkceVerifier = verifier;
 
     const authCodeUrlParameters = {
-        scopes: [
-            "https://auth.msft.communication.azure.com/Teams.ManageCalls",
-            "https://auth.msft.communication.azure.com/Teams.ManageChats"
-        ],
+        scopes: scopes,
         redirectUri: REDIRECT_URI,
         codeChallenge: challenge, 
         codeChallengeMethod: "S256"
     };
-
+    // Get url to sign user in and consent to scopes needed for application
     pca.getAuthCodeUrl(authCodeUrlParameters).then((response) => {
         res.redirect(response);
     }).catch((error) => console.log(JSON.stringify(error)));
 });
 
 app.get('/redirect', async (req, res) => {
+    // Create request parameters object for acquiring the AAD token and object ID of a Teams user
     const tokenRequest = {
         code: req.query.code,
-        scopes: [
-            "https://auth.msft.communication.azure.com/Teams.ManageCalls",
-            "https://auth.msft.communication.azure.com/Teams.ManageChats"
-        ],
+        scopes: scopes,
         redirectUri: REDIRECT_URI,
         codeVerifier: pkceVerifier,
     };
-
-    pca.acquireTokenByCode(tokenRequest).then((response) => {
+    // Retrieve the AAD token and object ID of a Teams user
+    pca.acquireTokenByCode(tokenRequest).then(async(response) => {
         console.log("Response:", response);
         let teamsUserAadToken = response.accessToken;
         let userObjectId = response.uniqueId;
@@ -156,12 +162,12 @@ const identityClient = new CommunicationIdentityClient(connectionString);
 Use the `getTokenForTeamsUser` method to issue an access token for the Teams user that can be used with the Azure Communication Services SDKs.
 
 ```javascript
-let teamsToken = response.accessToken;
+//Exchange the Azure AD access token of the Teams User for a Communication Identity access token
 let accessToken = await identityClient.getTokenForTeamsUser({
     teamsUserAadToken: teamsUserAadToken,
     clientId: clientId,
     userObjectId: userObjectId,
-  });;
+  });
 console.log("Token:", accessToken);
 ```
 

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

@@ -17,6 +17,9 @@ ms.author: gistefan
 
 - The latest version [.NET SDK](https://dotnet.microsoft.com/download/dotnet) for your operating system.
 
+## Final code
+Find the finalized code for this quickstart on [GitHub](https://github.com/Azure-Samples/communication-services-dotnet-quickstarts/tree/main/ManageTeamsIdentityMobileAndDesktop).
+
 ## Set up
 
 ### Create a new C# application
@@ -76,25 +79,29 @@ namespace CommunicationAccessTokensQuickstart
 
 ### Step 1: Receive the Azure AD user token and object ID via the MSAL library
 
-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).
+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). The code below retrieves Azure AD client ID and tenant ID from environment variables named `AAD_CLIENT_ID` and `AAD_TENANT_ID`.
 
 ```csharp
-string appId = "<contoso_application_id>";
-string tenantId = "<contoso_tenant_id>";
+// This code demonstrates how to fetch an AAD client ID and tenant ID 
+// from an environment variable.
+string appId = Environment.GetEnvironmentVariable("AAD_CLIENT_ID");
+string tenantId = Environment.GetEnvironmentVariable("AAD_TENANT_ID");
 string authority = $"https://login.microsoftonline.com/{tenantId}";
 string redirectUri = "http://localhost";
 
+// Create an instance of PublicClientApplication
 var aadClient = PublicClientApplicationBuilder
                 .Create(appId)
                 .WithAuthority(authority)
                 .WithRedirectUri(redirectUri)
                 .Build();
 
-List<string> scopes = new List<string> {
+List<string> scopes = new() {
     "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
 var result = await aadClient
                         .AcquireTokenInteractive(scopes)
                         .ExecuteAsync();