Skip to content

Commit dc4ff42

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into asc-melvyn-20200129
2 parents f2f095d + 73af96d commit dc4ff42

File tree

4,497 files changed

+71510
-48908
lines changed

Some content is hidden

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

4,497 files changed

+71510
-48908
lines changed

.openpublishing.publish.config.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158158
"branch": "master",
159159
"branch_mapping": {}
160-
},
160+
},
161161
{
162162
"path_to_root": "functions-quickstart-templates",
163163
"url": "https://github.com/Azure/azure-functions-templates",
@@ -187,7 +187,8 @@
187187
"path_to_root": "functions-docs-powershell",
188188
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
189189
"branch": "master"
190-
}, {
190+
},
191+
{
191192
"path_to_root": "samples-personalizer",
192193
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
193194
"branch": "master"
@@ -277,6 +278,11 @@
277278
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
278279
"branch": "master"
279280
},
281+
{
282+
"path_to_root": "MachineLearningNotebooks",
283+
"url": "https://github.com/Azure/MachineLearningNotebooks",
284+
"branch": "master"
285+
},
280286
{
281287
"path_to_root": "aml-sdk-samples",
282288
"url": "https://github.com/Azure/MachineLearningNotebooks",
@@ -361,7 +367,7 @@
361367
"path_to_root": "azure-sdk-for-java-script-event-hubs",
362368
"url": "https://github.com/Azure/azure-sdk-for-js/",
363369
"branch": "master"
364-
},
370+
},
365371
{
366372
"path_to_root": "azure-sdk-for-net-event-hubs",
367373
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -371,7 +377,7 @@
371377
"path_to_root": "azure-sdk-for-python-event-hubs",
372378
"url": "https://github.com/Azure/azure-sdk-for-python/",
373379
"branch": "master"
374-
},
380+
},
375381
{
376382
"path_to_root": "cosmos-dotnet-getting-started",
377383
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -505,5 +511,8 @@
505511
"Pdf": {
506512
"template_folder": "_themes.pdf"
507513
}
514+
},
515+
"docs_build_engine": {
516+
"name": "docfx_v3"
508517
}
509518
}

.openpublishing.redirection.json

Lines changed: 1184 additions & 69 deletions
Large diffs are not rendered by default.

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@
5757
],
5858
"cSpell.words": [
5959
"auditd"
60-
]
60+
],
61+
"git.ignoreLimitWarning": true
6162
}

CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ articles/jenkins/ @TomArcherMsft
99
articles/terraform/ @TomArcherMsft
1010

1111
# Requires Internal Review
12-
articles/best-practices-availability-paired-regions.md @jpconnock @arob98 @syntaxc4 @tysonn @snoviking
12+
articles/best-practices-availability-paired-regions.md @jpconnock @martinekuan @syntaxc4 @tysonn @snoviking
1313

1414
# Governance
1515
articles/governance/ @DCtheGeek
1616

1717
# Configuration
18-
*.json @SyntaxC4 @snoviking @arob98
19-
.acrolinx-config.edn @MonicaRush @arob98
20-
articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @arob98
18+
*.json @SyntaxC4 @snoviking @martinekuan
19+
.acrolinx-config.edn @MonicaRush @martinekuan
20+
articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @martinekuan

articles/active-directory-b2c/TOC.yml

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
href: custom-policy-overview.md
7575
- name: User accounts
7676
href: user-overview.md
77+
- name: User profile attributes
78+
href: user-profile-attributes.md
7779
- name: How-to guides
7880
items:
7981
- name: App integration
@@ -182,9 +184,13 @@
182184
- name: Customize the UI
183185
href: custom-policy-ui-customization.md
184186
displayName: ux, input, cors, html, css
187+
- name: Customize language
188+
href: custom-policy-localization.md
185189
- name: Custom email
186190
href: custom-email.md
187191
displayName: verification
192+
- name: Disable email verification
193+
href: custom-policy-disable-email-verification.md
188194
- name: Enable JavaScript
189195
href: javascript-samples.md
190196
- name: Password complexity
@@ -305,13 +311,15 @@
305311
items:
306312
- name: About technical profiles
307313
href: technical-profiles-overview.md
314+
- name: About validation technical profiles
315+
href: validation-technical-profile.md
316+
- name: Application Insights
317+
href: application-insights-technical-profile.md
318+
- name: Azure Active Directory
319+
href: active-directory-technical-profile.md
308320
- name: Azure Multi-Factor Authentication
309321
href: multi-factor-auth-technical-profile.md
310322
displayName: mfa
311-
- name: Claim resolvers
312-
href: claim-resolver-overview.md
313-
- name: Azure Active Directory
314-
href: active-directory-technical-profile.md
315323
- name: Claims transformation
316324
href: claims-transformation-technical-profile.md
317325
- name: JWT token issuer
@@ -325,21 +333,25 @@
325333
displayName: otp
326334
- name: OpenID Connect
327335
href: openid-connect-technical-profile.md
336+
- name: Phone factor
337+
href: phone-factor-technical-profile.md
328338
- name: REST
329339
href: restful-technical-profile.md
330340
- name: SAML
331341
href: saml-technical-profile.md
342+
- name: SAML token issuer
343+
href: saml-issuer-technical-profile.md
332344
- name: Self-asserted
333345
href: self-asserted-technical-profile.md
334346
- name: SSO session
335347
href: custom-policy-reference-sso.md
336348
displayName: single sign-on
337-
- name: Validation
338-
href: validation-technical-profile.md
339349
- name: UserJourneys
340350
href: userjourneys.md
341351
- name: RelyingParty
342352
href: relyingparty.md
353+
- name: Claim resolvers
354+
href: claim-resolver-overview.md
343355
- name: Use b2clogin.com
344356
items:
345357
- name: b2clogin.com overview
@@ -383,28 +395,28 @@
383395
href: user-migration.md
384396
- name: Reference
385397
items:
386-
- name: Identity Experience Framework release notes
387-
href: custom-policy-developer-notes.md
398+
- name: Billing model
399+
href: billing.md
388400
- name: Code samples
389401
href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
390-
- name: Page layout versions
391-
href: page-layout.md
392402
- name: Cookie definitions
393403
href: cookie-definitions.md
394404
displayName: cookies, SameSite
395405
- name: Error codes
396406
href: error-codes.md
407+
- name: Extensions app
408+
href: extensions-app.md
409+
- name: Identity Experience Framework release notes
410+
href: custom-policy-developer-notes.md
397411
- name: Microsoft Graph API operations
398412
href: microsoft-graph-operations.md
413+
- name: Page layout versions
414+
href: page-layout.md
399415
- name: Region availability & data residency
400416
href: data-residency.md
401-
- name: Billing model
402-
href: billing.md
403417
- name: Threat management
404418
href: threat-management.md
405419
displayName: security
406-
- name: Extensions app
407-
href: extensions-app.md
408420
- name: User flow versions
409421
href: user-flow-versions.md
410422
- name: Resources

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

Lines changed: 31 additions & 24 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: 03/05/2020
12+
ms.date: 03/16/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -52,21 +52,21 @@ The following example shows the **AAD-Common** technical profile:
5252
</TechnicalProfile>
5353
```
5454

55-
## Input claims
55+
## InputClaims
5656

57-
The following technical profiles include **InputClaims** for social and local accounts:
57+
The InputClaims element contains a claim, which is used to look up an account in the directory, or create a new one. There must be exactly one InputClaim element in the input claims collection for all Azure AD technical profiles. You may need to map the name of the claim defined in your policy to the name defined in Azure Active Directory.
5858

59-
- The social account technical profiles **AAD-UserReadUsingAlternativeSecurityId** and **AAD-UserWriteUsingAlternativeSecurityId** includes the **AlternativeSecurityId** claim. This claim contains the social account user identifier.
60-
- The local account technical profiles **AAD-UserReadUsingEmailAddress** and **AAD-UserWriteUsingLogonEmail** includes the **email** claim. This claim contains the sign-in name of the local account.
61-
- The unified (local and social) technical profiles **AAD-UserReadUsingObjectId**, **AAD-UserWritePasswordUsingObjectId**, **AAD-UserWriteProfileUsingObjectId**, and **AAD-UserWritePhoneNumberUsingObjectId** includes the **objectId** claim. The unique identifier of an account.
59+
To read, update, or delete an existing user account, the input claim is a key that uniquely identifies the account in Azure AD directory. For example, **objectId**, **userPrincipalName**, **signInNames.emailAddress**, **signInNames.userName**, or **alternativeSecurityId**.
6260

63-
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones.
61+
To create a new user account, the input claim is a key that uniquely identifies a local or federated account. For example, local account: **signInNames.emailAddress**, or **signInNames.userName**. For a federated account: the **alternativeSecurityId**.
6462

65-
## Output claims
63+
The [InputClaimsTransformations](technicalprofiles.md#inputclaimstransformations) element may contain a collection of input claims transformation elements that are used to modify the input claim or generate new one.
64+
65+
## OutputClaims
6666

6767
The **OutputClaims** element contains a list of claims returned by the Azure AD technical profile. You may need to map the name of the claim defined in your policy to the name defined in Azure Active Directory. You can also include claims that aren't returned by the Azure Active Directory, as long as you set the `DefaultValue` attribute.
6868

69-
The **OutputClaimsTransformations** element may contain a collection of **OutputClaimsTransformation** elements that are used to modify the output claims or generate new ones.
69+
The [OutputClaimsTransformations](technicalprofiles.md#outputclaimstransformations) element may contain a collection of **OutputClaimsTransformation** elements that are used to modify the output claims or generate new ones.
7070

7171
For example, the **AAD-UserWriteUsingLogonEmail** technical profile creates a local account and returns the following claims:
7272

@@ -88,7 +88,7 @@ For example, the **AAD-UserWriteUsingLogonEmail** technical profile creates a lo
8888

8989
## PersistedClaims
9090

91-
The **PersistedClaims** element contains all of the values that should be persisted by Azure AD with possible mapping information between a claim type already defined in the ClaimsSchema section in the policy and the Azure AD attribute name.
91+
The **PersistedClaims** element contains all of the values that should be persisted by Azure AD with possible mapping information between a claim type already defined in the [ClaimsSchema](claimsschema.md) section in the policy and the Azure AD attribute name.
9292

9393
The **AAD-UserWriteUsingLogonEmail** technical profile, which creates new local account, persists following claims:
9494

@@ -111,6 +111,7 @@ The name of the claim is the name of the Azure AD attribute unless the **Partner
111111
## Requirements of an operation
112112

113113
- There must be exactly one **InputClaim** element in the claims bag for all Azure AD technical profiles.
114+
- The [user profile attributes article](user-profile-attributes.md) describes the supported Azure AD B2C user profile attributes you can use in the input claims, output claims, and persisted claims.
114115
- If the operation is `Write` or `DeleteClaims`, then it must also appear in a **PersistedClaims** element.
115116
- The value of the **userPrincipalName** claim must be in the format of `[email protected]`.
116117
- The **displayName** claim is required and cannot be an empty string.
@@ -119,9 +120,7 @@ The name of the claim is the name of the Azure AD attribute unless the **Partner
119120

120121
### Read
121122

122-
The **Read** operation reads data about a single user account. To read user data, you need to provide a key as an input claim, such as **objectId**, **userPrincipalName**, **signInNames** (any type, user name and email-based account) or **alternativeSecurityId**.
123-
124-
The following technical profile reads data about a user account using the user's objectId:
123+
The **Read** operation reads data about a single user account. The following technical profile reads data about a user account using the user's objectId:
125124

126125
```XML
127126
<TechnicalProfile Id="AAD-UserReadUsingObjectId">
@@ -151,9 +150,7 @@ The following technical profile reads data about a user account using the user's
151150

152151
### Write
153152

154-
The **Write** operation creates or updates a single user account. To write a user account, you need to provide a key as an input claim, such as **objectId**, **userPrincipalName**, **signInNames.emailAddress**, or **alternativeSecurityId**.
155-
156-
The following technical profile creates new social account:
153+
The **Write** operation creates or updates a single user account. The following technical profile creates new social account:
157154

158155
```XML
159156
<TechnicalProfile Id="AAD-UserWriteUsingAlternativeSecurityId">
@@ -193,9 +190,7 @@ The following technical profile creates new social account:
193190

194191
### DeleteClaims
195192

196-
The **DeleteClaims** operation clears the information from a provided list of claims. To delete information from claims, you need to provide a key as an input claim, such as **objectId**, **userPrincipalName**, **signInNames.emailAddress** or **alternativeSecurityId**.
197-
198-
The following technical profile deletes claims:
193+
The **DeleteClaims** operation clears the information from a provided list of claims. The following technical profile deletes claims:
199194

200195
```XML
201196
<TechnicalProfile Id="AAD-DeleteClaimsUsingObjectId">
@@ -216,9 +211,7 @@ The following technical profile deletes claims:
216211

217212
### DeleteClaimsPrincipal
218213

219-
The **DeleteClaimsPrincipal** operation deletes a single user account from the directory. To delete a user account, you need to provide a key as an input claim, such as **objectId**, **userPrincipalName**, **signInNames.emailAddress** or **alternativeSecurityId**.
220-
221-
The following technical profile deletes a user account from the directory using the user principal name:
214+
The **DeleteClaimsPrincipal** operation deletes a single user account from the directory. The following technical profile deletes a user account from the directory using the user principal name:
222215

223216
```XML
224217
<TechnicalProfile Id="AAD-DeleteUserUsingObjectId">
@@ -253,13 +246,27 @@ The following technical profile deletes a social user account using **alternativ
253246
| --------- | -------- | ----------- |
254247
| Operation | Yes | The operation to be performed. Possible values: `Read`, `Write`, `DeleteClaims`, or `DeleteClaimsPrincipal`. |
255248
| RaiseErrorIfClaimsPrincipalDoesNotExist | No | Raise an error if the user object does not exist in the directory. Possible values: `true` or `false`. |
256-
| UserMessageIfClaimsPrincipalDoesNotExist | No | If an error is to be raised (see the RaiseErrorIfClaimsPrincipalDoesNotExist attribute description), specify the message to show to the user if user object does not exist. The value can be [localized](localization.md).|
257249
| RaiseErrorIfClaimsPrincipalAlreadyExists | No | Raise an error if the user object already exists. Possible values: `true` or `false`.|
258-
| 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).|
259250
| 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). |
260251
| 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) |
261252
| 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`. |
262253

254+
## Error messages
255+
256+
The following settings can be used to configure the error message displayed upon failure. The metadata should be configured in the [self-asserted](self-asserted-technical-profile.md) technical profile. The error messages can be [localized](localization.md).
257+
258+
| Attribute | Required | Description |
259+
| --------- | -------- | ----------- |
260+
| 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. |
261+
| UserMessageIfClaimsPrincipalDoesNotExist | No | If an error is to be raised (see the RaiseErrorIfClaimsPrincipalDoesNotExist attribute description), specify the message to show to the user if user object does not exist. |
262+
263+
264+
## Next steps
265+
266+
See the following article, for example of using Azure AD technical profile:
267+
268+
- [Add claims and customize user input using custom policies in Azure Active Directory B2C](custom-policy-configure-user-input.md)
269+
263270

264271

265272

0 commit comments

Comments
 (0)