Skip to content

Commit a37e6a8

Browse files
authored
Merge pull request #85709 from iainfoulds/azureadds-mvc-dirtypr
[AzureADDS] Dirty PR for release branch merge conflict with upstream master
2 parents 02ab20a + 17cd30a commit a37e6a8

File tree

234 files changed

+44346
-43616
lines changed

Some content is hidden

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

234 files changed

+44346
-43616
lines changed

.openpublishing.redirection.json

+41,340-41,311
Large diffs are not rendered by default.

articles/active-directory/authentication/TOC.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
href: concept-authentication-methods.md
2626
- name: Passwordless authentication
2727
href: concept-authentication-passwordless.md
28-
- name: Combined registration
28+
- name: Security information registration
2929
href: concept-registration-mfa-sspr-combined.md
3030
- name: Password reset
3131
items:
@@ -103,7 +103,7 @@
103103
href: howto-mfa-nps-extension-rdg.md
104104
- name: VPN
105105
href: howto-mfa-nps-extension-vpn.md
106-
- name: Combined registration
106+
- name: Security info registration
107107
items:
108108
- name: Enable combined registration
109109
href: howto-registration-mfa-sspr-combined.md

articles/active-directory/authentication/concept-authentication-methods.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 06/17/2019
9+
ms.date: 08/16/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -28,7 +28,7 @@ Microsoft highly recommends Administrators enable users to select more than the
2828
| Password | MFA and SSPR |
2929
| Security questions | SSPR Only |
3030
| Email address | SSPR Only |
31-
| Microsoft Authenticator app | MFA and public preview for SSPR |
31+
| Microsoft Authenticator app | MFA and SSPR |
3232
| OATH Hardware token | Public preview for MFA and SSPR |
3333
| SMS | MFA and SSPR |
3434
| Voice call | MFA and SSPR |
@@ -38,7 +38,7 @@ Microsoft highly recommends Administrators enable users to select more than the
3838

3939
| |
4040
| --- |
41-
| OATH Hardware tokens for MFA and SSPR and Mobile app notification or Mobile app code as methods for Azure AD self-service password reset are public preview features of Azure Active Directory. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/)|
41+
| OATH Hardware tokens for MFA and SSPR are public preview features of Azure Active Directory. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/)|
4242
| |
4343

4444
## Password

articles/active-directory/authentication/concept-sspr-howitworks.md

+4-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 01/30/2019
9+
ms.date: 08/16/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -19,11 +19,6 @@ ms.collection: M365-identity-device-management
1919

2020
How does self-service password reset (SSPR) work? What does that option mean in the interface? Continue reading to find out more about Azure Active Directory (Azure AD) SSPR.
2121

22-
| |
23-
| --- |
24-
| Mobile app notification and Mobile app code as methods for Azure AD self-service password reset are public preview features of Azure Active Directory. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/)|
25-
| |
26-
2722
## How does the password reset portal work?
2823

2924
When a user goes to the password reset portal, a workflow is kicked off to determine:
@@ -58,8 +53,8 @@ Read through the following steps to learn about the logic behind the password re
5853

5954
If SSPR is enabled, you must select at least one of the following options for the authentication methods. Sometimes you hear these options referred to as "gates." We highly recommend that you **choose two or more authentication methods** so that your users have more flexibility in case they are unable to access one when they need it. Additional details about the methods listed below can be found in the article [What are authentication methods?](concept-authentication-methods.md).
6055

61-
* Mobile app notification (preview)
62-
* Mobile app code (preview)
56+
* Mobile app notification
57+
* Mobile app code
6358
* Email
6459
* Mobile phone
6560
* Office phone
@@ -83,7 +78,7 @@ Users can choose to supply more authentication methods if the administrator enab
8378

8479
If a user does not have the minimum required methods registered, they see an error page that directs them to request that an administrator reset their password.
8580

86-
#### Mobile app and SSPR (Preview)
81+
#### Mobile app and SSPR
8782

8883
When using a mobile app, like the Microsoft Authenticator app, as a method for password reset, you should be aware of the following caveats:
8984

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Before enabling the new experience, review the article [Combined security inform
2626
| Combined security information registration for Azure Multi-Factor Authentication and Azure Active Directory (Azure AD) self-service password reset is a public preview feature of Azure AD. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).|
2727
| |
2828

29+
> [!NOTE]
30+
> Organizations who enabled the previous preview for registering and managing security info should complete the steps below to enable the enhanced preview experience. For organizations who do not make the switch, on September 25, 2019, Microsoft will switch users of the previous preview for registering and managing security info to the enhanced experience.
31+
>
32+
> If you have not enabled any version of the preview your organization will not be impacted.
33+
2934
## Enable combined registration
3035

3136
Complete these steps to enable combined registration:

articles/active-directory/authentication/tutorial-sspr-pilot.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: tutorial
9-
ms.date: 07/11/2018
9+
ms.date: 08/16/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -20,7 +20,7 @@ ms.collection: M365-identity-device-management
2020

2121
In this tutorial, you will enable a pilot roll out of Azure AD self-service password reset (SSPR) in your organization and test using a non-administrator account.
2222

23-
It is important that any testing of self-service password reset be done with non-administrator accounts. Microsoft manages the password reset policy for administrator accounts and requires the use of stronger authentication methods. This policy does not allow the use of security questions and answers, and requires the use of two methods for reset.
23+
It is important that any testing of self-service password reset is done with non-administrator accounts. Microsoft manages the password reset policy for administrator accounts and requires the use of stronger authentication methods. This policy does not allow the use of security questions and answers, and requires the use of two methods for reset.
2424

2525
> [!div class="checklist"]
2626
> * Enable self-service password reset
@@ -35,13 +35,13 @@ It is important that any testing of self-service password reset be done with non
3535
1. Sign in to the [Azure portal](https://portal.azure.com) using a Global Administrator account.
3636
1. Browse to **Azure Active Directory** and select **Password reset**.
3737
1. Start with a pilot group by enabling self-service password for a subset of users in your organization.
38-
* From the **Properties** page, under the option **Self Service Password Reset Enabled**, choose **Selected** and pick a pilot group.
38+
* From the **Properties** page, under the option **Self Service Password Reset Enabled**, choose **Selected**, and pick a pilot group.
3939
* Only members of the specific Azure AD group that you choose can use the SSPR functionality. We recommend that you define a group of users and use this setting when you deploy this functionality for a proof of concept. Nesting of security groups is supported here.
4040
* Ensure the users in the group you picked have been appropriately licensed.
4141
* Click **Save**
4242
1. On the **Authentication methods** page
4343
* Set the **Number of methods required to reset** to **1**
44-
* Choose which **Methods available to users** your organization wants to allow. For this tutorial check the boxes to enable **Email**, **Mobile phone**, **Office phone**, **Mobile app notification (preview)** and **Mobile app code (preview)**.
44+
* Choose which **Methods available to users** your organization wants to allow. For this tutorial, check the boxes to enable **Email**, **Mobile phone**, **Office phone**, **Mobile app notification**, and **Mobile app code**.
4545
* Click **Save**
4646
1. On the **Registration** page
4747
* Select **Yes** for **Require users to register when signing in**.
@@ -52,13 +52,13 @@ It is important that any testing of self-service password reset be done with non
5252
* Set **Notify all admins when other admins reset their password** to **Yes**.
5353
1. On the **Customization** page
5454
* Microsoft recommends that you set **Customize helpdesk link** to **Yes** and provide either an email address or web page URL where your users can get additional help from your organization in the **Custom helpdesk email or URL** field.
55-
* For this tutorial we will leave **Customize helpdesk link** set to **No**.
55+
* For this tutorial, we will leave **Customize helpdesk link** set to **No**.
5656

5757
Self-service password reset is now configured for cloud users in your pilot group.
5858

5959
## Test SSPR as a user
6060

61-
Test self-service password reset using a non-administrator test user that is a member of your pilot group. **Be aware that if you use an account that has any administrator roles assigned to it the authentication methods and number may be different than what you selected as Microsoft manages the administrator policy.**
61+
Test self-service password reset using a non-administrator test user that is a member of your pilot group. **If you use an account that has any administrator roles assigned to it the authentication methods and number may be different than what you selected as Microsoft manages the administrator policy.**
6262

6363
1. Open a new InPrivate or incognito mode browser window.
6464
1. Using a test user register for self-service password reset using the registration portal located at [https://aka.ms/ssprsetup](https://aka.ms/ssprsetup).

articles/active-directory/governance/entitlement-management-request-access.md

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ ms.collection: M365-identity-device-management
2828
> This preview version is provided without a service level agreement, and it's not recommended for production workloads. Certain features might not be supported or might have constrained capabilities.
2929
> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
3030
31+
With Azure AD entitlement management, access packages enable a one-time setup of resources and policies that automatically administers access for life of the access package.
32+
33+
An access package manager can configure policies to require approval for users to have access to access packages. A user that needs access to an access package can submit a request to get access. This article describes how to submit an access request.
34+
3135
## Sign in to the My Access portal
3236

3337
The first step is to sign in to the My Access portal where you can request access to an access package.

articles/active-directory/governance/index.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ metadata:
99
manager: daveba
1010
ms.author: ajburnle
1111
ms.collection: na
12-
ms.date: 08/08/2019
12+
ms.date: 08/15/2019
1313
ms.service: active-directory
1414
ms.subservice: na
1515
ms.topic: landing-page
1616
services: active-directory
1717

18-
# linkListType: architecture | deploy | download | get-started | how-to-guide | learn | overview | quickstart | tutorial
18+
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1919

2020
landingContent:
2121
# Card
22-
- title: Learn about Identity Governance
22+
- title: About Identity Governance
2323
linkLists:
2424
- linkListType: overview
2525
links:

0 commit comments

Comments
 (0)