Skip to content

Commit 7850ba2

Browse files
authored
Merge pull request #197379 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents bcf5448 + 82ff6ef commit 7850ba2

File tree

7 files changed

+32
-16
lines changed

7 files changed

+32
-16
lines changed

articles/active-directory-b2c/restful-technical-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Your REST API may need to return an error message, such as 'The user was not fou
259259
| Attribute | Required | Description |
260260
| --------- | -------- | ----------- |
261261
| version | Yes | Your REST API version. For example: 1.0.1 |
262-
| status | Yes | Must be 409 |
262+
| status | Yes | An HTTP response status codes-like number, and must be 409 |
263263
| code | No | An error code from the RESTful endpoint provider, which is displayed when `DebugMode` is enabled. |
264264
| requestId | No | A request identifier from the RESTful endpoint provider, which is displayed when `DebugMode` is enabled. |
265265
| userMessage | Yes | An error message that is shown to the user. |

articles/active-directory-b2c/technical-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Read the [User flows and custom policies overview](user-flow-overview.md) articl
118118

119119
## User interface
120120

121-
In Azure AD B2C, you can craft your users' identity experiences so that the pages that are shown blend seamlessly with the look and feel of your brand. You get nearly full control of the HTML and CSS content presented to your users when they proceed through your application's identity journeys. With this flexibility, you can maintain brand and visual consistency between your application and Azure AD B2C.
121+
In Azure AD B2C, you can craft your users' identity experiences so that the pages that are shown blend seamlessly with the look and feel of your brand. You get nearly full control of the HTML and CSS content presented to your users when they proceed through your application's identity journeys. (Customizing the pages rendered by third parties when using social accounts is limited to the options provided by the identity provider, and these are outside the control of Azure AD B2C.) With this flexibility, you can maintain brand and visual consistency between your application and Azure AD B2C.
122122

123123

124124

@@ -200,7 +200,7 @@ The following diagram shows how Azure AD B2C can communicate using various proto
200200

201201
## Application integration
202202

203-
When a user wants to sign in to your application, the application initiates an authorization request to a user flow- or custom policy-provided endpoint. The user flow or custom policy defines and controls the user's experience. When they complete a user flow, for example the *sign-up or sign-in* flow, Azure AD B2C generates a token, then redirects the user back to your application.
203+
When a user wants to sign in to your application, the application initiates an authorization request to a user-flow or custom policy-provided endpoint. The user flow or custom policy defines and controls the user's experience. When they complete a user flow, for example the *sign up or sign in* flow, Azure AD B2C generates a token, then redirects the user back to your application. This token is specific to Azure AD B2C and is not to be confused with the token issued by third-party identity providers when using social accounts. For information about how to use third-party tokens, see [Pass an identity provider access token to your application in Azure Active Directory B2C](idp-pass-through-user-flow.md).
204204

205205
:::image type="content" source="media/technical-overview/app-integration.png" alt-text="Mobile app with arrows showing flow between Azure AD B2C sign-in page.":::
206206

@@ -226,7 +226,7 @@ Azure AD B2C evaluates each sign-in event and ensures that all policy requiremen
226226

227227
## Password complexity
228228

229-
During sign up or password reset, your users must supply a password that meets complexity rules. By default, Azure AD B2C enforces a strong password policy. Azure AD B2C also provides configuration options for specifying the complexity requirements of the passwords your customers use.
229+
During sign up or password reset, your users must supply a password that meets complexity rules. By default, Azure AD B2C enforces a strong password policy. Azure AD B2C also provides configuration options for specifying the complexity requirements of the passwords your customers use when they use local accounts.
230230

231231
![Screenshot of password complexity user experience](media/technical-overview/password-complexity.png)
232232

@@ -259,7 +259,7 @@ Sessions are modeled as encrypted data, with the decryption key known only to th
259259

260260
### Access to user data
261261

262-
Azure AD B2C tenants share many characteristics with enterprise Azure Active Directory tenants used for employees and partners. Shared aspects include mechanisms for viewing administrative roles, assigning roles, and auditing activities.
262+
Azure AD B2C tenants share many characteristics with enterprise Azure Active Directory tenants used for employees and partners. Shared aspects include mechanisms for viewing administrative roles, assigning roles, and auditing activities.
263263

264264
You can assign roles to control who can perform certain administrative actions in Azure AD B2C, including:
265265

articles/active-directory-b2c/userjourneys.md

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,16 @@ User journeys specify explicit paths through which a policy allows a relying par
2121

2222
These user journeys can be considered as templates available to satisfy the core need of the various relying parties of the community of interest. User journeys facilitate the definition of the relying party part of a policy. A policy can define multiple user journeys. Each user journey is a sequence of orchestration steps.
2323

24-
To define the user journeys supported by the policy, a **UserJourneys** element is added under the top-level element of the policy file.
24+
To define the user journeys supported by the policy, a `UserJourneys` element is added under the top-level `TrustFrameworkPolicy` element of the policy file.
25+
26+
```xml
27+
<TrustFrameworkPolicy ...>
28+
...
29+
<UserJourneys>
30+
...
31+
</UserJourneys>
32+
</TrustFrameworkPolicy>
33+
```
2534

2635
The **UserJourneys** element contains the following element:
2736

@@ -51,13 +60,13 @@ The **AuthorizationTechnicalProfiles** element contains the following element:
5160

5261
| Element | Occurrences | Description |
5362
| ------- | ----------- | ----------- |
54-
| AuthorizationTechnicalProfile | 0:1 | List of authorization technical profiles. |
63+
| AuthorizationTechnicalProfile | 0:1 | The technical profile reference used to authorize the user. |
5564

5665
The **AuthorizationTechnicalProfile** element contains the following attribute:
5766

5867
| Attribute | Required | Description |
5968
| --------- | -------- | ----------- |
60-
| TechnicalProfileReferenceId | Yes | The identifier of the technical profile that is to be executed. |
69+
| ReferenceId | Yes | The identifier of the technical profile that is to be executed. |
6170

6271
The following example shows a user journey element with authorization technical profiles:
6372

@@ -81,6 +90,13 @@ Orchestration steps can be conditionally executed based on preconditions defined
8190

8291
To specify the ordered list of orchestration steps, an **OrchestrationSteps** element is added as part of the policy. This element is required.
8392

93+
```xml
94+
<UserJourney Id="SignUpOrSignIn">
95+
<OrchestrationSteps>
96+
<OrchestrationStep Order="1" Type="CombinedSignInAndSignUp" ContentDefinitionReferenceId="api.signuporsignin">
97+
...
98+
```
99+
84100
The **OrchestrationSteps** element contains the following element:
85101

86102
| Element | Occurrences | Description |
@@ -92,7 +108,7 @@ The **OrchestrationStep** element contains the following attributes:
92108
| Attribute | Required | Description |
93109
| --------- | -------- | ----------- |
94110
| `Order` | Yes | The order of the orchestration steps. |
95-
| `Type` | Yes | The type of the orchestration step. Possible values: <ul><li>**ClaimsProviderSelection** - Indicates that the orchestration step presents various claims providers to the user to select one.</li><li>**CombinedSignInAndSignUp** - Indicates that the orchestration step presents a combined social provider sign-in and local account sign-up page.</li><li>**ClaimsExchange** - Indicates that the orchestration step exchanges claims with a claims provider.</li><li>**GetClaims** - Specifies that the orchestration step should process claim data sent to Azure AD B2C from the relying party via its `InputClaims` configuration.</li><li>**InvokeSubJourney** - Indicates that the orchestration step exchanges claims with a [sub journey](subjourneys.md) (in public preview).</li><li>**SendClaims** - Indicates that the orchestration step sends the claims to the relying party with a token issued by a claims issuer.</li></ul> |
111+
| `Type` | Yes | The type of the orchestration step. Possible values: <ul><li>**ClaimsProviderSelection** - Indicates that the orchestration step presents various claims providers to the user to select one.</li><li>**CombinedSignInAndSignUp** - Indicates that the orchestration step presents a combined social provider sign-in and local account sign-up page.</li><li>**ClaimsExchange** - Indicates that the orchestration step exchanges claims with a claims provider.</li><li>**GetClaims** - Specifies that the orchestration step should process claim data sent to Azure AD B2C from the relying party via its `InputClaims` configuration.</li><li>**InvokeSubJourney** - Indicates that the orchestration step exchanges claims with a [sub journey](subjourneys.md).</li><li>**SendClaims** - Indicates that the orchestration step sends the claims to the relying party with a token issued by a claims issuer.</li></ul> |
96112
| ContentDefinitionReferenceId | No | The identifier of the [content definition](contentdefinitions.md) associated with this orchestration step. Usually the content definition reference identifier is defined in the self-asserted technical profile. But, there are some cases when Azure AD B2C needs to display something without a technical profile. There are two examples - if the type of the orchestration step is one of following: `ClaimsProviderSelection` or `CombinedSignInAndSignUp`, Azure AD B2C needs to display the identity provider selection without having a technical profile. |
97113
| CpimIssuerTechnicalProfileReferenceId | No | The type of the orchestration step is `SendClaims`. This property defines the technical profile identifier of the claims provider that issues the token for the relying party. If absent, no relying party token is created. |
98114

@@ -124,7 +140,7 @@ The **Precondition** element contains the following attributes:
124140
| Attribute | Required | Description |
125141
| --------- | -------- | ----------- |
126142
| `Type` | Yes | The type of check or query to perform for this precondition. The value can be **ClaimsExist**, which specifies that the actions should be performed if the specified claims exist in the user's current claim set, or **ClaimEquals**, which specifies that the actions should be performed if the specified claim exists and its value is equal to the specified value. |
127-
| `ExecuteActionsIf` | Yes | Decides how the precondition is considered satisfied. Possible values: `true` (default), or `false`. If the value is set to `true`, it's considered satisfied when the claim matches the precondition. If the value is set to `false`, it's considered satisfied when the claim doesn't match the precondition. |
143+
| `ExecuteActionsIf` | Yes | Decides how the precondition is considered satisfied. Possible values: `true`, or `false`. If the value is set to `true`, it's considered satisfied when the claim matches the precondition. If the value is set to `false`, it's considered satisfied when the claim doesn't match the precondition. |
128144

129145
The **Precondition** elements contains the following elements:
130146

articles/container-apps/authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Container Apps uses [federated identity](https://en.wikipedia.org/wiki/Federated
4040
| - | - | - |
4141
| [Microsoft Identity Platform](../active-directory/fundamentals/active-directory-whatis.md) | `/.auth/login/aad` | [Microsoft Identity Platform](authentication-azure-active-directory.md) |
4242
| [Facebook](https://developers.facebook.com/docs/facebook-login) | `/.auth/login/facebook` | [Facebook](authentication-facebook.md) |
43-
| [GitHub](https://docs.github.com/en/developers/apps/building-oauth-apps/authorizing-oauth-apps) | `/.auth/login/github` | [Google](authentication-github.md) |
43+
| [GitHub](https://docs.github.com/en/developers/apps/building-oauth-apps/authorizing-oauth-apps) | `/.auth/login/github` | [GitHub](authentication-github.md) |
4444
| [Google](https://developers.google.com/identity/choose-auth) | `/.auth/login/google` | [Google](authentication-google.md) |
4545
| [Twitter](https://developer.twitter.com/en/docs/basics/authentication) | `/.auth/login/twitter` | [Twitter](authentication-twitter.md) |
4646
| Any [OpenID Connect](https://openid.net/connect/) provider | `/.auth/login/<providerName>` | [OpenID Connect](authentication-openid.md) |
@@ -142,7 +142,7 @@ In a client-directed sign-in, the application signs in the user to the identity
142142
To validate the provider token, container app must first be configured with the desired provider. At runtime, after you retrieve the authentication token from your provider, post the token to `/.auth/login/<provider>` for validation. For example:
143143

144144
```console
145-
POST https://<appname>.azurewebsites.net/.auth/login/aad HTTP/1.1
145+
POST https://<hostname>.azurecontainerapps.io/.auth/login/aad HTTP/1.1
146146
Content-Type: application/json
147147

148148
{"id_token":"<token>","access_token":"<token>"}

articles/container-apps/health-probes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Container Apps support the following probes:
1919
- [Startup](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-startup-probes): Delay reporting on a liveness or readiness state for slower apps with a startup probe.
2020
- [Readiness](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes): Signals that a replica is ready to accept traffic.
2121

22-
For a full listing of the specification supported in Azure Container Apps, refer to [Azure Rest API specs](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/CommonDefinitions.json#L119-L236).
22+
For a full listing of the specification supported in Azure Container Apps, refer to [Azure REST API specs](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/CommonDefinitions.json#L119-L236).
2323

2424
## HTTP probes
2525

articles/healthcare-apis/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Azure Health Data Services is a set of managed API services based on open standa
3535

3636
|Feature | Related information |
3737
| :------------------------ | -------------------------------: |
38-
|FHIRPath Patch |This new feature enables you to use the FHIRPath Patch operation on FHIR resources. For more information, see [FHIR Rest API capabilities for Azure Health Data Services FHIR service](./../healthcare-apis/fhir/fhir-rest-api-capabilities.md). |
38+
|FHIRPath Patch |This new feature enables you to use the FHIRPath Patch operation on FHIR resources. For more information, see [FHIR REST API capabilities for Azure Health Data Services FHIR service](./../healthcare-apis/fhir/fhir-rest-api-capabilities.md). |
3939

4040
### **Bug fixes**
4141

articles/static-web-apps/front-door-manual.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ Add the following settings to disable Front Door's caching policies from trying
110110

111111
1. Select the **Add an action** dropdown.
112112

113-
1. Select **Cache expiration**.
113+
1. Select **Route configuration override**.
114114

115-
1. Select **Bypass cache** in the *Cache Behavior* dropdown.
115+
1. Select **Disabled** in the *Caching* dropdown.
116116

117117
1. Select the **Save** button.
118118

0 commit comments

Comments
 (0)