Skip to content

Commit 81a3776

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet
2 parents 8189b33 + 47fae07 commit 81a3776

File tree

680 files changed

+9874
-5604
lines changed

Some content is hidden

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

680 files changed

+9874
-5604
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
51+
"redirect_document_id": false
52+
},
4853
{
4954
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5055
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5516,6 +5516,11 @@
55165516
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
55175517
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
55185518
"redirect_document_id": false
5519+
},
5520+
{
5521+
"source_path_from_root": "/articles/azure-monitor/app/powershell-azure-diagnostics.md",
5522+
"redirect_url": "/azure/azure-monitor/agents/diagnostics-extension-to-application-insights",
5523+
"redirect_document_id": false
55195524
}
55205525
]
55215526
}

.openpublishing.redirection.defender-for-iot.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/defender-for-iot/organizations/tutorial-getting-started-eiot-sensor.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",

.openpublishing.redirection.json

Lines changed: 15 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/backup/backup-center-community.md",
5+
"redirect_url": "/azure/backup/backup-center-overview",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/api-management/developer-portal-widget-contribution-guidelines.md",
510
"redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
@@ -7018,6 +7023,11 @@
70187023
"redirect_url": "/azure/azure-functions/functions-event-grid-blob-trigger",
70197024
"redirect_document_id": false
70207025
},
7026+
{
7027+
"source_path_from_root": "/articles/azure-monitor/app/azure-functions-supported-features.md",
7028+
"redirect_url": "/azure/azure-functions/functions-monitoring",
7029+
"redirect_document_id": false
7030+
},
70217031
{
70227032
"source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
70237033
"redirect_url": "/azure/azure-government",
@@ -18273,6 +18283,11 @@
1827318283
"redirect_url": "/azure/sentinel/sap/sap-solution-log-reference",
1827418284
"redirect_document_id": false
1827518285
},
18286+
{
18287+
"source_path_from_root": "/articles/sentinel/monitor-sentinel-health.md",
18288+
"redirect_url": "/azure/sentinel/enable-monitoring",
18289+
"redirect_document_id": false
18290+
},
1827618291
{
1827718292
"source_path_from_root": "/articles/service-bus/index.md",
1827818293
"redirect_url": "/azure/service-bus-messaging/index",

articles/active-directory-b2c/configure-authentication-sample-react-spa-app.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: how-to
10-
ms.date: 08/25/2022
10+
ms.date: 11/17/2022
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"
@@ -167,13 +167,12 @@ export const protectedResources = {
167167
Now that the web API is registered and you've defined its scopes, configure the web API code to work with your Azure AD B2C tenant. Open the *3-Authorization-II/2-call-api-b2c/API* folder with Visual Studio Code.
168168

169169

170-
In the sample folder, open the *config.json* file. This file contains information about your Azure AD B2C identity provider. The web API app uses this information to validate the access token that the web app passes as a bearer token. Update the following properties of the app settings:
170+
In the sample folder, open the *authConfig.js* file. This file contains information about your Azure AD B2C identity provider. The web API app uses this information to validate the access token that the web app passes as a bearer token. Update the following properties of the app settings:
171171

172172
|Section |Key |Value |
173173
|---------|---------|---------|
174174
|credentials|tenantName| Your Azure AD B2C [domain/tenant name](tenant-management.md#get-your-tenant-name). For example: `contoso.ommicrosoft.com`.|
175175
|credentials|clientID| The web API application ID from step [2.1](#21-register-the-web-api-application). In the [earlier diagram](#app-registration), it's the application with **App ID: 2**.|
176-
|credentials| issuer| (Optional) The token issuer `iss` claim value. Azure AD B2C by default returns the token in the following format: `https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/`. Replace `<your-tenant-name>` with the first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). Replace `<your-tenant-ID>` with your [Azure AD B2C tenant ID](tenant-management.md#get-your-tenant-id). |
177176
|policies|policyName|The user flow or custom policy that you created in [step 1](#step-1-configure-your-user-flow). If your application uses multiple user flows or custom policies, specify only one. For example, use the sign-up or sign-in user flow.|
178177
| protectedRoutes| scopes | The scopes of your web API application registration from [step 2.5](#25-grant-permissions). |
179178

@@ -184,7 +183,6 @@ Your final configuration file should look like the following JSON:
184183
"credentials": {
185184
"tenantName": "<your-tenant-name>.ommicrosoft.com",
186185
"clientID": "<your-webapi-application-ID>",
187-
"issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
188186
},
189187
"policies": {
190188
"policyName": "b2c_1_susi"

articles/active-directory-b2c/error-codes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ The following errors can be returned by the Azure Active Directory B2C service.
144144
| `AADB2C90288` | UserJourney with ID '{0}' referenced in TechnicalProfile '{1}' for refresh token redemption for tenant '{2}' does not exist in policy '{3}' or any of its base policies. |
145145
| `AADB2C90287` | The request contains invalid redirect URI '{0}'.| [Register a web application](tutorial-register-applications.md), [Sending authentication requests](openid-connect.md#send-authentication-requests) |
146146
| `AADB2C90289` | We encountered an error connecting to the identity provider. Please try again later. | [Add an IDP to your Azure AD B2C tenant](add-identity-provider.md) |
147+
| `AADB2C90289` | We encountered an 'invalid_client' error connecting to the identity provider. Please try again later. | Make sure the application secret is correct or it hasn't expired. Learn how to [Register apps](register-apps.md).|
147148
| `AADB2C90296` | Application has not been configured correctly. Please contact administrator of the site you are trying to access. | [Register a web application](tutorial-register-applications.md) |
148149
| `AADB2C99005` | The request contains an invalid scope parameter which includes an illegal character '{0}'. | [Web sign-in with OpenID Connect](openid-connect.md) |
149150
| `AADB2C99006` | Azure AD B2C cannot find the extensions app with app ID '{0}'. Please visit https://go.microsoft.com/fwlink/?linkid=851224 for more information. | [Azure AD B2C extensions app](extensions-app.md) |

articles/active-directory-b2c/identity-provider-azure-ad-multi-tenant.md

Lines changed: 2 additions & 3 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: 03/10/2022
12+
ms.date: 11/17/2022
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C
@@ -133,7 +133,6 @@ You can define Azure AD as a claims provider by adding Azure AD to the **ClaimsP
133133
</CryptographicKeys>
134134
<OutputClaims>
135135
<OutputClaim ClaimTypeReferenceId="issuerUserId" PartnerClaimType="oid"/>
136-
<OutputClaim ClaimTypeReferenceId="tenantId" PartnerClaimType="tid"/>
137136
<OutputClaim ClaimTypeReferenceId="givenName" PartnerClaimType="given_name" />
138137
<OutputClaim ClaimTypeReferenceId="surName" PartnerClaimType="family_name" />
139138
<OutputClaim ClaimTypeReferenceId="displayName" PartnerClaimType="name" />
@@ -208,4 +207,4 @@ If the sign-in process is successful, your browser is redirected to `https://jwt
208207
- Learn how to [pass the Azure AD token to your application](idp-pass-through-user-flow.md).
209208
- Check out the Azure AD multi-tenant federation [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/Identity-providers#azure-active-directory), and how to pass Azure AD access token [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/Identity-providers#azure-active-directory-with-access-token)
210209

211-
::: zone-end
210+
::: zone-end

articles/active-directory-b2c/relyingparty.md

Lines changed: 3 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: reference
11-
ms.date: 06/26/2022
11+
ms.date: 11/17/2022
1212
ms.custom: project-no-code
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
@@ -144,7 +144,8 @@ The **UserJourneyBehaviors** element contains the following elements:
144144
| JourneyFraming | 0:1| Allows the user interface of this policy to be loaded in an iframe. |
145145
| ScriptExecution| 0:1| The supported [JavaScript](javascript-and-page-layout.md) execution modes. Possible values: `Allow` or `Disallow` (default).
146146

147-
147+
When you use the above elements, you need add them to your **UserJourneyBehaviors** element in the order specified in the table. For example, the **JourneyInsights** element must be added before (above) the **ScriptExecution** element.
148+
148149
### SingleSignOn
149150

150151
The **SingleSignOn** element contains the following attributes:

articles/active-directory-b2c/service-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
1111
ms.author: kengaderdus
12-
ms.date: 10/27/2022
12+
ms.date: 11/14/2022
1313
ms.subservice: B2C
1414
zone_pivot_groups: b2c-policy-type
1515
---
@@ -168,7 +168,7 @@ The following table lists the administrative configuration limits in the Azure A
168168
|Levels of [inheritance](custom-policy-overview.md#inheritance-model) in custom policies |10 |
169169
|Number of policies per Azure AD B2C tenant (user flows + custom policies) |200 |
170170
|Maximum policy file size |1024 KB |
171-
|Number of API connectors per tenant |19 |
171+
|Number of API connectors per tenant |20 |
172172

173173
<sup>1</sup> See also [Azure AD service limits and restrictions](../active-directory/enterprise-users/directory-service-limits-restrictions.md).
174174

articles/active-directory-b2c/tutorial-create-user-flows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The sign-up and sign-in user flow handles both sign-up and sign-in experiences w
7676

7777
1. Enter a **Name** for the user flow. For example, *signupsignin1*.
7878
1. For **Identity providers**, select **Email signup**.
79-
1. For **User attributes and claims**, choose the claims and attributes that you want to collect and send from the user during sign-up. For example, select **Show more**, and then choose attributes and claims for **Country/Region**, **Display Name**, and **Postal Code**. Select **OK**.
79+
1. For **User attributes and token claims**, choose the claims and attributes that you want to collect and send from the user during sign-up. For example, select **Show more**, and then choose attributes and claims for **Country/Region**, **Display Name**, and **Postal Code**. Select **OK**.
8080

8181
![Attributes and claims selection page with three claims selected](./media/tutorial-create-user-flows/signup-signin-attributes.png)
8282

0 commit comments

Comments
 (0)