Skip to content

Commit 10ac2ac

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents c5b221c + ad70977 commit 10ac2ac

4,841 files changed

Lines changed: 82605 additions & 110665 deletions

File tree

Some content is hidden

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

.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -834,12 +834,6 @@
834834
"branch": "tutorial",
835835
"branch_mapping": {}
836836
},
837-
{
838-
"path_to_root": "samples-tsi",
839-
"url": "https://github.com/Azure-Samples/Azure-Time-Series-Insights",
840-
"branch": "master",
841-
"branch_mapping": {}
842-
},
843837
{
844838
"path_to_root": "storage-mgmt-devguide-dotnet",
845839
"url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",

.openpublishing.redirection.json

Lines changed: 394 additions & 89 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
# Each line is a file pattern followed by one or more owners.
33

44
# Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
5-
/articles/aks @tynevi @thomps23 @jasonwhowell
6-
/articles/defender-for-cloud @tynevi @thomps23 @jasonwhowell
7-
/articles/attestation @tynevi @thomps23 @jasonwhowell
8-
/articles/confidential-ledger @tynevi @thomps23 @jasonwhowell
9-
/articles/dedicated-hsm @tynevi @thomps23 @jasonwhowell
10-
/articles/key-vault @tynevi @thomps23 @jasonwhowell
11-
/articles/payment-hsm @tynevi @thomps23 @jasonwhowell
12-
/articles/postgresql @tynevi @thomps23 @jasonwhowell
13-
/articles/cosmos-db @tynevi @thomps23 @jasonwhowell
14-
/articles/dms @tynevi @thomps23 @jasonwhowell
15-
/articles/mariadb @tynevi @thomps23 @jasonwhowell
16-
/articles/mysql @tynevi @thomps23 @jasonwhowell
17-
/articles/managed-instance-apache-cassandra @tynevi @thomps23 @jasonwhowell
5+
/articles/aks @thomps23 @jasonwhowell
6+
/articles/defender-for-cloud @thomps23 @jasonwhowell
7+
/articles/attestation @thomps23 @jasonwhowell
8+
/articles/confidential-ledger @thomps23 @jasonwhowell
9+
/articles/dedicated-hsm @thomps23 @jasonwhowell
10+
/articles/key-vault @thomps23 @jasonwhowell
11+
/articles/payment-hsm @thomps23 @jasonwhowell
12+
/articles/postgresql @thomps23 @jasonwhowell
13+
/articles/cosmos-db @thomps23 @jasonwhowell
14+
/articles/dms @thomps23 @jasonwhowell
15+
/articles/mariadb @thomps23 @jasonwhowell
16+
/articles/mysql @thomps23 @jasonwhowell
17+
/articles/managed-instance-apache-cassandra @thomps23 @jasonwhowell
1818
/articles/virtual-machines @jasonwhowell @thomps23
1919
/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
2020
/articles/container-instances @jasonwhowell @thomps23
@@ -37,3 +37,4 @@
3737
/articles/quotas @jasonwhowell @thomps23
3838
/articles/container-registry @jasonwhowell @thomps23
3939
/articles/kubernetes-fleet @MicrosoftDocs/azure-docs-codeowners
40+
/articles/reliability @thomps23

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Content-type: application/json
160160
}
161161
```
162162

163-
The exact claims sent to the API depend on the information is provided by the identity provider. 'email' is always sent.
163+
The exact claims sent to the API depend on the information provided by the identity provider. 'email' is always sent.
164164

165165
### Expected response types from the web API at this step
166166

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: kengaderdus
1111
ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type
1313

14-
#Customer intent: As a developer, I want to enable CAPTCHA in consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
14+
#Customer intent: As a developer, I want to enable CAPTCHA in a consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
1515

1616
---
1717

@@ -21,7 +21,7 @@ zone_pivot_groups: b2c-policy-type
2121

2222
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
2323

24-
Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C’s CAPTCHA supports both audio and visual CAPTCHA challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.
24+
Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C CAPTCHA supports both audio and visual challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.
2525

2626
> [!NOTE]
2727
> This feature is in public preview
@@ -52,7 +52,7 @@ Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to preven
5252

5353
## Test the user flow
5454

55-
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.
55+
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) that you choose.
5656

5757
::: zone-end
5858

@@ -395,7 +395,7 @@ Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b
395395

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type
1313
ms.custom: sfi-image-nochange
1414

15-
#Customer Intent: As an Azure AD B2C administrator, I want to set up a password reset flow for local accounts, so that users can reset their passwords if they forget them.
15+
# Customer Intent: As an Azure AD B2C administrator, I want to set up a password reset flow for local accounts, so that users can reset their passwords if they forget them.
1616
---
1717

1818
# Set up a password reset flow in Azure Active Directory B2C
@@ -43,7 +43,7 @@ The default name of the **Change email** button in *selfAsserted.html* is **chan
4343
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
4444

4545

46-
- 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.
46+
- 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.
4747

4848

4949
## Self-service password reset (recommended)
@@ -52,7 +52,7 @@ The new password reset experience is now part of the sign-up or sign-in policy.
5252

5353
::: zone pivot="b2c-user-flow"
5454

55-
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.
55+
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.
5656

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

articles/active-directory-b2c/authorization-code-flow.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,16 @@ client_id=00001111-aaaa-2222-bbbb-3333cccc4444
6969
| redirect_uri |Required |The redirect URI of your app, where authentication responses are sent and received by your app. It must exactly match one of the redirect URIs that you registered in the portal, except that it must be URL-encoded. |
7070
| scope |Required |A space-separated list of scopes. The `openid` scope indicates a permission to sign in the user and get data about the user in the form of ID tokens. The `offline_access` scope is optional for web applications. It indicates that your application needs a *refresh token* for extended access to resources. The client-id indicates the token issued are intended for use by Azure AD B2C registered client. The `https://{tenant-name}/{app-id-uri}/{scope}` indicates a permission to protected resources, such as a web API. For more information, see [Request an access token](access-tokens.md#scopes). |
7171
| response_mode |Recommended |The method that you use to send the resulting authorization code back to your app. It can be `query`, `form_post`, or `fragment`. |
72-
| state |Recommended |A value included in the request that can be a string of any content that you want to use. Usually, a randomly generated unique value is used, to prevent cross-site request forgery attacks. The state also is used to encode information about the user's state in the app before the authentication request occurred. For example, the page the user was on, or the user flow that was being executed. |
7372
| prompt |Optional |The type of user interaction that is required. Currently, the only valid value is `login`, which forces the user to enter their credentials on that request. Single sign-on won't take effect. |
7473
| code_challenge | recommended / required | Used to secure authorization code grants via Proof Key for Code Exchange (PKCE). Required if `code_challenge_method` is included. You need to add logic in your application to generate the `code_verifier` and `code_challenge`. The `code_challenge` is a Base64 URL-encoded SHA256 hash of the `code_verifier`. You store the `code_verifier` in your application for later use, and send the `code_challenge` along with the authorization request. For more information, see the [PKCE RFC](https://tools.ietf.org/html/rfc7636). This is now recommended for all application types - native apps, SPAs, and confidential clients like web apps. |
7574
| `code_challenge_method` | recommended / required | The method used to encode the `code_verifier` for the `code_challenge` parameter. This *SHOULD* be `S256`, but the spec allows the use of `plain` if for some reason the client can't support SHA256. <br/><br/>If you exclude the `code_challenge_method`, but still include the `code_challenge`, then the `code_challenge` is assumed to be plaintext. Microsoft identity platform supports both `plain` and `S256`. For more information, see the [PKCE RFC](https://tools.ietf.org/html/rfc7636). This is required for [single page apps using the authorization code flow](tutorial-register-spa.md).|
7675
| login_hint | No| Can be used to prefill the sign-in name field of the sign-in page. For more information, see [Prepopulate the sign-in name](direct-signin.md#prepopulate-the-sign-in-name). |
7776
| domain_hint | No| Provides a hint to Azure AD B2C about the social identity provider that should be used for sign-in. If a valid value is included, the user goes directly to the identity provider sign-in page. For more information, see [Redirect sign-in to a social provider](direct-signin.md#redirect-sign-in-to-a-social-provider). |
7877
| Custom parameters | No| Custom parameters that can be used with [custom policies](custom-policy-overview.md). For example, [dynamic custom page content URI](customize-ui-with-html.md?pivots=b2c-custom-policy#configure-dynamic-custom-page-content-uri), or [key-value claim resolvers](claim-resolver-overview.md#oauth2-key-value-parameters). |
78+
| state |Recommended |A value included in the request that can be a string of any content that you want to use. Usually, a randomly generated unique value is used, to prevent cross-site request forgery attacks. The state also is used to encode information about the user's state in the app before the authentication request occurred. For example, the page the user was on, or the user flow that was being executed. |
79+
80+
> [!IMPORTANT]
81+
> For security and privacy, do not put URLs or other sensitive data directly in the state parameter. Instead, use a key or identifier that corresponds to data stored in browser storage, such as localStorage or sessionStorage. This approach lets your app securely reference the necessary data after authentication.
7982
8083
At this point, the user is asked to complete the user flow's workflow. This might involve the user entering their username and password, signing in with a social identity, signing up for the directory, or any other number of steps. User actions depend on how the user flow is defined.
8184

articles/active-directory-b2c/configure-authentication-sample-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const msalConfig = {
160160
clientId: "<your-MyApp-application-ID>", // This is the ONLY mandatory field; everything else is optional.
161161
authority: b2cPolicies.authorities.signUpSignIn.authority, // Choose sign-up/sign-in user-flow as your default.
162162
knownAuthorities: [b2cPolicies.authorityDomain], // You must identify your tenant's domain as a known authority.
163-
redirectUri: "http://localhost:6420", // You must register this URI on Azure Portal/App Registration. Defaults to "window.location.href".
163+
redirectUri: "http://localhost:6420", // You must register this URI on Azure portal/App Registration. Defaults to "window.location.href".
164164
},
165165
cache: {
166166
cacheLocation: "sessionStorage",

articles/active-directory-b2c/custom-email-mailjet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If you don't already have one, start by setting up a Mailjet account (Azure cust
4646
2. Navigate to the [API Key Management page](https://dev.mailjet.com/email/guides/senders-and-domains/#use-a-sender-on-all-api-keys-(metasender)). Record the **API Key** and **Secret Key** for use in a later step. Both keys are generated automatically when your account is created.
4747

4848
> [!IMPORTANT]
49-
> Mailjet offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://documentation.mailjet.com/hc/en-us/articles/1260803352789-Dedicated-IPs-What-They-Are-and-How-to-Warm-Them-Up). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [How do I warm up my IP ?](https://documentation.mailjet.com/hc/articles/1260803352789-How-do-I-warm-up-my-IP-).
49+
> Mailjet offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://documentation.mailjet.com/hc/en-us/articles/1260803352789-Dedicated-IPs-What-They-Are-and-How-to-Warm-Them-Up). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [How do I warm up my IP ?](https://documentation.mailjet.com/hc/articles/1260803352789-How-do-I-warm-up-my-IP-)
5050
5151
## Create Azure AD B2C policy key
5252

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ The following IDs are used for [RESTful service technical profile](restful-techn
531531

532532
## Microsoft Entra multifactor authentication error messages
533533

534-
The following IDs are used for an [Microsoft Entra ID multifactor authentication technical profile](multi-factor-auth-technical-profile.md) error message:
534+
The following IDs are used for a [Microsoft Entra ID multifactor authentication technical profile](multi-factor-auth-technical-profile.md) error message:
535535

536536
| ID | Default value |
537537
| --- | ------------- |

0 commit comments

Comments
 (0)