Skip to content

Commit 2d6e2fc

Browse files
American-DipperAmerican-Dipper
committed
resolve merge conflict: resource-group-control
2 parents 4ef2a4d + ee9dba6 commit 2d6e2fc

File tree

3,285 files changed

+30665
-26421
lines changed

Some content is hidden

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

3,285 files changed

+30665
-26421
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Contributing to Microsoft Azure Documentation
22

3+
> Between March 5th and March 9th 2019, the MicrosoftDocs/azure-docs repo will be undergoing a Migration from it's current Markdown engine to the [Markdig](https://github.com/lunet-io/markdig) markdown engine. During this time, we will be turning off the ability to suspending merging of public pull requests in order to complete the migration.
4+
35
Thank you for taking the time to contribute to the Microsoft Azure documentation.
46

57
This guide covers some general topics around contribution and refers out to our [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations where relevant.

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,12 @@
308308
"branch": "master",
309309
"branch_mapping": {}
310310
},
311+
{
312+
"path_to_root": "samples-iot-distributed-tracing",
313+
"url": "https://github.com/Azure-Samples/azure-iot-distributed-tracing-sample",
314+
"branch": "master",
315+
"branch_mapping": {}
316+
},
311317
{
312318
"path_to_root": "AIVisualProvision",
313319
"url": "https://github.com/Microsoft/AIVisualProvision",

‎.openpublishing.redirection.json

Lines changed: 244 additions & 24 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Microsoft Azure Documentation
22

3+
> Between March 5th and March 9th 2019, the MicrosoftDocs/azure-docs repo will be undergoing a Migration from it's current Markdown engine to the [Markdig](https://github.com/lunet-io/markdig) markdown engine. During this time, we will be turning off the ability to suspending merging of public pull requests in order to complete the migration.
4+
35
Welcome to the open source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
46

57
## Getting Started

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ The web API can then use the token to verify the API caller's identity and to ex
8787
A web API can receive tokens from many types of clients, including web applications, desktop and mobile applications, single page applications, server-side daemons, and other web APIs. Here's an example of the complete flow for a web application that calls a web API:
8888

8989
1. The web application executes a policy and the user completes the user experience.
90-
2. Azure AD B2C returns an `access_token` and an authorization code to the browser.
91-
3. The browser posts the `access_token` and authorization code to the redirect URI.
92-
4. The web server validates the `access token` and sets a session cookie.
93-
5. The `access_token` is provided to Azure AD B2C with the authorization code, application client ID, and credentials.
90+
2. Azure AD B2C returns an (OpenID Connect) `id_token` and an authorization code to the browser.
91+
3. The browser posts the `id_token` and authorization code to the redirect URI.
92+
4. The web server validates the `id_token` and sets a session cookie.
93+
5. The web server asks Azure AD B2C for an `access_token` by providing it with the authorization code, application client ID, and client credentials.
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.

‎articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Open a browser and navigate to the URL. Make sure you type the correct URL and t
165165
166166
| LDAP attrubute | Outgoing claim type |
167167
| -------------- | ------------------- |
168-
| User-Principal-Name | userPricipalName |
168+
| User-Principal-Name | userPrincipalName |
169169
| Surname | family_name |
170170
| Given-Name | given_name |
171171
| E-Mail-Address | email |

‎articles/active-directory-b2c/active-directory-b2c-devquickstarts-graph-dotnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Now you need to configure your application to get all the required permissions t
5858
You now have an application that has permission to create, read and update users from your B2C tenant.
5959

6060
> [!NOTE]
61-
> Granting permissions make take a few minutes to fully process.
61+
> Granting permissions may take a few minutes to fully process.
6262
>
6363
>
6464

‎articles/active-directory-b2c/active-directory-b2c-overview.md

Lines changed: 74 additions & 57 deletions
Large diffs are not rendered by default.

‎articles/active-directory-b2c/active-directory-b2c-reference-oauth-code.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Authorization code flow in Azure Active Directory B2C | Microsoft Docs
2+
title: Authorization code flow - Azure Active Directory B2C | Microsoft Docs
33
description: Learn how to build web apps by using Azure AD B2C and OpenID Connect authentication protocol.
44
services: active-directory-b2c
55
author: davidmu1
@@ -8,12 +8,13 @@ manager: daveba
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 11/30/2018
11+
ms.date: 02/19/2019
1212
ms.author: davidmu
1313
ms.subservice: B2C
1414
---
1515

16-
# Azure Active Directory B2C: OAuth 2.0 authorization code flow
16+
# OAuth 2.0 authorization code flow in Azure Active Directory B2C
17+
1718
You can use the OAuth 2.0 authorization code grant in apps installed on a device to gain access to protected resources, such as web APIs. By using the Azure Active Directory B2C (Azure AD B2C) implementation of OAuth 2.0, you can add sign-up, sign-in,
1819
and other identity management tasks to your mobile and desktop apps. This article is language-independent. In the article, we describe how to send and receive HTTP messages without using any open-source libraries.
1920

@@ -24,7 +25,7 @@ This article focuses on the **public clients** OAuth 2.0 authorization code flow
2425
> [!NOTE]
2526
> To add identity management to a web app by using Azure AD B2C, use [OpenID Connect](active-directory-b2c-reference-oidc.md) instead of OAuth 2.0.
2627
27-
Azure AD B2C extends the standard OAuth 2.0 flows to do more than simple authentication and authorization. It introduces the [user flow parameter](active-directory-b2c-reference-policies.md). With user flows, you can use OAuth 2.0 to add user experiences to your application, such as sign-up, sign-in, and profile management. In this article, we show you how to use OAuth 2.0 and user flows to implement each of these experiences in your native applications. We also show you how to get access tokens for accessing web APIs.
28+
Azure AD B2C extends the standard OAuth 2.0 flows to do more than simple authentication and authorization. It introduces the [user flow parameter](active-directory-b2c-reference-policies.md). With user flows, you can use OAuth 2.0 to add user experiences to your application, such as sign-up, sign-in, and profile management. Identity providers that use the OAuth 2.0 protocol include [Amazon](active-directory-b2c-setup-amzn-app.md), [Azure Active Directory](active-directory-b2c-setup-oidc-azure-active-directory.md), [Facebook](active-directory-b2c-setup-fb-app.md), [GitHub](active-directory-b2c-setup-github-app.md), [Google](active-directory-b2c-setup-goog-app.md), and [LinkedIn](active-directory-b2c-setup-li-app.md).
2829

2930
In the example HTTP requests in this article, we use our sample Azure AD B2C directory, **fabrikamb2c.onmicrosoft.com**. We also use our sample application and user flows. You can try the requests yourself by using these values, or you can replace them with your own values.
3031
Learn how to [get your own Azure AD B2C directory, application, and user flows](#use-your-own-azure-ad-b2c-directory).

‎articles/active-directory-b2c/active-directory-b2c-reference-oidc.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Web sign-in with OpenID Connect in Azure Active Directory B2C | Microsoft Docs
2+
title: Web sign-in with OpenID Connect - Azure Active Directory B2C | Microsoft Docs
33
description: Building web applications by using the Azure Active Directory implementation of the OpenID Connect authentication protocol.
44
services: active-directory-b2c
55
author: davidmu1
@@ -8,21 +8,21 @@ manager: daveba
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 11/30/2018
11+
ms.date: 02/19/2019
1212
ms.author: davidmu
1313
ms.subservice: B2C
1414
---
1515

16-
# Azure Active Directory B2C: Web sign-in with OpenID Connect
17-
OpenID Connect is an authentication protocol, built on top of OAuth 2.0, that can be used to securely sign users in to web applications. By using the Azure Active Directory B2C (Azure AD B2C) implementation of OpenID Connect, you can outsource sign-up, sign-in, and other identity management experiences in your web applications to Azure Active Directory (Azure AD). This guide shows you how to do so in a language-independent manner. It describes how to send and receive HTTP messages without using any of our open-source libraries.
16+
# Web sign-in with OpenID Connect in Azure Active Directory B2C
1817

19-
[OpenID Connect](https://openid.net/specs/openid-connect-core-1_0.html) extends the OAuth 2.0 *authorization* protocol for use as an *authentication* protocol. This allows you to perform single sign-on by using OAuth. It introduces the concept of an *ID token*, which is a security token that allows the client to verify the identity of the user and obtain basic profile information about the user.
18+
[OpenID Connect](https://openid.net/specs/openid-connect-core-1_0.html) is an authentication protocol, built on top of OAuth 2.0, that can be used to securely sign users in to web applications. By using the Azure Active Directory B2C (Azure AD B2C) implementation of OpenID Connect, you can outsource sign-up, sign-in, and other identity management experiences in your web applications to Azure Active Directory (Azure AD). This guide shows you how to do so in a language-independent manner. It describes how to send and receive HTTP messages without using any of our open-source libraries.
2019

21-
Because it extends OAuth 2.0, it also enables apps to securely acquire *access tokens*. You can use access_tokens to access resources that are secured by an [authorization server](active-directory-b2c-reference-protocols.md#the-basics). We recommend OpenID Connect if you're building a web application that is hosted on a server and accessed through a browser. If you want to add identity management to your mobile or desktop applications by using Azure AD B2C, you should use [OAuth 2.0](active-directory-b2c-reference-oauth-code.md) rather than OpenID Connect.
20+
OpenID Connect extends the OAuth 2.0 *authorization* protocol for use as an *authentication* protocol. This allows you to perform single sign-on by using OAuth. It introduces the concept of an *ID token*, which is a security token that allows the client to verify the identity of the user and obtain basic profile information about the user.
21+
22+
Because it extends OAuth 2.0, it also enables apps to securely acquire *access tokens*. You can use access tokens to access resources that are secured by an [authorization server](active-directory-b2c-reference-protocols.md#the-basics). We recommend OpenID Connect if you're building a web application that is hosted on a server and accessed through a browser. If you want to add identity management to your mobile or desktop applications by using Azure AD B2C, you should use [OAuth 2.0](active-directory-b2c-reference-oauth-code.md) rather than OpenID Connect.
2223

2324
Azure AD B2C extends the standard OpenID Connect protocol to do more than simple authentication and authorization. It introduces the [user flow parameter](active-directory-b2c-reference-policies.md),
24-
which enables you to use OpenID Connect to add user experiences--such as sign-up, sign-in, and profile management--to your app. Here, we show you how to use OpenID Connect and user flows to implement each of these experiences
25-
in your web applications. We'll also show you how to get access tokens for accessing web APIs.
25+
which enables you to use OpenID Connect to add user experiences, such as sign-up, sign-in, and profile management to your app. Identity providers that use the OpenID Connect protocol include [Microsoft account](active-directory-b2c-setup-msa-app.md) and other [OpenID Connect providers](active-directory-b2c-setup-oidc-idp.md).
2626

2727
The example HTTP requests in the next section use our sample B2C directory, fabrikamb2c.onmicrosoft.com, as well as our sample application, https://aadb2cplayground.azurewebsites.net, and user flows. You're free to try out the requests yourself by using these values, or you can replace them with your own.
2828
Learn how to [get your own B2C tenant, application, and user flows](#use-your-own-b2c-tenant).

‎articles/active-directory-b2c/active-directory-b2c-reference-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@ Only the **otherMails** and **signInNames** properties are exposed through the A
8181

8282
## Next steps
8383

84-
To create the recommended user flows, follow the instructions in [Tutorial: Create a user flow](tutorial-create-tenant.md).
84+
To create the recommended user flows, follow the instructions in [Tutorial: Create a user flow](tutorial-create-user-flows.md).
8585

8686

‎articles/active-directory-b2c/active-directory-b2c-setup-amzn-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Set up sign-up and sign-in with an Amazon account using Azure Active Directory B2C | Microsoft Docs
2+
title: Set up sign-up and sign-in with an Amazon account - Azure Active Directory B2C | Microsoft Docs
33
description: Provide sign-up and sign-in to customers with Amazon accounts in your applications using Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: davidmu1
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
## Create an Amazon application
1919

20-
To use an Amazon account as an identity provider 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 Amazon account you can get it at [https://www.amazon.com/](https://www.amazon.com/).
20+
To use an Amazon account as an [identity provider](active-directory-b2c-reference-oauth-code.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 Amazon account you can get it at [https://www.amazon.com/](https://www.amazon.com/).
2121

2222
1. Sign in to the [Amazon Developer Center](https://login.amazon.com/) with your Amazon account credentials.
2323
2. If you have not already done so, click **Sign Up**, follow the developer registration steps, and accept the policy.

‎articles/active-directory-b2c/active-directory-b2c-setup-fb-app.md

Lines changed: 2 additions & 2 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 Facebook account using Azure Active Directory B2C | Microsoft Docs
2+
title: Set up sign-up and sign-in with a Facebook account - Azure Active Directory B2C | Microsoft Docs
33
description: Provide sign-up and sign-in to customers with Facebook accounts in your applications using Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: davidmu1
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
## Create a Facebook application
1919

20-
To use a Facebook account as an identity provider 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 Facebook account, you can get it at [https://www.facebook.com/](https://www.facebook.com/).
20+
To use a Facebook account as an [identity provider](active-directory-b2c-reference-oauth-code.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 Facebook account, you can get it at [https://www.facebook.com/](https://www.facebook.com/).
2121

2222
1. Sign in to [Facebook for developers](https://developers.facebook.com/) with your Facebook account credentials.
2323
2. If you have not already done so, you need to register as a Facebook developer. To do this, select **Register** on the upper-right corner of the page, accept Facebook's policies, and complete the registration steps.

‎articles/active-directory-b2c/active-directory-b2c-setup-github-app.md

Lines changed: 2 additions & 2 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 GitHub account using Azure Active Directory B2C | Microsoft Docs
2+
title: Set up sign-up and sign-in with a GitHub account - Azure Active Directory B2C | Microsoft Docs
33
description: Provide sign-up and sign-in to customers with GitHub accounts in your applications using Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: davidmu1
@@ -19,7 +19,7 @@ ms.subservice: B2C
1919
> This feature is in preview.
2020
>
2121
22-
To use a GitHub account as an identity provider 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 GitHub account, you can get it at [https://www.github.com/](https://www.github.com/).
22+
To use a GitHub account as an [identity provider](active-directory-b2c-reference-oauth-code.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 GitHub account, you can get it at [https://www.github.com/](https://www.github.com/).
2323

2424
## Create a GitHub OAuth application
2525

‎articles/active-directory-b2c/active-directory-b2c-setup-goog-app.md

Lines changed: 2 additions & 2 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 Google account using Azure Active Directory B2C | Microsoft Docs
2+
title: Set up sign-up and sign-in with a Google account - Azure Active Directory B2C | Microsoft Docs
33
description: Provide sign-up and sign-in to customers with Google accounts in your applications using Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: davidmu1
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
## Create a Google application
1919

20-
To use a Google account as an identity provider 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 Google account you can get it at [https://accounts.google.com/SignUp](https://accounts.google.com/SignUp).
20+
To use a Google account as an [identity provider](active-directory-b2c-reference-oauth-code.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 Google account you can get it at [https://accounts.google.com/SignUp](https://accounts.google.com/SignUp).
2121

2222
1. Sign in to the [Google Developers Console](https://console.developers.google.com/) with your Google account credentials.
2323
2. Select **Create project**, and then click **Create**. If you have created projects before, select the project list, and then select **New Project**.

‎articles/active-directory-b2c/active-directory-b2c-setup-li-app.md

Lines changed: 2 additions & 2 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 LinkedIn account using Azure Active Directory B2C | Microsoft Docs
2+
title: Set up sign-up and sign-in with a LinkedIn account - Azure Active Directory B2C | Microsoft Docs
33
description: Provide sign-up and sign-in to customers with LinkedIn accounts in your applications using Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: davidmu1
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
## Create a LinkedIn application
1919

20-
To use a LinkedIn account as an identity provider 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 LinkedIn account, you can get it at [https://www.linkedin.com/](https://www.linkedin.com/).
20+
To use a LinkedIn account as an [identity provider](active-directory-b2c-reference-oauth-code.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 LinkedIn account, you can get it at [https://www.linkedin.com/](https://www.linkedin.com/).
2121

2222
1. Sign in to the [LinkedIn Developers website](https://www.developer.linkedin.com/) with your LinkedIn account credentials.
2323
2. Select **My Apps**, and then click **Create Application**.

‎articles/active-directory-b2c/active-directory-b2c-setup-msa-app.md

Lines changed: 2 additions & 2 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 using Azure Active Directory B2C | Microsoft Docs
2+
title: Set up sign-up and sign-in with a Microsoft account - Azure Active Directory B2C | Microsoft Docs
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: davidmu1
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
## Create a Microsoft account application
1919

20-
To use a Microsoft account as an identity provider 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/).
20+
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

2222
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.
2323
2. In the upper-right corner, select **Add an app**.

0 commit comments

Comments
 (0)