Skip to content

Commit 1d44f57

Browse files
julieMSFTjulieMSFT
committed
resolving merge conflict with master
2 parents 8cb1250 + 23e0eb7 commit 1d44f57

File tree

1,052 files changed

+9216
-4315
lines changed

Some content is hidden

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

1,052 files changed

+9216
-4315
lines changed

‎.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,11 @@
377377
"url": "https://github.com/microsoft/immersive-reader-sdk",
378378
"branch": "master",
379379
"branch_mapping": {}
380+
},
381+
{
382+
"path_to_root": "azure-cosmosdb-java-v2",
383+
"url": "https://github.com/Azure/azure-cosmosdb-java",
384+
"branch": "master"
380385
}
381386
],
382387
"branch_target_mapping": {

‎.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19196,9 +19196,14 @@
1919619196
},
1919719197
{
1919819198
"source_path": "articles/active-directory/active-directory-passwords.md",
19199-
"redirect_url": "active-directory-passwords-update-your-own-password",
19199+
"redirect_url": "/azure/active-directory/user-help/active-directory-passwords-update-your-own-password",
1920019200
"redirect_document_id": false
1920119201
},
19202+
{
19203+
"source_path": "articles/active-directory/user-help/user-help-reset-password.md",
19204+
"redirect_url": "/azure/active-directory/user-help/active-directory-passwords-update-your-own-password",
19205+
"redirect_document_id": false
19206+
},
1920219207
{
1920319208
"source_path": "articles/active-directory/active-directory-protocols-oauth-code.md",
1920419209
"redirect_url": "/azure/active-directory/develop/active-directory-protocols-oauth-code",
@@ -43297,6 +43302,11 @@
4329743302
"source_path": "articles/terraform/terraform-vm-msi.md",
4329843303
"redirect_url": "/azure/terraform/terraform-vm-managed-identities-for-azure-resources",
4329943304
"redirect_document_id": true
43305+
},
43306+
{
43307+
"source_path": "articles/active-directory/develop/msal-acquire-token-interactively.md",
43308+
"redirect_url": "/azure/active-directory/develop/msal-acquire-cache-tokens",
43309+
"redirect_document_id": true
4330043310
}
4330143311
]
4330243312
}

‎articles/active-directory-b2c/active-directory-b2c-reference-customize-ui-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You can provide as many content pages as you like by crafting HTML5/CSS files as
3939
> [!NOTE]
4040
> For security reasons, the use of JavaScript is currently blocked for customization.
4141
42-
In each of your HTML5/CSS templates, you provide an *anchor* element, which corresponds to the required `<div id=”api”>` element in the HTML or the content page as illustrate hereafter. Azure AD B2C requires that all content pages have this specific div.
42+
In each of your HTML5/CSS templates, you provide an *anchor* element, which corresponds to the required `<div id="api">` element in the HTML or the content page as illustrate hereafter. Azure AD B2C requires that all content pages have this specific div.
4343

4444
```
4545
<!DOCTYPE html>

‎articles/active-directory-b2c/predicates.md

Lines changed: 7 additions & 3 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: 09/10/2018
11+
ms.date: 10/28/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -27,6 +27,8 @@ The following diagram shows the relationship between the elements:
2727

2828
The **Predicate** element defines a basic validation to check the value of a claim type and returns `true` or `false`. The validation is done by using a specified **Method** element and a set of **Parameter** elements relevant to the method. For example, a predicate can check whether the length of a string claim value is within the range of minimum and maximum parameters specified, or whether a string claim value contains a character set. The **UserHelpText** element provides an error message for users if the check fails. The value of **UserHelpText** element can be localized using [language customization](localization.md).
2929

30+
The **Predicates** element must appear directly following the **ClaimsSchema** element within the [BuildingBlocks](buildingblocks.md) element.
31+
3032
The **Predicates** element contains the following element:
3133

3234
| Element | Occurrences | Description |
@@ -108,6 +110,8 @@ The following example shows a `IsDateRange` method with the parameters `Minimum`
108110

109111
While the predicates define the validation to check against a claim type, the **PredicateValidations** group a set of predicates to form a user input validation that can be applied to a claim type. Each **PredicateValidation** element contains a set of **PredicateGroup** elements that contain a set of **PredicateReference** elements that points to a **Predicate**. To pass the validation, the value of the claim should pass all of the tests of any predicate under all of the **PredicateGroup** with their set of **PredicateReference** elements.
110112

113+
The **PredicateValidations** element must appear directly following the **Predicates** element within the [BuildingBlocks](buildingblocks.md) element.
114+
111115
```XML
112116
<PredicateValidations>
113117
<PredicateValidation Id="">
@@ -190,7 +194,7 @@ With **Predicates** and **PredicateValidationsInput** you can control the comple
190194
- **Lowercase** using the `IncludesCharacters` method, validates that the password contains a lowercase letter.
191195
- **Uppercase** using the `IncludesCharacters` method, validates that the password contains an uppercase letter.
192196
- **Number** using the `IncludesCharacters` method, validates that the password contains a digit.
193-
- **Symbol** using the `IncludesCharacters` method, validates that the password contains one of following symbols `@#$%^&*\-_+=[]{}|\:',?/~"();!`
197+
- **Symbol** using the `IncludesCharacters` method, validates that the password contains one of several symbol characters.
194198
- **PIN** using the `MatchesRegex` method, validates that the password contains numbers only.
195199
- **AllowedAADCharacters** using the `MatchesRegex` method, validates that the password only invalid character was provided.
196200
- **DisallowedWhitespace** using the `MatchesRegex` method, validates that the password doesn't begin or end with a whitespace character.
@@ -229,7 +233,7 @@ With **Predicates** and **PredicateValidationsInput** you can control the comple
229233
<Predicate Id="Symbol" Method="IncludesCharacters">
230234
<UserHelpText>a symbol</UserHelpText>
231235
<Parameters>
232-
<Parameter Id="CharacterSet">@#$%^&amp;*\-_+=[]{}|\:',?/`~"();!</Parameter>
236+
<Parameter Id="CharacterSet">@#$%^&amp;*\-_+=[]{}|\\:',.?/`~"();!</Parameter>
233237
</Parameters>
234238
</Predicate>
235239

‎articles/active-directory-domain-services/tutorial-configure-networking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ To see this managed domain in action, create and join a virtual machine to the d
151151
> [!div class="nextstepaction"]
152152
> [Join a Windows Server virtual machine to your managed domain](join-windows-vm.md)
153153
154-
<!-- INTERNAL LINKS -->
154+
<!-- INTERNAL LINKS -->
155155
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
156156
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
157157
[create-azure-ad-ds-instance]: tutorial-create-instance.md

‎articles/active-directory/authentication/TOC.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
items:
4444
- name: How MFA works
4545
href: concept-mfa-howitworks.md
46+
- name: Enable MFA
47+
href: concept-mfa-get-started.md
4648
- name: License your users
4749
href: concept-mfa-licensing.md
4850
- name: Manage an Auth Provider
@@ -135,6 +137,10 @@
135137
href: howto-authentication-passwordless-deployment.md
136138
- name: Passwordless security keys
137139
href: howto-authentication-passwordless-security-key.md
140+
- name: Passwordless Windows 10
141+
href: howto-authentication-passwordless-security-key-windows.md
142+
- name: Passwordless on-premises
143+
href: howto-authentication-passwordless-security-key-on-premises.md
138144
- name: Passwordless phone sign-in
139145
href: howto-authentication-passwordless-phone.md
140146
- name: Windows Hello for Business

‎articles/active-directory/authentication/concept-authentication-passwordless.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ Multi-factor authentication (MFA) is a great way to secure your organization, bu
2525

2626
Each organization has different needs when it comes to authentication. Microsoft offers three passwordless authentication options:
2727

28-
- Windows Hello for Business
29-
- Microsoft Authenticator app
28+
- Windows Hello for Business
29+
- Microsoft Authenticator app
3030
- FIDO2 security keys
3131

3232
![Authentication: Security versus convenience](./media/concept-authentication-passwordless/passwordless-convenience-security.png)
3333

34-
## Windows Hello for Business
34+
## Windows Hello for Business
3535

36-
Windows Hello for Business is ideal for information workers who have their own designated Windows PC. The biometric and PIN are directly tied to the user's PC, which prevents access from anyone other than the owner. With PKI integration and built-in support for single sign-on (SSO), Windows Hello for Business provides a simple and convenient method for seamlessly accessing corporate resources on-premises and in the cloud.
36+
Windows Hello for Business is ideal for information workers who have their own designated Windows PC. The biometric and PIN are directly tied to the user's PC, which prevents access from anyone other than the owner. With PKI integration and built-in support for single sign-on (SSO), Windows Hello for Business provides a simple and convenient method for seamlessly accessing corporate resources on-premises and in the cloud.
3737

3838
The Windows Hello for Business [planning guide](https://docs.microsoft.com/windows/security/identity-protection/hello-for-business/hello-planning-guide) can be used to help you make decisions on the type of Windows Hello for Business deployment and the options you'll need to consider.
3939

@@ -49,7 +49,7 @@ It turns any iOS or Android phone into a strong, passwordless credential by allo
4949

5050
FIDO2 security keys are an unphishable standards-based passwordless authentication method that can come in any form factor. Fast Identity Online (FIDO) is an open standard for passwordless authentication. It allows users and organizations to leverage the standard to sign in to their resources without a username or password using an external security key or a platform key built into a device.
5151

52-
For public preview, employees can use external security keys to sign in to their Azure Active Directory Joined Windows 10 machines (running version 1809 or higher) and get single-sign on to their cloud resources. They can also sign in to supported browsers.
52+
For public preview, employees can use security keys to sign in to their Azure AD or hybrid Azure AD joined Windows 10 devices and get single-sign on to their cloud and on-premises resources. They can also sign in to supported browsers.
5353

5454
![Sign in to Microsoft Edge with a security key](./media/concept-authentication-passwordless/concept-web-sign-in-security-key.png)
5555

@@ -75,6 +75,9 @@ The following providers offer FIDO2 security keys of different form factors that
7575
| eWBM | [https://www.ewbm.com/page/sub1_5](https://www.ewbm.com/page/sub1_5) |
7676
| AuthenTrend | [https://authentrend.com/about-us/#pg-35-3](https://authentrend.com/about-us/#pg-35-3) |
7777

78+
> [!NOTE]
79+
> If you purchase and plan to use NFC based security keys you will need a supported NFC reader.
80+
7881
If you are a vendor and want to get your device on this list, contact [[email protected]](mailto:[email protected]).
7982

8083
FIDO2 security keys are a great option for enterprises who are very security sensitive or have scenarios or employees who aren’t willing or able to use their phone as a second factor.
@@ -86,7 +89,7 @@ FIDO2 security keys are a great option for enterprises who are very security sen
8689
- End users can register and manage these passwordless authentication methods in their account portal
8790
- End users can sign in with these passwordless authentication methods
8891
- Microsoft Authenticator App: Will work in scenarios where Azure AD authentication is used, including across all browsers, during Windows 10 Out Of Box (OOBE) setup, and with integrated mobile apps on any operating system.
89-
- Security keys: Will work on lock screen for Windows 10 version 1809 or higher and the web in supported browsers like Microsoft Edge.
92+
- Security keys: Will work on lock screen for Windows 10 and the web in supported browsers like Microsoft Edge.
9093

9194
## Next steps
9295

‎articles/active-directory/authentication/concept-mfa-get-started.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
title: Enable Multi-Factor Authentication for your organization - Azure Active Directory
3+
description: Enable Azure MFA for your organization based on your license
4+
5+
services: multi-factor-authentication
6+
ms.service: active-directory
7+
ms.subservice: authentication
8+
ms.topic: conceptual
9+
ms.date: 10/29/2019
10+
11+
ms.author: joflore
12+
author: MicrosoftGuyJFlo
13+
manager: daveba
14+
ms.reviewer: michmcla
15+
16+
ms.collection: M365-identity-device-management
17+
---
18+
# Enable Multi-Factor Authentication for your organization
19+
20+
There are multiple ways to enable Azure Multi-Factor Authentication (MFA) for your Azure Active Directory (AD) users based on the licenses that your organization owns.
21+
22+
![Investigate signals and enforce MFA if needed](./media/concept-mfa-get-started/verify-signals-and-perform-mfa-if-required.png)
23+
24+
Based on our studies, your account is more than 99.9% less likely to be compromised if you use MFA.
25+
26+
So how does your organization turn on multi-factor authentication even for free, before becoming a statistic?
27+
28+
## Free option
29+
30+
Customers who are utilizing the free benefits of Azure AD can use [security defaults](../conditional-access/concept-conditional-access-security-defaults.md) to enable multi-factor authentication in their environment.
31+
32+
## Office 365
33+
34+
For customers with Office 365, there are two options:
35+
36+
- [Security defaults](../conditional-access/concept-conditional-access-security-defaults.md) can be enabled through Azure AD to protect all of your users with Azure Multi-Factor Authentication.
37+
- If your organization requires more granularity in providing multi-factor authentication, your Office licenses include [per-user MFA](../authentication/howto-mfa-userstates.md) capabilities. Per-user MFA is enabled and enforced on each user individually by administrators.
38+
39+
## Azure AD Premium P1
40+
41+
For customers with Azure AD Premium P1 or similar licenses that include this functionality such as Enterprise Mobility + Security E3, Microsoft 365 F1, or Microsoft 365 E3:
42+
43+
The recommendation is to use [Conditional Access policies](../conditional-access/concept-conditional-access-policy-common.md) for the best user experience.
44+
45+
## Azure AD Premium P2
46+
47+
For customers with Azure AD Premium P2 or similar licenses that include this functionality such as Enterprise Mobility + Security E5 or Microsoft 365 E5:
48+
49+
The recommendation is to use [Conditional Access policies](../conditional-access/concept-conditional-access-policy-common.md) along with [Identity Protection](../identity-protection/overview-v2.md) risk policies for the best user experience and enforcement flexibility.
50+
51+
## Authentication methods
52+
53+
| | Security defaults | All other methods |
54+
| --- | --- | --- |
55+
| Notification through mobile app | X | X |
56+
| Verification code from mobile app or hardware token | | X |
57+
| Text message to phone | | X |
58+
| Call to phone | | X |
59+
| App passwords | | X** |
60+
61+
** App passwords are only available in per-user MFA with legacy authentication scenarios only if enabled by administrators.
62+
63+
## Next steps
64+
65+
[Azure AD pricing page](https://azure.microsoft.com/pricing/details/active-directory/)

0 commit comments

Comments
 (0)