Skip to content

Commit c541164

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into mm-assign
2 parents 618b96c + 9c2f71b commit c541164

File tree

1,118 files changed

+8126
-4976
lines changed

Some content is hidden

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

1,118 files changed

+8126
-4976
lines changed

.openpublishing.redirection.json

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -801,34 +801,49 @@
801801
"redirect_url": "/azure/machine-learning",
802802
"redirect_document_id": false
803803
},
804+
{
805+
"source_path": "articles/cognitive-services/QnAMaker/concepts/data-sources-supported.md",
806+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/reference-document-format-guidelines",
807+
"redirect_document_id": false
808+
},
809+
{
810+
"source_path": "articles/cognitive-services/QnAMaker/tutorials/choosing-capacity-qnamaker-deployment.md",
811+
"redirect_url": "/azure/cognitive-services/QnAMaker/Concepts/azure-resources",
812+
"redirect_document_id": false
813+
},
804814
{
805815
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/create-publish-kb-nodejs-sdk.md",
806-
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/quickstart-sdk",
816+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/quickstart-sdk",
807817
"redirect_document_id": false
808818
},
809819
{
810820
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/create-publish-kb-csharp-sdk.md",
811-
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/quickstart-sdk",
821+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/quickstart-sdk",
812822
"redirect_document_id": false
813823
},
814824
{
815825
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/python-sdk.md",
816-
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/quickstart-sdk",
826+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/quickstart-sdk",
817827
"redirect_document_id": false
818828
},
819829
{
820830
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/create-knowledge-rest-api-nodejs.md",
821-
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/publish-kb-nodejs",
831+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/publish-kb-nodejs",
822832
"redirect_document_id": false
823833
},
824834
{
825835
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-postman.md",
826-
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
836+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
827837
"redirect_document_id": false
828838
},
829839
{
830840
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-curl.md",
831-
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
841+
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
842+
"redirect_document_id": false
843+
},
844+
{
845+
"source_path": "articles/cognitive-services/personalizer/how-to-learning-policy.md",
846+
"redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
832847
"redirect_document_id": false
833848
},
834849
{
@@ -981,11 +996,6 @@
981996
"redirect_url": "/azure/cognitive-services/QnAMaker/quickstarts/create-new-kb-csharp",
982997
"redirect_document_id": false
983998
},
984-
{
985-
"source_path": "articles/cognitive-services/QnAMaker/Concepts/data-sources-supported.md",
986-
"redirect_url": "/azure/cognitive-services/QnAMaker/concepts/knowledge-base",
987-
"redirect_document_id": false
988-
},
989999
{
9901000
"source_path": "articles/cognitive-services/QnAMaker/How-To/create-knowledge-base.md",
9911001
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -1661,6 +1671,26 @@
16611671
"redirect_url": "/azure/cognitive-services/bing-web-search/bing-web-stats",
16621672
"redirect_document_id": false
16631673
},
1674+
{
1675+
"source_path": "articles/cognitive-services/Bing-Web-Search/web-search-sdk-quickstart.md",
1676+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1677+
"redirect_document_id": false
1678+
},
1679+
{
1680+
"source_path": "articles/cognitive-services/Bing-Web-Search/web-sdk-java-quickstart.md",
1681+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1682+
"redirect_document_id": false
1683+
},
1684+
{
1685+
"source_path": "articles/cognitive-services/Bing-Web-Search/web-search-sdk-node-quickstart.md",
1686+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1687+
"redirect_document_id": false
1688+
},
1689+
{
1690+
"source_path": "articles/cognitive-services/Bing-Web-Search/web-sdk-python-quickstart.md",
1691+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1692+
"redirect_document_id": false
1693+
},
16641694
{
16651695
"source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
16661696
"redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -3636,6 +3666,11 @@
36363666
"redirect_url": "/azure/architecture",
36373667
"redirect_document_id": false
36383668
},
3669+
{
3670+
"source_path": "articles/azure-monitor/azure-monitor-log-hub.md",
3671+
"redirect_url": "/azure/azure-monitor/overview",
3672+
"redirect_document_id": false
3673+
},
36393674
{
36403675
"source_path": "articles/cloud-services/cloud-services-dotnet-diagnostics-storage.md",
36413676
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-to-storage",
@@ -27188,8 +27223,8 @@
2718827223
},
2718927224
{
2719027225
"source_path": "articles/storage/storage-java-jenkins-continuous-integration-solution.md",
27191-
"redirect_url": "/azure/storage/common/storage-java-jenkins-continuous-integration-solution",
27192-
"redirect_document_id": true
27226+
"redirect_url": "/azure/jenkins/storage-java-jenkins-continuous-integration-solution",
27227+
"redirect_document_id": false
2719327228
},
2719427229
{
2719527230
"source_path": "articles/storage/storage-manage-access-to-resources.md",
@@ -45118,7 +45153,7 @@
4511845153
},
4511945154
{
4512045155
"source_path": "articles/iot-central/howto-connect-nodejs.md",
45121-
"redirect_url": "/azure/iot-central/core/howto-connect-nodejs/",
45156+
"redirect_url": "/azure/iot-central/core/tutorial-connect-device/",
4512245157
"redirect_document_id": true
4512345158
},
4512445159
{
@@ -45598,7 +45633,7 @@
4559845633
},
4559945634
{
4560045635
"source_path": "articles/iot-central/core/howto-connect-nodejs.md",
45601-
"redirect_url": "/azure/iot-central/core/",
45636+
"redirect_url": "/azure/iot-central/core/tutorial-connect-device/",
4560245637
"redirect_document_id": false
4560345638
},
4560445639
{
@@ -48926,6 +48961,31 @@
4892648961
"source_path": "articles/virtual-machines/linux/tutorial-jenkins-github-docker-cicd.md",
4892748962
"redirect_url": "/azure/jenkins/tutorial-jenkins-github-docker-cicd",
4892848963
"redirect_document_id": false
48964+
},
48965+
{
48966+
"source_path": "articles/container-instances/container-instances-jenkins.md",
48967+
"redirect_url": "/azure/jenkins/container-instances-jenkins",
48968+
"redirect_document_id": false
48969+
},
48970+
{
48971+
"source_path": "articles/aks/jenkins-continuous-deployment.md",
48972+
"redirect_url": "/azure/jenkins/jenkins-continuous-deployment",
48973+
"redirect_document_id": false
48974+
},
48975+
{
48976+
"source_path": "articles/storage/common/storage-java-jenkins-continuous-integration-solution.md",
48977+
"redirect_url": "/azure/jenkins/storage-java-jenkins-continuous-integration-solution",
48978+
"redirect_document_id": false
48979+
},
48980+
{
48981+
"source_path": "articles/aks/acs-aks-migration.md",
48982+
"redirect_url": "/azure/aks/aks-migration",
48983+
"redirect_document_id": false
48984+
},
48985+
{
48986+
"source_path": "articles/service-fabric/service-fabric-cicd-your-linux-applications-with-jenkins.md",
48987+
"redirect_url": "/azure/jenkins/service-fabric-cicd-your-linux-applications-with-jenkins",
48988+
"redirect_document_id": true
4892948989
}
4893048990
]
4893148991
}

.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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,9 @@
350350
- name: Azure Monitor
351351
href: azure-monitor.md
352352
displayName: log, logs, logging, usage, events
353-
- name: Account management
353+
- name: Manage users - Microsoft Graph
354354
href: manage-user-accounts-graph-api.md
355+
displayName: account, accounts
355356
- name: Deploy with Azure Pipelines
356357
href: deploy-custom-policies-devops.md
357358
displayName: azure devops, ci/cd, cicd, custom policy, policies

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/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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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/page-layout.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: 02/10/2020
12+
ms.date: 02/26/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -29,7 +29,7 @@ Page layout packages are periodically updated to include fixes and improvements
2929

3030
- All pages
3131
- Accessibility fixes
32-
- You can now add the `data-preload="true"` attribute in your HTML tags to control the load order for CSS and JavaScript.
32+
- You can now add the `data-preload="true"` attribute [in your HTML tags](custom-policy-ui-customization.md#guidelines-for-using-custom-page-content) to control the load order for CSS and JavaScript.
3333
- Load linked CSS files at the same time as your HTML template so it doesn't 'flicker' between loading the files.
3434
- Control the order in which your `script` tags are fetched and executed before the page load.
3535
- Email field is now `type=email` and mobile keyboards will provide the correct suggestions

articles/active-directory-b2c/phone-authentication.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,35 @@
11
---
2-
title: Phone sign-up and sign-in with custom policies
2+
title: Phone sign-up and sign-in with custom policies (Preview)
33
titleSuffix: Azure AD B2C
4-
description: Learn how to send one-time passwords in text messages to your application users' phones with custom policies in Azure Active Directory B2C.
4+
description: Send one-time passwords (OTP) in text messages to your application users' phones with custom policies in Azure Active Directory B2C.
55
services: active-directory-b2c
66
author: mmacy
77
manager: celestedg
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 12/17/2019
12+
ms.date: 02/25/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
1616

17-
# Set up phone sign-up and sign-in with custom policies in Azure AD B2C
17+
# Set up phone sign-up and sign-in with custom policies in Azure AD B2C (Preview)
1818

1919
Phone sign-up and sign-in in Azure Active Directory B2C (Azure AD B2C) enables your users to sign up and sign in to your applications by using a one-time password (OTP) sent in a text message to their phone. One-time passwords can help minimize the risk of your users forgetting or having their passwords compromised.
2020

2121
Follow the steps in this article to use the custom policies to enable your customers to sign up and sign in to your applications by using a one-time password sent to their phone.
2222

2323
[!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
2424

25+
## Pricing
26+
27+
One-time passwords are sent to your users by using SMS text messages, and you may be charged for each message sent. For pricing information, see the **Separate Charges** section of [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
28+
2529
## Prerequisites
2630

31+
You need the following resources in place before setting up OTP.
32+
2733
* [Azure AD B2C tenant](tutorial-create-tenant.md)
2834
* [Web application registered](tutorial-register-applications.md) in your tenant
2935
* [Custom policies](custom-policy-get-started.md) uploaded to your tenant
@@ -66,6 +72,22 @@ As you upload each file, Azure adds the prefix `B2C_1A_`.
6672
1. Select **Run now** and sign up using an email address or a phone number.
6773
1. Select **Run now** once again and sign in with the same account to confirm that you have the correct configuration.
6874

75+
## Get user account by phone number
76+
77+
A user that signs up with a phone number but does not provide a recovery email address is recorded in your Azure AD B2C directory with their phone number as their sign-in name. If the user then wishes to change their phone number, your help desk or support team must first find their account, and then update their phone number.
78+
79+
You can find a user by their phone number (sign-in name) by using [Microsoft Graph](manage-user-accounts-graph-api.md):
80+
81+
```http
82+
GET https://graph.microsoft.com/v1.0/users?$filter=identities/any(c:c/issuerAssignedId eq '+{phone number}' and c/issuer eq '{tenant name}.onmicrosoft.com')
83+
```
84+
85+
For example:
86+
87+
```http
88+
GET https://graph.microsoft.com/v1.0/users?$filter=identities/any(c:c/issuerAssignedId eq '+450334567890' and c/issuer eq 'contosob2c.onmicrosoft.com')
89+
```
90+
6991
## Next steps
7092

7193
You can find the phone sign-up and sign-in custom policy starter pack (and other starter packs) on GitHub:

articles/active-directory-b2c/phone-number-claims-transformations.md

Lines changed: 35 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: conceptual
12-
ms.date: 02/14/2020
12+
ms.date: 02/26/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -22,9 +22,39 @@ This article provides reference and examples for using the phone number claims t
2222

2323
[!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
2424

25+
## ConvertPhoneNumberClaimToString
26+
27+
Converts a `phoneNumber` data type into a `string` data type.
28+
29+
| Item | TransformationClaimType | Data Type | Notes |
30+
| ---- | ----------------------- | --------- | ----- |
31+
| InputClaim | phoneNumber | phoneNumber | The ClaimType to convert to a string. |
32+
| OutputClaim | phoneNumberString | string | The ClaimType that is produced after this claims transformation has been invoked. |
33+
34+
In this example, the cellPhoneNumber claim with a value type of `phoneNumber` is converted to a cellPhone claim with a value type of `string`.
35+
36+
```XML
37+
<ClaimsTransformation Id="PhoneNumberToString" TransformationMethod="ConvertPhoneNumberClaimToString">
38+
<InputClaims>
39+
<InputClaim ClaimTypeReferenceId="cellPhoneNumber" TransformationClaimType="phoneNumber" />
40+
</InputClaims>
41+
<OutputClaims>
42+
<OutputClaim ClaimTypeReferenceId="cellPhone" TransformationClaimType="phoneNumberString" />
43+
</OutputClaims>
44+
</ClaimsTransformation>
45+
```
46+
47+
### Example
48+
49+
- Input claims:
50+
- **phoneNumber**: +11234567890 (phoneNumber)
51+
- Output claims:
52+
- **phoneNumberString**: +11234567890 (string)
53+
54+
2555
## ConvertStringToPhoneNumberClaim
2656

27-
This claim validates the format of the phone number. If it is in a valid format, change it to a standard format used by Azure AD B2C. If the provided phone number is not in a valid format, an error message is returned.
57+
This claim transformation validates the format of the phone number. If it is in a valid format, change it to a standard format used by Azure AD B2C. If the provided phone number is not in a valid format, an error message is returned.
2858

2959
| Item | TransformationClaimType | Data Type | Notes |
3060
| ---- | ----------------------- | --------- | ----- |
@@ -64,10 +94,10 @@ The self-asserted technical profile that calls the validation technical profile
6494
### Example 1
6595

6696
- Input claims:
67-
- **phoneNumberString**: 045 456-7890
97+
- **phoneNumberString**: 033 456-7890
6898
- **country**: DK
6999
- Output claims:
70-
- **outputClaim**: +450546148120
100+
- **outputClaim**: +450334567890
71101

72102
### Example 2
73103

@@ -76,6 +106,7 @@ The self-asserted technical profile that calls the validation technical profile
76106
- Output claims:
77107
- **outputClaim**: +11234567890
78108

109+
79110
## GetNationalNumberAndCountryCodeFromPhoneNumberString
80111

81112
This extracts the country code and the national number from the input claim, and optionally throws an exception if the supplied phone number is not valid.

0 commit comments

Comments
 (0)