Skip to content

Commit 6e4584b

Browse files
authored
Merge branch 'main' into ninallam-vuh-limits
2 parents 9055e78 + 0052eac commit 6e4584b

File tree

3,442 files changed

+30013
-34111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,442 files changed

+30013
-34111
lines changed

.github/policies/disallow-edits.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ configuration:
160160
matchAny: true
161161
pattern: articles/reliability/*
162162
- commentContains:
163-
pattern: \#sign-off
164-
isRegex: false
163+
pattern: '\#sign-off'
164+
isRegex: true
165165
- not:
166166
or:
167167
- isActivitySender:

.openpublishing.publish.config.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,6 @@
242242
"branch": "main",
243243
"branch_mapping": {}
244244
},
245-
{
246-
"path_to_root": "azure-proactive-resiliency-library",
247-
"url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
248-
"branch": "main",
249-
"branch_mapping": {}
250-
},
251245
{
252246
"path_to_root": "azure-sdk-for-go-samples",
253247
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
@@ -590,6 +584,12 @@
590584
"branch": "main",
591585
"branch_mapping": {}
592586
},
587+
{
588+
"path_to_root": "laravel-tasks",
589+
"url": "https://github.com/Azure-Samples/laravel-tasks",
590+
"branch": "main",
591+
"branch_mapping": {}
592+
},
593593
{
594594
"path_to_root": "playwright-testing-service",
595595
"url": "https://github.com/microsoft/playwright-testing-service",

.openpublishing.redirection.json

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/migrate/tutorial-modernize-asp-net-aks.md",
5+
"redirect_url": "/azure/migrate/migrate-services-overview",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/databox-online/azure-stack-edge-gpu-deploy-sample-module-marketplace.md",
510
"redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?page=1",
@@ -30,6 +35,11 @@
3035
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
3136
"redirect_document_id": false
3237
},
38+
{
39+
"source_path": "articles/event-grid/event-schema-storage-actions.md",
40+
"redirect_url": "/azure/storage-actions/overview",
41+
"redirect_document_id": false
42+
},
3343
{
3444
"source_path_from_root": "/articles/hdinsight-aks/index.yml",
3545
"redirect_url": "/previous-versions/azure/hdinsight-aks",
@@ -1855,6 +1865,11 @@
18551865
"redirect_url": "/azure/api-management/monitor-api-management",
18561866
"redirect_document_id": false
18571867
},
1868+
{
1869+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-cross-premises-options.md",
1870+
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
1871+
"redirect_document_id": false
1872+
},
18581873
{
18591874
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
18601875
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -4075,36 +4090,6 @@
40754090
"redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
40764091
"redirect_document_id": false
40774092
},
4078-
{
4079-
"source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
4080-
"redirect_url": "/azure/openshift/howto-byok",
4081-
"redirect_document_id": false
4082-
},
4083-
{
4084-
"source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
4085-
"redirect_url": "/azure/openshift/index",
4086-
"redirect_document_id": false
4087-
},
4088-
{
4089-
"source_path_from_root": "/articles/openshift/quickstart-portal.md",
4090-
"redirect_url": "/azure/openshift/create-cluster",
4091-
"redirect_document_id": false
4092-
},
4093-
{
4094-
"source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
4095-
"redirect_url": "/azure/openshift/connect-cluster",
4096-
"redirect_document_id": false
4097-
},
4098-
{
4099-
"source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
4100-
"redirect_url": "/azure/openshift/create-cluster",
4101-
"redirect_document_id": false
4102-
},
4103-
{
4104-
"source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
4105-
"redirect_url": "/azure/openshift/delete-cluster",
4106-
"redirect_document_id": false
4107-
},
41084093
{
41094094
"source_path_from_root": "/articles/operator-service-manager/overview.md",
41104095
"redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
@@ -5935,6 +5920,11 @@
59355920
"redirect_url": "/azure/reliability/overview-reliability-guidance",
59365921
"redirect_document_id": false
59375922
},
5923+
{
5924+
"source_path_from_root": "/articles/reliability/sovereign-cloud-china.md",
5925+
"redirect_url": "/azure/china/concepts-service-availability",
5926+
"redirect_document_id": false
5927+
},
59385928
{
59395929
"source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
59405930
"redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
@@ -5949,6 +5939,26 @@
59495939
"source_path": "articles/sentinel/resources.md",
59505940
"redirect_url": "/azure/sentinel/overview",
59515941
"redirect_document_id": false
5942+
},
5943+
{
5944+
"source_path_from_root": "/articles/nat-gateway/tutorial-dual-stack-outbound-nat-load-balancer.md",
5945+
"redirect_url": "/azure/nat-gateway/nat-overview",
5946+
"redirect_document_id": false
5947+
},
5948+
{
5949+
"source_path": "articles/sentinel/kusto-resources.md",
5950+
"redirect_url": "/kusto/query/kql-learning-resources?view=microsoft-sentinel?view=microsoft-sentinel&preserve-view=true&toc=/azure/sentinel/TOC.json&bc=/azure/sentinel/breadcrumb/toc.json",
5951+
"redirect_document_id": false
5952+
},
5953+
{
5954+
"source_path": "articles/reliability/availability-zones-baseline.md",
5955+
"redirect_url": "/azure/reliability/availability-zones-migration-overview",
5956+
"redirect_document_id": false
5957+
},
5958+
{
5959+
"source_path_from_root": "/articles/virtual-network/virtual-network-for-azure-services.md",
5960+
"redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
5961+
"redirect_document_id": false
59525962
}
59535963
]
5954-
}
5964+
}

articles/active-directory-b2c/add-captcha.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Enable CAPTCHA in Azure Active Directory B2C
3-
description: How to enable CAPTCHA for user flows and custom policies in Azure Active Directory B2C.
3+
description: Learn how to enable CAPTCHA in Azure AD B2C for user flows and custom policies to protect sign-in and sign-up flows from automated attacks.
44
author: kengaderdus
55
manager: mwongerapk
66
ms.service: azure-active-directory
77
ms.topic: how-to
8-
ms.date: 05/03/2024
8+
ms.date: 02/18/2024
99
ms.custom: project-no-code
1010
ms.author: kengaderdus
1111
ms.subservice: b2c
@@ -50,7 +50,7 @@ Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to preven
5050

5151
## Test the user flow
5252

53-
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual or audio, you choose.
53+
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual, or audio, you choose.
5454

5555
::: zone-end
5656

@@ -387,15 +387,15 @@ Use the steps in [Upload the policies](tutorial-create-user-flows.md?pivots=b2c-
387387

388388
## Test the custom policy
389389

390-
Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b2c-custom-policy#test-the-custom-policy) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual or audio, you choose.
390+
Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b2c-custom-policy#test-the-custom-policy) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual, or audio, you choose.
391391

392392
::: zone-end
393393

394394
> [!NOTE]
395395
> - You can't add CAPTCHA to an MFA step in a sign-up only user flow.
396396
> - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only or Phone call only.
397397
398-
## Next steps
398+
## Related content
399399

400400
- Learn how to [Define a CAPTCHA technical profile](captcha-technical-profile.md).
401401
- Learn how to [Configure CAPTCHA display control](display-control-captcha.md).

articles/active-directory-b2c/add-password-change-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 01/11/2024
12+
ms.date: 02/19/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515
zone_pivot_groups: b2c-policy-type
@@ -164,7 +164,7 @@ The password change flow involves the following steps:
164164
1. For **Application**, select the application that you registered earlier. To see the token, the **Reply URL** should show `https://jwt.ms`.
165165
1. Select **Run now**. In the new tab that opens, remove "&prompt=login" from the URL and refresh the tab. Then, sign in with the account you created earlier. A password change dialog gives you the option to change the password.
166166

167-
## Next steps
167+
## Related content
168168

169169
* Find the [sample policy on GitHub](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/password-change).
170170
* Learn about how you can [configure password complexity in Azure AD B2C](password-complexity.md).

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: garrodonnell
66
manager: CelesteDG
77
ms.service: azure-active-directory
88
ms.topic: how-to
9-
ms.date: 11/27/2024
9+
ms.date: 02/18/2024
1010
ms.author: godonnell
1111
ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type
@@ -40,16 +40,16 @@ The default name of the **Change email** button in *selfAsserted.html* is **chan
4040
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
4141

4242

43-
- The B2C Users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**, ensure **Authentication contact info** is set. B2C users created via a SignUp flow will have this set by default. For users created via Azure Portal or by Graph API need to have this set for SSPR to work.
43+
- The B2C Users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**. Ensure **Authentication contact info** is set. B2C users created via a Sign-up flow has this set by default. For users created via Azure Portal or by Graph API, you need to set **Authentication contact info** for SSPR to work.
4444

4545

4646
## Self-service password reset (recommended)
4747

48-
The new password reset experience is now part of the sign-up or sign-in policy. When the user selects the **Forgot your password?** link, they are immediately sent to the Forgot Password experience. Your application no longer needs to handle the [AADB2C90118 error code](#password-reset-policy-legacy), and you don't need a separate policy for password reset.
48+
The new password reset experience is now part of the sign-up or sign-in policy. When the user selects the **Forgot your password?** link, they're immediately sent to the Forgot Password experience. Your application no longer needs to handle the [AADB2C90118 error code](#password-reset-policy-legacy), and you don't need a separate policy for password reset.
4949

5050
::: zone pivot="b2c-user-flow"
5151

52-
The self-service password reset experience can be configured for the Sign in (Recommended) or Sign up and sign in (Recommended) user flows. If you don't have one of these user flows set up, create a [sign-up or sign-in](add-sign-up-and-sign-in-policy.md) user flow.
52+
The self-service password reset experience can be configured for the Sign in (Recommended) or Sign up and sign in (Recommended) user flows. If you don't have one of these user flows setup, create a [sign-up or sign-in](add-sign-up-and-sign-in-policy.md) user flow.
5353

5454
To set up self-service password reset for the sign-up or sign-in user flow:
5555

@@ -192,7 +192,7 @@ The sub journey is called from the user journey and performs the specific steps
192192

193193
### Prepare your user journey
194194

195-
Next, to connect the **Forgot your password?** link to the **Forgot Password** sub journey you will need to reference the **Forgot Password** sub journey ID in the **ClaimsProviderSelection** element of the **CombinedSignInAndSignUp** step.
195+
Next, to connect the **Forgot your password?** link to the **Forgot Password** sub journey you need to reference the **Forgot Password** sub journey ID in the **ClaimsProviderSelection** element of the **CombinedSignInAndSignUp** step.
196196

197197
If you don't have your own custom user journey that has a **CombinedSignInAndSignUp** step, complete the following steps to duplicate an existing sign-up or sign-in user journey. Otherwise, continue to the next section.
198198

@@ -352,14 +352,14 @@ To test the user flow:
352352

353353
### Create a password reset policy
354354

355-
Custom policies are a set of XML files that you upload to your Azure AD B2C tenant to define user journeys. We provide [starter packs](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) that have several pre-built policies, including sign up and sign in, password reset, and profile editing policies. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
355+
Custom policies are a set of XML files that you upload to your Azure AD B2C tenant to define user journeys. We provide [starter packs](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) that have several prebuilt policies, including sign up and sign in, password reset, and profile editing policies. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
356356

357357
::: zone-end
358358

359359
## Troubleshoot Azure AD B2C user flows and custom policies
360360
Your application needs to handle certain errors coming from Azure B2C service. Learn [how to troubleshoot Azure AD B2C's user flows and custom policies](troubleshoot.md).
361361

362-
## Next steps
362+
## Related content
363363

364364
Set up a [force password reset](force-password-reset.md).
365365

articles/active-directory-b2c/add-ropc-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 09/11/2024
12+
ms.date: 02/24/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515
zone_pivot_groups: b2c-policy-type

articles/active-directory-b2c/b2clogin.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: Migrate applications and APIs to b2clogin.com
33
titleSuffix: Azure AD B2C
4-
description: Learn about using b2clogin.com in your redirect URLs for Azure Active Directory B2C.
4+
description: Learn how to update redirect URLs in Azure AD B2C applications to use b2clogin.com or a custom domain for authentication endpoints.
55

66
author: kengaderdus
77
manager: CelesteDG
88

99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 01/26/2024
12+
ms.date: 02/26/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515

@@ -40,9 +40,9 @@ With Azure AD B2C [custom domain](./custom-domain.md) the corresponding updated
4040
- <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/<b>\<policy-name\></b>/oauth2/v2.0/authorize</code> or <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/oauth2/v2.0/authorize?<b>p=\<policy-name\></b></code> for the `/authorize` endpoint.
4141
- <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/<b>\<policy-name\></b>/oauth2/v2.0/logout</code> or <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/oauth2/v2.0/logout?<b>p=\<policy-name\></b></code> for the `/logout` endpoint.
4242

43-
## Endpoints that are not affected
43+
## Endpoints that aren't affected
4444

45-
Some customers use the shared capabilities of Microsoft Entra enterprise tenants. For example, acquiring an access token to call the [MS Graph API](microsoft-graph-operations.md#code-discussion) of the Azure AD B2C tenant.
45+
Some customers use the shared capabilities of Microsoft Entra enterprise tenants. For example, acquiring an access token to call the [MS Graph API](microsoft-graph-operations.md) of the Azure AD B2C tenant.
4646

4747
This change doesn't affect all endpoints, which don't contain a policy parameter in the URL. They're accessed only with the Microsoft Entra ID's login.microsoftonline.com endpoints, and can't be used with the *b2clogin.com*, or custom domains. The following example shows a valid token endpoint of the Microsoft identity platform:
4848

@@ -64,7 +64,6 @@ There are several modifications you might need to make to migrate your applicati
6464
* Update your Azure AD B2C applications to use *b2clogin.com*, or custom domain in their user flow and token endpoint references. The change may include updating your use of an authentication library like Microsoft Authentication Library (MSAL).
6565
* Update any **Allowed Origins** that you define in the CORS settings for [user interface customization](customize-ui-with-html.md).
6666

67-
6867
## Change identity provider redirect URLs
6968

7069
On each identity provider's website in which you've created an application, change all trusted URLs to redirect to `your-tenant-name.b2clogin.com`, or a custom domain instead of *login.microsoftonline.com*.
@@ -146,7 +145,7 @@ this.clientApplication = new UserAgentApplication(
146145
);
147146
```
148147

149-
## Next steps
148+
## Related content
150149

151150
For information about migrating OWIN-based web applications to b2clogin.com, see [Migrate an OWIN-based web API to b2clogin.com](multiple-token-endpoints.md).
152151

articles/active-directory-b2c/claim-resolver-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: Claim resolvers in custom policies
33
titleSuffix: Azure AD B2C
4-
description: Learn how to use claims resolvers in a custom policy in Azure Active Directory B2C.
4+
description: Learn how to use claim resolvers in Azure AD B2C custom policies to provide context information and populate claims with dynamic values.
55

66
author: kengaderdus
77
manager: CelesteDG
88

99
ms.service: azure-active-directory
1010

1111
ms.topic: reference
12-
ms.date: 01/17/2024
12+
ms.date: 02/19/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515

@@ -161,7 +161,7 @@ The following table lists the [OAuth2 identity provider](oauth2-technical-profil
161161
| {oauth2:access_token} | The OAuth2 identity provider access token. The `access_token` attribute. | `eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1Ni...` |
162162
| {oauth2:token_type} | The type of the access token. The `token_type` attribute. | Bearer |
163163
| {oauth2:expires_in} | The length of time that the access token is valid in seconds. The `expires_in` attribute. The output claim [DataType](claimsschema.md#datatype) must be `int` or `long`. | 960000 |
164-
| {oauth2:refresh_token} | The OAuth2 identity provider refresh token. The `refresh_token` attribute. | `eyJraWQiOiJacW9pQlp2TW5pYVc2MUY...` |
164+
| {oauth2:refresh_token} | The OAuth2 identity providers refresh token. The `refresh_token` attribute. | `eyJraWQiOiJacW9pQlp2TW5pYVc2MUY...` |
165165

166166
To use the OAuth2 identity provider claim resolvers, set the output claim's `PartnerClaimType` attribute to the claim resolver. The following example demonstrates how the get the external identity provider claims:
167167

@@ -312,6 +312,6 @@ In a [Relying party](relyingparty.md) policy technical profile, you may want to
312312
</RelyingParty>
313313
```
314314

315-
## Next steps
315+
## Related content
316316

317317
- Find more [claims resolvers samples](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-resolver) on the Azure AD B2C community GitHub repo

0 commit comments

Comments
 (0)