Skip to content

Commit 146286b

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1679050a
2 parents 6090880 + 89d28a6 commit 146286b

File tree

2,195 files changed

+36912
-27907
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,195 files changed

+36912
-27907
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: 213 additions & 37 deletions
Large diffs are not rendered by default.

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,8 @@
5454
"XAML",
5555
"XML",
5656
"YAML"
57+
],
58+
"cSpell.words": [
59+
"auditd"
5760
]
5861
}

articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,9 @@
350350
- name: Azure Monitor
351351
href: azure-monitor.md
352352
displayName: log, logs, logging, usage, events
353-
- name: Export usage report
354-
href: view-usage-reports.md
355-
- name: Account management
353+
- name: Manage users - Microsoft Graph
356354
href: manage-user-accounts-graph-api.md
355+
displayName: account, accounts
357356
- name: Deploy with Azure Pipelines
358357
href: deploy-custom-policies-devops.md
359358
displayName: azure devops, ci/cd, cicd, custom policy, policies

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/boolean-transformations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ Checks that boolean value of a claims is equal to `true` or `false`, and return
116116

117117
| Item | TransformationClaimType | Data Type | Notes |
118118
| ---- | ------------------------ | ---------- | ----- |
119-
| inputClaim | inputClaim | boolean | The ClaimType to be asserted. |
119+
| InputClaim | inputClaim | boolean | The ClaimType to be asserted. |
120120
| 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. |
121+
| OutputClaim | compareResult | boolean | The ClaimType that is produced after this ClaimsTransformation has been invoked. |
122122

123123

124124
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`.

articles/active-directory-b2c/claimsschema.md

Lines changed: 5 additions & 5 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/17/2020
11+
ms.date: 02/24/2020
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -171,6 +171,8 @@ The **Restriction** element contains the following elements:
171171

172172
#### Enumeration
173173

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.
175+
174176
The **Enumeration** element contains the following attributes:
175177

176178
| Attribute | Required | Description |
@@ -205,7 +207,7 @@ The **Pattern** element can contain the following attributes:
205207
| Attribute | Required | Description |
206208
| --------- | -------- | ----------- |
207209
| RegularExpression | Yes | The regular expression that claims of this type must match in order to be valid. |
208-
| HelpText | No | The pattern or regular expression for this claim. |
210+
| HelpText | No | An error message for users if the regular expression check fails. |
209211

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

@@ -243,7 +245,7 @@ The **UserInputType** element available user input types:
243245
|Paragraph | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`|A field that shows text only in a paragraph tag. |
244246
|Password | `string` |Password text box.|
245247
|RadioSingleSelect |`string` | Collection of radio buttons. The claim value is the selected value.|
246-
|Readonly | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`| Read only text box. |
248+
|Readonly | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`| Read-only text box. |
247249
|TextBox |`boolean`, `int`, `string` |Single-line text box. |
248250

249251

@@ -403,5 +405,3 @@ The **Paragraph** user input type is used to provide a field that shows text onl
403405
</Restriction>
404406
</ClaimType>
405407
```
406-
407-
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/code-samples.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ The following tables provide links to samples for applications including iOS, An
3535
| [dotnet-webapp-and-webapi](https://github.com/Azure-Samples/active-directory-b2c-dotnet-webapp-and-webapi) | A combined sample for a .NET web application that calls a .NET Web API, both secured using Azure AD B2C. |
3636
| [dotnetcore-webapp](https://github.com/Azure-Samples/active-directory-b2c-dotnetcore-webapp) | An ASP.NET Core web application that can sign in a user using Azure AD B2C, get an access token using MSAL.NET and call an API. |
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. |
38-
| [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. |
3938
| [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. |
4039
| [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. |
4140

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

Lines changed: 3 additions & 4 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

@@ -272,7 +272,6 @@ Your custom policy and Azure AD B2C tenant are now ready. Next, create an applic
272272
1. Enter a **Name** for the application. For example, *SAMLApp1*.
273273
1. Under **Supported account types**, select **Accounts in this organizational directory only**
274274
1. Under **Redirect URI**, select **Web**, and then enter `https://localhost`. You modify this value later in the application registration's manifest.
275-
1. Select **Grant admin consent to openid and offline_access permissions**.
276275
1. Select **Register**.
277276

278277
### 4.2 Update the app manifest
@@ -334,7 +333,7 @@ The last step is to enable Azure AD B2C as a SAML IdP in your SAML relying party
334333
Some or all the following are typically required:
335334

336335
* **Metadata**: `https://tenant-name.b2clogin.com/tenant-name.onmicrosoft.com/policy-name/Samlp/metadata`
337-
* **Issuer**: `https://tenant-name.onmicrosoft.com/policy-name`
336+
* **Issuer**: `https://tenant-name.b2clogin.com/tenant-name.onmicrosoft.com/policy-name`
338337
* **Login Url/SAML endpoint/SAML Url**: Check the value in the metadata file
339338
* **Certificate**: This is *B2C_1A_SamlIdpCert*, but without the private key. To get the public key of the certificate:
340339

articles/active-directory-b2c/manage-user-accounts-graph-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public static async Task ListUsers(GraphServiceClient graphClient)
175175
}
176176
```
177177

178-
[Make API calls using the Microsoft Graph SDKs](https://docs.microsoft.comgraph/sdks/create-requests) includes information on how to read and write information from Microsoft Graph, use `$select` to control the properties returned, provide custom query parameters, and use the `$filter` and `$orderBy` query parameters.
178+
[Make API calls using the Microsoft Graph SDKs](https://docs.microsoft.com/graph/sdks/create-requests) includes information on how to read and write information from Microsoft Graph, use `$select` to control the properties returned, provide custom query parameters, and use the `$filter` and `$orderBy` query parameters.
179179

180180
## Next steps
181181

0 commit comments

Comments
 (0)