Skip to content

Commit c314c21

Browse files
authored
Merge branch 'main' into updates-related-to-dependency-agent
2 parents 82734ef + b78dfce commit c314c21

File tree

2,229 files changed

+23330
-13543
lines changed

Some content is hidden

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

2,229 files changed

+23330
-13543
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10801,6 +10801,16 @@
1080110801
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
1080210802
"redirect_document_id": false
1080310803
},
10804+
{
10805+
"source_path": "articles/active-directory/saas-apps/iprova-provisioning-tutorial.md",
10806+
"redirect_url": "/azure/active-directory/saas-apps/zenya-provisioning-tutorial",
10807+
"redirect_document_id": false
10808+
},
10809+
{
10810+
"source_path": "articles/active-directory/saas-apps/iprova-tutorial.md",
10811+
"redirect_url": "/azure/active-directory/saas-apps/zenya-tutorial",
10812+
"redirect_document_id": false
10813+
},
1080410814
{
1080510815
"source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
1080610816
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-monitor/change/change-analysis-powershell.md",
5+
"redirect_url": "/azure/azure-monitor/change/change-analysis",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/azure-monitor/app/snapshot-debugger.md",
510
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger",

.openpublishing.redirection.json

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10388,8 +10388,8 @@
1038810388
},
1038910389
{
1039010390
"source_path_from_root": "/articles/azure-supportability/classic-deployment-model-quota-increase-requests.md",
10391-
"redirect_url": "/azure/azure-portal/supportability/classic-deployment-model-quota-increase-requests",
10392-
"redirect_document_id": true
10391+
"redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
10392+
"redirect_document_id": false
1039310393
},
1039410394
{
1039510395
"source_path_from_root": "/articles/azure-supportability/how-to-create-azure-support-request.md",
@@ -10433,44 +10433,79 @@
1043310433
},
1043410434
{
1043510435
"source_path_from_root": "/articles/azure-supportability/low-priority-quota.md",
10436-
"redirect_url": "/azure/azure-portal/supportability/spot-quota",
10437-
"redirect_document_id": true
10436+
"redirect_url": "/azure/quotas/spot-quota",
10437+
"redirect_document_id": false
1043810438
},
1043910439
{
1044010440
"source_path_from_root": "/articles/azure-supportability/networking-quota-requests.md",
10441-
"redirect_url": "/azure/azure-portal/supportability/networking-quota-requests",
10442-
"redirect_document_id": true
10441+
"redirect_url": "/azure/quotas/networking-quota-requests",
10442+
"redirect_document_id": false
1044310443
},
1044410444
{
1044510445
"source_path_from_root": "/articles/azure-supportability/per-vm-quota-requests.md",
10446-
"redirect_url": "/azure/azure-portal/supportability/per-vm-quota-requests",
10447-
"redirect_document_id": true
10446+
"redirect_url": "/azure/quotas/per-vm-quota-requests",
10447+
"redirect_document_id": false
1044810448
},
1044910449
{
1045010450
"source_path_from_root": "/articles/azure-supportability/regional-quota-requests.md",
10451-
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
10452-
"redirect_document_id": true
10451+
"redirect_url": "/azure/quotas/regional-quota-requests",
10452+
"redirect_document_id": false
1045310453
},
1045410454
{
1045510455
"source_path_from_root": "/articles/azure-supportability/resource-manager-core-quotas-request.md",
10456-
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
10456+
"redirect_url": "/azure/quotas/regional-quota-requests",
1045710457
"redirect_document_id": false
1045810458
},
1045910459
{
1046010460
"source_path_from_root": "/articles/azure-portal/supportability/resource-manager-core-quotas-request.md",
10461-
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
10461+
"redirect_url": "/azure/quotas/regional-quota-requests",
1046210462
"redirect_document_id": false
1046310463
},
1046410464
{
10465-
"source_path_from_root": "/articles/azure-supportability/sku-series-unavailable.md",
10466-
"redirect_url": "/azure/azure-portal/supportability/sku-series-unavailable",
10467-
"redirect_document_id": true
10465+
"source_path_from_root": "/articles/azure-supportability/sku-series-unavailable.md",
10466+
"redirect_url": "/troubleshoot/azure/general/region-access-request-process",
10467+
"redirect_document_id": false
1046810468
},
1046910469
{
1047010470
"source_path_from_root": "/articles/azure-portal/supportability/low-priority-quota.md",
10471-
"redirect_url": "/azure/azure-portal/supportability/spot-quota",
10471+
"redirect_url": "/azure/quotas/spot-quota",
1047210472
"redirect_document_id": false
1047310473
},
10474+
{
10475+
"source_path_from_root": "/articles/azure-portal/supportability/quotas-overview.md",
10476+
"redirect_url": "/azure/quotas/quotas-overview",
10477+
"redirect_document_id": true
10478+
},
10479+
{
10480+
"source_path_from_root": "/articles/azure-portal/supportability/view-quotas.md",
10481+
"redirect_url": "/azure/quotas/view-quotas",
10482+
"redirect_document_id": true
10483+
},
10484+
{
10485+
"source_path_from_root": "/articles/azure-portal/supportability/per-vm-quota-requests.md",
10486+
"redirect_url": "/azure/quotas/per-vm-quota-requests",
10487+
"redirect_document_id": true
10488+
},
10489+
{
10490+
"source_path_from_root": "/articles/azure-portal/supportability/regional-quota-requests.md",
10491+
"redirect_url": "/azure/quotas/regional-quota-requests",
10492+
"redirect_document_id": true
10493+
},
10494+
{
10495+
"source_path_from_root": "/articles/azure-portal/supportability/spot-quota.md",
10496+
"redirect_url": "/azure/quotas/spot-quota",
10497+
"redirect_document_id": true
10498+
},
10499+
{
10500+
"source_path_from_root": "/articles/azure-portal/supportability/classic-deployment-model-quota-increase-requests.md",
10501+
"redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
10502+
"redirect_document_id": true
10503+
},
10504+
{
10505+
"source_path_from_root": "/articles/azure-portal/supportability/networking-quota-requests.md",
10506+
"redirect_url": "/azure/quotas/networking-quota-requests",
10507+
"redirect_document_id": true
10508+
},
1047410509
{
1047510510
"source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
1047610511
"redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",

articles/active-directory-b2c/display-control-time-based-one-time-password.md

Lines changed: 6 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: 12/09/2021
12+
ms.date: 07/20/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -116,4 +116,8 @@ The following screenshot illustrates a TOTP verification page.
116116

117117
## Next steps
118118

119-
- Learn how to validate a TOTP code in [Define an Azure AD MFA technical profile](multi-factor-auth-technical-profile.md).
119+
- Learn more about multifactor authentication in [Enable multifactor authentication in Azure Active Directory B2C](multi-factor-authentication.md?pivots=b2c-custom-policy)
120+
121+
- Learn how to validate a TOTP code in [Define an Azure AD MFA technical profile](multi-factor-auth-technical-profile.md).
122+
123+
- Explore a sample [Azure AD B2C MFA with TOTP using any Authenticator app custom policy in GitHub](https://github.com/azure-ad-b2c/samples/tree/master/policies/totp).

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

Lines changed: 26 additions & 20 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: how-to
12-
ms.date: 09/16/2021
12+
ms.date: 07/20/2022
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C
@@ -34,30 +34,35 @@ zone_pivot_groups: b2c-policy-type
3434
To enable sign-in for users with a Twitter account in Azure AD B2C, you need to create a Twitter application. If you don't already have a Twitter account, you can sign up at [`https://twitter.com/signup`](https://twitter.com/signup). You also need to [Apply for a developer account](https://developer.twitter.com/). For more information, see [Apply for access](https://developer.twitter.com/en/apply-for-access).
3535

3636
1. Sign in to the [Twitter Developer Portal](https://developer.twitter.com/portal/projects-and-apps) with your Twitter account credentials.
37-
1. Under **Standalone Apps**, select **+Create App**.
38-
1. Enter an **App name**, and then select **Complete**.
39-
1. Copy the value of the **App key**, and **API key secret**. You use both of them to configure Twitter as an identity provider in your tenant.
40-
1. Under **Setup your App**, select **App settings**.
41-
1. Under **Authentication settings**, select **Edit**
42-
1. Select **Enable 3-legged OAuth** checkbox.
43-
1. Select **Request email address from users** checkbox.
44-
1. For the **Callback URLs**, enter `https://your-tenant.b2clogin.com/your-tenant-name.onmicrosoft.com/your-user-flow-Id/oauth1/authresp`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name/your-tenant-name.onmicrosoft.com/your-user-flow-Id/oauth1/authresp`. Use all lowercase letters when entering your tenant name and user flow ID even if they are defined with uppercase letters in Azure AD B2C. Replace:
37+
1. Select **+ Create Project** button.
38+
1. Under **Project name** tab, enter a preferred name of your project, and then select **Next** button.
39+
1. Under **Use case** tab, select your preferred use case, and then select **Next**.
40+
1. Under **Project description** tab, enter your project description, and then select **Next** button.
41+
1. Under **App name** tab, enter a name for your app, such as *azureadb2c*, and the select **Next** button.
42+
1. Under **Keys & Tokens** tab, copy the value of **API Key** and **API Key Secret** for later. You use both of them to configure Twitter as an identity provider in your Azure AD B2C tenant.
43+
1. Select **App settings** to open the app settings.
44+
1. At the lower part of the page, under **User authentication settings**, select **Set up**.
45+
1. In the **User authentication settings** page, select **OAuth 2.0** option.
46+
1. Under **OAUTH 2.0 SETTINGS**, for the **Type of app**, select your appropriate app type such as *Web App*.
47+
1. Under **GENERAL AUTHENTICATION SETTINGS**:
48+
1. For the **Callback URI/Redirect URL**, enter `https://your-tenant.b2clogin.com/your-tenant-name.onmicrosoft.com/your-user-flow-Id/oauth1/authresp`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name/your-tenant-name.onmicrosoft.com/your-user-flow-Id/oauth1/authresp`. Use all lowercase letters when entering your tenant name and user flow ID even if they are defined with uppercase letters in Azure AD B2C. Replace:
4549
- `your-tenant-name` with the name of your tenant name.
4650
- `your-domain-name` with your custom domain.
4751
- `your-user-flow-Id` with the identifier of your user flow. For example, `b2c_1a_signup_signin_twitter`.
4852

4953
1. For the **Website URL**, enter `https://your-tenant.b2clogin.com`. Replace `your-tenant` with the name of your tenant. For example, `https://contosob2c.b2clogin.com`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name`.
5054
1. Enter a URL for the **Terms of service**, for example `http://www.contoso.com/tos`. The policy URL is a page you maintain to provide terms and conditions for your application.
5155
1. Enter a URL for the **Privacy policy**, for example `http://www.contoso.com/privacy`. The policy URL is a page you maintain to provide privacy information for your application.
52-
1. Select **Save**.
56+
1. Select **Save**.
5357

5458
::: zone pivot="b2c-user-flow"
5559

5660
## Configure Twitter as an identity provider
5761

5862
1. Sign in to the [Azure portal](https://portal.azure.com/) as the global administrator of your Azure AD B2C tenant.
59-
1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
60-
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
63+
1. Make sure you're using the directory that contains your Azure AD B2C tenant.
64+
1. Select the **Directories + subscriptions** icon in the portal toolbar.
65+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
6166
1. Choose **All services** in the top-left corner of the Azure portal, search for and select **Azure AD B2C**.
6267
1. Select **Identity providers**, then select **Twitter**.
6368
1. Enter a **Name**. For example, *Twitter*.
@@ -86,25 +91,26 @@ If the sign-in process is successful, your browser is redirected to `https://jwt
8691

8792
## Create a policy key
8893

89-
You need to store the secret key that you previously recorded in your Azure AD B2C tenant.
94+
You need to store the secret key that you previously recorded for Twitter app in your Azure AD B2C tenant.
9095

9196
1. Sign in to the [Azure portal](https://portal.azure.com/).
92-
1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
93-
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
94-
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
95-
1. On the Overview page, select **Identity Experience Framework**.
97+
1. Make sure you're using the directory that contains your Azure AD B2C tenant.
98+
1. Select the **Directories + subscriptions** icon in the portal toolbar.
99+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
100+
1. In the Azure portal, search for and select **Azure AD B2C**.
101+
1. On the left menu, under **Policies**, select **Identity Experience Framework**.
96102
1. Select **Policy Keys** and then select **Add**.
97103
1. For **Options**, choose `Manual`.
98104
1. Enter a **Name** for the policy key. For example, `TwitterSecret`. The prefix `B2C_1A_` is added automatically to the name of your key.
99-
1. In **Secret**, enter your client secret that you previously recorded.
105+
1. For **Secret**, enter your *API key secret* value that you previously recorded.
100106
1. For **Key usage**, select `Encryption`.
101107
1. Click **Create**.
102108

103109
## Configure Twitter as an identity provider
104110

105111
To enable users to sign in using a Twitter account, you need to define the account as a claims provider that Azure AD B2C can communicate with through an endpoint. The endpoint provides a set of claims that are used by Azure AD B2C to verify that a specific user has authenticated.
106112

107-
You can define a Twitter account as a claims provider by adding it to the **ClaimsProviders** element in the extension file of your policy.
113+
You can define a Twitter account as a claims provider by adding it to the **ClaimsProviders** element in the extension file of your policy. Refer to the custom policy starter pack that you downloaded in the Prerequisites of this article.
108114

109115
1. Open the *TrustFrameworkExtensions.xml*.
110116
2. Find the **ClaimsProviders** element. If it does not exist, add it under the root element.
@@ -149,7 +155,7 @@ You can define a Twitter account as a claims provider by adding it to the **Clai
149155
</ClaimsProvider>
150156
```
151157

152-
4. Replace the value of **client_id** with the *API key secret* that you previously recorded.
158+
4. Replace the value of **client_id** with the *API key* that you previously recorded.
153159
5. Save the file.
154160

155161
[!INCLUDE [active-directory-b2c-add-identity-provider-to-user-journey](../../includes/active-directory-b2c-add-identity-provider-to-user-journey.md)]

articles/active-directory-b2c/javascript-and-page-layout.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,21 @@ function addTermsOfUseLink() {
233233

234234
In the code, replace `termsOfUseUrl` with the link to your terms of use agreement. For your directory, create a new user attribute called **termsOfUse** and then include **termsOfUse** as a user attribute.
235235

236+
Alternatively, you can add a link at the bottom of self-asserted pages, without using of JavaScript. Use the following localization:
237+
238+
```xml
239+
<LocalizedResources Id="api.localaccountsignup.en">
240+
<LocalizedStrings>
241+
<!-- The following elements will display a link at the bottom of the page. -->
242+
<LocalizedString ElementType="UxElement" StringId="disclaimer_link_1_text">Terms of use</LocalizedString>
243+
<LocalizedString ElementType="UxElement" StringId="disclaimer_link_1_url">termsOfUseUrl</LocalizedString>
244+
</LocalizedStrings>
245+
</LocalizedResources>
246+
```
247+
248+
Replace `termsOfUseUrl` with the link to your organization's privacy policy and terms of use.
249+
250+
236251
## Next steps
237252

238253
Find more information about how to [Customize the user interface of your application in Azure Active Directory B2C](customize-ui-with-html.md).

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 21 additions & 1 deletion
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: reference
11-
ms.date: 04/12/2022
11+
ms.date: 04/19/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---
@@ -177,6 +177,18 @@ The following are the IDs for a content definition with an ID of `api.localaccou
177177
| **ver_intro_msg** | Verification is necessary. Please click Send button. |
178178
| **ver_input** | Verification code |
179179

180+
### Sign-up and self-asserted pages disclaimer links
181+
182+
The following `UxElement` string IDs will display disclaimer link(s) at the bottom of the self-asserted page. These links are not displayed by default unless specified in the localized strings.
183+
184+
| ID | Example value |
185+
| --- | ------------- |
186+
| **disclaimer_msg_intro** | By providing your phone number, you consent to receiving a one-time passcode sent by text message to help you sign into {insert your application name}. Standard messsage and data rates may apply. |
187+
| **disclaimer_link_1_text** | Privacy Statement |
188+
| **disclaimer_link_1_url** | {insert your privacy statement URL} |
189+
| **disclaimer_link_2_text** | Terms and Conditions |
190+
| **disclaimer_link_2_url** | {insert your terms and conditions URL} |
191+
180192
### Sign-up and self-asserted pages error messages
181193

182194
| ID | Default value |
@@ -238,6 +250,14 @@ The following example shows the use of some of the user interface elements in th
238250
<LocalizedString ElementType="UxElement" StringId="ver_input">Verification code</LocalizedString>
239251
<LocalizedString ElementType="UxElement" StringId="ver_intro_msg">Verification is necessary. Please click Send button.</LocalizedString>
240252
<LocalizedString ElementType="UxElement" StringId="ver_success_msg">E-mail address verified. You can now continue.</LocalizedString>
253+
<!-- The following elements will display a message and two links at the bottom of the page.
254+
For policies that you intend to show to users in the United States, we suggest displaying the following text. Replace the content of the disclaimer_link_X_url elements with links to your organization's privacy statement and terms and conditions.
255+
Uncomment any of these lines to display them. -->
256+
<!-- <LocalizedString ElementType="UxElement" StringId="disclaimer_msg_intro">By providing your phone number, you consent to receiving a one-time passcode sent by text message to help you sign into {insert your application name}. Standard messsage and data rates may apply.</LocalizedString> -->
257+
<!-- <LocalizedString ElementType="UxElement" StringId="disclaimer_link_1_text">Privacy Statement</LocalizedString>
258+
<LocalizedString ElementType="UxElement" StringId="disclaimer_link_1_url">{insert your privacy statement URL}</LocalizedString> -->
259+
<!-- <LocalizedString ElementType="UxElement" StringId="disclaimer_link_2_text">Terms and Conditions</LocalizedString>
260+
<LocalizedString ElementType="UxElement" StringId="disclaimer_link_2_url">{insert your terms and conditions URL}</LocalizedString> -->
241261
<LocalizedString ElementType="ErrorMessage" StringId="ServiceThrottled">There are too many requests at this moment. Please wait for some time and try again.</LocalizedString>
242262
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfClaimNotVerified">Claim not verified: {0}</LocalizedString>
243263
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfClaimsPrincipalAlreadyExists">A user with the specified ID already exists. Please choose a different one.</LocalizedString>

0 commit comments

Comments
 (0)