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

Author: kasun04

.openpublishing.publish.config.json

@@ -632,6 +632,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "samples-cosmosdb-mongodb-javascript",
+      "url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-cosmosdb-java-v4-web-app",
       "url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",

.openpublishing.redirection.active-directory.json

@@ -355,6 +355,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/mimecast-personal-portal-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/carlsonwagonlit-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/cwt-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
       "redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",

.openpublishing.redirection.azure-monitor.json

@@ -203,7 +203,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-instances.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-page.md",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-page",
             "redirect_document_id": false
         },
         {

.openpublishing.redirection.json

@@ -754,6 +754,11 @@
       "redirect_url": "/azure/frontdoor/create-front-door-cli",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/cdn/index.yml",
+      "redirect_url": "/azure/frontdoor",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/app-service-web/web-sites-dotnet-deploy-aspnet-mvc-app-membership-oauth-sql-database.md",
       "redirect_url": "/aspnet/core/security/authorization/secure-data",
@@ -2399,6 +2404,21 @@
       "redirect_url": "/azure/aks/ingress-tls",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/aks/ingress-internal-ip.md",
+      "redirect_url": "/azure/aks/ingress-basic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/aks/ingress-own-tls.md",
+      "redirect_url": "/azure/aks/ingress-tls",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/aks/ingress-static-ip.md",
+      "redirect_url": "/azure/aks/ingress-tls",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/container-service/kubernetes/container-service-kubernetes-jenkins.md",
       "redirect_url": "/azure/aks/jenkins-continuous-deployment",
@@ -18991,6 +19011,16 @@
       "redirect_url": "/azure/logic-apps/logic-apps-exception-handling",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/machine-learning/tutorial-power-bi-automated-model.md",
+      "redirect_url": "/azure/machine-learning/tutorial-power-bi-custom-model",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/tutorial-power-bi-designer-model.md",
+      "redirect_url": "/azure/machine-learning/tutorial-power-bi-custom-model",
+      "redirect_document_id": false
+    },    
     {
       "source_path_from_root": "/articles/cognitive-services/LinguisticAnalysisAPI/AnalyzeMethod.md",
       "redirect_url": "/azure/machine-learning/classic-module-reference/text-analytics",

articles/active-directory-b2c/TOC.yml

@@ -222,6 +222,8 @@
         href: force-password-reset.md
     - name: Profile editing policy
       href: add-profile-editing-policy.md
+    - name: Client credentials policy
+      href: client-credentials-grant-flow.md
     - name: Resource owner password credentials policy
       href: add-ropc-policy.md
       displayName: ROPC

articles/active-directory-b2c/add-api-connector.md

@@ -262,7 +262,7 @@ Content-type: application/json
 {
  "clientId": "231c70e8-8424-48ac-9b5d-5623b9e4ccf3",
  "step": "PreTokenApplicationClaims",
- "ui_locales":"en-US"
+ "ui_locales":"en-US",
  "email": "[email protected]",
  "identities": [
      {

articles/active-directory-b2c/application-types.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/30/2022
+ms.date: 06/14/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 
@@ -72,6 +72,7 @@ To see this scenario in action, try one of the web application sign in code samp
 In addition to facilitating simple sign in, a web server application might also need to access a back-end web service. In this case, the web application can perform a slightly different [OpenID Connect flow](openid-connect.md) and acquire tokens by using authorization codes and refresh tokens. This scenario is depicted in the following [Web APIs section](#web-apis).
 
 ## Single-page applications
+
 Many modern web applications are built as client-side single-page applications ("SPAs"). Developers write them by using JavaScript or a SPA framework such as Angular, Vue, and React. These applications run on a web browser and have different authentication characteristics than traditional server-side web applications.
 
 Azure AD B2C provides **two** options to enable single-page applications to sign in users and get tokens to access back-end services or web APIs:
@@ -129,21 +130,15 @@ Applications that are installed on devices, such as mobile and desktop applicati
 
 In this flow, the application executes [policies](user-flow-overview.md) and receives an `authorization_code` from Azure AD after the user completes the policy. The `authorization_code` represents the application's permission to call back-end services on behalf of the user who is currently signed in. The application can then exchange the `authorization_code` in the background for an `access_token` and a `refresh_token`.  The application can use the `access_token` to authenticate to a back-end web API in HTTP requests. It can also use the `refresh_token` to get a new `access_token` when an older one expires.
 
-## Current limitations
-
-### Unsupported application types
-
-#### Daemons/server-side applications
+## Daemons/server-side applications
 
 Applications that contain long-running processes or that operate without the presence of a user also need a way to access secured resources such as web APIs. These applications can authenticate and get tokens by using their identities (rather than a user's delegated identity) and by using the OAuth 2.0 client credentials flow. Client credential flow isn't the same as on-behalf-flow and on-behalf-flow shouldn't be used for server-to-server authentication.
 
-Although the OAuth 2.0 client credentials grant flow isn't currently directly supported by the Azure AD B2C authentication service, you can set up client credential flow using Azure AD and the Microsoft identity platform /token (https://login.microsoftonline.com/your-tenant-name.onmicrosoft.com/oauth2/v2.0/token) endpoint for an application in your Azure AD B2C tenant. An Azure AD B2C tenant shares some functionality with Azure AD enterprise tenants.
-
-To set up client credential flow, see [Azure Active Directory v2.0 and the OAuth 2.0 client credentials flow](../active-directory/develop/v2-oauth2-client-creds-grant-flow.md). A successful authentication results in the receipt of a token formatted so that it can be used by Azure AD as described in [Azure AD token reference](../active-directory/develop/id-tokens.md).
+The [OAuth 2.0 client credentials flow](./client-credentials-grant-flow.md) is currently in public preview. You can also set up client credential flow using Azure AD and the Microsoft identity platform /token endpoint (`https://login.microsoftonline.com/your-tenant-name.onmicrosoft.com/oauth2/v2.0/token`) for a [Microsoft Graph application](microsoft-graph-get-started.md) or your own application. For more information, check out the [Azure AD token reference](../active-directory/develop/id-tokens.md) article.
 
-For instructions on registering a management application, see [Manage Azure AD B2C with Microsoft Graph](microsoft-graph-get-started.md).
+## Unsupported application types
 
-#### Web API chains (on-behalf-of flow)
+### Web API chains (on-behalf-of flow)
 
 Many architectures include a web API that needs to call another downstream web API, where both are secured by Azure AD B2C. This scenario is common in native clients that have a Web API back-end and calls a Microsoft online service such as the Microsoft Graph API.