Merge pull request #199094 from cristobal-buenrostro/cristobalb/adal-msal-doc

Azure Docs - ADAL to MSAL migration for Immersive Reader code sample

Author: BCS2022

articles/applied-ai-services/immersive-reader/how-to-cache-token.md

@@ -19,19 +19,44 @@ This article demonstrates how to cache the authentication token in order to impr
 
 ## Using ASP.NET
 
-Import the **Microsoft.IdentityModel.Clients.ActiveDirectory** NuGet package, which is used to acquire a token. Next, use the following code to acquire an `AuthenticationResult`, using the authentication values you got when you [created the Immersive Reader resource](./how-to-create-immersive-reader.md).
+Import the **Microsoft.Identity.Client** NuGet package, which is used to acquire a token.
+
+Create a confidential client application property.
+
+```csharp
+private IConfidentialClientApplication _confidentialClientApplication;
+private IConfidentialClientApplication ConfidentialClientApplication
+{
+    get {
+        if (_confidentialClientApplication == null) {
+            _confidentialClientApplication = ConfidentialClientApplicationBuilder.Create(ClientId)
+            .WithClientSecret(ClientSecret)
+            .WithAuthority($"https://login.windows.net/{TenantId}")
+            .Build();
+        }
+
+        return _confidentialClientApplication;
+    }
+}
+```
+
+Next, use the following code to acquire an `AuthenticationResult`, using the authentication values you got when you [created the Immersive Reader resource](./how-to-create-immersive-reader.md).
 
 > [!IMPORTANT]
 > The [Microsoft.IdentityModel.Clients.ActiveDirectory](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory) NuGet package and Azure AD Authentication Library (ADAL) have been deprecated. No new features have been added since June 30, 2020.   We strongly encourage you to upgrade, see the [migration guide](../../active-directory/develop/msal-migration.md) for more details.
 
 
 ```csharp
-private async Task<AuthenticationResult> GetTokenAsync()
+public async Task<string> GetTokenAsync()
 {
-    AuthenticationContext authContext = new AuthenticationContext($"https://login.windows.net/{TENANT_ID}");
-    ClientCredential clientCredential = new ClientCredential(CLIENT_ID, CLIENT_SECRET);
-    AuthenticationResult authResult = await authContext.AcquireTokenAsync("https://cognitiveservices.azure.com/", clientCredential);
-    return authResult;
+    const string resource = "https://cognitiveservices.azure.com/";
+
+    var authResult = await ConfidentialClientApplication.AcquireTokenForClient(
+        new[] { $"{resource}/.default" })
+        .ExecuteAsync()
+        .ConfigureAwait(false);
+
+    return authResult.AccessToken;
 }
 ```
 

articles/applied-ai-services/immersive-reader/includes/quickstarts/immersive-reader-client-library-csharp.md

@@ -20,12 +20,12 @@ In this quickstart, you build a web app from scratch and integrate Immersive Rea
 ## Prerequisites
 
 * Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services)
-* [Visual Studio 2019](https://visualstudio.microsoft.com/downloads)
+* [Visual Studio 2022](https://visualstudio.microsoft.com/downloads)
 * An Immersive Reader resource configured for Azure Active Directory authentication. Follow [these instructions](../../how-to-create-immersive-reader.md) to get set up. You will need some of the values created here when configuring the sample project properties. Save the output of your session into a text file for future reference.
 
 ## Create a web app project
 
-Create a new project in Visual Studio, using the ASP.NET Core Web Application template with built-in Model-View-Controller, and ASP.NET Core 2.1. Name the project "QuickstartSampleWebApp".
+Create a new project in Visual Studio, using the ASP.NET Core Web Application template with built-in Model-View-Controller, and ASP.NET Core 6. Name the project "QuickstartSampleWebApp".
 
 ![New project - C#](../../media/quickstart-csharp/1-createproject.png)
 
@@ -48,25 +48,25 @@ Right-click on the project in the _Solution Explorer_ and choose **Manage User S
 }
 ```
 
-### Install Active Directory NuGet package
+### Install Identity Client NuGet package
 
-The following code uses objects from the **Microsoft.IdentityModel.Clients.ActiveDirectory** NuGet package so you'll need to add a reference to that package in your project.
+The following code uses objects from the **Microsoft.Identity.Client** NuGet package so you'll need to add a reference to that package in your project.
 
 > [!IMPORTANT]
 > The [Microsoft.IdentityModel.Clients.ActiveDirectory](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory) NuGet package and Azure AD Authentication Library (ADAL) have been deprecated. No new features have been added since June 30, 2020.   We strongly encourage you to upgrade, see the [migration guide](../../../../active-directory/develop/msal-migration.md) for more details.
 
 Open the NuGet Package Manager Console from **Tools -> NuGet Package Manager -> Package Manager Console** and run the following command:
 
 ```powershell
-    Install-Package Microsoft.IdentityModel.Clients.ActiveDirectory -Version 5.2.0
+    Install-Package Microsoft.Identity.Client -Version 4.42.0
 ```
 
 ### Update the controller to acquire the token 
 
 Open _Controllers\HomeController.cs_, and add the following code after the _using_ statements at the top of the file.
 
 ```csharp
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using Microsoft.Identity.Client;
 ```
 
 Now, we'll configure the controller to obtain the Azure AD values from _secrets.json_. At the top of the _HomeController_ class, after ```public class HomeController : Controller {```, add the following code.
@@ -77,6 +77,21 @@ private readonly string ClientId;     // Azure AD ApplicationId
 private readonly string ClientSecret; // Azure AD Application Service Principal password
 private readonly string Subdomain;    // Immersive Reader resource subdomain (resource 'Name' if the resource was created in the Azure portal, or 'CustomSubDomain' option if the resource was created with Azure CLI PowerShell. Check the Azure portal for the subdomain on the Endpoint in the resource Overview page, for example, 'https://[SUBDOMAIN].cognitiveservices.azure.com/')
 
+private IConfidentialClientApplication _confidentialClientApplication;
+private IConfidentialClientApplication ConfidentialClientApplication
+{
+    get {
+        if (_confidentialClientApplication == null) {
+            _confidentialClientApplication = ConfidentialClientApplicationBuilder.Create(ClientId)
+            .WithClientSecret(ClientSecret)
+            .WithAuthority($"https://login.windows.net/{TenantId}")
+            .Build();
+        }
+
+        return _confidentialClientApplication;
+    }
+}
+
 public HomeController(Microsoft.Extensions.Configuration.IConfiguration configuration)
 {
     TenantId = configuration["TenantId"];
@@ -108,15 +123,14 @@ public HomeController(Microsoft.Extensions.Configuration.IConfiguration configur
 /// <summary>
 /// Get an Azure AD authentication token
 /// </summary>
-private async Task<string> GetTokenAsync()
+public async Task<string> GetTokenAsync()
 {
-    string authority = $"https://login.windows.net/{TenantId}";
     const string resource = "https://cognitiveservices.azure.com/";
 
-    AuthenticationContext authContext = new AuthenticationContext(authority);
-    ClientCredential clientCredential = new ClientCredential(ClientId, ClientSecret);
-
-    AuthenticationResult authResult = await authContext.AcquireTokenAsync(resource, clientCredential);
+    var authResult = await ConfidentialClientApplication.AcquireTokenForClient(
+        new[] { $"{resource}/.default" })
+        .ExecuteAsync()
+        .ConfigureAwait(false);
 
     return authResult.AccessToken;
 }
@@ -132,7 +146,7 @@ public async Task<JsonResult> GetTokenAndSubdomain()
     }
     catch (Exception e)
     {
-        string message = "Unable to acquire Azure AD token. Check the debugger for more information.";
+        string message = "Unable to acquire Azure AD token. Check the console for more information.";
         Debug.WriteLine(message, e);
         return new JsonResult(new { error = message });
     }