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

Author: Juliako

.openpublishing.publish.config.json

@@ -74,6 +74,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "ms-identity-ciam-dotnet-tutorial",
+      "url": "https://github.com/Azure-Samples/ms-identity-ciam-dotnet-tutorial",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",

.openpublishing.redirection.active-directory.json

@@ -11221,6 +11221,11 @@
       "redirect_url": "/azure/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/user-manage-inactive.md",
+      "redirect_url": "/azure/active-directory-b2c/manage-users-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
       "redirect_url": "/azure/active-directory-b2c/troubleshoot",
@@ -12892,7 +12897,94 @@
         "source_path_from_root": "/articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md",
         "redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-federation-get-started",
         "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-access-create-new-tenant.md",
+        "redirect_url": "/azure/active-directory/fundamentals/create-new-tenant",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-architecture.md",
+        "redirect_url": "/azure/active-directory/fundamentals/architecture",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-australia.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-australia",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-australia-newzealand.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-australia-newzealand",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-eu.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-eu",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-faq.yml",
+        "redirect_url": "/azure/active-directory/fundamentals/faq",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-japan.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-japan",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-get-started-premium.md",
+        "redirect_url": "/azure/active-directory/fundamentals/get-started-premium",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-view-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/groups-view-azure-portal",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md",
+        "redirect_url": "/azure/active-directory/fundamentals/how-subscriptions-associated-directory",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-how-to-find-tenant.md",
+        "redirect_url": "/azure/active-directory/fundamentals/how-to-find-tenant.md",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-assign-role-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/how-subscriptions-associated-directory",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-properties-area.md",
+        "redirect_url": "/azure/active-directory/fundamentals/properties-area",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-licensing-whatis-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/licensing-whatis-azure-portal",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-reset-password-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/users-reset-password-azure-portal",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-restore.md",
+        "redirect_url": "/azure/active-directory/fundamentals/users-restore",
+        "redirect_document_id": false
       }
 
+      
+      
+      
+      
+      
+      
+      
       ]
 } 

.openpublishing.redirection.defender-for-cloud.json

@@ -480,6 +480,11 @@
             "redirect_url": "/azure/defender-for-cloud/enable-enhanced-security",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/enable-enhanced-security.md",
+            "redirect_url": "/azure/defender-for-cloud/enable-all-plans",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/security-center/enhanced-security-features-overview.md",
             "redirect_url": "/azure/defender-for-cloud/enhanced-security-features-overview",
@@ -815,6 +820,11 @@
             "redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/quickstart-enable-database-protections.md",
+            "redirect_url": "/azure/defender-for-cloud/tutorial-enable-databases-plan",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
             "redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",

.openpublishing.redirection.healthcare-apis.json

@@ -479,9 +479,14 @@
       },
       {
           "source_path_from_root": "/articles/healthcare-apis/data-transformation/convert-data.md",
-          "redirect_url": "/azure/healthcare-apis/fhir/convert-data",
-          "redirect_document_id": true
+          "redirect_url": "/azure/healthcare-apis/fhir/overview-of-convert-data",
+          "redirect_document_id": false
       },
+      {
+          "source_path_from_root": "/articles/healthcare-apis/fhir/convert-data.md",
+          "redirect_url": "/azure/healthcare-apis/fhir/overview-of-convert-data",
+          "redirect_document_id": true
+      },    
       {
           "source_path_from_root": "/articles/healthcare-apis/fhir/bulk-importing-fhir-data.md",
           "redirect_url": "/azure/healthcare-apis/fhir/configure-import-data",

.openpublishing.redirection.json

@@ -23967,6 +23967,26 @@
             "source_path_from_root": "/articles/active-directory/manage-apps/migrate-okta-sync-provisioning-to-azure-active-directory.md",
             "redirect_url": "/azure/active-directory/manage-apps/migrate-okta-sync-provisioning",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-preface.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-preface",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-configuration.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-control-plane.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-control-plane",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-data-plane.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-data-plane",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.reliability.json

@@ -0,0 +1,11 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/reliability/reliability-energy-data-services.md",
+      "redirect_url": "/azure/energy-data-services/reliability-energy-data-services",
+      "redirect_document_id": true
+    }  
+  ]
+}
+
+

articles/active-directory-b2c/TOC.yml

@@ -403,10 +403,7 @@
       displayName: create users, add users, delete users, revoke sessions
     - name: Migrate users
       href: user-migration.md
-      displayName: bulk import
-    - name: Manage inactive users   
-      href: user-manage-inactive.md
-      displayName: Manage and delete inactive users          
+      displayName: bulk import        
     - name: Partner integration
       items:
       - name: N8identity

articles/active-directory-b2c/enable-authentication-web-application-options.md

@@ -303,7 +303,7 @@ To support a secured logout redirect in your application, first follow the steps
 1. In the **Startup.cs** class, parse the `id_token_hint` value and append the value to the authentication request. The following code snippet demonstrates how to pass the `id_token_hint` value to the authentication request:
 
     ```csharp
-    private async Task OnRedirectToIdentityProviderFunc(RedirectContext context)
+    private async Task OnRedirectToIdentityProviderForSignOutFunc(RedirectContext context)
     {
         var id_token_hint = context.Properties.Items.FirstOrDefault(x => x.Key == "id_token_hint").Value;
         if (id_token_hint != null)
@@ -324,7 +324,7 @@ To support a secured logout redirect in your application, first follow the steps
         {
             Configuration.Bind("AzureAdB2C", options);
             options.Events ??= new OpenIdConnectEvents();        
-            options.Events.OnRedirectToIdentityProvider += OnRedirectToIdentityProviderFunc;
+            options.Events.OnRedirectToIdentityProviderForSignOut += OnRedirectToIdentityProviderForSignOutFunc;
             options.SaveTokens = true;
         });
     ```

articles/active-directory-b2c/media/publish-app-to-azure-ad-app-gallery/app-gallery-sign-in-flow.png

@@ -66,63 +66,7 @@ Use Azure AD B2C to facilitate identity verification and proofing by collecting
 
 :::image type="content" source="./media/overview/scenario-idproofing.png" alt-text="A diagram showing the user flow for third-party identity proofing.":::
 
-You have learned some of the things you can do with Azure AD B2C as your business-to-customer identity platform. The following sections of this overview walk you through a demo application that uses Azure AD B2C. You're also welcome to move on directly to a more in-depth [technical overview of Azure AD B2C](technical-overview.md).
-
-## Example: WoodGrove Groceries
-
-[WoodGrove Groceries][woodgrove] is a live web application created by Microsoft to demonstrate several Azure AD B2C features. The next few sections review some of the authentication options provided by Azure AD B2C to the WoodGrove website.
-
-### Business overview
-
-WoodGrove is an online grocery store that sells groceries to both individual consumers and business customers. Their business customers buy groceries on behalf of their company, or businesses that they manage.
-
-### Sign-in options
-
-WoodGrove Groceries offers several sign-in options based on the relationship their customers have with the store:
-
-* **Individual** customers can sign-up or sign in with individual accounts, such as with a social identity provider or an email address and password.
-* **Business** customers can sign-up or sign in with their enterprise credentials.
-* **Partners** and suppliers are individuals who supply the grocery store with products to sell. Partner identity is provided by [Azure Active Directory B2B](../active-directory/external-identities/what-is-b2b.md).
-
-![Individual (B2C), business (B2C), and partner (B2B) sign-in pages](./media/overview/woodgrove-overview.png)
-
-### Authenticate individual customers
-
-When a customer selects **Sign in with your personal account**, they're redirected to a customized sign-in page hosted by Azure AD B2C. You can see in the following image that we've customized the user interface (UI) to look and feel just like the WoodGrove Groceries website. WoodGrove's customers should be unaware that the authentication experience is hosted and secured by Azure AD B2C.
-
-![Custom WoodGrove sign-in page hosted by Azure AD B2C](./media/overview/sign-in.png)
-
-WoodGrove allows their customers to sign-up and sign in by using their Google, Facebook, or Microsoft accounts as their identity provider. Or, they can sign-up by using their email address and a password to create what's called a *local account*.
-
-When a customer selects **Sign-up with your personal account** and then **Sign-up now**, they're presented with a custom sign-up page.
-
-![Custom WoodGrove sign-up page hosted by Azure AD B2C](./media/overview/sign-up.png)
-
-After entering an email address and selecting **Send verification code**, Azure AD B2C sends them the code. Once they enter their code, select **Verify code**, and then enter the other information on the form, they must also agree to the terms of service.
-
-Clicking the **Create** button causes Azure AD B2C to redirect the user back to the WoodGrove Groceries website. When it redirects, Azure AD B2C passes an OpenID Connect authentication token to the WoodGrove web application. The user is now signed-in and ready to go, their display name shown in the top-right corner to indicate they're signed in.
-
-![WoodGrove Groceries website header showing user is signed in](./media/overview/signed-in-individual.png)
-
-### Authenticate business customers
-
-When a customer selects one of the options under **Business customers**, the WoodGrove Groceries website invokes a different Azure AD *B2C policy* than it does for individual customers. You learn what a *B2C policy* is in [technical overview of Azure AD B2C](technical-overview.md)
-
-This policy presents the user with an option to use their corporate credentials for sign-up and sign-in. In the WoodGrove example, users are prompted to sign in with any work or school account. This policy uses a [multi-tenant Azure AD application](../active-directory/develop/howto-convert-app-to-be-multi-tenant.md) and the `/common` Azure AD endpoint to federate Azure AD B2C with any Microsoft 365 customer in the world.
-
-### Authenticate partners
-
-The **Sign in with your supplier account** link uses Azure Active Directory B2B's collaboration functionality. Azure AD B2B is a family of features in Azure Active Directory to manage partner identities. Those identities can be federated from Azure Active Directory for access into Azure AD B2C-protected applications.
-
-Learn more about Azure AD B2B in [What is guest user access in Azure Active Directory B2B?](../active-directory/external-identities/what-is-b2b.md).
-
-<!-- UNCOMMENT WHEN REPO IS UPDATED WITH LATEST DEMO CODE
-### Sample code
-
-If you'd like to jump right into the code to see how the WoodGrove Groceries application is built, you can find the repository on GitHub:
-
-[Azure-Samples/active-directory-external-identities-woodgrove-demo][woodgrove-repo] (GitHub)
--->
+You have learned some of the things you can do with Azure AD B2C as your business-to-customer identity platform. You may now move on directly to a more in-depth [technical overview of Azure AD B2C](technical-overview.md).
 
 ## Next steps
 
@@ -131,6 +75,4 @@ Now that you have an idea of what Azure AD B2C is and some of the scenarios it c
 > [!div class="nextstepaction"]
 > [Azure AD B2C technical overview >](technical-overview.md)
 
-<!-- LINKS - External -->
-[woodgrove]: https://aka.ms/ciamdemo
-[woodgrove-repo]: https://github.com/Azure-Samples/active-directory-external-identities-woodgrove-demo
+

articles/active-directory-b2c/media/technical-overview/custom-domain.png

@@ -71,7 +71,7 @@ To allow employees and consumers from any Azure AD tenant to sign in by using Az
 
 In your app, copy the URL of the sign-in endpoint. If you use the [web application sample](configure-authentication-sample-web-app.md), the sign-in URL is `https://localhost:5001/MicrosoftIdentity/Account/SignIn?`. This URL is where the Azure AD app gallery takes users to sign in to your app.
 
-In production environments, the app registration redirect URI is ordinarily a publicly accessible endpoint where your app is running, such as `https://woodgrovedemo.com/Account/SignIn`. The reply URL must begin with `https`.
+In production environments, the app registration redirect URI is ordinarily a publicly accessible endpoint where your app is running. The reply URL must begin with `https`.
 
 ## Step 4: Publish your Azure AD B2C app
 

articles/active-directory-b2c/media/technical-overview/seamless-ux.png

@@ -117,8 +117,6 @@ In Azure AD B2C, you can craft your users' identity experiences so that the page
 > [!NOTE]
 > Customizing the pages rendered by third parties when using social accounts is limited to the options provided by that identity provider, and are outside the control of Azure AD B2C.
 
-:::image type="content" source="media/technical-overview/seamless-ux.png" alt-text="Screenshots of brand-customized sign-up sign-in page.":::
-
 For information on UI customization, see:
 
 * [Customize the user interface](customize-ui.md)
@@ -127,11 +125,7 @@ For information on UI customization, see:
 
 ## Custom domain
 
-You can customize your Azure AD B2C domain in the redirect URIs for your application. Custom domain allows you to create a seamless experience so that the pages that are shown blend seamlessly with the domain name of your application.
-
-:::image type="content" source="media/technical-overview/custom-domain.png" alt-text="Screenshot of the sign in page of the WoodGrove sample app with a red box highlighting the custom domain in the address bar.":::
-
-From the user's perspective, they remain in your domain during the sign-in process rather than redirecting to the Azure AD B2C default domain .b2clogin.com. 
+You can customize your Azure AD B2C domain in the redirect URIs for your application. Custom domain allows you to create a seamless experience so that the pages that are shown blend seamlessly with the domain name of your application. From the user's perspective, they remain in your domain during the sign-in process rather than redirecting to the Azure AD B2C default domain .b2clogin.com. 
 
 For more information, see [Enable custom domains](custom-domain.md).
 

articles/active-directory-b2c/overview.md

@@ -81,8 +81,4 @@ If your tenant usage is higher that 80%, you can remove inactive users or reques
 
 ## Request increase directory quota size
 
-You can request to increase the quota size by [contacting support](find-help-open-support-ticket.md) 
-
-## Next steps
-
-- Learn [how to manage inactive user accounts](user-manage-inactive.md).
+You can request to increase the quota size by [contacting support](find-help-open-support-ticket.md)