Skip to content

Commit 8dcca14

Browse files
authored
Merge pull request #239663 from MicrosoftDocs/main
5/30 AM Publish
2 parents 2268df4 + c6ddd7a commit 8dcca14

File tree

183 files changed

+1526
-1838
lines changed

Some content is hidden

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

183 files changed

+1526
-1838
lines changed

.openpublishing.redirection.json

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22783,6 +22783,116 @@
2278322783
"source_path_from_root": "/articles/sentinel/data-connectors/threat-intelligence-upload-indicators-api.md",
2278422784
"redirect_url": "/azure/sentinel/data-connectors-reference",
2278522785
"redirect_document_id": false
22786+
},
22787+
{
22788+
"source_path_from_root": "/articles/networking/scripts/virtual-network-powershell-sample-peer-two-virtual-networks.md",
22789+
"redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks-powershell",
22790+
"redirect_document_id": false
22791+
},
22792+
{
22793+
"source_path_from_root": "/articles/networking/scripts/virtual-network-powershell-filter-network-traffic.md",
22794+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
22795+
"redirect_document_id": false
22796+
},
22797+
{
22798+
"source_path_from_root": "/articles/networking/powershell-samples.md",
22799+
"redirect_url": "/azure/networking/fundamentals/networking-overview",
22800+
"redirect_document_id": false
22801+
},
22802+
{
22803+
"source_path_from_root": "/articles/networking/scripts/virtual-network-filter-network-traffic.md",
22804+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
22805+
"redirect_document_id": false
22806+
},
22807+
{
22808+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-powershell-sample-filter-network-traffic.md",
22809+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
22810+
"redirect_document_id": false
22811+
},
22812+
{
22813+
"source_path_from_root": "/articles/networking/scripts/virtual-network-powershell-sample-route-traffic-through-nva.md",
22814+
"redirect_url": "/azure/virtual-network/tutorial-create-route-table-portal",
22815+
"redirect_document_id": false
22816+
},
22817+
{
22818+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-powershell-sample-route-traffic-through-nva.md",
22819+
"redirect_url": "/azure/virtual-network/tutorial-create-route-table-portal",
22820+
"redirect_document_id": false
22821+
},
22822+
{
22823+
"source_path_from_root": "/articles/networking/cli-samples.md",
22824+
"redirect_url": "/azure/networking/fundamentals/networking-overview",
22825+
"redirect_document_id": false
22826+
},
22827+
{
22828+
"source_path_from_root": "/articles/virtual-network/powershell-samples.md",
22829+
"redirect_url": "/azure/networking/fundamentals/networking-overview",
22830+
"redirect_document_id": false
22831+
},
22832+
{
22833+
"source_path_from_root": "/articles/virtual-network/cli-samples.md",
22834+
"redirect_url": "/azure/networking/fundamentals/networking-overview",
22835+
"redirect_document_id": false
22836+
},
22837+
{
22838+
"source_path_from_root": "/articles/networking/scripts/virtual-network-cli-sample-peer-two-virtual-networks.md",
22839+
"redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks-cli",
22840+
"redirect_document_id": false
22841+
},
22842+
{
22843+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-powershell-sample-ipv6-dual-stack-standard-load-balancer.md",
22844+
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
22845+
"redirect_document_id": false
22846+
},
22847+
{
22848+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-cli-sample-ipv6-dual-stack-standard-load-balancer.md",
22849+
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-cli",
22850+
"redirect_document_id": false
22851+
},
22852+
{
22853+
"source_path_from_root": "/articles/networking/scripts/virtual-network-cli-sample-route-traffic-through-nva.md",
22854+
"redirect_url": "/azure/virtual-network/tutorial-create-route-table-portal",
22855+
"redirect_document_id": false
22856+
},
22857+
{
22858+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-cli-sample-ipv6-dual-stack.md",
22859+
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-cli",
22860+
"redirect_document_id": false
22861+
},
22862+
{
22863+
"source_path_from_root": "/articles/networking/scripts/virtual-network-cli-sample-multi-tier-application.md",
22864+
"redirect_url": "/architecture/example-scenario/infrastructure/multi-tier-app-disaster-recovery",
22865+
"redirect_document_id": false
22866+
},
22867+
{
22868+
"source_path_from_root": "/articles/networking/scripts/virtual-network-powershell-sample-multi-tier-application.md",
22869+
"redirect_url": "/architecture/example-scenario/infrastructure/multi-tier-app-disaster-recovery",
22870+
"redirect_document_id": false
22871+
},
22872+
{
22873+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-powershell-sample-ipv6-dual-stack.md",
22874+
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
22875+
"redirect_document_id": false
22876+
},
22877+
{
22878+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-cli-sample-filter-network-traffic.md",
22879+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
22880+
"redirect_document_id": false
22881+
},
22882+
{
22883+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-cli-sample-route-traffic-through-nva.md",
22884+
"redirect_url": "/azure/virtual-network/tutorial-create-route-table-portal",
22885+
"redirect_document_id": false
22886+
},
22887+
{
22888+
"source_path_from_root": "/articles/virtual-network/scripts/virtual-network-cli-sample-multi-tier-application.md",
22889+
"redirect_url": "/architecture/example-scenario/infrastructure/multi-tier-app-disaster-recovery",
22890+
"redirect_document_id": false
22891+
},
22892+
{
22893+
"source_path_from_root": "/articles/active-directory/authentication/how-to-migrate-mfa-server-to-azure-mfa-with-federation.md",
22894+
"redirect_url": "/azure/active-directory/authentication/how-to-migrate-mfa-server-to-mfa-with-federation",
22895+
"redirect_document_id": true
2278622896
}
2278722897
]
2278822898
}

articles/active-directory-b2c/claimsschema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The **DataType** element supports the following values:
6868
|boolean|Represents a Boolean (`true` or `false`) value.|
6969
|date| Represents an instant in time, typically expressed as a date of a day. The value of the date follows ISO 8601 convention.|
7070
|dateTime|Represents an instant in time, typically expressed as a date and time of day. The value of the date follows ISO 8601 convention during runtime and is converted to UNIX epoch time when issued as a claim into the token.|
71-
|duration|Represents a time interval in years, months, days, hours, minutes, and seconds. The format of is `PnYnMnDTnHnMnS`, where `P` indicates positive, or `N` for negative value. `nY` is the number of years followed by a literal `Y`. `nMo` is the number of months followed by a literal `Mo`. `nD` is the number of days followed by a literal `D`. Examples: `P21Y` represents 21 years. `P1Y2Mo` represents one year, and two months. `P1Y2Mo5D` represents one year, two months, and five days. `P1Y2M5DT8H5M620S` represents one year, two months, five days, eight hours, five minutes, and twenty seconds. |
71+
|duration|Represents a time interval in years, months, days, hours, minutes, and seconds. The format of is `PnYnMnDTnHnMnS`, where `P` indicates positive, or `N` for negative value. `nY` is the number of years followed by a literal `Y`. `nMo` is the number of months followed by a literal `Mo`. `nD` is the number of days followed by a literal `D`. Examples: `P21Y` represents 21 years. `P1Y2Mo` represents one year, and two months. `P1Y2Mo5D` represents one year, two months, and five days. `P1Y2M5DT8H5M20S` represents one year, two months, five days, eight hours, five minutes, and twenty seconds. |
7272
|phoneNumber|Represents a phone number. |
7373
|int| Represents number between -2,147,483,648 and 2,147,483,647|
7474
|long| Represents number between -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807 |
@@ -251,7 +251,7 @@ The **UserInputType** element available user input types:
251251
|Password | `string` |Password text box.|
252252
|RadioSingleSelect |`string` | Collection of radio buttons. The claim value is the selected value.|
253253
|Readonly | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`| Read-only text box. |
254-
|TextBox |`boolean`, `int`, `string` |Single-line text box. |
254+
|TextBox |`boolean`, `int`, `phoneNumber`, `string` |Single-line text box. |
255255

256256

257257
#### TextBox

articles/active-directory-b2c/embedded-login.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ The **Sources** attribute contains the URI of your web application. Add a space
7373
- The URI must be trusted and owned by your application.
7474
- The URI must use the https scheme.
7575
- The full URI of the web app must be specified. Wildcards are not supported.
76+
- The **JourneyFraming** element only allows site URLs with a **two to seven-character** Top-level domain (TLD) to align with commonly recognized TLDs.
7677

7778
In addition, we recommend that you also block your own domain name from being embedded in an iframe by setting the `Content-Security-Policy` and `X-Frame-Options` headers respectively on your application pages. This will mitigate security concerns around older browsers related to nested embedding of iframes.
7879

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const b2cPolicies = {
107107
export const msalConfig: Configuration = {
108108
auth: {
109109
clientId: '<your-MyApp-application-ID>',
110-
authority: b2cPolicies.authorities.signUpSignIn,
110+
authority: b2cPolicies.authorities.signUpSignIn.authority,
111111
knownAuthorities: [b2cPolicies.authorityDomain],
112112
redirectUri: '/',
113113
},

articles/active-directory-b2c/language-customization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ You configure localized resources elements for the content definition and any la
285285
<LocalizedString ElementType="UxElement" StringId="local_intro_email">#Iniciar sesión con su cuenta existente</LocalizedString>
286286
<LocalizedString ElementType="UxElement" StringId="invalid_email">#Escriba una dirección de correo electrónico válida</LocalizedString>
287287
<LocalizedString ElementType="UxElement" StringId="unknown_error">#Tenemos problemas para iniciar su sesión. Vuelva a intentarlo más tarde. </LocalizedString>
288-
<LocalizedString ElementType="UxElement" StringId="email_pattern">^[a-zA-Z0-9.!#$%&amp;'^_`{}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$</LocalizedString>
288+
<LocalizedString ElementType="UxElement" StringId="email_pattern">^[a-zA-Z0-9.!#$%&amp;'^_`\{\}~\-]+@[a-zA-Z0-9\-]+(?:\.[a-zA-Z0-9\-]+)*$</LocalizedString>
289289
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidPassword">#Su contraseña es incorrecta.</LocalizedString>
290290
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfClaimsPrincipalDoesNotExist">#Parece que no podemos encontrar su cuenta.</LocalizedString>
291291
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfOldPasswordUsed">#Parece que ha usado una contraseña antigua.</LocalizedString>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The following IDs are used for a content definition with an ID of `api.signupors
3636
| `logonIdentifier_email` | Email Address | `< 2.0.0` |
3737
| `requiredField_email` | Please enter your email | `< 2.0.0` |
3838
| `invalid_email` | Please enter a valid email address | `< 2.0.0` |
39-
| `email_pattern` | ```^[a-zA-Z0-9.!#$%&''\*+/=?^\_\`{\|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)\*$``` | `< 2.0.0` |
39+
| `email_pattern` | ```^[a-zA-Z0-9.!#$%&'*+\/=?^_`\{\|\}~\-]+@[a-zA-Z0-9\-]+(?:\\.[a-zA-Z0-9\-]+)\*$``` | `< 2.0.0` |
4040
| `local_intro_username` | Sign in with your user name | `< 2.0.0` |
4141
| `logonIdentifier_username` | Username | `< 2.0.0` |
4242
| `requiredField_username` | Please enter your user name | `< 2.0.0` |
@@ -178,6 +178,7 @@ The following IDs are used for a content definition having an ID of `api.localac
178178
| `alert_message` | Are you sure that you want to cancel entering your details? |
179179
| `ver_intro_msg` | Verification is necessary. Please click Send button. |
180180
| `ver_input` | Verification code |
181+
| `required_field_descriptive` | {0} is required |
181182

182183
### Sign-up and self-asserted pages disclaimer links
183184

@@ -240,6 +241,7 @@ The following example shows the use of some of the user interface elements in th
240241
<LocalizedString ElementType="UxElement" StringId="initial_intro">Please provide the following details.</LocalizedString>
241242
<LocalizedString ElementType="UxElement" StringId="preloader_alt">Please wait</LocalizedString>
242243
<LocalizedString ElementType="UxElement" StringId="required_field">This information is required.</LocalizedString>
244+
<LocalizedString ElementType="UxElement" StringId="required_field_descriptive">{0} is required</LocalizedString>
243245
<LocalizedString ElementType="UxElement" StringId="ver_but_edit">Change e-mail</LocalizedString>
244246
<LocalizedString ElementType="UxElement" StringId="ver_but_resend">Send new code</LocalizedString>
245247
<LocalizedString ElementType="UxElement" StringId="ver_but_send">Send verification code</LocalizedString>

articles/active-directory-b2c/troubleshoot-with-application-insights.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ To create an instance of Application Insights in your subscription, follow these
7272
UserJourneyRecorderEndpoint="urn:journeyrecorder:applicationinsights"
7373
```
7474

75-
1. If it doesn't already exist, add a `<UserJourneyBehaviors>` child node to the `<RelyingParty>` node. It must be located after `<DefaultUserJourney ReferenceId="UserJourney Id" from your extensions policy, or equivalent (for example:SignUpOrSigninWithAAD" />`.
75+
1. If it doesn't already exist, add a `<UserJourneyBehaviors>` child node to the `<RelyingParty>` node. It must be located after `<DefaultUserJourney ReferenceId="UserJourney Id" from your extensions policy, or equivalent (for example:SignUpOrSigninWithAAD" />`. See [RelyingParty schema reference](./relyingparty.md) for a complete order of the **RelyingParty** child elements.
7676
1. Add the following node as a child of the `<UserJourneyBehaviors>` element. Make sure to replace `{Your Application Insights Key}` with the Application Insights **Instrumentation Key** that you recorded earlier.
7777

7878
```xml
@@ -96,6 +96,10 @@ To create an instance of Application Insights in your subscription, follow these
9696
...
9797
<RelyingParty>
9898
<DefaultUserJourney ReferenceId="UserJourney ID from your extensions policy, or equivalent (for example: SignUpOrSigninWithAzureAD)" />
99+
<Endpoints>
100+
<!--points to refresh token journey when app makes refresh token request-->
101+
<Endpoint Id="Token" UserJourneyReferenceId="RedeemRefreshToken" />
102+
</Endpoints>
99103
<UserJourneyBehaviors>
100104
<JourneyInsights TelemetryEngine="ApplicationInsights" InstrumentationKey="{Your Application Insights Key}" DeveloperMode="true" ClientEnabled="false" ServerEnabled="true" TelemetryVersion="1.0.0" />
101105
</UserJourneyBehaviors>

articles/active-directory/authentication/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
- name: Migrate to Azure MFA and user authentication
256256
href: how-to-migrate-mfa-server-to-mfa-user-authentication.md
257257
- name: Migrate to Azure MFA with Federation
258-
href: how-to-migrate-mfa-server-to-azure-mfa-with-federation.md
258+
href: how-to-migrate-mfa-server-to-mfa-with-federation.md
259259
- name: Migration Utility
260260
href: how-to-mfa-server-migration-utility.md
261261
- name: Deploy MFA on-premises

articles/active-directory/authentication/how-to-migrate-mfa-server-to-azure-mfa.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
1717
---
1818
# Migrate from MFA Server to Azure AD Multi-Factor Authentication
1919

20-
Multifactor authentication (MFA) is important to securing your infrastructure and assets from bad actors. Azure AD Multi-Factor Authentication Server (MFA Server) isnt available for new deployments and will be deprecated. Customers who are using MFA Server should move to using cloud-based Azure Active Directory (Azure AD) Multi-Factor Authentication.
20+
Multifactor authentication (MFA) is important to securing your infrastructure and assets from bad actors. Azure AD Multi-Factor Authentication Server (MFA Server) isn't available for new deployments and will be deprecated. Customers who are using MFA Server should move to using cloud-based Azure Active Directory (Azure AD) Multi-Factor Authentication.
2121

2222
In this article, we assume that you have a hybrid environment where:
2323

@@ -31,13 +31,13 @@ There are multiple possible end states to your migration, depending on your goal
3131

3232
| <br> | Goal: Decommission MFA Server ONLY | Goal: Decommission MFA Server and move to Azure AD Authentication | Goal: Decommission MFA Server and AD FS |
3333
|------|------------------------------------|-------------------------------------------------------------------|-----------------------------------------|
34-
|MFA provider | Change MFA provider from MFA Server to Azure AD Multi-Factor Authentication. | Change MFA provider from MFA Server to Azure AD Multi-Factor Authentication. | Change MFA provider from MFA Server to Azure AD Multi-Factor Authentication. |
34+
|MFA provider | Change MFA provider from MFA Server to Azure AD Multi-Factor Authentication. | Change MFA provider from MFA Server to Azure AD Multi-Factor Authentication. | Change MFA provider from MFA Server to Azure AD Multi-Factor Authentication. |
3535
|User authentication |Continue to use federation for Azure AD authentication. | Move to Azure AD with Password Hash Synchronization (preferred) or Passthrough Authentication **and** Seamless single sign-on (SSO).| Move to Azure AD with Password Hash Synchronization (preferred) or Passthrough Authentication **and** SSO. |
3636
|Application authentication | Continue to use AD FS authentication for your applications. | Continue to use AD FS authentication for your applications. | Move apps to Azure AD before migrating to Azure AD Multi-Factor Authentication. |
3737

3838
If you can, move both your multifactor authentication and your user authentication to Azure. For step-by-step guidance, see [Moving to Azure AD Multi-Factor Authentication and Azure AD user authentication](how-to-migrate-mfa-server-to-mfa-user-authentication.md).
3939

40-
If you cant move your user authentication, see the step-by-step guidance for [Moving to Azure AD Multi-Factor Authentication with federation](how-to-migrate-mfa-server-to-azure-mfa-with-federation.md).
40+
If you can't move your user authentication, see the step-by-step guidance for [Moving to Azure AD Multi-Factor Authentication with federation](how-to-migrate-mfa-server-to-mfa-with-federation.md).
4141

4242
## Prerequisites
4343

@@ -51,7 +51,7 @@ If you can’t move your user authentication, see the step-by-step guidance for
5151
## Considerations for all migration paths
5252

5353
Migrating from MFA Server to Azure AD Multi-Factor Authentication involves more than just moving the registered MFA phone numbers.
54-
Microsofts MFA server can be integrated with many systems, and you must evaluate how these systems are using MFA Server to understand the best ways to integrate with Azure AD Multi-Factor Authentication.
54+
Microsoft's MFA server can be integrated with many systems, and you must evaluate how these systems are using MFA Server to understand the best ways to integrate with Azure AD Multi-Factor Authentication.
5555

5656
### Migrating MFA user information
5757

@@ -157,7 +157,7 @@ Others might include:
157157

158158
## Next steps
159159

160-
- [Moving to Azure AD Multi-Factor Authentication with federation](how-to-migrate-mfa-server-to-azure-mfa-with-federation.md)
160+
- [Moving to Azure AD Multi-Factor Authentication with federation](how-to-migrate-mfa-server-to-mfa-with-federation.md)
161161
- [Moving to Azure AD Multi-Factor Authentication and Azure AD user authentication](how-to-migrate-mfa-server-to-mfa-user-authentication.md)
162162
- [How to use the MFA Server Migration Utility](how-to-mfa-server-migration-utility.md)
163163

0 commit comments

Comments
 (0)