Skip to content

Commit 1ab526c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into quickstarts10
2 parents f42f564 + a09ff8e commit 1ab526c

File tree

476 files changed

+15645
-6421
lines changed

Some content is hidden

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

476 files changed

+15645
-6421
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,16 @@
820820
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
821821
"redirect_document_id": false
822822
},
823+
{
824+
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-bot-csharp-appinsights.md",
825+
"redirect_url": "/azure/cognitive-services/LUIS/luis-csharp-tutorial-bf-v4",
826+
"redirect_document_id": false
827+
},
828+
{
829+
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-bot-nodejs-appinsights.md",
830+
"redirect_url": "/azure/cognitive-services/LUIS/luis-nodejs-tutorial-bf-v4",
831+
"redirect_document_id": false
832+
},
823833
{
824834
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-pattern-roles.md",
825835
"redirect_url": "/azure/cognitive-services/LUIS/luis-tutorial-pattern",

articles/active-directory-b2c/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ GET https://<tenant-name>.b2clogin.com/tfp/<tenant-name>.onmicrosoft.com/<policy
6868
client_id=<application-ID>
6969
&nonce=anyRandomValue
7070
&redirect_uri=https://jwt.ms
71-
&scope=https://tenant-name>.onmicrosoft.com/api/read
71+
&scope=https://<tenant-name>.onmicrosoft.com/api/read
7272
&response_type=code
7373
```
7474

articles/active-directory-b2c/boolean-transformations.md

Lines changed: 39 additions & 2 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: 09/10/2018
12+
ms.date: 02/03/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -110,6 +110,44 @@ The self-asserted technical profile calls the validation **login-NonInteractive*
110110
- **valueToCompareTo**: true
111111
- Result: Error thrown
112112

113+
## CompareBooleanClaimToValue
114+
115+
Checks that boolean value of a claims is equal to `true` or `false`, and return the result of the compression.
116+
117+
| Item | TransformationClaimType | Data Type | Notes |
118+
| ---- | ------------------------ | ---------- | ----- |
119+
| inputClaim | inputClaim | boolean | The ClaimType to be asserted. |
120+
| InputParameter |valueToCompareTo | boolean | The value to compare (true or false). |
121+
| OutputClaim | inputClaim | boolean | The ClaimType that is produced after this ClaimsTransformation has been invoked. |
122+
123+
124+
The following claims transformation demonstrates how to check the value of a boolean ClaimType with a `true` value. If the value of the `IsAgeOver21Years` ClaimType is equal to `true`, the claims transformation returns `true`, otherwise `false`.
125+
126+
```XML
127+
<ClaimsTransformation Id="AssertAccountEnabled" TransformationMethod="CompareBooleanClaimToValue">
128+
<InputClaims>
129+
<InputClaim ClaimTypeReferenceId="IsAgeOver21Years" TransformationClaimType="inputClaim" />
130+
</InputClaims>
131+
<InputParameters>
132+
<InputParameter Id="valueToCompareTo" DataType="boolean" Value="true" />
133+
</InputParameters>
134+
<OutputClaims>
135+
<OutputClaim ClaimTypeReferenceId="accountEnabled" TransformationClaimType="compareResult"/>
136+
</OutputClaims>
137+
</ClaimsTransformation>
138+
```
139+
140+
### Example
141+
142+
- Input claims:
143+
- **inputClaim**: false
144+
- Input parameters:
145+
- **valueToCompareTo**: true
146+
- Output claims:
147+
- **compareResult**: false
148+
149+
150+
113151
## NotClaims
114152

115153
Performs a Not operation of the boolean inputClaim and sets the outputClaim with result of the operation.
@@ -170,4 +208,3 @@ The following claims transformation demonstrates how to `Or` two boolean ClaimTy
170208
- **inputClaim2**: false
171209
- Output claims:
172210
- **outputClaim**: true
173-

articles/active-directory-b2c/claimsproviders.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 09/10/2018
11+
ms.date: 01/29/2020
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -48,7 +48,7 @@ The **ClaimsProvider** element contains the following child elements:
4848
| Element | Occurrences | Description |
4949
| ------- | ---------- | ----------- |
5050
| Domain | 0:1 | A string that contains the domain name for the claim provider. For example, if your claims provider includes the Facebook technical profile, the domain name is Facebook.com. This domain name is used for all technical profiles defined in the claims provider unless overridden by the technical profile. The domain name can also be referenced in a **domain_hint**. For more information, see the **Redirect sign-in to a social provider** section of [Set up direct sign-in using Azure Active Directory B2C](direct-signin.md). |
51-
| DisplayName | 1:1 | A string that contains the name of the claims provider that can be displayed to users. |
51+
| DisplayName | 1:1 | A string that contains the name of the claims provider. |
5252
| [TechnicalProfiles](technicalprofiles.md) | 0:1 | A set of technical profiles supported by the claim provider |
5353

5454
**ClaimsProvider** organizes how your technical profiles relate to the claims provider. The following example shows the Azure Active Directory claims provider with the Azure Active Directory technical profiles:

articles/active-directory-b2c/claimsschema.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 09/10/2018
11+
ms.date: 03/02/2020
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -46,8 +46,8 @@ The **ClaimType** element contains the following elements:
4646

4747
| Element | Occurrences | Description |
4848
| ------- | ----------- | ----------- |
49-
| DisplayName | 0:1 | The title that's displayed to users on various screens. The value can be [localized](localization.md). |
50-
| DataType | 0:1 | The type of the claim. The data types of boolean, date, dateTime, int, long, string, stringCollection, alternativeSecurityIdCollection can be used. |
49+
| DisplayName | 1:1 | The title that's displayed to users on various screens. The value can be [localized](localization.md). |
50+
| DataType | 1:1 | The type of the claim. The data types of boolean, date, dateTime, int, long, string, stringCollection can be used. Primitive data type represents the equivalent of C# variable data type. stringCollection represents a collection of strings. For more information see [C# Types and variables](https://docs.microsoft.com/dotnet/csharp/tour-of-csharp/types-and-variables). Date follows ISO 8601 convention. |
5151
| DefaultPartnerClaimTypes | 0:1 | The partner default claim types to use for a specified protocol. The value can be overwritten in the **PartnerClaimType** specified in the **InputClaim** or **OutputClaim** elements. Use this element to specify the default name for a protocol. |
5252
| Mask | 0:1 | An optional string of masking characters that can be applied when displaying the claim. For example, the phone number 324-232-4343 can be masked as XXX-XXX-4343. |
5353
| UserHelpText | 0:1 | A description of the claim type that can be helpful for users to understand its purpose. The value can be [localized](localization.md). |
@@ -61,7 +61,7 @@ The **DefaultPartnerClaimTypes** may contain the following element:
6161

6262
| Element | Occurrences | Description |
6363
| ------- | ----------- | ----------- |
64-
| Protocol | 0:n | List of protocols with their default partner claim type name. |
64+
| Protocol | 1:n | List of protocols with their default partner claim type name. |
6565

6666
The **Protocol** element contains the following attributes:
6767

articles/active-directory-b2c/code-samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: mmacy
66
manager: celestedg
77

88
ms.author: marsma
9-
ms.date: 01/23/2018
9+
ms.date: 01/29/2020
1010
ms.custom: mvc
1111
ms.topic: sample
1212
ms.service: active-directory
@@ -37,6 +37,7 @@ The following tables provide links to samples for applications including iOS, An
3737
| [openidconnect-nodejs](https://github.com/AzureADQuickStarts/B2C-WebApp-OpenIDConnect-NodeJS) | A Node.js app that provides a quick and easy way to set up a Web application with Express using OpenID Connect. |
3838
| [javascript-nodejs-webapp](https://github.com/AzureADQuickStarts/active-directory-b2c-javascript-nodejs-webapp) | A node.js server that provides a quick and easy way to set up a REST API service using the OAuth2 protocol. |
3939
| [javascript-nodejs-webapi](https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi) | A small node.js Web API for Azure AD B2C that shows how to protect your web api and accept B2C access tokens using passport.js. |
40+
| [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp/blob/master/README_B2C.md) | Demonstrate how to Integrate B2C of Microsoft identity platform with a Python web application. |
4041

4142
## Single page apps
4243

articles/active-directory-b2c/date-transformations.md

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 09/10/2018
11+
ms.date: 02/03/2020
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -110,6 +110,35 @@ The following example demonstrates the conversion of the claim `dateOfBirth` (da
110110
- Output claims:
111111
- **outputClaim**: 1559347200 (June 1, 2019 12:00:00 AM)
112112

113+
## ConvertDateTimeToDateClaim
114+
115+
Converts a **DateTime** ClaimType to a **Date** ClaimType. The claims transformation removes the time format from the date.
116+
117+
| Item | TransformationClaimType | Data Type | Notes |
118+
| ---- | ----------------------- | --------- | ----- |
119+
| InputClaim | inputClaim | dateTime | The ClaimType to be converted. |
120+
| OutputClaim | outputClaim | date | The ClaimType that is produced after this ClaimsTransformation has been invoked. |
121+
122+
The following example demonstrates the conversion of the claim `systemDateTime` (dateTime data type) to another claim `systemDate` (date data type).
123+
124+
```XML
125+
<ClaimsTransformation Id="ConvertToDate" TransformationMethod="ConvertDateTimeToDateClaim">
126+
<InputClaims>
127+
<InputClaim ClaimTypeReferenceId="systemDateTime" TransformationClaimType="inputClaim" />
128+
</InputClaims>
129+
<OutputClaims>
130+
<OutputClaim ClaimTypeReferenceId="systemDate" TransformationClaimType="outputClaim" />
131+
</OutputClaims>
132+
</ClaimsTransformation>
133+
```
134+
135+
### Example
136+
137+
- Input claims:
138+
- **inputClaim**: 1559347200 (June 1, 2019 12:00:00 AM)
139+
- Output claims:
140+
- **outputClaim**: 2019-06-01
141+
113142
## GetCurrentDateTime
114143

115144
Get the current UTC date and time and add the value to a ClaimType.

articles/active-directory-b2c/general-transformations.md

Lines changed: 30 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: 08/27/2019
12+
ms.date: 02/03/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -20,6 +20,35 @@ ms.subservice: B2C
2020

2121
This article provides examples for using general claims transformations of the Identity Experience Framework schema in Azure Active Directory B2C (Azure AD B2C). For more information, see [ClaimsTransformations](claimstransformations.md).
2222

23+
## CopyClaim
24+
25+
Copy value of a claim to another. Both claims must be from the same type.
26+
27+
| Item | TransformationClaimType | Data Type | Notes |
28+
| ---- | ----------------------- | --------- | ----- |
29+
| InputClaim | inputClaim | string, int | The claim type which is to be copied. |
30+
| OutputClaim | outputClaim | string, int | The ClaimType that is produced after this ClaimsTransformation has been invoked. |
31+
32+
Use this claims transformation to copy a value from a string or numeric claim, to another claim. The following example copies the externalEmail claim value to email claim.
33+
34+
```XML
35+
<ClaimsTransformation Id="CopyEmailAddress" TransformationMethod="CopyClaim">
36+
<InputClaims>
37+
<InputClaim ClaimTypeReferenceId="externalEmail" TransformationClaimType="inputClaim"/>
38+
</InputClaims>
39+
<OutputClaims>
40+
<OutputClaim ClaimTypeReferenceId="email" TransformationClaimType="outputClaim"/>
41+
</OutputClaims>
42+
</ClaimsTransformation>
43+
```
44+
45+
### Example
46+
47+
- Input claims:
48+
- **inputClaim**: [email protected]
49+
- Output claims:
50+
- **outputClaim**: [email protected]
51+
2352
## DoesClaimExist
2453

2554
Checks if the **inputClaim** exists or not and sets **outputClaim** to true or false accordingly.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 01/31/2020
11+
ms.date: 02/03/2020
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -212,7 +212,8 @@ The following are the IDs for a [Verification display control](display-control-v
212212
|verification_control_but_send_new_code |Send New Code |
213213
|verification_control_but_verify_code |Verify Code |
214214

215-
### Verification display control error messages
215+
## One time password error messages
216+
The following are the IDs for a [one time password technical profile](one-time-password-technical-profile.md) error messages
216217

217218
| ID | Default value |
218219
| -- | ------------- |

articles/active-directory-b2c/one-time-password-technical-profile.md

Lines changed: 3 additions & 2 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: 12/10/2019
12+
ms.date: 02/03/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -73,6 +73,7 @@ The following settings can be used to configure code generation and maintenance:
7373
| CodeLength | No | Length of the code. The default value is `6`. |
7474
| CharacterSet | No | The character set for the code, formatted for use in a regular expression. For example, `a-z0-9A-Z`. The default value is `0-9`. The character set must include a minimum of 10 different characters in the set specified. |
7575
| NumRetryAttempts | No | The number of verification attempts before the code is considered invalid. The default value is `5`. |
76+
| Operation | Yes | The operation to be performed. Possible values: `GenerateCode`, or `VerifyCode`. |
7677
| ReuseSameCode | No | Whether a duplicate code should be given rather than generating a new code when given code has not expired and is still valid. The default value is `false`. |
7778

7879
### Returning error message
@@ -162,4 +163,4 @@ The following example `TechnicalProfile` is used for verifying a code:
162163
<InputClaim ClaimTypeReferenceId="otpGenerated" PartnerClaimType="otpToVerify" />
163164
</InputClaims>
164165
</TechnicalProfile>
165-
```
166+
```

0 commit comments

Comments
 (0)