Skip to content

Commit 05584a5

Browse files
authored
Merge branch 'master' into zoom
2 parents 2f74b77 + 5d75e24 commit 05584a5

File tree

2,551 files changed

+32779
-19341
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,551 files changed

+32779
-19341
lines changed

.markdownlint.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"default": true,
3+
"MD001": false,
4+
"MD002": false,
5+
"MD003": false,
6+
"MD004": false,
7+
"MD005": false,
8+
"MD006": false,
9+
"MD007": false,
10+
"MD009": false,
11+
"MD010": false,
12+
"MD011": false,
13+
"MD012": false,
14+
"MD013": false,
15+
"MD014": false,
16+
"MD018": false,
17+
"MD019": false,
18+
"MD020": false,
19+
"MD021": false,
20+
"MD022": false,
21+
"MD023": false,
22+
"MD024": false,
23+
"MD025": false,
24+
"MD026": false,
25+
"MD027": false,
26+
"MD028": false,
27+
"MD029": false,
28+
"MD030": false,
29+
"MD031": false,
30+
"MD032": false,
31+
"MD033": false,
32+
"MD034": false,
33+
"MD035": false,
34+
"MD036": false,
35+
"MD037": false,
36+
"MD038": false,
37+
"MD039": false,
38+
"MD040": false,
39+
"MD041": false,
40+
"MD042": false,
41+
"MD045": false
42+
}

.openpublishing.redirection.json

Lines changed: 246 additions & 66 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/active-directory-b2c-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ A web API can receive tokens from many types of clients, including web applicati
9494
6. The `access_token` and `refresh_token` are returned to the web server.
9595
7. The web API is called with the `access_token` in an authorization header.
9696
8. The web API validates the token.
97-
9. Secure data is returned to the web server.
97+
9. Secure data is returned to the web application.
9898

9999
To learn more about authorization codes, refresh tokens, and the steps for getting tokens, read about the [OAuth 2.0 protocol](active-directory-b2c-reference-oauth-code.md).
100100

articles/active-directory-b2c/active-directory-b2c-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ There are two common reasons for why the Azure AD extension is not working for y
2323
Azure AD and Azure AD B2C are separate product offerings and cannot coexist in the same tenant. An Azure AD tenant represents an organization. An Azure AD B2C tenant represents a collection of identities to be used with relying party applications. With custom policies (in public preview), Azure AD B2C can federate to Azure AD allowing authentication of employees in an organization.
2424

2525
### Can I use Azure AD B2C to provide social login (Facebook and Google+) into Office 365?
26-
Azure AD B2C can't be used to authenticate users for Microsoft Office 365. Azure AD is Microsoft's solution for managing employee access to SaaS apps and it has features designed for this purpose such as licensing and conditional access. Azure AD B2C provides an identity and access management platform for building web and mobile applications. When Azure AD B2C is configured to federate to an Azure AD tenant, the Azure AD tenant manages employee access to applications that rely on Azure AD B2C.
26+
Azure AD B2C can't be used to authenticate users for Microsoft Office 365. Azure AD is Microsoft's solution for managing employee access to SaaS apps and it has features designed for this purpose such as licensing and Conditional Access. Azure AD B2C provides an identity and access management platform for building web and mobile applications. When Azure AD B2C is configured to federate to an Azure AD tenant, the Azure AD tenant manages employee access to applications that rely on Azure AD B2C.
2727

2828
### What are local accounts in Azure AD B2C? How are they different from work or school accounts in Azure AD?
2929
In an Azure AD tenant, users that belong to the tenant sign-in with an email address of the form `<xyz>@<tenant domain>`. The `<tenant domain>` is one of the verified domains in the tenant or the initial `<...>.onmicrosoft.com` domain. This type of account is a work or school account.
Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Set up sign-up and sign-in with a Microsoft account - Azure Active Directory B2C | Microsoft Docs
2+
title: Set up sign-up and sign-in with a Microsoft account - Azure Active Directory B2C
33
description: Provide sign-up and sign-in to customers with Microsoft accounts in your applications using Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: mmacy
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 09/21/2018
11+
ms.date: 06/11/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -19,22 +19,28 @@ ms.subservice: B2C
1919

2020
To use a Microsoft account as an [identity provider](active-directory-b2c-reference-oidc.md) in Azure Active Directory (Azure AD) B2C, you need to create an application in your tenant that represents it. If you don’t already have a Microsoft account, you can get it at [https://www.live.com/](https://www.live.com/).
2121

22-
1. Sign in to the [Microsoft Application Registration Portal](https://apps.dev.microsoft.com/?referrer=https://azure.microsoft.com/documentation/articles&deeplink=/appList) with your Microsoft account credentials.
23-
2. In the upper-right corner, select **Add an app**.
24-
3. Enter a **Name** for your application. For example, *MSAapp1*.
25-
4. Select **Generate New Password** and make sure that you copy the password to use when you configure the identity provider. Also copy the **Application Id**.
26-
5. Select **Add platform**, and then and choose **Web**.
27-
4. Enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp` in **Redirect URLs**. Replace `your-tenant-name` with the name of your tenant.
28-
5. Select **Save**.
22+
1. Sign in to the [Azure portal](https://portal.azure.com/).
23+
1. Select **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
24+
1. Select **New registration**
25+
1. Enter a **Name** for your application. For example, *MSAapp1*.
26+
1. Under **Supported account types**, select **Accounts in any organizational directory and personal Microsoft accounts (e.g. Skype, Xbox, Outlook.com)**. This option targets the widest set of Microsoft identities.
27+
28+
For more information on the different account type selections, see [Quickstart: Register an application with the Microsoft identity platform](../active-directory/develop/quickstart-register-app.md).
29+
1. Under **Redirect URI (optional)**, select **Web** and enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp` in the text box. Replace `your-tenant-name` with your Azure AD B2C tenant name.
30+
1. Select **Register**
31+
1. Record the **Application (client) ID** shown on the application Overview page. You need this when you configure the identity provider in the next section.
32+
1. Select **Certificates & secrets**
33+
1. Click **New client secret**
34+
1. Enter a **Description** for the secret, for example *Application password 1*, and then click **Add**.
35+
1. Record the application password shown in the **VALUE** column. You need this when you configure the identity provider in the next section.
2936

3037
## Configure a Microsoft account as an identity provider
3138

3239
1. Sign in to the [Azure portal](https://portal.azure.com/) as the global administrator of your Azure AD B2C tenant.
33-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
34-
3. Choose **All services** in the top-left corner of the Azure portal, search for and select **Azure AD B2C**.
35-
4. Select **Identity providers**, and then select **Add**.
36-
5. Provide a **Name**. For example, enter *MSA*.
37-
6. Select **Identity provider type**, select **Microsoft Account**, and click **OK**.
38-
7. Select **Set up this identity provider** and enter the Application Id that you recorded earlier as the **Client ID** and enter the password that you recorded as the **Client secret** of the Microsoft account application that you created earlier.
39-
8. Click **OK** and then click **Create** to save your Microsoft account configuration.
40-
40+
1. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
41+
1. Choose **All services** in the top-left corner of the Azure portal, search for and select **Azure AD B2C**.
42+
1. Select **Identity providers**, and then select **Add**.
43+
1. Provide a **Name**. For example, enter *MSA*.
44+
1. Select **Identity provider type**, select **Microsoft Account**, and click **OK**.
45+
1. Select **Set up this identity provider** and enter the Application (client) ID that you recorded earlier in the **Client ID** text box, and enter the client secret that you recorded in the **Client secret** text box.
46+
1. Click **OK** and then click **Create** to save your Microsoft account configuration.
50.6 KB
Loading
23.8 KB
Loading
15.4 KB
Loading
9.67 KB
Loading

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This article provides examples for using the social account claims transformatio
3434

3535
## CreateAlternativeSecurityId
3636

37-
Creates a JSON representation of the user’s alternativeSecurityId property that can be used in the calls to Azure Active Directory. For more information, see [AlternativeSecurityId's schema](/previous-versions/azure/ad/graph/api/entity-and-complex-type-reference#AlternativeSecurityIdType).
37+
Creates a JSON representation of the user’s alternativeSecurityId property that can be used in the calls to Azure Active Directory. For more information, see [AlternativeSecurityId's schema](/previous-versions/azure/ad/graph/api/entity-and-complex-type-reference#alternativesecurityid-type).
3838

3939
| Item | TransformationClaimType | Data Type | Notes |
4040
| ---- | ----------------------- | --------- | ----- |

0 commit comments

Comments
 (0)