Merge pull request #159117 from MicrosoftDocs/master

5/17 PM Publish

Author: huypub

.openpublishing.redirection.json

@@ -62288,6 +62288,11 @@
       "redirect_url": "/azure/cognitive-services/speech-service/custom-keyword-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/cognitive-services/Speech-Service/custom-keyword-overview.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/keyword-recognition-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/how-to-custom-speech.md",
       "redirect_url": "/azure/cognitive-services/speech-service/custom-speech-overview",
@@ -65992,6 +65997,11 @@
       "redirect_url": "/windows-server/remote/remote-desktop-services/remote-desktop-gateway-role",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/active-directory/privileged-identity-management/pim-apis-concept.md",
+      "redirect_url": "/azure/active-directory/privileged-identity-management/pim-apis",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/managed-identities-azure-resources/howto-migrate-vm-extension.md",
       "redirect_url": "/azure/active-directory/managed-identities-azure-resources/overview",
@@ -66106,6 +66116,21 @@
       "source_path_from_root": "/articles/communication-services/quickstarts/ui-framework/get-started-with-composites.md",
       "redirect_url": "https://azure.github.io/communication-ui-sdk",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/communication-services/concepts/ui-framework/ui-sdk-features.md",
+      "redirect_url": "/azure/communication-services/concepts/ui-library/ui-library-use-cases",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/communication-services/concepts/ui-framework/ui-sdk-overview.md",
+      "redirect_url": "/azure/communication-services/concepts/ui-library/ui-library-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/communication-services/concepts/ui-framework/teams-embed.md",
+      "redirect_url": "/azure/communication-services/concepts/ui-library/teams-embed",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory/develop/quickstart-v2-aspnet-core-webapp-calls-graph.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.subservice: develop
 ms.topic: quickstart
 ms.workload: identity
-ms.date: 12/10/2020
+ms.date: 05/17/2021
 ms.author: jmprieur
 ms.custom: "devx-track-csharp, aaddev, scenarios:getting-started, languages:aspnet-core"
 # Customer intent: As an application developer, I want to download and run a demo ASP.NET Core web app that can sign in users with personal Microsoft accounts (MSA) and work/school accounts from any Azure Active Directory instance, then access their data in Microsoft Graph on their behalf.
@@ -28,20 +28,8 @@ See [How the sample works](#how-the-sample-works) for an illustration.
 > * [Visual Studio 2019](https://visualstudio.microsoft.com/vs/) or [Visual Studio Code](https://code.visualstudio.com/)
 > * [.NET Core SDK 3.1+](https://dotnet.microsoft.com/download)
 >
-> ## Register and download the quickstart app
-> You have two options to start your quickstart application:
-> * [Express] [Option 1: Register and auto configure your app and then download your code sample](#option-1-register-and-auto-configure-your-app-and-then-download-your-code-sample)
-> * [Manual] [Option 2: Register and manually configure your application and code sample](#option-2-register-and-manually-configure-your-application-and-code-sample)
 >
-> ### Option 1: Register and auto configure your app and then download your code sample
->
-> 1. Go to the <a href="https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/applicationsListBlade/quickStartType/AspNetCoreWebAppQuickstartPage/sourceType/docs" target="_blank">Azure portal - App registrations</a> quickstart experience.
-> 1. Enter a name for your application and select **Register**.
-> 1. Follow the instructions to download and automatically configure your new application for you in one click.
->
-> ### Option 2: Register and manually configure your application and code sample
->
-> #### Step 1: Register your application
+> ## Step 1: Register your application
 > To register your application and add the app's registration information to your solution manually, follow these steps:
 >
 > 1. Sign in to the <a href="https://portal.azure.com/" target="_blank">Azure portal</a>.
@@ -60,15 +48,16 @@ See [How the sample works](#how-the-sample-works) for an illustration.
 > 1. Select **Add** and immediately record the secret's **Value** for use in a later step. The secret value is *never displayed again* and is irretrievable by any other means. Record it in a secure location as you would any password.
 
 > [!div class="sxs-lookup" renderon="portal"]
-> #### Step 1: Configure your application in the Azure portal
+> ## Step 1: Configure your application in the Azure portal
+>
 > For the code sample in this quickstart to work, add a **Redirect URI** of `https://localhost:44321/signin-oidc` and **Front-channel logout URL** of `https://localhost:44321/signout-oidc` in the app registration.
 > > [!div renderon="portal" id="makechanges" class="nextstepaction"]
 > > [Make this change for me]()
 >
 > > [!div id="appconfigured" class="alert alert-info"]
 > > ![Already configured](media/quickstart-v2-aspnet-webapp/green-check.png) Your application is configured with these attributes.
 
-#### Step 2: Download the ASP.NET Core project
+## Step 2: Download the ASP.NET Core project
 
 > [!div renderon="docs"]
 > [Download the ASP.NET Core solution](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/archive/aspnetcore3-1-callsgraph.zip)
@@ -82,13 +71,15 @@ See [How the sample works](#how-the-sample-works) for an illustration.
 [!INCLUDE [active-directory-develop-path-length-tip](../../../includes/active-directory-develop-path-length-tip.md)]
 
 > [!div class="sxs-lookup" renderon="portal"]
-> #### Step 3: Your app is configured and ready to run
+> ## Step 3: Your app is configured and ready to run
+>
 > We have configured your project with values of your app's properties and it's ready to run.
 > [!div class="sxs-lookup" renderon="portal"]
 > > [!NOTE]
 > > `Enter_the_Supported_Account_Info_Here`
 > [!div renderon="docs"]
-> #### Step 3: Configure your ASP.NET Core project
+>
+> ## Step 3: Configure your ASP.NET Core project
 > 1. Extract the .zip archive into a local folder near the root of your drive. For example, into *C:\Azure-Samples*.
 > 1. Open the solution in Visual Studio 2019.
 > 1. Open the *appsettings.json* file and modify the following:
@@ -108,7 +99,7 @@ See [How the sample works](#how-the-sample-works) for an illustration.
 >
 > For this quickstart, don't change any other values in the *appsettings.json* file.
 >
-> #### Step 4: Build and run the application
+> ## Step 4: Build and run the application
 >
 > Build and run the app in Visual Studio by selecting the **Debug** menu > **Start Debugging**, or by pressing the `F5` key.
 >

articles/active-directory/develop/scenario-spa-sign-in.md

@@ -56,25 +56,14 @@ const loginRequest = {
     scopes: ["User.ReadWrite"]
 }
 
-let username = "";
+let accountId = "";
 
 const myMsal = new PublicClientApplication(config);
 
 myMsal.loginPopup(loginRequest)
     .then(function (loginResponse) {
-        //login success
-
-        // In case multiple accounts exist, you can select
-        const currentAccounts = myMsal.getAllAccounts();
-    
-        if (currentAccounts === null) {
-            // no accounts detected
-        } else if (currentAccounts.length > 1) {
-            // Add choose account code here
-        } else if (currentAccounts.length === 1) {
-            username = currentAccounts[0].username;
-        }
-    
+        accountId = loginResponse.account.homeAccountId;
+        // Display signed-in user content, call API, etc.
     }).catch(function (error) {
         //login failure
         console.log(error);
@@ -303,28 +292,30 @@ const loginRequest = {
     scopes: ["User.ReadWrite"]
 }
 
-let username = "";
+let accountId = "";
 
 const myMsal = new PublicClientApplication(config);
 
 function handleResponse(response) {
-    //handle redirect response
-
-    // In case multiple accounts exist, you can select
-    const currentAccounts = myMsal.getAllAccounts();
-
-    if (currentAccounts === null) {
-        // no accounts detected
-    } else if (currentAccounts.length > 1) {
-        // Add choose account code here
-    } else if (currentAccounts.length === 1) {
-        username = currentAccounts[0].username;
+    if (response !== null) {
+        accountId = response.account.homeAccountId;
+        // Display signed-in user content, call API, etc.
+    } else {
+        // In case multiple accounts exist, you can select
+        const currentAccounts = myMsal.getAllAccounts();
+    
+        if (currentAccounts.length === 0) {
+            // no accounts signed-in, attempt to sign a user in
+            myMsal.loginRedirect(loginRequest);
+        } else if (currentAccounts.length > 1) {
+            // Add choose account code here
+        } else if (currentAccounts.length === 1) {
+            accountId = currentAccounts[0].homeAccountId;
+        }
     }
 }
 
 myMsal.handleRedirectPromise().then(handleResponse);
-
-myMsal.loginRedirect(loginRequest);
 ```
 
 # [JavaScript (MSAL.js v1)](#tab/javascript1)

articles/active-directory/privileged-identity-management/TOC.yml

@@ -19,9 +19,8 @@
   - name: Email notifications
     href: pim-email-notifications.md
   - name: PIM API concepts
-    href: pim-apis-concept.md  
-  - name: Microsoft Graph API and PIM
-    href: pim-apis.md
+    href: pim-apis.md  
+
 - name: How-to guides
   expanded: true
   items: