Skip to content

Commit eac670a

Browse files
authored
Merge pull request #2 from MicrosoftDocs/master
Syncing with base master
2 parents 5aaa762 + 19894e6 commit eac670a

File tree

4,532 files changed

+79340
-42637
lines changed

Some content is hidden

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

4,532 files changed

+79340
-42637
lines changed

.openpublishing.publish.config.json

Lines changed: 745 additions & 629 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 103 additions & 129 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.media-services.json

Lines changed: 470 additions & 40 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,19 @@ includes/policy/ @DCtheGeek
99

1010
# Azure Monitor
1111

12-
articles/azure-monitor/ @bwren
12+
articles/azure-monitor/* @bwren
13+
articles/azure-monitor/agents @bwren
14+
articles/azure-monitor/alerts @rboucher
15+
articles/azure-monitor/app @bwren @lgayhardt
16+
articles/azure-monitor/autoscale @rboucher
17+
articles/azure-monitor/containers @bwren
18+
articles/azure-monitor/essentials @bwren @rboucher
19+
articles/azure-monitor/insights @bwren @rboucher @lgayhardt
20+
articles/azure-monitor/logs @bwren
21+
articles/azure-monitor/visualize @bwren @lgayhardt
22+
articles/azure-monitor/vm @bwren
23+
articles/advisor @rboucher
24+
articles/service-health @rboucher
1325

1426
# Azure Active Directory
1527

@@ -42,6 +54,10 @@ articles/governance/ @DCtheGeek
4254
articles/**/*security-baseline.md @msmbaldwin @mgblythe
4355
articles/security/benchmarks/ @msmbaldwin @mgblythe
4456

57+
# Azure Security Center
58+
articles/security-center/ @memildin
59+
includes/*security-controls*.md @memildin
60+
4561
# DDOS Protection
4662

4763
articles/ddos-protection @aletheatoh @anupamvi

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,8 @@
298298
- name: Collect logs using Application Insights
299299
href: troubleshoot-with-application-insights.md
300300
displayName: troubleshooting, app insights
301-
- name: Policy validation
301+
- name: Troubleshooting custom policies
302302
href: troubleshoot-custom-policies.md
303-
displayName: troubleshooting
304303
- name: Reference
305304
items:
306305
- name: TrustFrameworkPolicy

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,16 @@ In the following example, you replace these values:
6767
- `<tenant-name>` - The name of your Azure AD B2C tenant.
6868
- `<policy-name>` - The name of your custom policy or user flow.
6969
- `<application-ID>` - The application identifier of the web application that you registered to support the user flow.
70+
- `<application-ID-URI>` - The application identifier URI that you set under **Expose an API** blade of the client application.
71+
- `<scope-name>` - The name of the scope that you added under **Expose an API** blade of the client application.
7072
- `<redirect-uri>` - The **Redirect URI** that you entered when you registered the client application.
7173

7274
```http
7375
GET https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/authorize?
7476
client_id=<application-ID>
7577
&nonce=anyRandomValue
7678
&redirect_uri=https://jwt.ms
77-
&scope=https://<tenant-name>.onmicrosoft.com/api/read
79+
&scope=<application-ID-URI>/<scope-name>
7880
&response_type=code
7981
```
8082

@@ -93,7 +95,7 @@ Content-Type: application/x-www-form-urlencoded
9395
9496
grant_type=authorization_code
9597
&client_id=<application-ID>
96-
&scope=https://<tenant-name>.onmicrosoft.com/api/read
98+
&scope=<application-ID-URI>/<scope-name>
9799
&code=eyJraWQiOiJjcGltY29yZV8wOTI1MjAxNSIsInZlciI6IjEuMC...
98100
&redirect_uri=https://jwt.ms
99101
&client_secret=2hMG2-_:y12n10vwH...

articles/active-directory-b2c/azure-ad-external-identities-videos.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ description: Microsoft Azure Active Directory B2C Video Series
55
services: active-directory-b2c
66
author: gargi-sinha
77
manager: martinco
8-
98
ms.service: active-directory
109
ms.workload: identity
1110
ms.topic: how-to
@@ -24,7 +23,7 @@ Learn the basics of External Identities - Azure Active Directory B2C (Azure AD B
2423
Get a deeper view into the features and technical aspects of the Azure AD B2C service.
2524

2625

27-
| Video title | | Video title | |
26+
| Video title | Video | Video title | Video |
2827
|:------|:------|:------|:------|
2928
|[Azure AD B2C sign-up sign-in](https://www.youtube.com/watch?v=c8rN1ZaR7wk&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=6&t=2s) 10:25 | [:::image type="icon" source="./media/external-identities-videos/customer-sign-up-sign-in.png" border="false":::](https://www.youtube.com/watch?v=c8rN1ZaR7wk&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=6) | [Azure AD B2C single sign on and self service password reset](https://www.youtube.com/watch?v=kRV-7PSLK38&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=7) 8:40 | [:::image type="icon" source="./media/external-identities-videos/single-sign-on.png" border="false":::](https://www.youtube.com/watch?v=kRV-7PSLK38&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=7) |
3029
| [Application and identity migration to Azure AD B2C](https://www.youtube.com/watch?v=Xw_YwSJmhIQ&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=9) 10:34 | [:::image type="icon" source="./media/external-identities-videos/identity-migration-aad-b2c.png" border="false":::](https://www.youtube.com/watch?v=Xw_YwSJmhIQ&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=9) | [Build resilient and scalable flows using Azure AD B2C](https://www.youtube.com/watch?v=8f_Ozpw9yTs&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=12) 16:47 | [:::image type="icon" source="./media/external-identities-videos/b2c-scalable-flows.png" border="false":::](https://www.youtube.com/watch?v=8f_Ozpw9yTs&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=12) |
@@ -35,7 +34,8 @@ Get a deeper view into the features and technical aspects of the Azure AD B2C se
3534

3635
Learn how to perform various use cases in Azure AD B2C.
3736

38-
| Video title | | Video title | |
37+
| Video title | Video | Video title | Video |
3938
|:------|:------|:------|:------|
4039
|[Azure AD: Monitoring and reporting Azure AD B2C using Azure Monitor](https://www.youtube.com/watch?v=Mu9GQy-CbXI&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=1) 6:57 | [:::image type="icon" source="./media/external-identities-videos/monitoring-reporting-aad-b2c.png" border="false":::](https://www.youtube.com/watch?v=Mu9GQy-CbXI&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=1) | [Azure AD B2C user migration using Microsoft Graph API](https://www.youtube.com/watch?v=9BRXBtkBzL4&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=5) 7:09 | [:::image type="icon" source="./media/external-identities-videos/user-migration-msgraph-api.png" border="false":::](https://www.youtube.com/watch?v=9BRXBtkBzL4list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=5) |
41-
| [Azure AD B2C user migration strategies](https://www.youtube.com/watch?v=lCWR6PGUgz0&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=2) 8:22 | [:::image type="icon" source="./media/external-identities-videos/user-migration-stratagies.png" border="false":::](https://www.youtube.com/watch?v=lCWR6PGUgz0&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=2) | [How to localize or customize language using Azure AD B2C](https://www.youtube.com/watch?v=yqrX5_tA7Ms&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=13) 20:41 | [:::image type="icon" source="./media/external-identities-videos/language-localization.png" border="false":::](https://www.youtube.com/watch?v=yqrX5_tA7Ms&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=13) |
40+
| [Azure AD B2C user migration strategies](https://www.youtube.com/watch?v=lCWR6PGUgz0&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=2) 8:22 | [:::image type="icon" source="./media/external-identities-videos/user-migration-stratagies.png" border="false":::](https://www.youtube.com/watch?v=lCWR6PGUgz0&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=2) | [How to localize or customize language using Azure AD B2C](https://www.youtube.com/watch?v=yqrX5_tA7Ms&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=13) 20:41 | [:::image type="icon" source="./media/external-identities-videos/language-localization.png" border="false":::](https://www.youtube.com/watch?v=yqrX5_tA7Ms&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=13) |
41+
|[Configure monitoring: Azure AD B2C using Azure Monitor](https://www.youtube.com/watch?v=tF2JS6TGc3g&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=14) 17:23 | [:::image type="icon" source="./media/external-identities-videos/configure-monitoring.png" border="false":::](https://www.youtube.com/watch?v=tF2JS6TGc3g&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=14) |

articles/active-directory-b2c/azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following diagram depicts the components you'll configure in your Azure AD a
4242

4343
![Resource group projection](./media/azure-monitor/resource-group-projection.png)
4444

45-
During this deployment, you'll configure both your Azure AD B2C tenant and Azure AD tenant where the Log Analytics workspace will be hosted. The Azure AD B2C account should be assigned the [Global Administrator](../active-directory/roles/permissions-reference.md#limit-use-of-global-administrator) role on the Azure AD B2C tenant. The Azure AD account used to run the deployment must be assigned the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Azure AD subscription.It's also important to make sure you're signed in to the correct directory as you complete each step as described.
45+
During this deployment, you'll configure both your Azure AD B2C tenant and Azure AD tenant where the Log Analytics workspace will be hosted. The Azure AD B2C account should be assigned the [Global Administrator](../active-directory/roles/permissions-reference.md#global-administrator) role on the Azure AD B2C tenant. The Azure AD account used to run the deployment must be assigned the [Owner](../role-based-access-control/built-in-roles.md#owner) role in the Azure AD subscription.It's also important to make sure you're signed in to the correct directory as you complete each step as described.
4646

4747
## 1. Create or choose resource group
4848

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

Lines changed: 6 additions & 2 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: how-to
11-
ms.date: 12/14/2020
11+
ms.date: 04/05/2021
1212
ms.custom: project-no-code
1313
ms.author: mimart
1414
ms.subservice: B2C
@@ -225,6 +225,10 @@ The OutputClaim element contains the following attributes:
225225

226226
::: zone-end
227227

228+
## Authorization code lifetime
229+
230+
When using the [OAuth 2.0 authorization code flow](authorization-code-flow.md), the app can use the authorization code to request an access token for a target resource. Authorization codes are short-lived that expire after about 10 minutes. The authorization code lifetime cannot be configured. Make sure your application redeems the authorization codes within 10 minutes.
231+
228232
## Next steps
229233

230-
Learn more about how to [request access tokens](access-tokens.md).
234+
Learn more about how to [request access tokens](access-tokens.md).

articles/active-directory-b2c/configure-user-input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The application claims are values that are returned to the application. Update y
5555
1. Select **Page layouts**.
5656
1. Select **Local account sign-up page**.
5757
1. Under **User attributes**, select **City**.
58-
1. In the **User input type** drop-down, select **DropdownSingleSelect**.
58+
1. In the **User input type** drop-down, select **DropdownSingleSelect**. Optional: Use the "Move up/down" buttons to arrange the text order on the sign-up page.
5959
1. In the **Optional** drop-down, select **No**.
6060
1. Select **Save**.
6161

0 commit comments

Comments
 (0)