Skip to content

Commit dd67b0f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into anf-2tib-capacity-pool
2 parents 840bed9 + 90ec518 commit dd67b0f

File tree

3,144 files changed

+35697
-20849
lines changed

Some content is hidden

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

3,144 files changed

+35697
-20849
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@
987987
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
988988
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
989989
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
990+
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
990991
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
991992
"articles/mariadb/.openpublishing.redirection.mariadb.json",
992993
"articles/marketplace/.openpublishing.redirection.marketplace.json",

.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
5656
"redirect_document_id": false
5757
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/saas-apps/trello-tutorial.md",
60+
"redirect_url": "/azure/active-directory/saas-apps/atlassian-cloud-tutorial",
61+
"redirect_document_id": false
62+
},
5863
{
5964
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
6065
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
@@ -11095,6 +11100,11 @@
1109511100
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-data-inventory.md",
1109611101
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/product-data-billable-resources",
1109711102
"redirect_document_id": false
11103+
},
11104+
{
11105+
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
11106+
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
11107+
"redirect_document_id": false
1109811108
}
1109911109
]
1110011110
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/azure-monitor/getting-started",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/observability-data.md",
10+
"redirect_url": "/azure/azure-monitor/overview",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/azure-monitor/change/change-analysis-query.md",
1015
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
@@ -25,6 +30,26 @@
2530
"redirect_url": "/azure/azure-monitor/change/change-analysis",
2631
"redirect_document_id": false
2732
},
33+
{
34+
"source_path_from_root": "/articles/azure-monitor/app/javascript-react-plugin.md",
35+
"redirect_url": "/azure/azure-monitor/app/javascript-framework-extensions",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/javascript-react-native-plugin.md",
40+
"redirect_url": "/azure/azure-monitor/app/javascript-framework-extensions",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-monitor/app/javascript-angular-plugin.md",
45+
"redirect_url": "/azure/azure-monitor/app/javascript-framework-extensions",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/javascript-click-analytics-plugin.md",
50+
"redirect_url": "/azure/azure-monitor/app/javascript-feature-extensions",
51+
"redirect_document_id": false
52+
},
2853
{
2954
"source_path_from_root": "/articles/azure-monitor/app/java-in-process-agent-redirect.md",
3055
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",

.openpublishing.redirection.json

Lines changed: 5 additions & 740 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/azure-ad-b2c-global-identity-proof-of-concept-funnel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The following block diagram shows the proof of concept. The guidance will show h
2828

2929
1. [Create a tenant.](../active-directory-b2c/tutorial-create-tenant.md)
3030

31-
1. [Configure federations to each Azure AD B2C tenant/policy combination](tenant-management.md)
31+
1. [Configure federations to each Azure AD B2C tenant/policy combination](../active-directory-b2c/tutorial-create-user-flows.md?pivots=b2c-user-flow)
3232

3333
1. Configure client_id mapping to region – use [lookup claim transformation](general-transformations.md) to emulate.
3434

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The sample code is made up of the following components. Add these components fro
8080
- [src/pages/Hello.jsx](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/6-AdvancedScenarios/1-call-api-obo/SPA/src/pages/Hello.jsx) - Demonstrate how to call a protected resource with OAuth2 bearer token.
8181
- It uses the [useMsal](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-react/docs/hooks.md) hook that returns the PublicClientApplication instance.
8282
- With PublicClientApplication instance, it acquires an access token to call the REST API.
83-
- Invokes the [callApiWithToken](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/3-Authorization-II/2-call-api-b2c/SPA/src/fetch.js) function to fetch the data from the REST API and renders the result using the **DataDisplay** component.
83+
- Invokes the [callApiWithToken](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/4-Deployment/2-deploy-static/App/src/fetch.js) function to fetch the data from the REST API and renders the result using the **DataDisplay** component.
8484

8585
- [src/components/NavigationBar.jsx](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/3-Authorization-II/2-call-api-b2c/SPA/src/components/NavigationBar.jsx) - The app top navigation bar with the sign-in, sign-out, edit profile and call REST API reset buttons.
8686
- It uses the [AuthenticatedTemplate](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-react/docs/getting-started.md#authenticatedtemplate-and-unauthenticatedtemplate) and UnauthenticatedTemplate, which only render their children if a user is authenticated or unauthenticated, respectively.
@@ -94,7 +94,7 @@ The sample code is made up of the following components. Add these components fro
9494

9595
- [src/styles/App.css](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/3-Authorization-II/2-call-api-b2c/SPA/src/styles/App.css) and [src/styles/index.css](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/3-Authorization-II/2-call-api-b2c/SPA/src/styles/index.css) - CSS styling files for the app.
9696

97-
- [src/fetch.js](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/3-Authorization-II/2-call-api-b2c/SPA/src/fetch.js) - Fetches HTTP requests to the REST API.
97+
- [src/fetch.js](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/blob/main/4-Deployment/2-deploy-static/App/src/fetch.js) - Fetches HTTP requests to the REST API.
9898

9999
## Step 4: Configure your React app
100100

articles/active-directory-b2c/identity-provider-generic-saml-options.md

Lines changed: 2 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: how-to
12-
ms.date: 01/13/2022
12+
ms.date: 02/17/2023
1313
ms.custom: project-no-code
1414
ms.author: godonnell
1515
ms.subservice: B2C
@@ -294,7 +294,7 @@ The following SAML authorization request contains the authentication context cla
294294

295295
## Include custom data in the authorization request
296296

297-
You can optionally include protocol message extension elements that are agreed to by both Azure AD BC and your identity provider. The extension is presented in XML format. You include extension elements by adding XML data inside the CDATA element `<![CDATA[Your Custom XML]]>`. Check your identity provider’s documentation to see if the extensions element is supported.
297+
You can optionally include protocol message extension elements that are agreed to by both Azure AD B2C and your identity provider. The extension is presented in XML format. You include extension elements by adding XML data inside the CDATA element `<![CDATA[Your Custom XML]]>`. Check your identity provider’s documentation to see if the extensions element is supported.
298298

299299
The following example illustrates the use of extension data:
300300

articles/active-directory-b2c/identity-provider-microsoft-account.md

Lines changed: 2 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: how-to
12-
ms.date: 01/13/2022
12+
ms.date: 02/13/2023
1313
ms.custom: project-no-code
1414
ms.author: godonnell
1515
ms.subservice: B2C
@@ -51,7 +51,7 @@ To enable sign-in for users with a Microsoft account in Azure Active Directory B
5151
1. Under **Supported account types**, select **Accounts in any organizational directory (Any Azure AD directory - Multitenant) and personal Microsoft accounts (e.g. Skype, Xbox)**.
5252

5353
For more information on the different account type selections, see [Quickstart: Register an application with the Microsoft identity platform](../active-directory/develop/quickstart-register-app.md).
54-
1. Under **Redirect URI (optional)**, select **Web** and enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name/your-tenant-name.onmicrosoft.com/oauth2/authresp`. Replace `your-tenant-name` with the name of your tenant, and `your-domain-name` with your custom domain.
54+
1. Under **Redirect URI (optional)**, select **Web** and enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name/your-tenant-name.onmicrosoft.com/oauth2/authresp`. Replace `your-tenant-name` with the name of your Azure AD B2C tenant, and `your-domain-name` with your custom domain.
5555
1. Select **Register**
5656
1. Record the **Application (client) ID** shown on the application Overview page. You need the client ID when you configure the identity provider in the next section.
5757
1. Select **Certificates & secrets**

articles/active-directory-b2c/json-transformations.md

Lines changed: 99 additions & 1 deletion
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: 09/07/2022
12+
ms.date: 02/14/2023
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -409,6 +409,104 @@ In the following example, the claims transformation extracts the following claim
409409
- **active**: true
410410
- **birthDate**: 2005-09-23T00:00:00Z
411411

412+
413+
## GetClaimsFromJsonArrayV2
414+
415+
Get a list of specified elements from a string collection JSON elements. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimsfromjsonarrayv2) of this claims transformation.
416+
417+
| Element | TransformationClaimType | Data Type | Notes |
418+
| ---- | ----------------------- | --------- | ----- |
419+
| InputClaim | jsonSourceClaim | stringCollection | The string collection claim with the JSON payloads. This claim is used by the claims transformation to get the claims. |
420+
| InputParameter | errorOnMissingClaims | boolean | Specifies whether to throw an error if one of the claims is missing. |
421+
| InputParameter | includeEmptyClaims | string | Specify whether to include empty claims. |
422+
| InputParameter | jsonSourceKeyName | string | Element key name |
423+
| InputParameter | jsonSourceValueName | string | Element value name |
424+
| OutputClaim | Collection | string, int, boolean, and datetime |List of claims to extract. The name of the claim should be equal to the one specified in _jsonSourceClaim_ input claim. |
425+
426+
### Example of GetClaimsFromJsonArrayV2
427+
428+
In the following example, the claims transformation extracts the following claims: email (string), displayName (string), membershipNum (int), active (boolean) and birthDate (datetime) from the JSON data.
429+
430+
```xml
431+
<ClaimsTransformation Id="GetClaimsFromJson" TransformationMethod="GetClaimsFromJsonArrayV2">
432+
<InputClaims>
433+
<InputClaim ClaimTypeReferenceId="jsonSourceClaim" TransformationClaimType="jsonSource" />
434+
</InputClaims>
435+
<InputParameters>
436+
<InputParameter Id="errorOnMissingClaims" DataType="boolean" Value="false" />
437+
<InputParameter Id="includeEmptyClaims" DataType="boolean" Value="false" />
438+
<InputParameter Id="jsonSourceKeyName" DataType="string" Value="key" />
439+
<InputParameter Id="jsonSourceValueName" DataType="string" Value="value" />
440+
</InputParameters>
441+
<OutputClaims>
442+
<OutputClaim ClaimTypeReferenceId="email" />
443+
<OutputClaim ClaimTypeReferenceId="displayName" />
444+
<OutputClaim ClaimTypeReferenceId="membershipID" />
445+
<OutputClaim ClaimTypeReferenceId="active" />
446+
<OutputClaim ClaimTypeReferenceId="birthDate" />
447+
</OutputClaims>
448+
</ClaimsTransformation>
449+
```
450+
451+
- Input claims:
452+
- **jsonSourceClaim[0]** (string collection first element):
453+
454+
```json
455+
{
456+
"key": "email",
457+
"value": "[email protected]"
458+
}
459+
```
460+
461+
- **jsonSourceClaim[1]** (string collection second element):
462+
463+
```json
464+
{
465+
"key": "displayName",
466+
"value": "Someone"
467+
}
468+
```
469+
470+
- **jsonSourceClaim[2]** (string collection third element):
471+
472+
```json
473+
{
474+
"key": "membershipID",
475+
"value": 6353399
476+
}
477+
```
478+
479+
- **jsonSourceClaim[3]** (string collection fourth element):
480+
481+
```json
482+
{
483+
"key": "active",
484+
"value": true
485+
}
486+
```
487+
488+
- **jsonSourceClaim[4]** (string collection fifth element):
489+
490+
```json
491+
{
492+
"key": "birthDate",
493+
"value": "2005-09-23T00:00:00Z"
494+
}
495+
```
496+
497+
- Input parameters:
498+
- **errorOnMissingClaims**: false
499+
- **includeEmptyClaims**: false
500+
- **jsonSourceKeyName**: key
501+
- **jsonSourceValueName**: value
502+
- Output claims:
503+
- **email**: "[email protected]"
504+
- **displayName**: "Someone"
505+
- **membershipID**: 6353399
506+
- **active**: true
507+
- **birthDate**: 2005-09-23T00:00:00Z
508+
509+
412510
## GetNumericClaimFromJson
413511

414512
Gets a specified numeric (long) element from a JSON data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getnumericclaimfromjson) of this claims transformation.

articles/active-directory-b2c/partner-nevis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To get started, you'll need:
2929
- An [Azure AD B2C tenant](./tutorial-create-tenant.md) linked to your Azure subscription
3030

3131
>[!NOTE]
32-
>To integrate Nevis into your sign-up policy flow, configure the Azure AD B2C environment to use custom policies. </br>See, [Tutorial: Create user flows and custom policies in Azure Active Directory B2C](/azure/active-directory-b2c/tutorial-create-user-flows).
32+
>To integrate Nevis into your sign-up policy flow, configure the Azure AD B2C environment to use custom policies. </br>See, [Tutorial: Create user flows and custom policies in Azure Active Directory B2C](./tutorial-create-user-flows.md).
3333
3434
## Scenario description
3535

@@ -191,4 +191,4 @@ The diagram shows the implementation.
191191
## Next steps
192192

193193
- [Custom policies in Azure AD B2C](./custom-policy-overview.md)
194-
- [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy)
194+
- [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy)

0 commit comments

Comments
 (0)