Skip to content

Commit 83510ae

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into data-explorer-data-factory
2 parents fe948a9 + 0aa6b6a commit 83510ae

File tree

559 files changed

+7093
-3546
lines changed

Some content is hidden

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

559 files changed

+7093
-3546
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35643,6 +35643,11 @@
3564335643
"redirect_url": "/azure/key-vault/vs-key-vault-add-connected-service",
3564435644
"redirect_document_id": false
3564535645
},
35646+
{
35647+
"source_path": "articles/iot-central/howto-generate-connection-string.md",
35648+
"redirect_url": "/azure/iot-central",
35649+
"redirect_document_id": false
35650+
},
3564635651
{
3564735652
"source_path": "articles/iot-central/howto-create-application.md",
3564835653
"redirect_url": "/azure/iot-central/quick-deploy-iot-central",

articles/active-directory-b2c/active-directory-b2c-access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.subservice: B2C
1515
---
1616
# Request an access token in Azure Active Directory B2C
1717

18-
An *access token* contains claims that you can use in Azure Active Directory (Azure AD) B2C to identify the granted permissions to your APIs. When calling a resource server, an access token must be present in the HTTP request. An access token is denoted as **access_token** in the responses from Azure AD B2C.
18+
An *access token* contains claims that you can use in Azure Active Directory B2C (Azure AD B2C) to identify the granted permissions to your APIs. When calling a resource server, an access token must be present in the HTTP request. An access token is denoted as **access_token** in the responses from Azure AD B2C.
1919

2020
This article shows you how to request an access token for a web application and web API. For more information about tokens in Azure AD B2C, see the [overview of tokens in Azure Active Directory B2C](active-directory-b2c-reference-tokens.md).
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.subservice: B2C
1515
---
1616
# Application types that can be used in Active Directory B2C
1717

18-
Azure Active Directory (Azure AD) B2C supports authentication for a variety of modern application architectures. All of them are based on the industry standard protocols [OAuth 2.0](active-directory-b2c-reference-protocols.md) or [OpenID Connect](active-directory-b2c-reference-protocols.md). This article describes the types of applications that you can build, independent of the language or platform you prefer. It also helps you understand the high-level scenarios before you start building applications.
18+
Azure Active Directory B2C (Azure AD B2C) supports authentication for a variety of modern application architectures. All of them are based on the industry standard protocols [OAuth 2.0](active-directory-b2c-reference-protocols.md) or [OpenID Connect](active-directory-b2c-reference-protocols.md). This article describes the types of applications that you can build, independent of the language or platform you prefer. It also helps you understand the high-level scenarios before you start building applications.
1919

2020
Every application that uses Azure AD B2C must be registered in your [Azure AD B2C tenant](active-directory-b2c-get-started.md) by using the [Azure portal](https://portal.azure.com/). The application registration process collects and assigns values, such as:
2121

articles/active-directory-b2c/active-directory-b2c-configure-signup-self-asserted-custom.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.subservice: B2C
1616

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

19-
In this article, you add a new user provided entry (a claim) to your sign-up user journey in Azure Active Directory (Azure AD) B2C. You configure the entry as a dropdown and define whether it's required.
19+
In this article, you add a new user provided entry (a claim) to your sign-up user journey in Azure Active Directory B2C (Azure AD B2C). You configure the entry as a dropdown and define whether it's required.
2020

2121
## Prerequisites
2222

@@ -256,7 +256,7 @@ The following elements are used to define the claim:
256256
## Test the custom policy
257257

258258
1. Sign in to the [Azure portal](https://portal.azure.com).
259-
2. Make sure you're using the directory that contains your Azure AD tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your Azure AD tenant.
259+
2. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your Azure AD tenant.
260260
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
261261
4. Select **Identity Experience Framework (Preview)**.
262262
5. Select **Upload Custom Policy**, and then upload the two policy files that you changed.

articles/active-directory-b2c/active-directory-b2c-create-custom-attributes-profile-edit-custom.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.subservice: B2C
1616

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

19-
In this article, you create a custom attribute in your Azure Active Directory (Azure AD) B2C directory. You'll use this new attribute as a custom claim in the profile edit user journey.
19+
In this article, you create a custom attribute in your Azure Active Directory B2C (Azure AD B2C) directory. You'll use this new attribute as a custom claim in the profile edit user journey.
2020

2121
## Prerequisites
2222

@@ -38,7 +38,7 @@ If the application is deleted, those extension properties along with any data co
3838
Extension properties exist only in the context of a registered application in the tenant. The object ID of that application must be included in the **TechnicalProfile** that uses it.
3939

4040
>[!NOTE]
41-
>The Azure AD B2C directory typically includes a web app named `b2c-extensions-app`. This application is primarily used by the B2C built-in policies for the custom claims created via the Azure portal. We recommend that only advanced users register extensions for B2C custom policies by using this application.
41+
>The Azure AD B2C directory typically includes a web app named `b2c-extensions-app`. This application is primarily used by the B2C built-in policies for the custom claims created via the Azure portal. We recommend that only advanced users register extensions for B2C custom policies by using this application.
4242
Instructions are included in the **Next steps** section in this article.
4343

4444
## Create a new application to store the extension properties
@@ -64,7 +64,7 @@ Instructions are included in the **Next steps** section in this article.
6464

6565
When you followed the steps in [Azure Active Directory B2C: Get started with custom policies](active-directory-b2c-get-started-custom.md), you downloaded and modified [sample files](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/archive/master.zip) named **TrustFrameworkBase.xml**, **TrustFrameworkExtensions.xml**, **SignUpOrSignin.xml**, **ProfileEdit.xml**, and **PasswordReset.xml**. In this step, you make more modifications to those files.
6666

67-
* Open the **TrustFrameworkBase.xml** file and add the `Metadata` section as shown in the following example. Insert the object ID that you previously recorded for the `ApplicationObjectId` value and the application ID that you recorded for the `ClientId` value:
67+
* Open the **TrustFrameworkBase.xml** file and add the `Metadata` section as shown in the following example. Insert the object ID that you previously recorded for the `ApplicationObjectId` value and the application ID that you recorded for the `ClientId` value:
6868

6969
```xml
7070
<ClaimsProviders>
@@ -98,7 +98,7 @@ When you followed the steps in [Azure Active Directory B2C: Get started with cus
9898

9999
1. Open the **ProfileEdit.xml** file.
100100
2. Add a custom claim `loyaltyId`. By including the custom claim in the `<RelyingParty>` element, it's included in the token for the application.
101-
101+
102102
```xml
103103
<RelyingParty>
104104
<DefaultUserJourney ReferenceId="ProfileEdit" />
@@ -263,10 +263,10 @@ The ID token sent back to your application includes the new extension property a
263263

264264
2. Use the same extension attributes between built-in and custom policies. When you add extension, or custom, attributes via the portal experience, those attributes are registered by using the **b2c-extensions-app** that exists in every B2C tenant. Take the following steps to use extension attributes in your custom policy:
265265

266-
a. Within your B2C tenant in portal.azure.com, navigate to **Azure Active Directory** and select **App registrations**.
267-
b. Find your **b2c-extensions-app** and select it.
268-
c. Under **Essentials**, enter the **Application ID** and the **Object ID**.
269-
d. Include them in your **AAD-Common** TechnicalProfile metadata:
266+
a. Within your B2C tenant in portal.azure.com, navigate to **Azure Active Directory** and select **App registrations**.
267+
b. Find your **b2c-extensions-app** and select it.
268+
c. Under **Essentials**, enter the **Application ID** and the **Object ID**.
269+
d. Include them in your **AAD-Common** TechnicalProfile metadata:
270270

271271
```xml
272272
<ClaimsProviders>
@@ -294,6 +294,6 @@ The ID token sent back to your application includes the new extension property a
294294
For more information on extension properties, see the article [Directory schema extensions | Graph API concepts](/previous-versions/azure/ad/graph/howto/azure-ad-graph-api-directory-schema-extensions).
295295

296296
> [!NOTE]
297-
> * A **TechnicalProfile** is an element type, or function, that defines an endpoint’s name, metadata, and protocol. The **TechnicalProfile** details the exchange of claims that the Identity Experience Framework performs. When this function is called in an orchestration step or from another **TechnicalProfile**, the **InputClaims** and **OutputClaims** are provided as parameters by the caller.
298-
> * Extension attributes in the Graph API are named by using the convention `extension_ApplicationObjectID_attributename`.
297+
> * A **TechnicalProfile** is an element type, or function, that defines an endpoint’s name, metadata, and protocol. The **TechnicalProfile** details the exchange of claims that the Identity Experience Framework performs. When this function is called in an orchestration step or from another **TechnicalProfile**, the **InputClaims** and **OutputClaims** are provided as parameters by the caller.
298+
> * Extension attributes in the Graph API are named by using the convention `extension_ApplicationObjectID_attributename`.
299299
> * Custom policies refer to extension attributes as **extension_attributename**. This reference omits the **ApplicationObjectId** in XML.

articles/active-directory-b2c/active-directory-b2c-custom-guide-eventlogger-appins.md

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

1818
[!INCLUDE [active-directory-b2c-public-preview](../../includes/active-directory-b2c-public-preview.md)]
1919

20-
When you use Azure Active Directory (Azure AD) B2C together with Azure Application Insights, you can get detailed and customized event logs for your user journeys. In this article, you learn how to:
20+
When you use Azure Active Directory B2C (Azure AD B2C) together with Azure Application Insights, you can get detailed and customized event logs for your user journeys. In this article, you learn how to:
2121

2222
* Gain insights on user behavior.
2323
* Troubleshoot your own policies in development or in production.
@@ -41,7 +41,7 @@ Complete the steps in [Get started with custom policies](active-directory-b2c-ge
4141
When you're using Application Insights with Azure AD B2C, all you need to do is create a resource and get the instrumentation key.
4242

4343
1. Sign in to the [Azure portal](https://portal.azure.com/).
44-
2. Make sure you're using the directory that contains your Azure subscription by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your subscription. This tenant is not your Azure AD B2C tenant.
44+
2. Make sure you're using the directory that contains your Azure subscription by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your subscription. This tenant is not your Azure AD B2C tenant.
4545
3. Choose **Create a resource** in the top-left corner of the Azure portal, and then search for and select **Application Insights**.
4646
4. Click **Create**.
4747
5. Enter a **Name** for the resource.
@@ -107,10 +107,10 @@ Technical profiles can be considered functions in the Identity Experience Framew
107107

108108
| Technical Profile | Task |
109109
| ----------------- | -----|
110-
| AzureInsights-Common | Creates a common set of parameters to be included in all AzureInsights technical profiles. |
111-
| AzureInsights-SignInRequest | Creates a SignIn event with a set of claims when a sign-in request has been received. |
112-
| AzureInsights-UserSignup | Creates a UserSignup event when the user triggers the sign-up option in a sign-up/sign-in journey. |
113-
| AzureInsights-SignInComplete | Records the successful completion of an authentication when a token has been sent to the relying party application. |
110+
| AzureInsights-Common | Creates a common set of parameters to be included in all AzureInsights technical profiles. |
111+
| AzureInsights-SignInRequest | Creates a SignIn event with a set of claims when a sign-in request has been received. |
112+
| AzureInsights-UserSignup | Creates a UserSignup event when the user triggers the sign-up option in a sign-up/sign-in journey. |
113+
| AzureInsights-SignInComplete | Records the successful completion of an authentication when a token has been sent to the relying party application. |
114114

115115
Add the profiles to the *TrustFrameworkExtensions.xml* file from the starter pack. Add these elements to the **ClaimsProviders** element:
116116

@@ -226,11 +226,11 @@ Save and upload the *TrustFrameworkExtensions.xml* file. Then, call the relying
226226

227227
## Next steps
228228

229-
Add claim types and events to your user journey to fit your needs. You can use [claim resolvers](claim-resolver-overview.md) or any string claim type, add the claims by adding an **Input Claim** element to the Application Insights event or to the AzureInsights-Common technical profile.
229+
Add claim types and events to your user journey to fit your needs. You can use [claim resolvers](claim-resolver-overview.md) or any string claim type, add the claims by adding an **Input Claim** element to the Application Insights event or to the AzureInsights-Common technical profile.
230230

231231
- **ClaimTypeReferenceId** is the reference to a claim type.
232-
- **PartnerClaimType** is the name of the property that appears in Azure Insights. Use the syntax of `{property:NAME}`, where `NAME` is property being added to the event.
233-
- **DefaultValue** use any string value or the claim resolver.
232+
- **PartnerClaimType** is the name of the property that appears in Azure Insights. Use the syntax of `{property:NAME}`, where `NAME` is property being added to the event.
233+
- **DefaultValue** use any string value or the claim resolver.
234234

235235
```XML
236236
<InputClaim ClaimTypeReferenceId="app_session" PartnerClaimType="{property:app_session}" DefaultValue="{OAUTH-KV:app_session}" />

0 commit comments

Comments
 (0)