Skip to content

Commit b0df8f8

Browse files
authored
Merge pull request #76782 from MicrosoftDocs/master
Merge master to live 3:00 AM
2 parents 752ba65 + 6bbb3ea commit b0df8f8

File tree

134 files changed

+924
-1199
lines changed

Some content is hidden

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

134 files changed

+924
-1199
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27419,6 +27419,11 @@
2741927419
"redirect_url": "/azure/azure-stack/azure-stack-registration",
2742027420
"redirect_document_id": false
2742127421
},
27422+
{
27423+
"source_path": "articles/sql-data-warehouse/release-notes.md",
27424+
"redirect_url": "/azure/sql-data-warehouse/release-notes-10-0-10106-0",
27425+
"redirect_document_id": false
27426+
},
2742227427
{
2742327428
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-overview.md",
2742427429
"redirect_url": "/azure/sql-data-warehouse/backup-and-restore",

articles/active-directory-b2c/active-directory-b2c-configure-signup-self-asserted-custom.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ ms.subservice: B2C
1616

1717
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1818

19-
In this article, you add a new user provided entry (a claim) to your sign-up user journey in Azure Active Directory (Azure AD) B2C. You configure the entry as a dropdown, and define whether it's required.
19+
In this article, you add a new user provided entry (a claim) to your sign-up user journey in Azure Active Directory (Azure AD) B2C. You configure the entry as a dropdown and define whether it's required.
2020

2121
## Prerequisites
2222

2323
Complete the steps in the article [Getting Started with Custom Policies](active-directory-b2c-get-started-custom.md). Test the sign-up or sign-in user journey to sign up a new local account before proceeding.
2424

2525
## Add claims
2626

27-
Gathering initial data from your users is achieved using the sign-up or sign-in user journey. Additional claims can be gathered later by using a profile edit user journey. Anytime Azure AD B2C gathers information directly from the user interactively, the Identity Experience Framework uses its selfasserted provider.
27+
Gathering initial data from your users is achieved using the sign-up or sign-in user journey. Additional claims can be gathered later by using a profile edit user journey. Anytime Azure AD B2C gathers information directly from the user interactively, the Identity Experience Framework uses its self-asserted provider.
2828

2929

3030
### Define the claim
3131

32-
Lets ask the user for their city. Add the following element to the **ClaimsSchema** element in the TrustFrameworkBase policy file:
32+
Let's ask the user for their city. Add the following element to the **ClaimsSchema** element in the TrustFrameworkBase policy file:
3333

3434
```xml
3535
<ClaimType Id="city">

articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You need to store your certificate in your Azure AD B2C tenant.
3131
1. Sign in to the [Azure portal](https://portal.azure.com/).
3232
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
3333
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
34-
4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
34+
4. On the Overview page, select **Identity Experience Framework**.
3535
5. Select **Policy Keys** and then select **Add**.
3636
6. For **Options**, choose `Upload`.
3737
7. Enter a **Name** for the policy key. For example, `SamlCert`. The prefix `B2C_1A_` is added automatically to the name of your key.

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ms.subservice: B2C
2929
1. Sign in to the [Azure portal](https://portal.azure.com/) as the global administrator of your Azure AD B2C tenant.
3030
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Click the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
3131
3. Choose **All services** in the top-left corner of the Azure portal, search for and select **Azure AD B2C**.
32-
4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
32+
4. On the Overview page, select **Identity Experience Framework**.
3333

3434
### Create the signing key
3535

articles/active-directory-b2c/active-directory-b2c-setup-aad-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You need to store the application key that you created in your Azure AD B2C tena
5151
5252
1. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
5353
2. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
54-
3. On the Overview page, select **Identity Experience Framework - PREVIEW**.
54+
3. On the Overview page, select **Identity Experience Framework**.
5555
4. Select **Policy Keys** and then select **Add**.
5656
5. For **Options**, choose `Manual`.
5757
6. Enter a **Name** for the policy key. For example, `ContosoAppSecret`. The prefix `B2C_1A_` is added automatically to the name of your key.

articles/active-directory-b2c/trustframeworkpolicy.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The following example shows how to specify a base policy. This **B2C_1A_TrustFra
112112

113113
## Policy execution
114114

115-
A relying party application, such as a web, mobile, or desktop application, calls the [relying party (RP) policy](relyingparty.md). The RP policy file executes a specific task, such as signing in, resetting a password, or editing a profile. The RP policy configures the list of claims the relying party application receives as part of the token that is issued. Multiple applications can use the same policy. All applications receive the same token with claims and the user goes through the same user journey. A single application can use multiple policies.
115+
A relying party application, such as a web, mobile, or desktop application, calls the [relying party (RP) policy](relyingparty.md). The RP policy file executes a specific task, such as signing in, resetting a password, or editing a profile. The RP policy configures the list of claims the relying party application receives as part of the token that is issued. Multiple applications can use the same policy. All applications receive the same token with claims, and the user goes through the same user journey. A single application can use multiple policies.
116116

117117
Inside the RP policy file, you specify the **DefaultUserJourney** element, which points to the [UserJourney](userjourneys.md). The user journey usually is defined in the Base or Extensions policy.
118118

@@ -134,7 +134,7 @@ B2C_1A_TrustFrameWorkBase or B2C_1A_TrustFrameworkExtensionPolicy:
134134

135135
A user journey defines the business logic of what a user goes through. Each user journey is a set of orchestration steps that performs a series of actions, in sequence in terms of authentication and information collection.
136136

137-
The **SocialAndLocalAccounts** policy file in the [starter pack](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started-custom#download-starter-pack-and-modify-policies) contains the SignUpOrSignIn, ProfileEdit, PasswordReset user journeys. You can add more user journeys for another scenarios, such as changing an email address, link and unlink a social account, or resetting a password.
137+
The **SocialAndLocalAccounts** policy file in the [starter pack](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started-custom#download-starter-pack-and-modify-policies) contains the SignUpOrSignIn, ProfileEdit, PasswordReset user journeys. You can add more user journeys for other scenarios, such as changing an email address or linking and unlinking a social account.
138138

139139
The orchestration steps may call a [Technical Profile](technicalprofiles.md). A technical profile provides a framework with a built-in mechanism to communicate with different types of parties. For example, a technical profile can perform these actions among others:
140140

@@ -153,4 +153,3 @@ The orchestration steps may call a [Technical Profile](technicalprofiles.md). A
153153
- [ClaimsProviders](claimsproviders.md)
154154
- [UserJourneys](userjourneys.md)
155155
- [RelyingParty](relyingparty.md)
156-

articles/active-directory-b2c/userjourneys.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.subservice: B2C
1919

2020
User journeys specify explicit paths through which a policy allows a relying party application to obtain the desired claims for a user. The user is taken through these paths to retrieve the claims that are to be presented to the relying party. In other words, user journeys define the business logic of what an end user goes through as the Azure AD B2C Identity Experience Framework processes the request.
2121

22-
These user journeys can be considered as templates available to satisfy the core need of the various replying parties of the community of interest. User journeys facilitate the definition the relying party part of a policy. A policy can define multiple user journeys. Each user journey is a sequence of orchestration steps.
22+
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

2424
To define the user journeys supported by the policy, a **UserJourneys** element is added under the top-level element of the policy file.
2525

@@ -45,7 +45,7 @@ The **UserJourney** element contains the following elements:
4545

4646
A user journey is represented as an orchestration sequence that must be followed through for a successful transaction. If any step fails, the transaction fails. These orchestration steps reference both the building blocks and the claims providers allowed in the policy file. Any orchestration step that is responsible to show or render a user experience also has a reference to the corresponding content definition identifier.
4747

48-
Orchestration steps can be conditionally executed, based on preconditions defined in the orchestration step element. For example you can check to perform an orchestration step only if a specific claims exists, or if a claim is equal or not to the specified value.
48+
Orchestration steps can be conditionally executed based on preconditions defined in the orchestration step element. For example, you can check to perform an orchestration step only if a specific claims exists, or if a claim is equal or not to the specified value.
4949

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

@@ -61,7 +61,7 @@ The **OrchestrationStep** element contains the following attributes:
6161
| --------- | -------- | ----------- |
6262
| `Order` | Yes | The order of the orchestration steps. |
6363
| `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>**SendClaims** - Indicates that the orchestration step sends the claims to the relying party with a token issued by a claims issuer.</li></ul> |
64-
| 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. |
64+
| 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. |
6565
| 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. |
6666

6767

@@ -84,7 +84,7 @@ The **Preconditions** element contains the following element:
8484

8585
#### Precondition
8686

87-
The **Precondition** element contains the following attribute:
87+
The **Precondition** element contains the following attributes:
8888

8989
| Attribute | Required | Description |
9090
| --------- | -------- | ----------- |
@@ -117,7 +117,7 @@ The following preconditions checks whether the user's objectId exists. In the us
117117
</OrchestrationStep>
118118
```
119119

120-
The following preconditions checks whether the user signed in with a social account. An attempt is made to find the user account in the directory. If the user signs in or signs up with a local account skip, this orchestration step.
120+
The following preconditions checks whether the user signed in with a social account. An attempt is made to find the user account in the directory. If the user signs in or signs up with a local account, skip this orchestration step.
121121

122122
```XML
123123
<OrchestrationStep Order="3" Type="ClaimsExchange">
@@ -134,7 +134,7 @@ The following preconditions checks whether the user signed in with a social acco
134134
</OrchestrationStep>
135135
```
136136

137-
Preconditions can check multiple preconditions. The following example checks whether 'objectId' or 'email' exists. If the first condition is true, The journey skips to the next orchestration step.
137+
Preconditions can check multiple preconditions. The following example checks whether 'objectId' or 'email' exists. If the first condition is true, the journey skips to the next orchestration step.
138138

139139
```XML
140140
<OrchestrationStep Order="4" Type="ClaimsExchange">
@@ -173,7 +173,7 @@ The **ClaimsProviderSelection** element contains the following attributes:
173173

174174
### ClaimsProviderSelection example
175175

176-
In the following orchestration step, the user can choose to sign in with, Facebook, LinkedIn, Twitter, Google, or a local account. If the user selects one of the social identity providers, the second orchestration step executes with the selected claim exchange specified in the `TargetClaimsExchangeId` attribute. The second orchestration step redirects the user to the social identity provider to complete the sign-in process. If the user chooses to sign in with the local account, Azure AD B2C stays on the same orchestration step (the same sign-up page or sign-in page) and skips the second orchestration step.
176+
In the following orchestration step, the user can choose to sign in with Facebook, LinkedIn, Twitter, Google, or a local account. If the user selects one of the social identity providers, the second orchestration step executes with the selected claim exchange specified in the `TargetClaimsExchangeId` attribute. The second orchestration step redirects the user to the social identity provider to complete the sign-in process. If the user chooses to sign in with the local account, Azure AD B2C stays on the same orchestration step (the same sign-up page or sign-in page) and skips the second orchestration step.
177177

178178
```XML
179179
<OrchestrationStep Order="1" Type="CombinedSignInAndSignUp" ContentDefinitionReferenceId="api.signuporsignin">

articles/active-directory/develop/active-directory-authentication-libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The Azure Active Directory Authentication Library (ADAL) v1.0 enables applicatio
4242
| .NET Client, Windows Store, Windows Phone 8.1 |ADAL .NET v2 |[NuGet](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory/2.28.4) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-dotnet/releases/tag/v2.28.4) | [Desktop app](https://github.com/AzureADQuickStarts/NativeClient-DotNet/releases/tag/v2.X) | |
4343
| JavaScript |ADAL.js |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[Single-page app](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi) | |
4444
| iOS, macOS |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc/releases) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc) |[iOS app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-ios) | [Reference](http://cocoadocs.org/docsets/ADAL/2.5.1/)|
45-
| Android |ADAL |[The Central Repository](https://search.maven.org/remotecontent?filepath=com/microsoft/aad/adal/) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-android) |[Android app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-android) | [JavaDocs](https://javadoc.io/doc/com.microsoft.aad/adal/)|
45+
| Android |ADAL |[Maven](https://search.maven.org/search?q=g:com.microsoft.aad+AND+a:adal&core=gav) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-android) |[Android app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-android) | [JavaDocs](https://javadoc.io/doc/com.microsoft.aad/adal/)|
4646
| Node.js |ADAL |[npm](https://www.npmjs.com/package/adal-node) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-nodejs) | [Node.js web app](https://github.com/Azure-Samples/active-directory-node-webapp-openidconnect)|[Reference](https://docs.microsoft.com/javascript/api/adal-node/?view=azure-node-latest) |
4747
| Java |ADAL4J |[Maven](https://search.maven.org/#search%7Cga%7C1%7Ca%3Aadal4j%20g%3Acom.microsoft.azure) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-java) |[Java web app](https://github.com/Azure-Samples/active-directory-java-webapp-openidconnect) |[Reference](https://javadoc.io/doc/com.microsoft.azure/adal4j) |
4848
| Python |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[Python web app](https://github.com/Azure-Samples/active-directory-python-webapp-graphapi) |[Reference](https://adal-python.readthedocs.io/) |

articles/active-directory/develop/active-directory-saml-claims-customization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ You can also use the claims transformations functions.
117117
| **Extract() - Before matching** | Returns the substring until it matches the specified value.<br/>For example, if the input's value is "BSimon_US", the matching value is "_US", then the claim's output is "BSimon". |
118118
| **Extract() - Between matching** | Returns the substring until it matches the specified value.<br/>For example, if the input's value is "Finance_BSimon_US", the first matching value is "Finance_", the second matching value is "_US", then the claim's output is "BSimon". |
119119
| **ExtractAlpha() - Prefix** | Returns the prefix alphabetical part of the string.<br/>For example, if the input's value is "BSimon_123", then it returns "BSimon". |
120-
| **ExtractAlpha() - Suffix** | Returns the suffix alphabetical part of the string.<br/>For example, if the input's value is "123_Simon", then it returns "BSimon". |
120+
| **ExtractAlpha() - Suffix** | Returns the suffix alphabetical part of the string.<br/>For example, if the input's value is "123_Simon", then it returns "Simon". |
121121
| **ExtractNumeric() - Prefix** | Returns the prefix numerical part of the string.<br/>For example, if the input's value is "123_BSimon", then it returns "123". |
122122
| **ExtractNumeric() - Suffix** | Returns the suffix numerical part of the string.<br/>For example, if the input's value is "BSimon_123", then it returns "123". |
123123
| **IfEmpty()** | Outputs an attribute or constant if the input is null or empty.<br/>For example, if you want to output an attribute stored in an extensionattribute if the employeeid for a given user is empty. To do this, you would configure the following values:<br/>Parameter 1(input): user.employeeid<br/>Parameter 2 (output): user.extensionattribute1<br/>Parameter 3 (output if there's no match): user.employeeid |

0 commit comments

Comments
 (0)