Skip to content

Commit f14067f

Browse files
author
Justin
committed
Merge branch 'master' of github.com:MicrosoftDocs/azure-docs-pr into update-dashboard
2 parents 198360d + 964d9d1 commit f14067f

File tree

1,864 files changed

+37142
-21311
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,864 files changed

+37142
-21311
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@
233233
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
234234
"branch": "master"
235235
},
236+
{
237+
"path_to_root": "azure-iot-sdk-node",
238+
"url": "https://github.com/Azure/azure-iot-sdk-node",
239+
"branch": "master"
240+
},
236241
{
237242
"path_to_root": "iot-samples-c",
238243
"url": "https://github.com/Azure/azure-iot-sdk-c",

.openpublishing.redirection.json

Lines changed: 289 additions & 534 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2+
3+
# Horizontals
4+
5+
## Azure Policy: Samples
6+
articles/**/policy-samples.md @DCtheGeek
7+
includes/policy/ @DCtheGeek
8+
9+
# Azure Active Directory
10+
11+
articles/active-directory-b2c/ @msmimart @yoelhor
12+
articles/active-directory/app-provisioning/ @CelesteDG
13+
articles/active-directory/manage-apps/ @CelesteDG
14+
215
# Cognitive Services
316
articles/cognitive-services/ @diberry @erhopf @aahill @ievangelist @patrickfarley @nitinme
417

@@ -9,7 +22,7 @@ articles/jenkins/ @TomArcherMsft
922
articles/terraform/ @TomArcherMsft
1023

1124
# Requires Internal Review
12-
articles/best-practices-availability-paired-regions.md @jpconnock @martinekuan @syntaxc4 @tysonn @snoviking
25+
articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
1326

1427
# Governance
1528
articles/governance/ @DCtheGeek

articles/active-directory-b2c/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,9 @@
226226
- name: Tokens and session management
227227
items:
228228
- name: Customize tokens
229-
href: custom-policy-manage-sso-and-token-config.md
229+
href: configure-tokens-custom-policy.md
230+
- name: Configure session behavior
231+
href: session-behavior-custom-policy.md
230232
- name: Pass through external IdP token
231233
href: idp-pass-through-custom.md
232234
- name: Adaptive experience

articles/active-directory-b2c/custom-policy-manage-sso-and-token-config.md renamed to articles/active-directory-b2c/configure-tokens-custom-policy.md

Lines changed: 21 additions & 33 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: 10/09/2018
12+
ms.date: 05/07/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -18,7 +18,7 @@ ms.subservice: B2C
1818

1919
This article provides information about how you can manage your token, session, and single sign-on (SSO) configurations using [custom policies](custom-policy-overview.md) in Azure Active Directory B2C (Azure AD B2C).
2020

21-
## Token lifetimes and claims configuration
21+
## JTW token lifetimes and claims configuration
2222

2323
To change the settings on your token lifetimes, you add a [ClaimsProviders](claimsproviders.md) element in the relying party file of the policy you want to impact. The **ClaimsProviders** element is a child of the [TrustFrameworkPolicy](trustframeworkpolicy.md) element.
2424

@@ -28,21 +28,21 @@ Inside, you'll need to put the information that affects your token lifetimes. Th
2828

2929
```XML
3030
<ClaimsProviders>
31-
<ClaimsProvider>
32-
<DisplayName>Token Issuer</DisplayName>
33-
<TechnicalProfiles>
34-
<TechnicalProfile Id="JwtIssuer">
35-
<Metadata>
36-
<Item Key="token_lifetime_secs">3600</Item>
37-
<Item Key="id_token_lifetime_secs">3600</Item>
38-
<Item Key="refresh_token_lifetime_secs">1209600</Item>
39-
<Item Key="rolling_refresh_token_lifetime_secs">7776000</Item>
40-
<Item Key="IssuanceClaimPattern">AuthorityAndTenantGuid</Item>
41-
<Item Key="AuthenticationContextReferenceClaimPattern">None</Item>
42-
</Metadata>
43-
</TechnicalProfile>
44-
</TechnicalProfiles>
45-
</ClaimsProvider>
31+
<ClaimsProvider>
32+
<DisplayName>Token Issuer</DisplayName>
33+
<TechnicalProfiles>
34+
<TechnicalProfile Id="JwtIssuer">
35+
<Metadata>
36+
<Item Key="token_lifetime_secs">3600</Item>
37+
<Item Key="id_token_lifetime_secs">3600</Item>
38+
<Item Key="refresh_token_lifetime_secs">1209600</Item>
39+
<Item Key="rolling_refresh_token_lifetime_secs">7776000</Item>
40+
<Item Key="IssuanceClaimPattern">AuthorityAndTenantGuid</Item>
41+
<Item Key="AuthenticationContextReferenceClaimPattern">None</Item>
42+
</Metadata>
43+
</TechnicalProfile>
44+
</TechnicalProfiles>
45+
</ClaimsProvider>
4646
</ClaimsProviders>
4747
```
4848

@@ -84,20 +84,8 @@ The following values are set in the previous example:
8484
<OutputClaim ClaimTypeReferenceId="sub" />
8585
```
8686

87-
## Session behavior and SSO
87+
## Next steps
8888

89-
To change your session behavior and SSO configurations, you add a **UserJourneyBehaviors** element inside of the [RelyingParty](relyingparty.md) element. The **UserJourneyBehaviors** element must immediately follow the **DefaultUserJourney**. The inside of your **UserJourneyBehavors** element should look like this example:
90-
91-
```XML
92-
<UserJourneyBehaviors>
93-
<SingleSignOn Scope="Application" />
94-
<SessionExpiryType>Absolute</SessionExpiryType>
95-
<SessionExpiryInSeconds>86400</SessionExpiryInSeconds>
96-
</UserJourneyBehaviors>
97-
```
98-
99-
The following values are configured in the previous example:
100-
101-
- **Single sign on (SSO)** - Single sign-on is configured with the **SingleSignOn**. The applicable values are `Tenant`, `Application`, `Policy`, and `Suppressed`.
102-
- **Web app session time-out** - The web app session timeout is set with the **SessionExpiryType** element. The applicable values are `Absolute` and `Rolling`.
103-
- **Web app session lifetime** - The web app session lifetime is set with the **SessionExpiryInSeconds** element. The default value is 86400 seconds (1440 minutes).
89+
- Learn more about [Azure AD B2C session](session-overview.md).
90+
- Learn how to [configure session behavior in custom policies](session-behavior-custom-policy.md).
91+
- Reference: [JwtIssuer](jwt-issuer-technical-profile.md).

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 04/16/2019
11+
ms.date: 05/07/2020
1212
ms.author: mimart
1313
ms.subservice: B2C
1414
---
@@ -21,7 +21,7 @@ In this article, you learn how to configure the [lifetime and compatibility of a
2121

2222
[Create a user flow](tutorial-create-user-flows.md) to enable users to sign up and sign in to your application.
2323

24-
## Configure token lifetime
24+
## Configure JWT token lifetime
2525

2626
You can configure the token lifetime on any user flow.
2727

@@ -37,7 +37,7 @@ You can configure the token lifetime on any user flow.
3737

3838
8. Click **Save**.
3939

40-
## Configure token compatibility
40+
## Configure JWT token compatibility
4141

4242
1. Select **User flows (policies)**.
4343
2. Open the user flow that you previously created.

articles/active-directory-b2c/custom-policy-reference-sso.md

Lines changed: 3 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: reference
12-
ms.date: 04/28/2020
12+
ms.date: 05/07/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -18,9 +18,7 @@ ms.subservice: B2C
1818

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

21-
[Single sign-on (SSO) session](session-overview.md) management in Azure Active Directory B2C (Azure AD B2C) enables an administrator to control interaction with a user after the user has already authenticated. For example, the administrator can control whether the selection of identity providers is displayed, or whether account details need to be entered again. This article describes how to configure the SSO settings for Azure AD B2C.
22-
23-
SSO session management uses the same semantics as any other technical profile in custom policies. When an orchestration step is executed, the technical profile associated with the step is queried for a `UseTechnicalProfileForSessionManagement` reference. If one exists, the referenced SSO session provider is then checked to see if the user is a session participant. If so, the SSO session provider is used to repopulate the session. Similarly, when the execution of an orchestration step is complete, the provider is used to store information in the session if an SSO session provider has been specified.
21+
[Single sign-on (SSO) session](session-overview.md) management uses the same semantics as any other technical profile in custom policies. When an orchestration step is executed, the technical profile associated with the step is queried for a `UseTechnicalProfileForSessionManagement` reference. If one exists, the referenced SSO session provider is then checked to see if the user is a session participant. If so, the SSO session provider is used to repopulate the session. Similarly, when the execution of an orchestration step is complete, the provider is used to store information in the session if an SSO session provider has been specified.
2422

2523
Azure AD B2C has defined a number of SSO session providers that can be used:
2624

@@ -170,3 +168,4 @@ The following `SM-Saml-issuer` technical profile is used by [SAML issuer technic
170168
## Next steps
171169

172170
- Learn more about [Azure AD B2C session](session-overview.md).
171+
- Learn how to [configure session behavior in custom policies](session-behavior-custom-policy.md).

articles/active-directory-b2c/identity-provider-amazon-custom.md

Lines changed: 9 additions & 10 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: 10/05/2018
12+
ms.date: 05/04/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -25,17 +25,16 @@ This article shows you how to enable sign-in for users from an Amazon account by
2525
- Complete the steps in [Get started with custom policies](custom-policy-get-started.md).
2626
- If you don't already have an Amazon account, create one at [https://www.amazon.com/](https://www.amazon.com/).
2727

28-
## Register the application
28+
## Create an app in the Amazon developer console
2929

30-
To enable sign-in for users from an Amazon account, you need to create an Amazon application.
30+
To use an Amazon account as a federated identity provider in Azure Active Directory B2C (Azure AD B2C), you need to create an application in your [Amazon Developer Services and Technologies](https://developer.amazon.com). If you don't already have an Amazon account, you can sign up at [https://www.amazon.com/](https://www.amazon.com/).
3131

32-
1. Sign in to the [Amazon Developer Center](https://login.amazon.com/) with your Amazon account credentials.
33-
2. If you have not already done so, click **Sign Up**, follow the developer registration steps, and accept the policy.
34-
3. Select **Register new application**.
35-
4. Enter a **Name**, **Description**, and **Privacy Notice URL**, and then click **Save**. The privacy notice is a page that you manage that provides privacy information to users.
36-
5. In the **Web Settings** section, copy the values of **Client ID**. Select **Show Secret** to get the client secret and then copy it. You need both of them to configure an Amazon account as an identity provider in your tenant. **Client Secret** is an important security credential.
37-
6. In the **Web Settings** section, select **Edit**, and then enter `https://your-tenant-name.b2clogin.com` in **Allowed JavaScript Origins** and `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp` in **Allowed Return URLs**. Replace `your-tenant-name` with the name of your tenant. Use all lowercase letters when entering your tenant name even if the tenant is defined with uppercase letters in Azure AD B2C.
38-
7. Click **Save**.
32+
> [!NOTE]
33+
> Use the following URLs in **step 8** below, replacing `your-tenant-name` with the name of your tenant. When entering your tenant name, use all lowercase letters, even if the tenant is defined with uppercase letters in Azure AD B2C.
34+
> - For **Allowed Origins**, enter `https://your-tenant-name.b2clogin.com`
35+
> - For **Allowed Return URLs**, enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp`
36+
37+
[!INCLUDE [identity-provider-amazon-idp-register.md](../../includes/identity-provider-amazon-idp-register.md)]
3938

4039
## Create a policy key
4140

articles/active-directory-b2c/identity-provider-amazon.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,23 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 08/08/2019
12+
ms.date: 04/05/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
1616

1717
# Set up sign-up and sign-in with an Amazon account using Azure Active Directory B2C
1818

19-
## Create an Amazon application
19+
## Create an app in the Amazon developer console
2020

21-
To use an Amazon account as an [identity provider](authorization-code-flow.md) in Azure Active Directory B2C (Azure AD B2C), you need to create an application in your tenant that represents it. If you don't already have an Amazon account you can sign up at [https://www.amazon.com/](https://www.amazon.com/).
21+
To use an Amazon account as a federated identity provider in Azure Active Directory B2C (Azure AD B2C), you need to create an application in your [Amazon Developer Services and Technologies](https://developer.amazon.com). If you don't already have an Amazon account, you can sign up at [https://www.amazon.com/](https://www.amazon.com/).
2222

23-
1. Sign in to the [Amazon Developer Center](https://login.amazon.com/) with your Amazon account credentials.
24-
1. If you have not already done so, click **Sign Up**, follow the developer registration steps, and accept the policy.
25-
1. Select **Register new application**.
26-
1. Enter a **Name**, **Description**, and **Privacy Notice URL**, and then click **Save**. The privacy notice is a page that you manage that provides privacy information to users.
27-
1. In the **Web Settings** section, copy the values of **Client ID**. Select **Show Secret** to get the client secret and then copy it. You need both of them to configure an Amazon account as an identity provider in your tenant. **Client Secret** is an important security credential.
28-
1. In the **Web Settings** section, select **Edit**, and then enter `https://your-tenant-name.b2clogin.com` in **Allowed JavaScript Origins** and `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp` in **Allowed Return URLs**. Replace `your-tenant-name` with the name of your tenant. You need to use all lowercase letters when entering your tenant name even if the tenant is defined with uppercase letters in Azure AD B2C.
29-
1. Click **Save**.
23+
> [!NOTE]
24+
> Use the following URLs in **step 8** below, replacing `your-tenant-name` with the name of your tenant. When entering your tenant name, use all lowercase letters, even if the tenant is defined with uppercase letters in Azure AD B2C.
25+
> - For **Allowed Origins**, enter `https://your-tenant-name.b2clogin.com`
26+
> - For **Allowed Return URLs**, enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp`
27+
28+
[!INCLUDE [identity-provider-amazon-idp-register.md](../../includes/identity-provider-amazon-idp-register.md)]
3029

3130
## Configure an Amazon account as an identity provider
3231

articles/active-directory-b2c/jwt-issuer-technical-profile.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: 04/28/2020
12+
ms.date: 05/07/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -29,7 +29,7 @@ The following example shows a technical profile for `JwtIssuer`:
2929
```XML
3030
<TechnicalProfile Id="JwtIssuer">
3131
<DisplayName>JWT Issuer</DisplayName>
32-
<Protocol Name="None" />
32+
<Protocol Name="OpenIdConnect" />
3333
<OutputTokenFormat>JWT</OutputTokenFormat>
3434
<Metadata>
3535
<Item Key="client_id">{service:te}</Item>

0 commit comments

Comments
 (0)