Skip to content

Commit b9772b9

Browse files
committed
Merge branch 'main' into passwordless-work
2 parents 22c41cc + c565a80 commit b9772b9

File tree

577 files changed

+9992
-6948
lines changed

Some content is hidden

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

577 files changed

+9992
-6948
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@
934934
".openpublishing.redirection.active-directory.json",
935935
".openpublishing.redirection.api-management.json",
936936
".openpublishing.redirection.azure-attestation.json",
937-
".openpublishing.redirection.azure-blob.json",
937+
".openpublishing.redirection.storage.json",
938938
"articles/data-factory/.openpublishing.redirection.data-factory.json",
939939
".openpublishing.redirection.defender-for-cloud.json",
940940
".openpublishing.redirection.defender-for-iot.json",

.openpublishing.redirection.azure-blob.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

.openpublishing.redirection.defender-for-iot.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,11 @@
654654
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
655655
"redirect_document_id": false
656656
},
657+
{
658+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-connect-sensor-by-proxy.md",
659+
"redirect_url": "/azure/defender-for-iot/organizations/connect-sensors",
660+
"redirect_document_id": false
661+
},
657662
{
658663
"source_path_from_root": "/articles/defender-for-iot/organizations/references-defender-for-iot-glossary.md",
659664
"redirect_url": "/azure/defender-for-iot/organizations/overview",

.openpublishing.redirection.json

Lines changed: 99 additions & 2049 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title: Add an identity provider - Azure Active Directory B2C
33
description: Learn how to add an identity provider to your Active Directory B2C tenant.
44
services: active-directory-b2c
5-
author: kengaderdus
5+
author: garrodonnell
66
manager: CelesteDG
77

8-
ms.author: kengaderdus
9-
ms.date: 04/08/2022
8+
ms.author: godonnell
9+
ms.date: 01/19/2022
1010
ms.custom: mvc
1111
ms.topic: how-to
1212
ms.service: active-directory
@@ -19,9 +19,9 @@ You can configure Azure AD B2C to allow users to sign in to your application wit
1919

2020
With external identity provider federation, you can offer your consumers the ability to sign in with their existing social or enterprise accounts, without having to create a new account just for your application.
2121

22-
On the sign-up or sign-in page, Azure AD B2C presents a list of external identity providers the user can choose for sign-in. Once they select one of the external identity providers, they're taken (redirected) to the selected provider's website to complete the sign in process. After the user successfully signs in, they're returned to Azure AD B2C for authentication of the account in your application.
22+
On the sign-up or sign-in page, Azure AD B2C presents a list of external identity providers the user can choose for sign-in. Once they select one of the external identity providers, they're taken (redirected) to the selected provider's website to complete the sign-in process. After the user successfully signs in, they're returned to Azure AD B2C for authentication of the account in your application.
2323

24-
![Mobile sign-in example with a social account (Facebook)](media/add-identity-provider/external-idp.png)
24+
![Diagram showing mobile sign-in example with a social account (Facebook).](media/add-identity-provider/external-idp.png)
2525

2626
You can add identity providers that are supported by Azure Active Directory B2C (Azure AD B2C) to your [user flows](user-flow-overview.md) using the Azure portal. You can also add identity providers to your [custom policies](user-flow-overview.md).
2727

articles/active-directory-b2c/sign-in-options.md

Lines changed: 21 additions & 8 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: 11/03/2022
12+
ms.date: 01/18/2022
1313
ms.author: godonnell
1414
ms.subservice: B2C
1515

@@ -28,7 +28,7 @@ Email sign-up is enabled by default in your local account identity provider sett
2828
- **Sign-up**: users are prompted for an email address, which is verified at sign-up (optional) and becomes their login ID. The user then enters any other information requested on the sign-up page, for example, display name, given name, and surname. Then they select **Continue** to create an account.
2929
- **Password reset**: Users enter and verify their email, after which the user can reset the password
3030

31-
![Email sign-up or sign-in experience](./media/sign-in-options/local-account-email-experience.png)
31+
![Series of screenshots showing email sign-up or sign-in experience.](./media/sign-in-options/local-account-email-experience.png)
3232

3333
Learn how to configure email sign-in in your local account identity provider.
3434
## Username sign-in
@@ -39,7 +39,7 @@ Your local account identity provider includes a Username option that lets users
3939
- **Sign-up**: Users will be prompted for a username, which will become their login ID. Users will also be prompted for an email address, which will be verified at sign-up. The email address will be used during a password reset flow. The user enters any other information requested on the sign-up page, for example, Display Name, Given Name, and Surname. The user then selects Continue to create the account.
4040
- **Password reset**: Users must enter their username and the associated email address. The email address must be verified, after which, the user can reset the password.
4141

42-
![Username sign-up or sign-in experience](./media/sign-in-options/local-account-username-experience.png)
42+
![Series of screenshots showing sign-up or sign-in experience.](./media/sign-in-options/local-account-username-experience.png)
4343

4444
## Phone sign-in
4545

@@ -53,7 +53,7 @@ Phone sign-in is a passwordless option in your local account identity provider s
5353
1. Next, the user is asked to provide a **recovery email**. The user enters their email address, and then selects *Send verification code*. A code is sent to the user's email inbox, which they can retrieve and enter in the Verification code box. Then the user selects Verify code.
5454
1. Once the code is verified, the user selects *Create* to create their account.
5555

56-
![Phone sign-up or sign-in experience](./media/sign-in-options/local-account-phone-experience.png)
56+
![Series of screenshots showing phone sign-up or sign-in experience.](./media/sign-in-options/local-account-phone-experience.png)
5757

5858
### Pricing for phone sign-in
5959

@@ -66,22 +66,35 @@ One-time passwords are sent to your users by using SMS text messages. Depending
6666

6767
When you enable phone sign-up and sign-in for your user flows, it's also a good idea to enable the recovery email feature. With this feature, a user can provide an email address that can be used to recover their account when they don't have their phone. This email address is used for account recovery only. It can't be used for signing in.
6868

69-
- When the recovery email prompt is **On**, a user signing up for the first time is prompted to verify a backup email. A user who hasn't provided a recovery email before is asked to verify a backup email during next sign in.
69+
- When the recovery email prompt is **On**, a user signing up for the first time is prompted to verify a backup email. A user who hasn't provided a recovery email before is asked to verify a backup email during next sign-in.
7070

7171
- When recovery email is **Off**, a user signing up or signing in isn't shown the recovery email prompt.
7272

7373
The following screenshots demonstrate the phone recovery flow:
7474

75-
![Phone recovery user flow](./media/sign-in-options/local-account-change-phone-flow.png)
75+
![Diagram showing phone recovery user flow.](./media/sign-in-options/local-account-change-phone-flow.png)
7676

7777

7878
## Phone or email sign-in
7979

8080
You can choose to combine the [phone sign-in](#phone-sign-in), and the [email sign-in](#email-sign-in) in your local account identity provider settings. In the sign-up or sign-in page, user can type a phone number, or email address. Based on the user input, Azure AD B2C takes the user to the corresponding flow.
8181

82-
![Phone or email sign-up or sign-in experience](./media/sign-in-options/local-account-phone-and-email-experience.png)
82+
![Series of screenshots showing phone or email sign-up or sign-in experience.](./media/sign-in-options/local-account-phone-and-email-experience.png)
83+
84+
85+
## Federated sign-in
86+
87+
You can configure Azure AD B2C to allow users to sign in to your application with credentials from external social or enterprise identity providers (IdPs). Azure AD B2C supports many [external identity providers](add-identity-provider.md) and any identity provider that supports OAuth 1.0, OAuth 2.0, OpenID Connect, and SAML protocols.
88+
89+
With external identity provider federation, you can offer your consumers the ability to sign in with their existing social or enterprise accounts, without having to create a new account just for your application.
90+
91+
On the sign-up or sign-in page, Azure AD B2C presents a list of external identity providers the user can choose for sign-in. Once they select one of the external identity providers, they're redirected to the selected provider's website to complete the sign-in process. After the user successfully signs in, they're returned to Azure AD B2C for authentication of the account in your application.
92+
93+
![Diagram showing mobile sign-in example with a social account (Facebook).](media/add-identity-provider/external-idp.png)
94+
95+
You can add identity providers that are supported by Azure Active Directory B2C (Azure AD B2C) to your [user flows](user-flow-overview.md) using the Azure portal. You can also add identity providers to your [custom policies](user-flow-overview.md).
8396

8497
## Next steps
8598

8699
- Find out more about the built-in policies provided by [User flows in Azure Active Directory B2C](user-flow-overview.md).
87-
- [Configure your local account identity provider](identity-provider-local.md).
100+
- [Configure your local account identity provider](identity-provider-local.md).

articles/active-directory-b2c/tutorial-create-tenant.md

Lines changed: 2 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: tutorial
11-
ms.date: 11/3/2022
11+
ms.date: 01/20/2023
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: "b2c-support"
@@ -26,7 +26,7 @@ In this article, you learn how to:
2626
> * Switch to the directory containing your Azure AD B2C tenant
2727
> * Add the Azure AD B2C resource as a **Favorite** in the Azure portal
2828
29-
Before you create you Azure AD B2C, you need to take the following considerations into account:
29+
Before you create your Azure AD B2C tenant, you need to take the following considerations into account:
3030

3131
- You can create up to **20** tenants per subscription. This limit help protect against threats to your resources, such as denial-of-service attacks, and is enforced in both the Azure portal and the underlying tenant creation API. If you want to increase this limit, please contact [Microsoft Support](find-help-open-support-ticket.md).
3232

articles/active-directory/app-proxy/application-proxy-configure-complex-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Before you get started with Application Proxy Complex application scenario apps,
5959
To configure (and update) Application Segments for a complex app using the API, you first [create a wildcard application](application-proxy-wildcard.md#create-a-wildcard-application), and then update the application's onPremisesPublishing property to configure the application segments and respective CORS settings.
6060

6161
> [!NOTE]
62-
> One application segment is supported in preview. Support for multiple application segment to be announced soon.
62+
> 2 application segment per complex application are supported for [Microsoft Azure AD premium subscription](https://azure.microsoft.com/pricing/details/active-directory). Licence requirement for more than 2 application segments per complex application to be announced soon.
6363
6464
If successful, this method returns a `204 No Content` response code and does not return anything in the response body.
6565
## Example

0 commit comments

Comments
 (0)