Skip to content

Commit 9639f67

Browse files
authored
Merge pull request #157146 from MicrosoftDocs/master
Merge master to live, 4 AM
2 parents d10744b + 3071b58 commit 9639f67

File tree

286 files changed

+2463
-2224
lines changed

Some content is hidden

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

286 files changed

+2463
-2224
lines changed

.openpublishing.redirection.json

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5185,6 +5185,11 @@
51855185
"redirect_url": "/azure/architecture/vdc/networking-virtual-datacenter",
51865186
"redirect_document_id": false
51875187
},
5188+
{
5189+
"source_path_from_root": "/articles/automation/automation-watchers-tutorial.md",
5190+
"redirect_url": "/azure/automation/automation-scenario-using-watcher-task",
5191+
"redirect_document_id": false
5192+
},
51885193
{
51895194
"source_path_from_root": "/articles/automation/automation-scenario-remove-resourcegroup.md",
51905195
"redirect_url": "/azure/automation",
@@ -19515,9 +19520,19 @@
1951519520
"redirect_url": "/azure/devtest-labs/use-paas-services",
1951619521
"redirect_document_id": true
1951719522
},
19523+
{
19524+
"source_path_from_root": "/articles/digital-twins/how-to-use-cli.md",
19525+
"redirect_url": "/azure/digital-twins/concepts-cli",
19526+
"redirect_document_id": true
19527+
},
19528+
{
19529+
"source_path_from_root": "/articles/digital-twins/how-to-use-apis-sdks.md",
19530+
"redirect_url": "/azure/digital-twins/concepts-apis-sdks",
19531+
"redirect_document_id": true
19532+
},
1951819533
{
1951919534
"source_path_from_root": "/articles/digital-twins/how-to-create-custom-sdks.md",
19520-
"redirect_url": "/azure/digital-twins/how-to-use-apis-sdks",
19535+
"redirect_url": "/azure/digital-twins/concepts-apis-sdks",
1952119536
"redirect_document_id": false
1952219537
},
1952319538
{
@@ -33494,7 +33509,7 @@
3349433509
"source_path_from_root": "/articles/service-bus-messaging/service-bus-migrate-acs-sas.md",
3349533510
"redirect_url": "/azure/service-bus-messaging/service-bus-sas",
3349633511
"redirect_document_id": false
33497-
},
33512+
},
3349833513
{
3349933514
"source_path_from_root": "/articles/service-bus-messaging/service-bus-dotnet-advanced-message-queuing.md",
3350033515
"redirect_url": "/azure/service-bus-messaging/service-bus-amqp-dotnet",
@@ -61635,6 +61650,11 @@
6163561650
"redirect_url": "/azure/cognitive-services/personalizer/what-is-personalizer",
6163661651
"redirect_document_id": false
6163761652
},
61653+
{
61654+
"source_path_from_root": "/articles/cognitive-services/personalizer/troubleshooting.md",
61655+
"redirect_url": "/azure/cognitive-services/personalizer/frequently-asked-questions",
61656+
"redirect_document_id": true
61657+
},
6163861658
{
6163961659
"source_path_from_root": "/articles/cognitive-services/policy-samples.md",
6164061660
"redirect_url": "/azure/cognitive-services/policy-reference",
@@ -65813,6 +65833,16 @@
6581365833
"source_path_from_root": "/articles/service-fabric-mesh/index.yml",
6581465834
"redirect_url": "/previous-versions/azure/service-fabric-mesh/service-fabric-mesh-overview",
6581565835
"redirect_document_id": false
65836+
},
65837+
{
65838+
"source_path_from_root": "/articles/dms/tutorial-oracle-azure-postgresql-online.md",
65839+
"redirect_url": "/azure/postgresql/howto-migrate-from-oracle",
65840+
"redirect_document_id": false
65841+
},
65842+
{
65843+
"source_path_from_root": "/articles/dms/known-issues-oracle-azure-postgresql-online.md",
65844+
"redirect_url": "/azure/postgresql/howto-migrate-from-oracle",
65845+
"redirect_document_id": false
6581665846
}
6581765847
]
65818-
}
65848+
}

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

Lines changed: 37 additions & 24 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/30/2021
12+
ms.date: 05/04/2021
1313
ms.custom: project-no-code
1414
ms.author: mimart
1515
ms.subservice: B2C
@@ -34,7 +34,42 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
3434
| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | |
3535
| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| |
3636
| [Force password reset](force-password-reset.md) | Preview | NA | |
37-
| [phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | |
37+
| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | |
38+
39+
## OAuth 2.0 application authorization flows
40+
41+
The following table summarizes the OAuth 2.0 and OpenId Connect application authentication flows that can be integrated with Azure AD B2C.
42+
43+
|Feature |User flow |Custom policy |Notes |
44+
|---------|:---------:|:---------:|---------|
45+
[Authorization code](authorization-code-flow.md) | GA | GA | Allows users to sign in to web applications. The web application receives an authorization code. The authorization code is redeemed to acquire a token to call web APIs.|
46+
[Authorization code with PKCE](authorization-code-flow.md)| GA | GA | Allows users to sign in to mobile and single-page applications. The application receives an authorization code using proof key for code exchange (PKCE). The authorization code is redeemed to acquire a token to call web APIs. |
47+
[Client credentials grant](https://tools.ietf.org/html/rfc6749#section-4.4)| GA | GA | Allows access web-hosted resources by using the identity of an application. Commonly used for server-to-server interactions that must run in the background, without immediate interaction with a user. <br /> <br /> To use this feature in an Azure AD B2C tenant, use the Azure AD endpoint of your Azure AD B2C tenant. For more information, see [OAuth 2.0 client credentials flow](../active-directory/develop/v2-oauth2-client-creds-grant-flow.md). This flow doesn't use your Azure AD B2C [user flow or custom policy](user-flow-overview.md) settings. |
48+
[Device authorization grant](https://tools.ietf.org/html/rfc8628)| NA | NA | Allows users to sign in to input-constrained devices such as a smart TV, IoT device, or printer. |
49+
[Implicit flow](implicit-flow-single-page-application.md) | GA | GA | Allows users to sign in to single-page applications. The app gets tokens directly without performing a back-end server credential exchange.|
50+
[On-behalf-of](../active-directory/develop/v2-oauth2-on-behalf-of-flow.md)| NA | NA | An application invokes a service or web API, which in turn needs to call another service or web API. <br /> <br /> For the middle-tier service to make authenticated requests to the downstream service, pass a *client credential* token in the authorization header. Optionally, you can include a custom header with the Azure AD B2C user's token. |
51+
[OpenId Connect](openid-connect.md) | GA | GA | OpenID Connect introduces the concept of an ID token, which is a security token that allows the client to verify the identity of the user. |
52+
[OpenId Connect hybrid flow](openid-connect.md) | GA | GA | Allows a web application retrieve the ID token on the authorize request along with an authorization code. |
53+
[Resource owner password credentials (ROPC)](add-ropc-policy.md) | Preview | Preview | Allows a mobile application to sign in the user by directly handling their password. |
54+
55+
### OAuth 2.0 options
56+
57+
|Feature |User flow |Custom policy |Notes |
58+
|---------|:---------:|:---------:|---------|
59+
| [Redirect sign-in to a social provider](direct-signin.md#redirect-sign-in-to-a-social-provider) | GA | GA | Query string parameter `domain_hint`. |
60+
| [Prepopulate the sign-in name](direct-signin.md#prepopulate-the-sign-in-name) | GA | GA | Query string parameter `login_hint`. |
61+
| Insert JSON into user journey via `client_assertion`| NA| Deprecated | |
62+
| Insert JSON into user journey as [id_token_hint](id-token-hint.md) | NA | GA | |
63+
| [Pass identity provider token to the application](idp-pass-through-user-flow.md)| Preview| Preview| For example, from Facebook to app. |
64+
65+
## SAML2 application authentication flows
66+
67+
The following table summarizes the Security Assertion Markup Language (SAML) application authentication flows that can be integrated with Azure AD B2C.
68+
69+
|Feature |User flow |Custom policy |Notes |
70+
|---------|:---------:|:---------:|---------|
71+
[SP initiated](saml-service-provider.md) | NA | GA | POST and Redirect bindings. |
72+
[IDP initiated](saml-service-provider-options.md#identity-provider-initiated-flow) | NA | GA | Where the initiating identity provider is Azure AD B2C. |
3873

3974
## User experience customization
4075

@@ -50,18 +85,6 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
5085
| [Disable email verification](disable-email-verification.md) | GA| GA| Not recommended for production environments. Disabling email verification in the sign-up process may lead to spam. |
5186

5287

53-
## Protocols and authorization flows
54-
55-
|Feature |User flow |Custom policy |Notes |
56-
|---------|:---------:|:---------:|---------|
57-
|[OAuth2 authorization code](authorization-code-flow.md) | GA | GA |
58-
|[OAuth2 authorization code with PKCE](authorization-code-flow.md)| GA | GA | Public clients and single-page applications. |
59-
|[OAuth2 implicit flow](implicit-flow-single-page-application.md) | GA | GA | |
60-
|[OAuth2 resource owner password credentials](add-ropc-policy.md) | Preview | Preview | |
61-
|OAuth1 | NA | NA | Not supported. |
62-
|[OpenId Connect](openid-connect.md) | GA | GA | |
63-
|[SAML2](saml-service-provider.md) | NA | GA | POST and Redirect bindings. |
64-
| WSFED | NA | NA | Not supported. |
6588

6689
## Identity providers
6790

@@ -107,16 +130,6 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
107130
|[Secure with OAuth2 bearer authentication](secure-rest-api.md#oauth2-bearer-authentication) | NA | GA | |
108131
|[Secure API key authentication](secure-rest-api.md#api-key-authentication) | NA | GA | |
109132

110-
### Application and Azure AD B2C integration
111-
112-
|Feature |User flow |Custom policy |Notes |
113-
|---------|:---------:|:---------:|---------|
114-
| [Redirect sign-in to a social provider](direct-signin.md#redirect-sign-in-to-a-social-provider) | GA | GA | Query string parameter `domain_hint`. |
115-
| [Prepopulate the sign-in name](direct-signin.md#prepopulate-the-sign-in-name) | GA | GA | Query string parameter `login_hint`. |
116-
| Insert JSON into user journey via `client_assertion`| NA| Deprecated | |
117-
| Insert JSON into user journey as [id_token_hint](id-token-hint.md) | NA | GA | |
118-
| [Pass identity provider token to the application](idp-pass-through-user-flow.md)| Preview| Preview| For example, from Facebook to app. |
119-
120133

121134
## Custom policy features
122135

articles/active-directory/enterprise-users/users-restrict-guest-permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ When guest access is restricted, guests can view only their own user profile. Pe
2929

3030
## Permissions and licenses
3131

32-
You must be in the Global Administrator role to configure the external collaboration settings. There are no additional licensing requirements to restrict guest access.
32+
You must be in the Global Administrator or Privileged Role Administrator role to configure guest user access. There are no additional licensing requirements to restrict guest access.
3333

3434
## Update in the Azure portal
3535

articles/active-directory/external-identities/b2b-fundamentals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This article contains recommendations and best practices for business-to-busines
2626
## B2B recommendations
2727
| Recommendation | Comments |
2828
| --- | --- |
29-
| For an optimal sign-in experience, federate with identity providers | Whenever possible, federate directly with identity providers to allow invited users to sign in to your shared apps and resources without having to create Microsoft Accounts (MSAs) or Azure AD accounts. You can use the [Google federation feature](google-federation.md) to allow B2B guest users to sign in with their Google accounts. Or, you can use the [Direct federation (preview) feature](direct-federation.md) to set up direct federation with any organization whose identity provider (IdP) supports the SAML 2.0 or WS-Fed protocol. |
29+
| For an optimal sign-in experience, federate with identity providers | Whenever possible, federate directly with identity providers to allow invited users to sign in to your shared apps and resources without having to create Microsoft Accounts (MSAs) or Azure AD accounts. You can use the [Google federation feature](google-federation.md) to allow B2B guest users to sign in with their Google accounts. Or, you can use the [SAML/WS-Fed federation (preview) feature](direct-federation.md) to set up federation with any organization whose identity provider (IdP) supports the SAML 2.0 or WS-Fed protocol. |
3030
| Use the Email one-time passcode feature for B2B guests who can’t authenticate by other means | The [Email one-time passcode](one-time-passcode.md) feature authenticates B2B guest users when they can't be authenticated through other means like Azure AD, a Microsoft account (MSA), or Google federation. When the guest user redeems an invitation or accesses a shared resource, they can request a temporary code, which is sent to their email address. Then they enter this code to continue signing in. |
3131
| Add company branding to your sign-in page | You can customize your sign-in page so it's more intuitive for your B2B guest users. See how to [add company branding to sign in and Access Panel pages](../fundamentals/customize-branding.md). |
3232
| Add your privacy statement to the B2B guest user redemption experience | You can add the URL of your organization's privacy statement to the first time invitation redemption process so that an invited user must consent to your privacy terms to continue. See [How-to: Add your organization's privacy info in Azure Active Directory](../fundamentals/active-directory-properties-area.md). |

articles/active-directory/external-identities/compare-with-b2c.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The following table gives a detailed comparison of the scenarios you can enable
3737
| ---- | --- | --- |
3838
| **Primary scenario** | Collaboration using Microsoft applications (Microsoft 365, Teams, etc.) or your own applications (SaaS apps, custom-developed apps, etc.). | Identity and access management for modern SaaS or custom-developed applications (not first-party Microsoft apps). |
3939
| **Intended for** | Collaborating with business partners from external organizations like suppliers, partners, vendors. Users appear as guest users in your directory. These users may or may not have managed IT. | Customers of your product. These users are managed in a separate Azure AD directory. |
40-
| **Identity providers supported** | External users can collaborate using work accounts, school accounts, any email address, SAML and WS-Fed based identity providers, Gmail, and Facebook. | Consumer users with local application accounts (any email address or user name), various supported social identities, and users with corporate and government-issued identities via direct federation. |
40+
| **Identity providers supported** | External users can collaborate using work accounts, school accounts, any email address, SAML and WS-Fed based identity providers, Gmail, and Facebook. | Consumer users with local application accounts (any email address or user name), various supported social identities, and users with corporate and government-issued identities via SAML/WS-Fed identity provider federation. |
4141
| **External user management** | External users are managed in the same directory as employees, but are typically annotated as guest users. Guest users can be managed the same way as employees, added to the same groups, and so on. | External users are managed in the Azure AD B2C directory. They're managed separately from the organization's employee and partner directory (if any). |
4242
| **Single sign-on (SSO)** | SSO to all Azure AD-connected apps is supported. For example, you can provide access to Microsoft 365 or on-premises apps, and to other SaaS apps such as Salesforce or Workday. | SSO to customer owned apps within the Azure AD B2C tenants is supported. SSO to Microsoft 365 or to other Microsoft SaaS apps isn't supported. |
4343
| **Security policy and compliance** | Managed by the host/inviting organization (for example, with [Conditional Access policies](conditional-access.md)). | Managed by the organization via Conditional Access and Identity Protection. |

0 commit comments

Comments
 (0)