Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rai082022

Author: lgayhardt

.openpublishing.redirection.active-directory.json

@@ -30,6 +30,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/netmotion-mobility-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
       "redirect_url": "/azure/active-directory/fundamentals/whats-new",
@@ -57,7 +62,7 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
-      "redirect_url":"/azure/active-directory/develop/workload-identity-federation-create-trust",
+      "redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
       "redirect_document_id": false
     },
     {
@@ -2800,7 +2805,7 @@
       "redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
       "redirect_document_id": false
     },
-    
+
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
       "redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",

.openpublishing.redirection.json

@@ -12848,6 +12848,16 @@
     "redirect_url":  "/azure/cloudfoundry/cloudfoundry-deploy-your-first-app",
     "redirect_document_id":  true
 },
+{
+    "source_path_from_root":  "/articles/virtual-machines/linux/overview.md",
+    "redirect_url":  "/azure/virtual-machines/overview",
+    "redirect_document_id":  true
+},
+{
+    "source_path_from_root":  "/articles/virtual-machines/windows/overview.md",
+    "redirect_url":  "/azure/virtual-machines/overview",
+    "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/virtual-machines/linux/cloudfoundry-get-started.md",
     "redirect_url":  "/azure/cloudfoundry/cloudfoundry-get-started",

articles/active-directory/app-proxy/application-proxy-application-gateway-waf.md

@@ -71,7 +71,7 @@ To ensure the connector VMs send requests to the Application Gateway, an [Azure
 
 ### Test the application.
 
-After [adding a user for testing](/azure/active-directory/app-proxy/application-proxy-add-on-premises-application#add-a-user-for-testing), you can test the application by accessing https://www.fabrikam.one. The user will be prompted to authenticate in Azure AD, and upon successful authentication, will access the application. 
+After [adding a user for testing](./application-proxy-add-on-premises-application.md#add-a-user-for-testing), you can test the application by accessing https://www.fabrikam.one. The user will be prompted to authenticate in Azure AD, and upon successful authentication, will access the application. 
 
 ![Screenshot of authentication step.](./media/application-proxy-waf/sign-in-2.png)
 ![Screenshot of server response.](./media/application-proxy-waf/application-gateway-response.png)
@@ -90,13 +90,12 @@ The Application Gateway [Firewall logs][waf-logs] provide more details about the
 
 ## Next steps
 
-To prevent false positives, learn how to [Customize Web Application Firewall rules](/azure/web-application-firewall/ag/application-gateway-customize-waf-rules-portal), configure [Web Application Firewall exclusion lists](/azure/web-application-firewall/ag/application-gateway-waf-configuration?tabs=portal), or [Web Application Firewall custom rules](/azure/web-application-firewall/ag/create-custom-waf-rules).
-
-[waf-overview]: /azure/web-application-firewall/ag/ag-overview 
-[appgw_quick]: /azure/application-gateway/quick-create-portal
-[appproxy-add-app]: /azure/active-directory/app-proxy/application-proxy-add-on-premises-application
-[appproxy-optimize]: /azure/active-directory/app-proxy/application-proxy-network-topology
-[appproxy-custom-domain]: /azure/active-directory/app-proxy/application-proxy-configure-custom-domain
-[private-dns]: /azure/dns/private-dns-getstarted-portal
-[waf-logs]: /azure/application-gateway/application-gateway-diagnostics#firewall-log
+To prevent false positives, learn how to [Customize Web Application Firewall rules](../../web-application-firewall/ag/application-gateway-customize-waf-rules-portal.md), configure [Web Application Firewall exclusion lists](../../web-application-firewall/ag/application-gateway-waf-configuration.md?tabs=portal), or [Web Application Firewall custom rules](../../web-application-firewall/ag/create-custom-waf-rules.md).
 
+[waf-overview]: ../../web-application-firewall/ag/ag-overview.md
+[appgw_quick]: ../../application-gateway/quick-create-portal.md
+[appproxy-add-app]: ./application-proxy-add-on-premises-application.md
+[appproxy-optimize]: ./application-proxy-network-topology.md
+[appproxy-custom-domain]: ./application-proxy-configure-custom-domain.md
+[private-dns]: ../../dns/private-dns-getstarted-portal.md
+[waf-logs]: ../../application-gateway/application-gateway-diagnostics.md#firewall-log

articles/active-directory/authentication/concept-authentication-passwordless.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: conceptual
-ms.date: 06/23/2022
+ms.date: 08/17/2022
 
 ms.author: justinha
 author: justinha
@@ -129,7 +129,7 @@ The following providers offer FIDO2 security keys of different form factors that
 | Octatco                   | ![y]              | ![y]| ![n]| ![n]| ![n]           | https://octatco.com/                                                                                |
 | OneSpan Inc.              | ![n]              | ![y]| ![n]| ![y]| ![n]           | https://www.onespan.com/products/fido                                                               |
 | Swissbit                  | ![n]              | ![y]| ![y]| ![n]| ![n]           | https://www.swissbit.com/en/products/ishield-fido2/                                                 |
-| Thales Group              | ![n]              | ![y]| ![y]| ![n]| ![n]           | https://cpl.thalesgroup.com/access-management/authenticators/fido-devices                           |
+| Thales Group              | ![n]              | ![y]| ![y]| ![n]| ![y]           | https://cpl.thalesgroup.com/access-management/authenticators/fido-devices                           |
 | Thetis                    | ![y]              | ![y]| ![y]| ![y]| ![n]           | https://thetis.io/collections/fido2                                                                 |
 | Token2 Switzerland        | ![y]              | ![y]| ![y]| ![n]| ![n]           | https://www.token2.swiss/shop/product/token2-t2f2-alu-fido2-u2f-and-totp-security-key               |
 | TrustKey Solutions        | ![y]              | ![y]| ![n]| ![n]| ![n]           | https://www.trustkeysolutions.com/security-keys/                                                    |

articles/active-directory/develop/TOC.yml

@@ -329,6 +329,8 @@
           href: tutorial-blazor-server.md
         - name: Node.js
           href: tutorial-v2-nodejs-webapp-msal.md
+        - name: Spring
+          href: /azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-active-directory?toc=/azure/active-directory/develop/toc.json&bc=/azure/active-directory/develop/breadcrumb/toc.json
         - name: Secure web app accesses storage and Microsoft Graph
           items:
             - name: Overview

articles/active-directory/develop/breadcrumb/toc.yml

@@ -9,3 +9,6 @@
     - name: Develop
       tocHref: /azure/active-directory/app-provisioning/
       topicHref: /azure/active-directory/develop/index
+    - name: Develop
+      tocHref: /azure/developer/java/spring-framework/
+      topicHref: /azure/active-directory/develop/index

articles/active-directory/develop/index-web-app.yml

@@ -43,7 +43,7 @@ landingContent:
           - text: Node.js with Express
             url: tutorial-v2-nodejs-webapp-msal.md
           - text: Spring
-            url: /azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-active-directory
+            url: /azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-active-directory?toc=/azure/active-directory/develop/toc.json&bc=/azure/active-directory/develop/breadcrumb/toc.json
   - title: "Web apps in depth"
     linkLists:
       - linkListType: how-to-guide

articles/active-directory/develop/spa-quickstart-portal-javascript-auth-code-angular.md

@@ -0,0 +1,103 @@
+---
+title: "Quickstart: Sign in users in JavaScript Angular single-page apps (SPA) with auth code and call Microsoft Graph"
+description: In this quickstart, learn how a JavaScript Angular single-page application (SPA) can sign in users of personal accounts, work accounts, and school accounts by using the authorization code flow and call Microsoft Graph.
+services: active-directory
+author: Dickson-Mwendia
+manager: CelesteDG
+ms.service: active-directory
+ms.subservice: develop
+ms.topic: portal
+ms.workload: identity
+ms.date: 08/16/2022
+ROBOTS: NOINDEX
+ms.author: dmwendia
+ms.custom: aaddev, "scenarios:getting-started", "languages:JavaScript", devx-track-js, mode-other
+#Customer intent: As an app developer, I want to learn how to get access tokens and refresh tokens by using the Microsoft identity platform so that my JavaScript Angular app can sign in users of personal accounts, work accounts, and school accounts.
+---
+
+# Quickstart: Sign in and get an access token in an Angular SPA using the auth code flow
+
+
+> [!div renderon="docs"]
+> Welcome! This probably isn't the page you were expecting. While we work on a fix, this link should take you to the right article:
+>
+> > [Quickstart: Angular single-page app with user sign-in](single-page-app-quickstart.md?pivots=devlang-angular)
+> 
+> We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
+ 
+> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
+> # Quickstart: Sign in and get an access token in an Angular SPA using the auth code flow
+>
+> In this quickstart, you download and run a code sample that demonstrates how a JavaScript Angular single-page application (SPA) can sign in users and call Microsoft Graph using the authorization code flow. The code sample demonstrates how to get an access token to call the Microsoft Graph API or any web API.
+> 
+> See [How the sample works](#how-the-sample-works) for an illustration.
+> 
+> This quickstart uses MSAL Angular v2 with the authorization code flow.
+> 
+> ## Prerequisites
+> 
+> * Azure subscription - [Create an Azure subscription for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)
+> * [Node.js](https://nodejs.org/en/download/)
+> * [Visual Studio Code](https://code.visualstudio.com/download) or another code editor
+> 
+> #### Step 1: Configure your application in the Azure portal
+> For the code sample in this quickstart to work, add a **Redirect URI** of `http://localhost:4200/`.
+> 
+> <button id="makechanges" class="nextstepaction configure-app-button"> Make these changes for me </button>
+> 
+> > [!div id="appconfigured" class="alert alert-info"]
+> > ![Already configured](media/quickstart-v2-javascript/green-check.png) Your application is configured with these attributes.
+> 
+>  #### Step 2: Download the project
+> 
+> Run the project with a web server by using Node.js
+> 
+> > [!div class="nextstepaction"]
+> > <button id="downloadsample" class="download-sample-button">Download the code sample</button>
+> 
+> > [!div class="sxs-lookup"]
+> > > [!NOTE]
+> > > `Enter_the_Supported_Account_Info_Here`
+> 
+> 
+> #### Step 3: Your app is configured and ready to run
+> 
+> We have configured your project with values of your app's properties.
+> 
+> #### Step 4: Run the project
+> 
+> Run the project with a web server by using Node.js:
+> 
+> 1. To start the server, run the following commands from within the project directory:
+>     ```console
+>     npm install
+>     npm start
+>     ```
+> 1. Browse to `http://localhost:4200/`.
+> 
+> 1. Select **Login** to start the sign-in process and then call the Microsoft Graph API.
+> 
+>     The first time you sign in, you're prompted to provide your consent to allow the application to access your profile and sign you in. After you're signed in successfully, click the **Profile** button to display your user information on the page.
+> 
+> ## More information
+> 
+> ### How the sample works
+> 
+> ![Diagram showing the authorization code flow for a single-page application.](media/quickstart-v2-javascript-auth-code/diagram-01-auth-code-flow.png)
+> 
+> ### msal.js
+> 
+> The MSAL.js library signs in users and requests the tokens that are used to access an API that's protected by the Microsoft identity platform.
+> 
+> If you have Node.js installed, you can download the latest version by using the Node.js Package Manager (npm):
+> 
+> ```console
+> npm install @azure/msal-browser @azure/msal-angular@2
+> ```
+> 
+> ## Next steps
+> 
+> For a detailed step-by-step guide on building the auth code flow application using vanilla JavaScript, see the following  tutorial:
+> 
+> > [!div class="nextstepaction"]
+> > [Tutorial: Sign in users and call Microsoft Graph](./tutorial-v2-javascript-auth-code.md)

articles/active-directory/develop/spa-quickstart-portal-javascript-auth-code-react.md

@@ -0,0 +1,99 @@
+---
+title: "Quickstart: Sign in users in JavaScript React single-page apps (SPA) with auth code and call Microsoft Graph"
+description: In this quickstart, learn how a JavaScript React single-page application (SPA) can sign in users of personal accounts, work accounts, and school accounts by using the authorization code flow and call Microsoft Graph.
+services: active-directory
+author: Dickson-Mwendia
+manager: CelesteDG
+ms.service: active-directory
+ms.subservice: develop
+ms.topic: portal
+ms.workload: identity
+ms.date: 08/16/2022
+ROBOTS: NOINDEX
+ms.author: dmwendia
+ms.custom: aaddev, "scenarios:getting-started", "languages:JavaScript", devx-track-js, mode-other
+#Customer intent: As an app developer, I want to learn how to login, logout, conditionally render components to authenticated users, and acquire an access token for a protected resource such as Microsoft Graph by using the Microsoft identity platform so that my JavaScript React app can sign in users of personal accounts, work accounts, and school accounts.
+---
+> # Quickstart: Sign in and get an access token in a React SPA using the auth code flow
+
+
+> [!div renderon="docs"]
+> Welcome! This probably isn't the page you were expecting. While we work on a fix, this link should take you to the right article:
+>
+> > [Quickstart: React single-page app with user sign-in](single-page-app-quickstart.md?pivots=devlang-react)
+> 
+> We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
+
+> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
+>  # Quickstart: Sign in and get an access token in a React SPA using the auth code flow
+> In this quickstart, you download and run a code sample that demonstrates how a JavaScript React single-page application (SPA) can sign in users and call Microsoft Graph using the authorization code flow. The code sample demonstrates how to get an access token to call the Microsoft Graph API or any web API.
+> 
+> See [How the sample works](#how-the-sample-works) for an illustration.
+> 
+> ## Prerequisites
+> 
+> * Azure subscription - [Create an Azure subscription for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)
+> * [Node.js](https://nodejs.org/en/download/)
+> * [Visual Studio Code](https://code.visualstudio.com/download) or another code editor
+> 
+> #### Step 1: Configure your application in the Azure portal
+> 
+> This code samples requires a **Redirect URI** of `http://localhost:3000/`.
+>
+> <button id="makechanges" class="nextstepaction configure-app-button"> Make these changes for me </button>
+> 
+> > [!div id="appconfigured" class="alert alert-info"]
+> > ![Already configured](media/quickstart-v2-javascript/green-check.png) Your application is configured with these attributes.
+> 
+> #### Step 2: Download the project
+> 
+> Run the project with a web server by using Node.js
+> 
+> > [!div class="nextstepaction"]
+> > <button id="downloadsample" class="download-sample-button">Download the code sample</button>
+> 
+> > [!div class="sxs-lookup"]
+> > > [!NOTE]
+> > > `Enter_the_Supported_Account_Info_Here`
+> 
+> 
+> #### Step 3: Your app is configured and ready to run
+> We have configured your project with values of your app's properties.
+> 
+> #### Step 4: Run the project
+> 
+> Run the project with a web server by using Node.js:
+> 
+> 1. To start the server, run the following commands from within the project directory:
+>     ```console
+>     npm install
+>     npm start
+>     ```
+> 1. Browse to `http://localhost:3000/`.
+> 
+> 1. Select **Sign In** to start the sign-in process and then call the Microsoft Graph API.
+> 
+>     The first time you sign in, you're prompted to provide your consent to allow the application to access your profile and sign you in. After you're signed in successfully, click on the **Request Profile Information** to display your profile information on the page.
+> 
+> ## More information
+> 
+> ### How the sample works
+> 
+> ![Diagram showing the authorization code flow for a single-page application.](media/quickstart-v2-javascript-auth-code/diagram-01-auth-code-flow.png)
+> 
+> ### msal.js
+> 
+> The MSAL.js library signs in users and requests the tokens that are used to access an API that's protected by the Microsoft identity platform.
+> 
+> If you have Node.js installed, you can download the latest version by using the Node.js Package Manager (npm):
+> 
+> ```console
+> npm install @azure/msal-browser @azure/msal-react
+> ```
+> 
+> ## Next steps
+> 
+> Next, try a step-by-step tutorial to learn how to build a React SPA from scratch that signs in users and calls the > Microsoft Graph API to get user profile data:
+> 
+> > [!div class="nextstepaction"]
+> > [Tutorial: Sign in users and call Microsoft Graph from a React single-page app](tutorial-v2-react.md)