Skip to content

Commit b9d4e39

Browse files
linda33wjlinda33wj
committed
2 parents 5c8f7a6 + c223372 commit b9d4e39

File tree

814 files changed

+12133
-8772
lines changed

Some content is hidden

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

814 files changed

+12133
-8772
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
Thumbs.db
44

55
# Visual Studio and VS Code files
6-
.settings.json
76
.vscode/*
87
.vs/*
98
log/
@@ -24,3 +23,4 @@ AzureMigration.ps1
2423
!/.vscode/extensions.json
2524
.gitignore
2625
**/.vscode/settings.json
26+
!/.vscode/settings.json

‎.openpublishing.redirection.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3732,7 +3732,12 @@
37323732
},
37333733
{
37343734
"source_path": "articles/azure-resource-manager/resource-group-create-multiple.md",
3735-
"redirect_url": "/azure/azure-resource-manager/templates/create-multiple-instances",
3735+
"redirect_url": "/azure/azure-resource-manager/templates/copy-resources",
3736+
"redirect_document_id": false
3737+
},
3738+
{
3739+
"source_path": "articles/azure-resource-manager/templates/create-multiple-instances.md",
3740+
"redirect_url": "/azure/azure-resource-manager/templates/copy-resources",
37363741
"redirect_document_id": false
37373742
},
37383743
{
@@ -4662,7 +4667,7 @@
46624667
},
46634668
{
46644669
"source_path": "articles/resource-group-create-multiple.md",
4665-
"redirect_url": "/azure/azure-resource-manager/templates/create-multiple-instances",
4670+
"redirect_url": "/azure/azure-resource-manager/templates/copy-resources",
46664671
"redirect_document_id": false
46674672
},
46684673
{
@@ -5655,6 +5660,11 @@
56555660
"redirect_url": "/azure/active-directory-b2c/custom-policy-get-started",
56565661
"redirect_document_id": true
56575662
},
5663+
{
5664+
"source_path": "articles/active-directory-b2c/custom-policy-ui-customization-dynamic.md",
5665+
"redirect_url": "/azure/active-directory-b2c/custom-policy-ui-customization",
5666+
"redirect_document_id": false
5667+
},
56585668
{
56595669
"source_path": "articles/active-directory-b2c/active-directory-b2c-overview-custom.md",
56605670
"redirect_url": "/azure/active-directory-b2c/custom-policy-overview",
@@ -12037,7 +12047,7 @@
1203712047
},
1203812048
{
1203912049
"source_path": "articles/azure-resource-manager/resource-manager-property-copy.md",
12040-
"redirect_url": "/azure/azure-resource-manager/templates/create-multiple-instances",
12050+
"redirect_url": "/azure/azure-resource-manager/templates/copy-properties",
1204112051
"redirect_document_id": false
1204212052
},
1204312053
{
@@ -12047,7 +12057,7 @@
1204712057
},
1204812058
{
1204912059
"source_path": "articles/azure-resource-manager/resource-manager-sequential-loop.md",
12050-
"redirect_url": "/azure/azure-resource-manager/templates/create-multiple-instances",
12060+
"redirect_url": "/azure/azure-resource-manager/templates/copy-resources",
1205112061
"redirect_document_id": false
1205212062
},
1205312063
{

‎.vscode/settings.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"markdown.docsetLanguages": [
3+
".NET Core CLI",
4+
"Apache",
5+
"ASPX",
6+
"AzCopy",
7+
"Azure CLI",
8+
"Azure CLI (Interactive)",
9+
"Azure Powershell",
10+
"Azure Powershell (Interactive)",
11+
"Bash",
12+
"C",
13+
"C#",
14+
"C# (Interactive)",
15+
"C++",
16+
"CSS",
17+
"DAX Power BI",
18+
"Diff",
19+
"Dockerfile",
20+
"DOS",
21+
"F#",
22+
"Go",
23+
"Gradle",
24+
"Groovy",
25+
"HTML",
26+
"HTTP",
27+
"Ini",
28+
"Java",
29+
"JavaScript",
30+
"JSON",
31+
"Kotlin",
32+
"Kusto",
33+
"Markdown",
34+
"MS Graph (Interactive)",
35+
"Objective C",
36+
"PHP",
37+
"Plaintext no highlight",
38+
"PostgreSQL & PL/pgSQL",
39+
"PowerShell",
40+
"PowerShell (Interactive)",
41+
"Properties",
42+
"Python",
43+
"R",
44+
"Razor CSHTML",
45+
"Ruby",
46+
"Scala",
47+
"Shell",
48+
"Solidity",
49+
"SQL",
50+
"Swift",
51+
"Terraform (HCL)",
52+
"TypeScript",
53+
"VB.NET",
54+
"XAML",
55+
"XML",
56+
"YAML"
57+
]
58+
}

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
22
# Cognitive Services
3-
articles/cognitive-services/ @diberry @erhopf, @nitinme
3+
articles/cognitive-services/ @diberry @erhopf @aahill @ievangelist @patrickfarley @nitinme
44

55
# DevOps
66
articles/ansible/ @TomArcherMsft

‎articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
href: user-flow-self-service-password-reset.md
102102
- name: UX customization
103103
items:
104-
- name: User interface customization
104+
- name: Customize the UI
105105
href: customize-ui-overview.md
106106
- name: JavaScript and page layouts
107107
href: user-flow-javascript-overview.md
@@ -177,8 +177,6 @@
177177
- name: Customize the UI
178178
href: custom-policy-ui-customization.md
179179
displayName: ux, input, cors, html, css
180-
- name: Customize the UI dynamically
181-
href: custom-policy-ui-customization-dynamic.md
182180
- name: Custom email
183181
href: custom-email.md
184182
displayName: verification

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 09/10/2018
12+
ms.date: 02/13/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -258,6 +258,7 @@ The following technical profile deletes a social user account using **alternativ
258258
| UserMessageIfClaimsPrincipalAlreadyExists | No | If an error is to be raised (see RaiseErrorIfClaimsPrincipalAlreadyExists attribute description), specify the message to show to the user if user object already exists. The value can be [localized](localization.md).|
259259
| ApplicationObjectId | No | The application object identifier for extension attributes. Value: ObjectId of an application. For more information, see [Use custom attributes in a custom profile edit policy](custom-policy-custom-attributes.md). |
260260
| ClientId | No | The client identifier for accessing the tenant as a third party. For more information, see [Use custom attributes in a custom profile edit policy](custom-policy-custom-attributes.md) |
261+
| IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |
261262

262263

263264

‎articles/active-directory-b2c/b2clogin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ There are several modifications you might need to make to migrate your applicati
4242

4343
* Change the redirect URL in your identity provider's applications to reference *b2clogin.com*.
4444
* Update your Azure AD B2C applications to use *b2clogin.com* in their user flow and token endpoint references.
45-
* Update any **Allowed Origins** that you've defined in the CORS settings for [user interface customization](custom-policy-ui-customization-dynamic.md).
45+
* Update any **Allowed Origins** that you've defined in the CORS settings for [user interface customization](custom-policy-ui-customization.md).
4646

4747
## Change identity provider redirect URLs
4848

@@ -117,4 +117,4 @@ For migrating Azure API Management APIs protected by Azure AD B2C, see the [Migr
117117
[msal-dotnet]: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet
118118
[msal-dotnet-b2c]: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/AAD-B2C-specifics
119119
[msal-js]: https://github.com/AzureAD/microsoft-authentication-library-for-js
120-
[msal-js-b2c]: ../active-directory/develop/msal-b2c-overview.md
120+
[msal-js-b2c]: ../active-directory/develop/msal-b2c-overview.md

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

Lines changed: 69 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 01/25/2019
12+
ms.date: 02/13/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -100,13 +100,35 @@ Any parameter name included as part of an OIDC or OAuth2 request can be mapped t
100100
| ----- | ----------------------- | --------|
101101
| {oauth2:access_token} | The access token. | N/A |
102102

103-
## How to use claim resolvers
103+
## Using claim resolvers
104+
105+
You can use claims resolvers with the following elements:
106+
107+
| Item | Element | Settings |
108+
| ----- | ----------------------- | --------|
109+
|Application Insights technical profile |`InputClaim` | |
110+
|[Azure Active Directory](active-directory-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
111+
|[OAuth2](oauth2-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
112+
|[OpenID Connect](openid-connect-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
113+
|[Claims transformation](claims-transformation-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
114+
|[RESTful provider](restful-technical-profile.md) technical profile| `InputClaim`| 1, 2|
115+
|[SAML2](saml-technical-profile.md) technical profile| `OutputClaim`| 1, 2|
116+
|[Self-Asserted](self-asserted-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
117+
|[ContentDefinition](contentdefinitions.md)| `LoadUri`| |
118+
|[ContentDefinitionParameters](relyingparty.md#contentdefinitionparameters)| `Parameter` | |
119+
|[RelyingParty](relyingparty.md#technicalprofile) technical profile| `OutputClaim`| 2 |
120+
121+
Settings:
122+
1. The `IncludeClaimResolvingInClaimsHandling` metadata must be set to `true`.
123+
1. The input or output claims attribute `AlwaysUseDefaultValue` must be set to `true`.
124+
125+
## Claim resolvers samples
104126

105127
### RESTful technical profile
106128

107129
In a [RESTful](restful-technical-profile.md) technical profile, you may want to send the user language, policy name, scope, and client ID. Based on these claims the REST API can run custom business logic, and if necessary raise a localized error message.
108130

109-
The following example shows a RESTful technical profile:
131+
The following example shows a RESTful technical profile with this scenario:
110132

111133
```XML
112134
<TechnicalProfile Id="REST">
@@ -116,12 +138,13 @@ The following example shows a RESTful technical profile:
116138
<Item Key="ServiceUrl">https://your-app.azurewebsites.net/api/identity</Item>
117139
<Item Key="AuthenticationType">None</Item>
118140
<Item Key="SendClaimsIn">Body</Item>
141+
<Item Key="IncludeClaimResolvingInClaimsHandling">true</Item>
119142
</Metadata>
120143
<InputClaims>
121-
<InputClaim ClaimTypeReferenceId="userLanguage" DefaultValue="{Culture:LCID}" />
122-
<InputClaim ClaimTypeReferenceId="policyName" DefaultValue="{Policy:PolicyId}" />
123-
<InputClaim ClaimTypeReferenceId="scope" DefaultValue="{OIDC:scope}" />
124-
<InputClaim ClaimTypeReferenceId="clientId" DefaultValue="{OIDC:ClientId}" />
144+
<InputClaim ClaimTypeReferenceId="userLanguage" DefaultValue="{Culture:LCID}" AlwaysUseDefaultValue="true" />
145+
<InputClaim ClaimTypeReferenceId="policyName" DefaultValue="{Policy:PolicyId}" AlwaysUseDefaultValue="true" />
146+
<InputClaim ClaimTypeReferenceId="scope" DefaultValue="{OIDC:scope}" AlwaysUseDefaultValue="true" />
147+
<InputClaim ClaimTypeReferenceId="clientId" DefaultValue="{OIDC:ClientId}" AlwaysUseDefaultValue="true" />
125148
</InputClaims>
126149
<UseTechnicalProfileForSessionManagement ReferenceId="SM-Noop" />
127150
</TechnicalProfile>
@@ -133,9 +156,9 @@ Using claim resolvers, you can prepopulate the sign-in name or direct sign-in to
133156

134157
### Dynamic UI customization
135158

136-
Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints so that you can dynamically render the page content. For example, you can change the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization-dynamic.md). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
159+
Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints to dynamically render the page content. For example, this allows the ability to modify the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization.md). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
137160

138-
The following example passes in the query string a parameter named **campaignId** with a value of `hawaii`, a **language** code of `en-US`, and **app** representing the client ID:
161+
The following example passes in the query string parameter named **campaignId** with a value of `hawaii`, a **language** code of `en-US`, and **app** representing the client ID:
139162

140163
```XML
141164
<UserJourneyBehaviors>
@@ -147,12 +170,23 @@ The following example passes in the query string a parameter named **campaignId*
147170
</UserJourneyBehaviors>
148171
```
149172

150-
As a result Azure AD B2C sends the above parameters to the HTML content page:
173+
As a result, Azure AD B2C sends the above parameters to the HTML content page:
151174

152175
```
153176
/selfAsserted.aspx?campaignId=hawaii&language=en-US&app=0239a9cc-309c-4d41-87f1-31288feb2e82
154177
```
155178

179+
### Content definition
180+
181+
In a [ContentDefinition](contentdefinitions.md) `LoadUri`, you can send claim resolvers to pull content from different places, based on the parameters used.
182+
183+
```XML
184+
<ContentDefinition Id="api.signuporsignin">
185+
<LoadUri>https://contoso.blob.core.windows.net/{Culture:LanguageName}/myHTML/unified.html</LoadUri>
186+
...
187+
</ContentDefinition>
188+
```
189+
156190
### Application Insights technical profile
157191

158192
With Azure Application Insights and claim resolvers you can gain insights on user behavior. In the Application Insights technical profile, you send input claims that are persisted to Azure Application Insights. For more information, see [Track user behavior in Azure AD B2C journeys by using Application Insights](analytics-with-application-insights.md). The following example sends the policy ID, correlation ID, language, and the client ID to Azure Application Insights.
@@ -170,3 +204,28 @@ With Azure Application Insights and claim resolvers you can gain insights on use
170204
</InputClaims>
171205
</TechnicalProfile>
172206
```
207+
208+
### Relying party policy
209+
210+
In a [Relying party](relyingparty.md) policy technical profile, you may want to send the tenant ID, or correlation ID to the relying party application within the JWT.
211+
212+
```XML
213+
<RelyingParty>
214+
<DefaultUserJourney ReferenceId="SignUpOrSignIn" />
215+
<TechnicalProfile Id="PolicyProfile">
216+
<DisplayName>PolicyProfile</DisplayName>
217+
<Protocol Name="OpenIdConnect" />
218+
<OutputClaims>
219+
<OutputClaim ClaimTypeReferenceId="displayName" />
220+
<OutputClaim ClaimTypeReferenceId="givenName" />
221+
<OutputClaim ClaimTypeReferenceId="surname" />
222+
<OutputClaim ClaimTypeReferenceId="email" />
223+
<OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="sub"/>
224+
<OutputClaim ClaimTypeReferenceId="identityProvider" />
225+
<OutputClaim ClaimTypeReferenceId="tenantId" AlwaysUseDefaultValue="true" DefaultValue="{Policy:TenantObjectId}" />
226+
<OutputClaim ClaimTypeReferenceId="correlationId" AlwaysUseDefaultValue="true" DefaultValue="{Context:CorrelationId}" />
227+
</OutputClaims>
228+
<SubjectNamingInfo ClaimType="sub" />
229+
</TechnicalProfile>
230+
</RelyingParty>
231+
```

‎articles/active-directory-b2c/claims-transformation-technical-profile.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 09/10/2018
12+
ms.date: 02/13/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -96,6 +96,12 @@ The claims transformation technical profile enables you to execute a claims tran
9696
</UserJourney>
9797
```
9898

99+
## Metadata
100+
101+
| Attribute | Required | Description |
102+
| --------- | -------- | ----------- |
103+
| IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |
104+
99105
## Use a validation technical profile
100106

101107
A claims transformation technical profile can be used to validate information. In the following example, the [self asserted technical profile](self-asserted-technical-profile.md) named **LocalAccountSignUpWithLogonEmail** asks the user to enter the email twice, then calls the [validation technical profile](validation-technical-profile.md) named **Validate-Email** to validate the emails. The **Validate-Email** technical profile calls the claims transformation **AssertEmailAreEqual** to compare the two claims **email** and **emailRepeat**, and throw an exception if they are not equal according to the specified comparison.

0 commit comments

Comments
 (0)