Skip to content

Commit e5866dd

Browse files
timlttimlt
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into timlt1
2 parents 423ea96 + 961e070 commit e5866dd

File tree

839 files changed

+12462
-6453
lines changed

Some content is hidden

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

839 files changed

+12462
-6453
lines changed

‎.openpublishing.redirection.json

Lines changed: 80 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4040,6 +4040,11 @@
40404040
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
40414041
"redirect_document_id": false
40424042
},
4043+
{
4044+
"source_path": "articles/azure-resource-manager/templates/template-tutorial-create-encrypted-storage-accounts.md",
4045+
"redirect_url": "/azure/azure-resource-manager/templates/template-tutorial-use-template-reference",
4046+
"redirect_document_id": false
4047+
},
40434048
{
40444049
"source_path": "articles/azure-resource-manager/azure-resource-manager-security-controls.md",
40454050
"redirect_url": "/azure/azure-resource-manager/management/azure-resource-manager-security-controls",
@@ -6235,16 +6240,31 @@
62356240
"redirect_url": "/azure/active-directory-b2c/secure-rest-api-dotnet-basic-auth",
62366241
"redirect_document_id": true
62376242
},
6243+
{
6244+
"source_path": "articles/active-directory-b2c/secure-rest-api-dotnet-basic-auth.md",
6245+
"redirect_url": "/azure/active-directory-b2c/secure-rest-api",
6246+
"redirect_document_id": false
6247+
},
62386248
{
62396249
"source_path": "articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-cert.md",
62406250
"redirect_url": "/azure/active-directory-b2c/secure-rest-api-dotnet-certificate-auth",
62416251
"redirect_document_id": true
62426252
},
6253+
{
6254+
"source_path": "articles/active-directory-b2c/secure-rest-api-dotnet-certificate-auth.md",
6255+
"redirect_url": "/azure/active-directory-b2c/secure-rest-api",
6256+
"redirect_document_id": false
6257+
},
62436258
{
62446259
"source_path": "articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw.md",
62456260
"redirect_url": "/azure/active-directory-b2c/rest-api-claims-exchange-dotnet",
62466261
"redirect_document_id": true
62476262
},
6263+
{
6264+
"source_path": "articles/active-directory-b2c/rest-api-claims-exchange-dotnet.md",
6265+
"redirect_url": "/azure/active-directory-b2c/secure-rest-api",
6266+
"redirect_document_id": false
6267+
},
62486268
{
62496269
"source_path": "articles/active-directory-b2c/active-directory-b2c-devquickstarts-android.md",
62506270
"redirect_url": "/azure/active-directory-b2c/signin-appauth-android",
@@ -20224,6 +20244,11 @@
2022420244
"redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-to-party-cluster",
2022520245
"redirect_document_id": false
2022620246
},
20247+
{
20248+
"source_path": "articles/migrate/deploy-appliance.md",
20249+
"redirect_url": "migrate-appliance-architecture",
20250+
"redirect_document_id": false
20251+
},
2022720252
{
2022820253
"source_path": "articles/migrate/troubleshooting-general.md",
2022920254
"redirect_url": "troubleshoot-general",
@@ -29715,6 +29740,26 @@
2971529740
"redirect_url": "/azure/sentinel/fusion",
2971629741
"redirect_document_id": false
2971729742
},
29743+
{
29744+
"source_path": "articles/security-center/security-center-virtual-machine.md",
29745+
"redirect_url": "/azure/security-center/security-center-intro",
29746+
"redirect_document_id": false
29747+
},
29748+
{
29749+
"source_path": "articles/security-center/security-center-install-endpoint-protection.md",
29750+
"redirect_url": "/azure/security-center/security-center-services?tabs=features-windows#supported-endpoint-protection-solutions-",
29751+
"redirect_document_id": false
29752+
},
29753+
{
29754+
"source_path": "articles/security-center/security-center-linux-virtual-machine.md",
29755+
"redirect_url": "/azure/security-center/security-center-intro",
29756+
"redirect_document_id": false
29757+
},
29758+
{
29759+
"source_path": "articles/security-center/security-center-container-recommendations.md",
29760+
"redirect_url": "/azure/security-center/container-security",
29761+
"redirect_document_id": false
29762+
},
2971829763
{
2971929764
"source_path": "articles/security-center/security-center-ata-integration.md",
2972029765
"redirect_url": "/azure/security-center/security-center-partner-integration",
@@ -42385,6 +42430,11 @@
4238542430
"redirect_url": "/azure/azure-monitor/log-query/vminsights-overview",
4238642431
"redirect_document_id": false
4238742432
},
42433+
{
42434+
"source_path": "articles/azure-monitor/platform/diagnostic-settings-legacy.md",
42435+
"redirect_url": "/azure/azure-monitor/platform/activity-log-collect",
42436+
"redirect_document_id": false
42437+
},
4238842438
{
4238942439
"source_path": "articles/machine-learning/service/how-to-automated-ml.md",
4239042440
"redirect_url": "/azure/machine-learning/service/concept-automated-ml",
@@ -49330,6 +49380,11 @@
4933049380
"redirect_url": "/azure/cost-management-billing/reservations/monthly-payments-reservations",
4933149381
"redirect_document_id": true
4933249382
},
49383+
{
49384+
"source_path": "articles/cost-management-billing/reservations/monthly-payments-reservations.md",
49385+
"redirect_url": "/azure/cost-management-billing/reservations/prepare-buy-reservation",
49386+
"redirect_document_id": true
49387+
},
4933349388
{
4933449389
"source_path": "articles/billing/billing-prepay-app-service-isolated-stamp.md",
4933549390
"redirect_url": "/azure/cost-management-billing/reservations/prepay-app-service-isolated-stamp",
@@ -50389,28 +50444,44 @@
5038950444
"source_path": "articles/cognitive-services/speech-service/quickstart-voice-assistant-java-jre.md",
5039050445
"redirect_url": "/azure/cognitive-services/speech-service/quickstarts/voice-assistants?pivots=programming-language-java&tabs=jre"
5039150446
},
50392-
{
50447+
{
5039350448
"source_path": "articles/security/fundamentals/choose-ad-authn.md",
5039450449
"redirect_url": "/azure/active-directory/hybrid/choose-ad-authn",
50395-
"redirect_document_id": true
50450+
"redirect_document_id": true
5039650451
},
50397-
{
50398-
"source_path": "articles/azure-monitor/app/opencensus-go.md",
50452+
{
50453+
"source_path": "articles/azure-monitor/app/opencensus-go.md",
5039950454
"redirect_url": "/azure/azure-monitor/overview",
5040050455
"redirect_document_id": false
50401-
},
50402-
{
50403-
"source_path": "articles/azure-monitor/app/opencensus-local-forwarder.md",
50456+
},
50457+
{
50458+
"source_path": "articles/azure-monitor/app/opencensus-local-forwarder.md",
5040450459
"redirect_url": "/azure/azure-monitor/overview",
5040550460
"redirect_document_id": false
50406-
},
50461+
},
5040750462
{
5040850463
"source_path": "articles/cognitive-services/Speech-Service/quickstart-voice-assistant-csharp-uwp.md",
5040950464
"redirect_url": "/azure/cognitive-services/speech-service/quickstarts/voice-assistants?pivots=programming-language-csharp&tabs=uwp"
5041050465
},
5041150466
{
5041250467
"source_path": "articles/load-balancer/use-existing-lb-vmss-cli.md",
5041350468
"redirect_url": "/azure/load-balancer/configure-vm-scale-set-cli"
50469+
},
50470+
{
50471+
"source_path": "articles/cognitive-services/speech-service/how-to-custom-speech-test-data.md",
50472+
"redirect_url": "/azure/cognitive-services/speech-service/how-to-custom-speech-test-and-train"
50473+
},
50474+
{
50475+
"source_path": "articles/sql-database/sql-database-paas-index.yml",
50476+
"redirect_url": "/azure/sql-database/sql-database-technical-overview"
50477+
},
50478+
{
50479+
"source_path": "articles/sql-database/sql-database-scalability-index.yml",
50480+
"redirect_url": "/azure/sql-database/sql-database-scale-resources"
50481+
},
50482+
{
50483+
"source_path": "articles/sql-database/sql-database-features-index.yml",
50484+
"redirect_url": "/azure/sql-database/sql-database-features"
5041450485
}
5041550486
]
50416-
}
50487+
}

‎articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
href: error-codes.md
405405
- name: Extensions app
406406
href: extensions-app.md
407-
- name: Identity Experience Framework release notes
407+
- name: IEF release notes
408408
href: custom-policy-developer-notes.md
409409
- name: Microsoft Graph API operations
410410
href: microsoft-graph-operations.md

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

Lines changed: 4 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: 03/20/2020
12+
ms.date: 03/30/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -72,7 +72,7 @@ The following sections list available claim resolvers.
7272
| {OIDC:Prompt} | The `prompt` query string parameter. | login |
7373
| {OIDC:RedirectUri} |The `redirect_uri` query string parameter. | https://jwt.ms |
7474
| {OIDC:Resource} |The `resource` query string parameter. | N/A |
75-
| {OIDC:scope} |The `scope` query string parameter. | openid |
75+
| {OIDC:Scope} |The `scope` query string parameter. | openid |
7676
| {OIDC:Username}| The [resource owner password credentials flow](ropc-custom.md) user's username.| [email protected]|
7777

7878
### Context
@@ -158,7 +158,7 @@ The following example shows a RESTful technical profile with this scenario:
158158
<InputClaims>
159159
<InputClaim ClaimTypeReferenceId="userLanguage" DefaultValue="{Culture:LCID}" AlwaysUseDefaultValue="true" />
160160
<InputClaim ClaimTypeReferenceId="policyName" DefaultValue="{Policy:PolicyId}" AlwaysUseDefaultValue="true" />
161-
<InputClaim ClaimTypeReferenceId="scope" DefaultValue="{OIDC:scope}" AlwaysUseDefaultValue="true" />
161+
<InputClaim ClaimTypeReferenceId="scope" DefaultValue="{OIDC:Scope}" AlwaysUseDefaultValue="true" />
162162
<InputClaim ClaimTypeReferenceId="clientId" DefaultValue="{OIDC:ClientId}" AlwaysUseDefaultValue="true" />
163163
</InputClaims>
164164
<UseTechnicalProfileForSessionManagement ReferenceId="SM-Noop" />
@@ -171,7 +171,7 @@ Using claim resolvers, you can prepopulate the sign-in name or direct sign-in to
171171

172172
### Dynamic UI customization
173173

174-
Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints to dynamically render the page content. For example, this allows the ability to modify the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization.md). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
174+
Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints to dynamically render the page content. For example, this feature allows the ability to modify the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization.md#configure-dynamic-custom-page-content-uri). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
175175

176176
The following example passes in the query string parameter named **campaignId** with a value of `Hawaii`, a **language** code of `en-US`, and **app** representing the client ID:
177177

‎articles/active-directory-b2c/custom-policy-developer-notes.md

Lines changed: 64 additions & 47 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: 02/12/2020
12+
ms.date: 03/30/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -55,85 +55,102 @@ Developers consuming the custom policy feature set should adhere to the followin
5555

5656
Custom policy/Identity Experience Framework capabilities are under constant and rapid development. The following table is an index of features and component availability.
5757

58-
### Identity Providers, Tokens, Protocols
58+
59+
### Protocols and authorization flows
5960

6061
| Feature | Development | Preview | GA | Notes |
6162
|-------- | :-----------: | :-------: | :--: | ----- |
62-
| IDP-OpenIDConnect | | | X | For example, Google+. |
63-
| IDP-OAUTH2 | | | X | For example, Facebook. |
64-
| IDP-OAUTH1 (twitter) | | X | | For example, Twitter. |
65-
| IDP-OAUTH1 (ex-twitter) | | | | Not supported |
66-
| IDP-SAML | | | X | For example, Salesforce, ADFS. |
67-
| IDP-WSFED | X | | | |
68-
| Relying Party OAUTH1 | | | | Not supported. |
69-
| Relying Party OAUTH2 | | | X | |
70-
| Relying Party OIDC | | | X | |
71-
| Relying Party SAML | |X | | |
72-
| Relying Party WSFED | X | | | |
73-
| REST API with basic and certificate auth | | | X | For example, Azure Logic Apps. |
74-
75-
### Component Support
63+
| [OAuth2 authorization code](authorization-code-flow.md) | | | X | |
64+
| OAuth2 authorization code with PKCE | | | X | Mobile applications only |
65+
| [OAuth2 implicit flow](implicit-flow-single-page-application.md) | | | X | |
66+
| [OAuth2 resource owner password credentials](ropc-custom.md) | | X | | |
67+
| [OIDC Connect](openid-connect.md) | | | X | |
68+
| [SAML2](connect-with-saml-service-providers.md) | |X | | POST and Redirect bindings. |
69+
| OAuth1 | | | | Not supported. |
70+
| WSFED | X | | | |
71+
72+
### Identify providers federation
73+
74+
| Feature | Development | Preview | GA | Notes |
75+
|-------- | :-----------: | :-------: | :--: | ----- |
76+
| [OpenID Connect](openid-connect-technical-profile.md) | | | X | For example, Google+. |
77+
| [OAuth2](oauth2-technical-profile.md) | | | X | For example, Facebook. |
78+
| [OAuth1](oauth1-technical-profile.md) | | X | | For example, Twitter. |
79+
| [SAML2](saml-technical-profile.md) | | | X | For example, Salesforce, ADFS. |
80+
| WSFED| X | | | |
81+
82+
83+
### REST API integration
84+
85+
| Feature | Development | Preview | GA | Notes |
86+
|-------- | :-----------: | :-------: | :--: | ----- |
87+
| [REST API with basic auth](secure-rest-api.md#http-basic-authentication) | | | X | |
88+
| [REST API with client certificate auth](secure-rest-api.md#https-client-certificate-authentication) | | | X | |
89+
| [REST API with OAuth2 bearer auth](secure-rest-api.md#oauth2-bearer-authentication) | | X | | |
90+
91+
### Component support
7692

7793
| Feature | Development | Preview | GA | Notes |
7894
| ------- | :-----------: | :-------: | :--: | ----- |
79-
| Azure Multi Factor Authentication | | | X | |
80-
| Azure Active Directory as local directory | | | X | |
81-
| Azure Email subsystem for email verification | | | X | |
82-
| Multi-language support| | | X | |
83-
| Predicate Validations | | | X | For example, password complexity. |
84-
| Using third party email service providers | |X | | |
95+
| [Phone factor authentication](phone-factor-technical-profile.md) | | | X | |
96+
| [Azure MFA authentication](multi-factor-auth-technical-profile.md) | | X | | |
97+
| [One-time password](one-time-password-technical-profile.md) | | X | | |
98+
| [Azure Active Directory](active-directory-technical-profile.md) as local directory | | | X | |
99+
| Azure email subsystem for email verification | | | X | |
100+
| [Third party email service providers](custom-email.md) | |X | | |
101+
| [Multi-language support](localization.md)| | | X | |
102+
| [Predicate validations](predicates.md) | | | X | For example, password complexity. |
103+
| [Display controls](display-controls.md) | |X | | |
85104

86-
### Content Definition
105+
106+
### Page layout versions
87107

88108
| Feature | Development | Preview | GA | Notes |
89109
| ------- | :-----------: | :-------: | :--: | ----- |
90-
| Error page, api.error | | | X | |
91-
| IDP selection page, api.idpselections | | | X | |
92-
| IDP selection for signup, api.idpselections.signup | | | X | |
93-
| Forgot Password, api.localaccountpasswordreset | | | X | |
94-
| Local Account Sign-in, api.localaccountsignin | | | X | |
95-
| Local Account Sign-up, api.localaccountsignup | | | X | |
96-
| MFA page, api.phonefactor | | | X | |
97-
| Self-asserted social account sign-up, api.selfasserted | | | X | |
98-
| Self-asserted profile update, api.selfasserted.profileupdate | | | X | |
99-
| Unified signup or sign-in page, api.signuporsignin, with parameter "disableSignup" | | | X | |
100-
| JavaScript / Page layout | | X | | |
110+
| [2.0.0](page-layout.md#200) | | X | | |
111+
| [1.2.0](page-layout.md#120) | | X | | |
112+
| [1.1.0](page-layout.md#110) | | | X | |
113+
| [1.0.0](page-layout.md#100) | | | X | |
114+
| [JavaScript support](javascript-samples.md) | | X | | |
101115

102116
### App-IEF integration
103117

104118
| Feature | Development | Preview | GA | Notes |
105119
| ------- | :-----------: | :-------: | :--: | ----- |
106-
| Query string parameter domain_hint | | | X | Available as claim, can be passed to IDP. |
107-
| Query string parameter login_hint | | | X | Available as claim, can be passed to IDP. |
108-
| Insert JSON into UserJourney via client_assertion | X | | | Will be deprecated. |
109-
| Insert JSON into UserJourney as id_token_hint | | X | | Go-forward approach to pass JSON. |
110-
| Pass IDP TOKEN to the application | | X | | For example, from Facebook to app. |
120+
| Query string parameter `domain_hint` | | | X | Available as claim, can be passed to IDP. |
121+
| Query string parameter `login_hint` | | | X | Available as claim, can be passed to IDP. |
122+
| Insert JSON into user journey via `client_assertion` | X | | | Will be deprecated. |
123+
| Insert JSON into user journey as `id_token_hint` | | X | | Go-forward approach to pass JSON. |
124+
| [Pass identity provider token to the application](idp-pass-through-custom.md) | | X | | For example, from Facebook to app. |
111125

112126
### Session Management
113127

114128
| Feature | Development | Preview | GA | Notes |
115129
| ------- | :-----------: | :-------: | :--: | ----- |
116-
| SSO Session Provider | | | X | |
117-
| External Login Session Provider | | | X | |
118-
| SAML SSO Session Provider | | | X | |
119-
| Default SSO Session Provider | | | X | |
130+
| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | | | X | |
131+
| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | | | X | |
132+
| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | | | X | |
133+
120134

121135
### Security
122136

123137
| Feature | Development | Preview | GA | Notes |
124138
|-------- | :-----------: | :-------: | :--: | ----- |
125139
| Policy Keys- Generate, Manual, Upload | | | X | |
126140
| Policy Keys- RSA/Cert, Secrets | | | X | |
127-
| Policy upload | | | X | |
141+
128142

129143
### Developer interface
130144

131145
| Feature | Development | Preview | GA | Notes |
132146
| ------- | :-----------: | :-------: | :--: | ----- |
133147
| Azure Portal-IEF UX | | | X | |
134-
| Application Insights UserJourney Logs | | X | | Used for troubleshooting during development. |
135-
| Application Insights Event Logs (via orchestration steps) | | X | | Used to monitor user flows in production. |
148+
| Policy upload | | | X | |
149+
| [Application Insights user journey logs](troubleshoot-with-application-insights.md) | | X | | Used for troubleshooting during development. |
150+
| [Application Insights event logs](application-insights-technical-profile.md) | | X | | Used to monitor user flows in production. |
151+
136152

137153
## Next steps
138154

139-
Learn more about [custom policies and the differences with user flows](custom-policy-overview.md).
155+
- Check the [Microsoft Graph operations available for Azure AD B2C](microsoft-graph-operations.md)
156+
- Learn more about [custom policies and the differences with user flows](custom-policy-overview.md).

‎articles/active-directory-b2c/custom-policy-ui-customization.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Complete the steps in [Get started with custom policies](custom-policy-get-start
2525

2626
[!INCLUDE [active-directory-b2c-html-how-to](../../includes/active-directory-b2c-html-how-to.md)]
2727

28-
## 4. Modify the extensions file
28+
### 4. Modify the extensions file
2929

3030
To configure UI customization, copy the **ContentDefinition** and its child elements from the base file to the extensions file.
3131

@@ -55,17 +55,17 @@ To configure UI customization, copy the **ContentDefinition** and its child elem
5555

5656
1. Save the extensions file.
5757

58-
## 5. Upload and test your updated custom policy
58+
### 5. Upload and test your updated custom policy
5959

60-
### 5.1 Upload the custom policy
60+
#### 5.1 Upload the custom policy
6161

6262
1. 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.
6363
1. Search for and select **Azure AD B2C**.
6464
1. Under **Policies**, select **Identity Experience Framework**.
6565
1. Select **Upload custom policy**.
6666
1. Upload the extensions file that you previously changed.
6767

68-
### 5.2 Test the custom policy by using **Run now**
68+
#### 5.2 Test the custom policy by using **Run now**
6969

7070
1. Select the policy that you uploaded, and then select **Run now**.
7171
1. You should be able to sign up by using an email address.

0 commit comments

Comments
 (0)