Skip to content

Commit d16ee81

Browse files
authored
Merge branch 'master' into 1669724-update-documents-with-correct-azure-cli-tags-02-14
2 parents 57787e0 + 0e24c1e commit d16ee81

File tree

2,579 files changed

+63689
-45208
lines changed

Some content is hidden

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

2,579 files changed

+63689
-45208
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,11 @@
419419
"url": "https://github.com/Azure/azure-cosmosdb-java",
420420
"branch": "master"
421421
},
422+
{
423+
"path_to_root": "azure-cosmosdb-graph-dotnet",
424+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
425+
"branch": "master"
426+
},
422427
{
423428
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
424429
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",

.openpublishing.redirection.json

Lines changed: 422 additions & 36 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/TOC.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
- name: Register a SAML service provider
8282
href: connect-with-saml-service-providers.md
8383
displayName: SP, RP, service provider, connect
84+
- name: Register a Graph application
85+
href: microsoft-graph-get-started.md
86+
displayName: migrate, migration, microsoft graph
8487
- name: Add a web API application
8588
href: add-web-application.md
8689
- name: Add a native client application
@@ -101,7 +104,7 @@
101104
href: user-flow-self-service-password-reset.md
102105
- name: UX customization
103106
items:
104-
- name: User interface customization
107+
- name: Customize the UI
105108
href: customize-ui-overview.md
106109
- name: JavaScript and page layouts
107110
href: user-flow-javascript-overview.md
@@ -177,8 +180,6 @@
177180
- name: Customize the UI
178181
href: custom-policy-ui-customization.md
179182
displayName: ux, input, cors, html, css
180-
- name: Customize the UI dynamically
181-
href: custom-policy-ui-customization-dynamic.md
182183
- name: Custom email
183184
href: custom-email.md
184185
displayName: verification
@@ -349,10 +350,14 @@
349350
- name: Azure Monitor
350351
href: azure-monitor.md
351352
displayName: log, logs, logging, usage, events
352-
- name: Export usage report
353-
href: view-usage-reports.md
354353
- name: Account management
355354
href: manage-user-accounts-graph-api.md
355+
- name: Deploy with Azure Pipelines
356+
href: deploy-custom-policies-devops.md
357+
displayName: azure devops, ci/cd, cicd, custom policy, policies
358+
- name: Manage policies with PowerShell
359+
href: manage-custom-policies-powershell.md
360+
displayName: scripting, scripts, psh, custom policy
356361
- name: Audit logs
357362
href: view-audit-logs.md
358363
- name: Manage users - Azure portal
@@ -373,8 +378,6 @@
373378
items:
374379
- name: Migrate users
375380
href: user-migration.md
376-
- name: Migrate users with external identities
377-
href: migrate-social-identities.md
378381
- name: Reference
379382
items:
380383
- name: Identity Experience Framework release notes
@@ -388,9 +391,11 @@
388391
displayName: cookies, SameSite
389392
- name: Error codes
390393
href: error-codes.md
394+
- name: Microsoft Graph API operations
395+
href: microsoft-graph-operations.md
391396
- name: Region availability & data residency
392397
href: data-residency.md
393-
- name: Enable billing
398+
- name: Billing model
394399
href: billing.md
395400
- name: Threat management
396401
href: threat-management.md

articles/active-directory-b2c/application-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ To set up client credential flow, see [Azure Active Directory v2.0 and the OAuth
121121

122122
#### Web API chains (on-behalf-of flow)
123123

124-
Many architectures include a web API that needs to call another downstream web API, where both are secured by Azure AD B2C. This scenario is common in native clients that have a Web API back-end and calls a Microsoft online service such as the Microsoft Graph API or Azure AD Graph API.
124+
Many architectures include a web API that needs to call another downstream web API, where both are secured by Azure AD B2C. This scenario is common in native clients that have a Web API back-end and calls a Microsoft online service such as the Microsoft Graph API.
125125

126126
This chained web API scenario can be supported by using the OAuth 2.0 JWT bearer credential grant, also known as the on-behalf-of flow. However, the on-behalf-of flow is not currently implemented in the Azure AD B2C.
127127

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/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ Before you initiate the move, be sure to read the entire article to fully unders
136136

137137
## Next steps
138138

139-
In addition to reviewing the usage and billing details within a selected Azure subscription, you can review detailed day-by-day usage reports by using the [usage reporting API](view-usage-reports.md).
139+
For the latest pricing information, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).

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

Lines changed: 14 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: 02/13/2020
12+
ms.date: 02/17/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -100,6 +100,18 @@ 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+
104+
### SAML
105+
106+
| Claim | Description | Example |
107+
| ----- | ----------- | --------|
108+
| {SAML:AuthnContextClassReferences} | The `AuthnContextClassRef` element value, from the SAML request. | urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport |
109+
| {SAML:NameIdPolicyFormat} | The `Format` attribute, from the `NameIDPolicy` element of the SAML request. | urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress |
110+
| {SAML:Issuer} | The SAML `Issuer` element value of the SAML request.| https://contoso.com |
111+
| {SAML:AllowCreate} | The `AllowCreate` attribute value, from the `NameIDPolicy` element of the SAML request. | True |
112+
| {SAML:ForceAuthn} | The `ForceAuthN` attribute value, from the `AuthnRequest` element of the SAML request. | True |
113+
| {SAML:ProviderName} | The `ProviderName` attribute value, from the `AuthnRequest` element of the SAML request.| Contoso.com |
114+
103115
## Using claim resolvers
104116

105117
You can use claims resolvers with the following elements:
@@ -156,7 +168,7 @@ Using claim resolvers, you can prepopulate the sign-in name or direct sign-in to
156168

157169
### Dynamic UI customization
158170

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-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.
171+
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.
160172

161173
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:
162174

articles/active-directory-b2c/claimsschema.md

Lines changed: 51 additions & 18 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: 02/12/2020
11+
ms.date: 02/24/2020
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -47,14 +47,32 @@ The **ClaimType** element contains the following elements:
4747
| Element | Occurrences | Description |
4848
| ------- | ----------- | ----------- |
4949
| 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 and phoneNumber 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. |
50+
| DataType | 1:1 | The type of the claim. |
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). |
5454
| UserInputType | 0:1 | The type of input control that should be available to the user when manually entering the claim data for the claim type. See the user input types defined later in this page. |
5555
| Restriction | 0:1 | The value restrictions for this claim, such as a regular expression (Regex) or a list of acceptable values. The value can be [localized](localization.md). |
5656
PredicateValidationReference| 0:1 | A reference to a **PredicateValidationsInput** element. The **PredicateValidationReference** elements enable you to perform a validation process to ensure that only properly formed data is entered. For more information, see [Predicates](predicates.md). |
5757

58+
### DataType
59+
60+
The **DataType** element supports the following values:
61+
62+
| Type | Description |
63+
| ------- | ----------- |
64+
|boolean|Represents a Boolean (`true` or `false`) value.|
65+
|date| Represents an instant in time, typically expressed as a date of a day. The value of the date follows ISO 8601 convention.|
66+
|dateTime|Represents an instant in time, typically expressed as a date and time of day. The value of the date follows ISO 8601 convention.|
67+
|duration|Represents a time interval in years, months, days, hours, minutes, and seconds. The format of is `PnYnMnDTnHnMnS`, where `P` indicates positive, or `N` for negative value. `nY` is the number of years followed by a literal `Y`. `nMo` is the number of months followed by a literal `Mo`. `nD` is the number of days followed by a literal `D`. Examples: `P21Y` represents 21 years. `P1Y2Mo` represents one year, and two months. `P1Y2Mo5D` represents one year, two months, and five days. `P1Y2M5DT8H5M620S` represents one year, two months, five days, eight hours, five minutes, and twenty seconds. |
68+
|phoneNumber|Represents a phone number. |
69+
|int| Represents number between -2,147,483,648 and 2,147,483,647|
70+
|long| Represents number between -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807 |
71+
|string| Represents text as a sequence of UTF-16 code units.|
72+
|stringCollection|Represents a collection of `string`.|
73+
|userIdentity| Represents a user identity.|
74+
|userIdentityCollection|Represents a collection of `userIdentity`.|
75+
5876
### DefaultPartnerClaimTypes
5977

6078
The **DefaultPartnerClaimTypes** may contain the following element:
@@ -151,7 +169,9 @@ The **Restriction** element contains the following elements:
151169
| Enumeration | 1:n | The available options in the user interface for the user to select for a claim, such as a value in a dropdown. |
152170
| Pattern | 1:1 | The regular expression to use. |
153171

154-
### Enumeration
172+
#### Enumeration
173+
174+
The **Enumeration** element defines available options for the user to select for a claim in the user interface, such as a value in a `CheckboxMultiSelect`, `DropdownSingleSelect`, or `RadioSingleSelect`. Alternatively, you can define and localize available options with [LocalizedCollections](localization.md#localizedcollections) element. To look up an item from a claim **Enumeration** collection, use [GetMappedValueFromLocalizedCollection](string-transformations.md#getmappedvaluefromlocalizedcollection) claims transformation.
155175

156176
The **Enumeration** element contains the following attributes:
157177

@@ -187,7 +207,7 @@ The **Pattern** element can contain the following attributes:
187207
| Attribute | Required | Description |
188208
| --------- | -------- | ----------- |
189209
| RegularExpression | Yes | The regular expression that claims of this type must match in order to be valid. |
190-
| HelpText | No | The pattern or regular expression for this claim. |
210+
| HelpText | No | An error message for users if the regular expression check fails. |
191211

192212
The following example configures an **email** claim with regular expression input validation and help text:
193213

@@ -210,11 +230,26 @@ The Identity Experience Framework renders the email address claim with email for
210230

211231
![TextBox showing error message triggered by regex restriction](./media/claimsschema/pattern.png)
212232

213-
## UserInputType
233+
### UserInputType
214234

215-
Azure AD B2C supports a variety of user input types, such as a textbox, password, and dropdown list that can be used when manually entering claim data for the claim type. You must specify the **UserInputType** when you collect information from the user by using a [self-asserted technical profile](self-asserted-technical-profile.md).
235+
Azure AD B2C supports a variety of user input types, such as a textbox, password, and dropdown list that can be used when manually entering claim data for the claim type. You must specify the **UserInputType** when you collect information from the user by using a [self-asserted technical profile](self-asserted-technical-profile.md) and [display controls](display-controls.md).
216236

217-
### TextBox
237+
The **UserInputType** element available user input types:
238+
239+
| UserInputType | Supported ClaimType | Description |
240+
| --------- | -------- | ----------- |
241+
|CheckboxMultiSelect| `string` |Multi select drop-down box. The claim value is represented in a comma delimiter string of the selected values. |
242+
|DateTimeDropdown | `date`, `dateTime` |Drop-downs to select a day, month, and year. |
243+
|DropdownSingleSelect |`string` |Single select drop-down box. The claim value is the selected value.|
244+
|EmailBox | `string` |Email input field. |
245+
|Paragraph | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`|A field that shows text only in a paragraph tag. |
246+
|Password | `string` |Password text box.|
247+
|RadioSingleSelect |`string` | Collection of radio buttons. The claim value is the selected value.|
248+
|Readonly | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`| Read-only text box. |
249+
|TextBox |`boolean`, `int`, `string` |Single-line text box. |
250+
251+
252+
#### TextBox
218253

219254
The **TextBox** user input type is used to provide a single-line text box.
220255

@@ -229,7 +264,7 @@ The **TextBox** user input type is used to provide a single-line text box.
229264
</ClaimType>
230265
```
231266

232-
### EmailBox
267+
#### EmailBox
233268

234269
The **EmailBox** user input type is used to provide a basic email input field.
235270

@@ -247,7 +282,7 @@ The **EmailBox** user input type is used to provide a basic email input field.
247282
</ClaimType>
248283
```
249284

250-
### Password
285+
#### Password
251286

252287
The **Password** user input type is used to record a password entered by the user.
253288

@@ -262,7 +297,7 @@ The **Password** user input type is used to record a password entered by the use
262297
</ClaimType>
263298
```
264299

265-
### DateTimeDropdown
300+
#### DateTimeDropdown
266301

267302
The **DateTimeDropdown** user input type is used to provide a set of drop-downs to select a day, month, and year. You can use Predicates and PredicateValidations elements to control the minimum and maximum date values. For more information, see the **Configure a date range** section of [Predicates and PredicateValidations](predicates.md).
268303

@@ -277,7 +312,7 @@ The **DateTimeDropdown** user input type is used to provide a set of drop-downs
277312
</ClaimType>
278313
```
279314

280-
### RadioSingleSelect
315+
#### RadioSingleSelect
281316

282317
The **RadioSingleSelect** user input type is used to provide a collection of radio buttons that allows the user to select one option.
283318

@@ -296,7 +331,7 @@ The **RadioSingleSelect** user input type is used to provide a collection of rad
296331
</ClaimType>
297332
```
298333

299-
### DropdownSingleSelect
334+
#### DropdownSingleSelect
300335

301336
The **DropdownSingleSelect** user input type is used to provide a drop-down box that allows the user to select one option.
302337

@@ -315,7 +350,7 @@ The **DropdownSingleSelect** user input type is used to provide a drop-down box
315350
</ClaimType>
316351
```
317352

318-
### CheckboxMultiSelect
353+
#### CheckboxMultiSelect
319354

320355
The **CheckboxMultiSelect** user input type is used to provide a collection of checkboxes that allows the user to select multiple options.
321356

@@ -334,7 +369,7 @@ The **CheckboxMultiSelect** user input type is used to provide a collection of c
334369
</ClaimType>
335370
```
336371

337-
### Readonly
372+
#### Readonly
338373

339374
The **Readonly** user input type is used to provide a readonly field to display the claim and value.
340375

@@ -350,9 +385,9 @@ The **Readonly** user input type is used to provide a readonly field to display
350385
```
351386

352387

353-
### Paragraph
388+
#### Paragraph
354389

355-
The **Paragraph** user input type is used to provide a field that shows text only in a paragraph tag. For example, &lt;p&gt;text&lt;/p&gt;.
390+
The **Paragraph** user input type is used to provide a field that shows text only in a paragraph tag. For example, &lt;p&gt;text&lt;/p&gt;. A **Paragraph** user input type `OutputClaim` of self-asserted technical profile, must set the `Required` attribute `false` (default).
356391

357392
![Using claim type with paragraph](./media/claimsschema/paragraph.png)
358393

@@ -370,5 +405,3 @@ The **Paragraph** user input type is used to provide a field that shows text onl
370405
</Restriction>
371406
</ClaimType>
372407
```
373-
374-
To display one of the **Enumeration** values in a **responseMsg** claim, use `GetMappedValueFromLocalizedCollection` or `CreateStringClaim` claims transformation. For more information, see [String Claims Transformations](string-transformations.md)

articles/active-directory-b2c/connect-with-saml-service-providers.md

Lines changed: 2 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/24/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
ms.custom: fasttrack-edit
@@ -255,7 +255,7 @@ Your final relying party policy file should look like the following:
255255

256256
Save your changes and upload the new policy file. After you've uploaded both policies (the extension and the relying party files), open a web browser and navigate to the policy metadata.
257257

258-
The Azure AD B2C policy metadata is available at the following URL. Replace `tenant-name` with the name of your Azure AD B2C tenant, and `policy-name` with the name (ID) of the policy:
258+
Azure AD B2C policy IDP metadata is information used in the SAML protocol to expose the configuration of a SAML identity provider. Metadata defines the location of the services, such as sign-in and sign-out, certificates, sign-in method, and more. The Azure AD B2C policy metadata is available at the following URL. Replace `tenant-name` with the name of your Azure AD B2C tenant, and `policy-name` with the name (ID) of the policy:
259259

260260
`https://tenant-name.b2clogin.com/tenant-name.onmicrosoft.com/policy-name/Samlp/metadata`
261261

0 commit comments

Comments
 (0)