Skip to content

Commit dc59c89

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into patch-30
2 parents 8bcf6dc + 174ee5f commit dc59c89

File tree

5,470 files changed

+105996
-68685
lines changed

Some content is hidden

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

5,470 files changed

+105996
-68685
lines changed

.openpublishing.publish.config.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@
271271
"url": "https://github.com/Azure-Samples/cognitive-services-java-sdk-samples",
272272
"branch": "master"
273273
},
274+
{
275+
"path_to_root": "cognitive-services-rest-samples",
276+
"url": "https://github.com/Azure-Samples/cognitive-services-REST-api-samples",
277+
"branch": "master"
278+
},
274279
{
275280
"path_to_root": "cognitive-services-vision-csharp-sdk-quickstarts",
276281
"url": "https://github.com/Azure-Samples/cognitive-services-vision-csharp-sdk-quickstarts",
@@ -297,11 +302,16 @@
297302
"url": "https://github.com/Azure-Samples/cosmos-dotnet-todo-app",
298303
"branch": "master"
299304
},
300-
{
305+
{
301306
"path_to_root": "samples-cosmosdb-dotnet-v3",
302307
"url": "https://github.com/Azure/azure-cosmos-dotnet-v3",
303308
"branch": "master"
304309
},
310+
{
311+
"path_to_root": "samples-cosmosdb-dotnet-v2",
312+
"url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
313+
"branch": "master"
314+
},
305315
{
306316
"path_to_root": "samples-cosmosdb-dotnet-change-feed-processor",
307317
"url": "https://github.com/Azure-Samples/cosmos-dotnet-change-feed-processor",

.openpublishing.redirection.json

Lines changed: 539 additions & 107 deletions
Large diffs are not rendered by default.

README.md

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

3-
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.
3+
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.
44

55
## Getting Started
66

@@ -10,7 +10,7 @@ Contributing to open source is more than just providing updates, it's also letti
1010

1111
You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
1212

13-
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
13+
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
1414

1515
#### Download
1616

articles/active-directory-b2c/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
- name: About Azure AD B2C
66
expanded: true
77
href: active-directory-b2c-overview.md
8+
- name: Technical and feature overview
9+
href: technical-overview.md
810
- name: Quickstarts
911
expanded: true
1012
items:
@@ -374,4 +376,4 @@
374376
- name: Support
375377
href: active-directory-b2c-support.md
376378
- name: Videos
377-
href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c
379+
href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,9 @@ Open a browser and navigate to the URL. Make sure you type the correct URL and t
184184
185185
## Create an Azure AD B2C application
186186
187-
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
187+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
188188
189-
1. Sign in to the [Azure portal](https://portal.azure.com).
190-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your tenant.
191-
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
192-
4. Select **Applications**, and then select **Add**.
193-
5. Enter a name for the application, for example *testapp1*.
194-
6. For **Web App / Web API**, select `Yes`, and then enter `https://jwt.ms` for the **Reply URL**.
195-
7. Click **Create**.
189+
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
196190
197191
### Update and test the relying party file
198192

articles/active-directory-b2c/active-directory-b2c-custom-setup-goog-idp.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1919

20-
This article shows you how to enable sign-in for users from a Google account by using [custom policies](active-directory-b2c-overview-custom.md) in Azure Active Directory B2C (Azure AD B2C).
20+
This article shows you how to enable sign-in for users with a Google account by using [custom policies](active-directory-b2c-overview-custom.md) in Azure Active Directory B2C (Azure AD B2C).
2121

2222
## Prerequisites
2323

@@ -155,15 +155,9 @@ Now that you have a button in place, you need to link it to an action. The actio
155155

156156
## Create an Azure AD B2C application
157157

158-
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
158+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
159159

160-
1. Sign in to the [Azure portal](https://portal.azure.com).
161-
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory + subscription** filter in the top menu and choose the directory that contains your tenant.
162-
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
163-
4. Select **Applications**, and then select **Add**.
164-
5. Enter a name for the application, for example *testapp1*.
165-
6. For **Web App / Web API**, select `Yes`, and then enter `https://jwt.ms` for the **Reply URL**.
166-
7. Click **Create**.
160+
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
167161

168162
## Update and test the relying party file
169163

articles/active-directory-b2c/active-directory-b2c-custom-setup-li-idp.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,9 @@ Now that you have a button in place, you need to link it to an action. The actio
213213

214214
## Create an Azure AD B2C application
215215

216-
Communication with Azure AD B2C occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
216+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
217217

218-
1. Sign in to the [Azure portal](https://portal.azure.com).
219-
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory + subscription** filter in the top menu and choose the directory that contains your tenant.
220-
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
221-
4. Select **Applications**, and then select **Add**.
222-
5. Enter a name for the application, for example *testapp1*.
223-
6. For **Web App / Web API**, select `Yes`, and then enter `https://jwt.ms` for the **Reply URL**.
224-
7. Click **Create**.
218+
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
225219

226220
## Update and test the relying party file
227221

articles/active-directory-b2c/active-directory-b2c-custom-setup-msa-idp.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,9 @@ Now that you have a button in place, you need to link it to an action. The actio
161161

162162
## Create an Azure AD B2C application
163163

164-
Communication with Azure AD B2C occurs through an application that you create in your Azure AD B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
164+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
165165

166-
1. Sign in to the [Azure portal](https://portal.azure.com).
167-
1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory + subscription** filter in the top menu and choose the directory that contains your tenant.
168-
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
169-
1. Select **Applications**, and then select **Add**.
170-
1. Enter a name for the application, for example *testapp1*.
171-
1. For **Web App / Web API**, select `Yes`, and then enter `https://jwt.ms` for the **Reply URL**.
172-
1. Click **Create**.
166+
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
173167

174168
## Update and test the relying party file
175169

articles/active-directory-b2c/active-directory-b2c-custom-setup-twitter-idp.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,9 @@ Now that you have a button in place, you need to link it to an action. The actio
150150

151151
## Create an Azure AD B2C application
152152

153-
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
153+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
154154

155-
1. Sign in to the [Azure portal](https://portal.azure.com).
156-
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory + subscription** filter in the top menu and choose the directory that contains your tenant.
157-
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
158-
4. Select **Applications**, and then select **Add**.
159-
5. Enter a name for the application, for example *testapp1*.
160-
6. For **Web App / Web API**, select `Yes`, and then enter `https://jwt.ms` for the **Reply URL**.
161-
7. Click **Create**.
155+
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
162156

163157
## Update and test the relying party file
164158

articles/active-directory-b2c/active-directory-b2c-devquickstarts-android.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.subservice: B2C
1818
The Microsoft identity platform uses open standards such as OAuth2 and OpenID Connect. These standards allow you to leverage any library you wish to integrate with Azure Active Directory B2C. To help you use other libraries, you can use a walkthrough like this one to demonstrate how to configure 3rd party libraries to connect to the Microsoft identity platform. Most libraries that implement [the RFC6749 OAuth2 spec](https://tools.ietf.org/html/rfc6749) can connect to the Microsoft Identity platform.
1919

2020
> [!WARNING]
21-
> Microsoft does not provide fixes for 3rd party libraries and has not done a review of those libraries. This sample is using a 3rd party library called AppAuth that has been tested for compatibility in basic scenarios with the Azure AD B2C. Issues and feature requests should be directed to the library's open-source project. Please see [this article](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-libraries) for more information.
21+
> Microsoft does not provide fixes for 3rd party libraries and has not done a review of those libraries. This sample is using a 3rd party library called AppAuth that has been tested for compatibility in basic scenarios with the Azure AD B2C. Issues and feature requests should be directed to the library's open-source project. Please see [this article](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-libraries) for more information.
2222
>
2323
>
2424
@@ -30,11 +30,11 @@ Before you can use Azure AD B2C, you must create a directory, or tenant. A direc
3030

3131
## Create an application
3232

33-
Next, you need to create an app in your B2C directory. This gives Azure AD information that it needs to communicate securely with your app. To create a mobile app, follow [these instructions](active-directory-b2c-app-registration.md). Be sure to:
33+
Next, register an application in your Azure AD B2C tenant. This gives Azure AD the information it needs to communicate securely with your app.
3434

35-
* Include a **Native Client** in the application.
36-
* Copy the **Application ID** that is assigned to your app. You will need this later.
37-
* Set up a native client **Redirect URI** (e.g. com.onmicrosoft.fabrikamb2c.exampleapp://oauth/redirect). You will also need this later.
35+
[!INCLUDE [active-directory-b2c-appreg-native](../../includes/active-directory-b2c-appreg-native.md)]
36+
37+
Record the **APPLICATION ID** for use in a later step. Next, select the application in the list and record the **Custom Redirect URI**, also for use in a later step. For example, `com.onmicrosoft.contosob2c.exampleapp://oauth/redirect`.
3838

3939
## Create your user flows
4040

@@ -113,8 +113,8 @@ AuthorizationServiceConfiguration config =
113113

114114
After configuring or retrieving an authorization service configuration, an authorization request can be constructed. To create the request, you will need the following information:
115115

116-
* Client ID (e.g. 00000000-0000-0000-0000-000000000000)
117-
* Redirect URI with a custom scheme (e.g. com.onmicrosoft.fabrikamb2c.exampleapp://oauthredirect)
116+
* Client ID (APPLICATION ID) that you recorded earlier. For example, `00000000-0000-0000-0000-000000000000`.
117+
* Custom Redirect URI that you recorded earlier. For example, `com.onmicrosoft.contosob2c.exampleapp://oauth/redirect`.
118118

119119
Both items should have been saved when you were [registering your app](#create-an-application).
120120

@@ -128,4 +128,3 @@ AuthorizationRequest req = new AuthorizationRequest.Builder(
128128
```
129129

130130
Please refer to the [AppAuth guide](https://openid.github.io/AppAuth-Android/) on how to complete the rest of the process. If you need to quickly get started with a working app, check out [our sample](https://github.com/Azure-Samples/active-directory-android-native-appauth-b2c). Follow the steps in the [README.md](https://github.com/Azure-Samples/active-directory-android-native-appauth-b2c/blob/master/README.md) to enter your own Azure AD B2C configuration.
131-

0 commit comments

Comments
 (0)