Skip to content

Commit b87d365

Browse files
authored
Merge branch 'main' into patch-2
2 parents f50928b + b5f2ad6 commit b87d365

File tree

6,706 files changed

+61314
-48518
lines changed

Some content is hidden

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

6,706 files changed

+61314
-48518
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "📄 Feedback control template"
2+
title: "Feedback"
3+
description: >-
4+
⛔ This template is intended for use by the feedback control on the bottom of every page on the
5+
live site. If you aren't using the feedback control, choose one of the other templates.⛔
6+
labels:
7+
- "needs-triage"
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: "## 🎁Enter your feedback🎁"
12+
- type: markdown
13+
attributes:
14+
value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
15+
- type: dropdown
16+
id: issue-type
17+
attributes:
18+
label: Type of issue
19+
options:
20+
- Typo
21+
- Code doesn't work
22+
- Missing information
23+
- Outdated article
24+
- Other (describe below)
25+
validations:
26+
required: true
27+
- type: textarea
28+
id: userfeedback
29+
validations:
30+
required: true
31+
attributes:
32+
label: Feedback
33+
description: >-
34+
If possible, please provide extended details that will add context and help the team update
35+
the documentation. Additional details may not be useful for typos, grammar, formatting, etc.
36+
For technical or factual errors, please include code snippets and output to show how the
37+
documentation is incorrect.
38+
- type: markdown
39+
attributes:
40+
value: "## 🚧 Article information 🚧"
41+
- type: markdown
42+
attributes:
43+
value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
44+
- type: input
45+
id: pageUrl
46+
validations:
47+
required: true
48+
attributes:
49+
label: Page URL
50+
- type: input
51+
id: contentSourceUrl
52+
validations:
53+
required: true
54+
attributes:
55+
label: Content source URL
56+
- type: input
57+
id: author
58+
validations:
59+
required: true
60+
attributes:
61+
label: Author
62+
description: GitHub Id of the author
63+
- type: input
64+
id: documentVersionIndependentId
65+
validations:
66+
required: true
67+
attributes:
68+
label: Document Id

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 1943 additions & 1938 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,11 @@
16491649
"source_path_from_root": "/articles/dns/dns-getstarted-create-recordset.md",
16501650
"redirect_url": "/azure/dns/dns-getstarted-powershell",
16511651
"redirect_document_id": false
1652+
},
1653+
{
1654+
"source_path_from_root": "/articles/time-series-insights/migration-to-adx.md",
1655+
"redirect_url": "/azure/time-series-insights/migration-to-fabric.md",
1656+
"redirect_document_id": false
16521657
},
16531658
{
16541659
"source_path_from_root": "/articles/dns/dns-operations-dnszones-cli-nodejs.md",
@@ -4059,14 +4064,35 @@
40594064
"redirect_document_id": false
40604065
},
40614066
{
4062-
"source_path_from_root": "/articles/cosmos-dbcreate-websitemd",
4067+
"source_path_from_root": "/articles/cosmos-db/create-website.md",
40634068
"redirect_url": "/azure/cosmos-db/sql/create-website",
40644069
"redirect_document_id": true
40654070
},
40664071
{
40674072
"source_path_from_root": "/articles/virtual-machines-linux-nodejs-deploy.md",
40684073
"redirect_url": "/azure",
40694074
"redirect_document_id": false
4075+
},
4076+
{
4077+
"source_path_from_root": "/articles/event-grid/move-system-topics-across-regions.md",
4078+
"redirect_url": "/azure",
4079+
"redirect_document_id": false
4080+
},
4081+
{
4082+
"source_path_from_root": "/articles/event-grid/move-custom-topics-across-regions.md",
4083+
"redirect_url": "/azure",
4084+
"redirect_document_id": false
4085+
},
4086+
{
4087+
"source_path_from_root": "/articles/event-grid/move-domains-across-regions.md",
4088+
"redirect_url": "/azure",
4089+
"redirect_document_id": false
4090+
},
4091+
{
4092+
"source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
4093+
"redirect_url": "/azure",
4094+
"redirect_document_id": false
40704095
}
4096+
40714097
]
40724098
}

.openpublishing.redirection.virtual-desktop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,11 @@
419419
"source_path_from_root": "/articles/virtual-desktop/troubleshoot-getting-started.md",
420420
"redirect_url": "/azure/virtual-desktop/troubleshoot-quickstart",
421421
"redirect_document_id": true
422+
},
423+
{
424+
"source_path_from_root": "/articles/virtual-desktop/fslogix-containers-azure-files.md",
425+
"redirect_url": "/azure/virtual-desktop/fslogix-profile-containers",
426+
"redirect_document_id": true
422427
}
423428
]
424429
}

articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,6 @@
537537
href: partner-nok-nok.md
538538
- name: Transmit Security for passwordless
539539
href: partner-bindid.md
540-
- name: Transmit Security for risk detection
541-
href: partner-transmit-security.md
542540
- name: Trusona
543541
href: partner-trusona.md
544542
- name: Twilio
@@ -571,6 +569,8 @@
571569
- name: Microsoft Dynamics 365 Fraud Protection
572570
href: partner-dynamics-365-fraud-protection.md
573571
displayName: m365 dynamics, dynamics fraud protection, fraud, 365 protection
572+
- name: Transmit Security
573+
href: partner-transmit-security.md
574574
- name: Investigate risk with Identity Protection
575575
href: identity-protection-investigate-risk.md
576576
- name: Configure Conditional Access
@@ -824,8 +824,6 @@
824824
href: user-flow-versions-legacy.md
825825
- name: Resources
826826
items:
827-
- name: Azure Roadmap
828-
href: https://azure.microsoft.com/updates/?status=nowavailable,inpreview,indevelopment&category=identity,security&query=b2c
829827
- name: Frequently asked questions
830828
href: ./faq.yml
831829
displayName: FAQ

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ Upon an application sign-out request, Azure AD B2C attempts to sign out from you
422422

423423
## Debug SAML protocol
424424

425-
To help configure and debug federation with a SAML identity provider, you can use a browser extension for the SAML protocol, such as [SAML DevTools extension](https://chrome.google.com/webstore/detail/saml-devtools-extension/jndllhgbinhiiddokbeoeepbppdnhhio) for Chrome, [SAML-tracer](https://addons.mozilla.org/es/firefox/addon/saml-tracer/) for FireFox, or [Microsoft Edge or IE Developer tools](https://techcommunity.microsoft.com/t5/microsoft-sharepoint-blog/gathering-a-saml-token-using-edge-or-ie-developer-tools/ba-p/320957).
425+
To help configure and debug federation with a SAML identity provider, you can use a browser extension for the SAML protocol, such as [SAML DevTools extension](https://chrome.google.com/webstore/detail/saml-devtools-extension/jndllhgbinhiiddokbeoeepbppdnhhio) for Chrome, [SAML-tracer](https://addons.mozilla.org/es/firefox/addon/saml-tracer/) for FireFox, or [Microsoft Edge or Internet Explorer developer tools](https://techcommunity.microsoft.com/t5/microsoft-sharepoint-blog/gathering-a-saml-token-using-edge-or-ie-developer-tools/ba-p/320957).
426426

427427
Using these tools, you can check the integration between Azure AD B2C and your SAML identity provider. For example:
428428

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ The following IDs are used for an [Microsoft Entra ID multifactor authentication
532532
| `UserMessageIfMaxAllowedCodeRetryReached` | Wrong code entered too many times, please try again later.|
533533
| `UserMessageIfServerError` | Cannot use MFA service, please try again later.|
534534
| `UserMessageIfThrottled` | Your request has been throttled, please try again later.|
535-
| `UserMessageIfWrongCodeEntered` |Wrong code entered, please try again.|
535+
| `UserMessageIfIncorrectOTPCodeEntered` |Wrong code entered, please try again.|
536536

537537
<a name='azure-ad-mfa-example'></a>
538538

@@ -684,4 +684,4 @@ This example shows localized messages for CAPTCHA display control.
684684
See the following articles for localization examples:
685685

686686
- [Language customization with custom policy in Azure AD B2C](language-customization.md)
687-
- [Language customization with user flows in Azure AD B2C](language-customization.md)
687+
- [Language customization with user flows in Azure AD B2C](language-customization.md)

articles/active-directory-b2c/manage-user-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.custom: fasttrack-edit
2222

2323
This article discusses how you can manage the user data in Azure Active Directory B2C (Azure AD B2C) by using the operations that are provided by the [Microsoft Graph API](/graph/use-the-api). Managing user data includes deleting or exporting data from audit logs.
2424

25-
[!INCLUDE [gdpr-intro-sentence.md](../../includes/gdpr-intro-sentence.md)]
25+
[!INCLUDE [gdpr-intro-sentence.md](~/reusable-content/ce-skilling/azure/includes/gdpr-intro-sentence.md)]
2626

2727
## Delete user data
2828

articles/active-directory-b2c/oauth2-error-technical-profile.md

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010

1111
ms.topic: reference
12-
ms.date: 01/11/2024
12+
ms.date: 05/07/2024
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515

@@ -73,6 +73,43 @@ The following example shows a technical profile for `ReturnOAuth2Error`:
7373
</ClaimsProviders> -->
7474
```
7575

76+
## Define claims transformation to generate custom values of error code and error message
77+
78+
Use these steps to generate custom values of error code and error message:
79+
80+
1. Locate the `ClaimsTransformations` element, then add the following code inside it
81+
82+
```xml
83+
<!--
84+
<ClaimsTransformations> -->
85+
<ClaimsTransformation Id="GenerateErrorCode" TransformationMethod="CreateStringClaim">
86+
<InputParameters>
87+
<InputParameter Id="value" DataType="string" Value="Error_001" />
88+
</InputParameters>
89+
<OutputClaims>
90+
<OutputClaim ClaimTypeReferenceId="errorCode" TransformationClaimType="createdClaim" />
91+
</OutputClaims>
92+
</ClaimsTransformation>
93+
<ClaimsTransformation Id="GenerateErrorMessage" TransformationMethod="CreateStringClaim">
94+
<InputParameters>
95+
<InputParameter Id="value" DataType="string" Value="Insert error description." />
96+
</InputParameters>
97+
<OutputClaims>
98+
<OutputClaim ClaimTypeReferenceId="errorMessage" TransformationClaimType="createdClaim" />
99+
</OutputClaims>
100+
</ClaimsTransformation>
101+
<!--
102+
</ClaimsTransformations> -->
103+
```
104+
105+
1. Add the two claims transformations in the `OutputClaimsTransformations` element of any technical profile before Oauth2 technical that you define:
106+
107+
```xml
108+
<OutputClaimsTransformations>
109+
<OutputClaimsTransformation ReferenceId="generateErrorCode" />
110+
<OutputClaimsTransformation ReferenceId="generateErrorMessage" />
111+
</OutputClaimsTransformations>
112+
```
76113
## Input claims
77114

78115
The **InputClaims** element contains a list of claims required to return OAuth2 error.
@@ -123,6 +160,20 @@ In the following example:
123160
</UserJourney>
124161
```
125162

163+
Optionally, you can use preconditions to manipulate the Oauth2 error technical profile. For example, if there is no email claim, you can set to call Oauth2 error technical profile:
164+
165+
```xml
166+
<OrchestrationStep Order="3" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="ReturnOAuth2Error">
167+
<Preconditions>
168+
<Precondition Type="ClaimsExist" ExecuteActionsIf="false">
169+
<Value>email</Value>
170+
<Action>SkipThisOrchestrationStep</Action>
171+
</Precondition>
172+
</Preconditions>
173+
</OrchestrationStep>
174+
```
175+
176+
126177
## Next steps
127178

128179
Learn about [UserJourneys](userjourneys.md)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
179179
- Added support for [display controls](display-controls.md) in custom policies.
180180

181181
**1.2.0**
182-
- The username/email and password fields now use the `form` HTML element to allow Microsoft Edge and Internet Explorer (IE) to properly save this information.
182+
- The username/email and password fields now use the `form` HTML element to allow Microsoft Edge and Internet Explorer to properly save this information.
183183
- Added a configurable user input validation delay for improved user experience.
184184
- Accessibility fixes
185185
- Fix an accessibility issue so that error messages are read by Narrator.
@@ -273,7 +273,7 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
273273
- When the [sign-in option](sign-in-options.md) is set to Email, the sign-in header presents "Sign in with your sign-in name". The username field presents "Sign in name". For more information, see [localization](localization-string-ids.md#sign-up-or-sign-in-page-elements).
274274

275275
**1.2.0**
276-
- The username/email and password fields now use the `form` HTML element to allow Microsoft Edge and Internet Explorer (IE) to properly save this information.
276+
- The username/email and password fields now use the `form` HTML element to allow Microsoft Edge and Internet Explorer to properly save this information.
277277
- Accessibility fixes
278278
- You can now add the `data-preload="true"` attribute [in your HTML tags](customize-ui-with-html.md#guidelines-for-using-custom-page-content) to control the load order for CSS and JavaScript.
279279
- Load linked CSS files at the same time as your HTML template so it doesn't 'flicker' between loading the files.
@@ -313,7 +313,7 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
313313

314314
**1.2.7**
315315
- Fixed accessibility issue on label for retries code.
316-
- Fixed issue caused by incompatibility of default parameter on IE 11.
316+
- Fixed issue caused by incompatibility of default parameter on Internet Explorer 11.
317317
- Set up `H1` heading and enable by default.
318318
- Updated HandlebarJS version to 4.7.7.
319319

0 commit comments

Comments
 (0)