Merge pull request #93725 from MicrosoftDocs/master

Merge master to live 4 AM

Author: ShannonLeavitt

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

@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.subservice: compliance
-ms.date: 04/19/2019
+ms.date: 10/26/2019
 ms.author: ajburnle
 ms.reviewer: mamkumar
 ms.collection: M365-identity-device-management
@@ -56,13 +56,14 @@ Once you have found the access package in the My Access portal, you can submit a
 
 1. Find the access package in the list.  If necessary, you can search by typing a search string and then selecting the **Name**, **Catalog**, or **Resources** filter.
 
-    ![My Access portal - Resource search](./media/entitlement-management-request-access/elm-myaccess-resource-search.png)
-1. Click the checkmark to select the access package.
+    ![My Access portal - Resource search](./media/entitlement-management-request-access/my-access-resource-search.png)
 
-    ![My Access portal - Access packages](./media/entitlement-management-shared/my-access-access-packages.png)
+1. Click the checkmark to select the access package.
 
 1. Click **Request access** to open the Request access pane.
 
+    ![My Access portal - Access packages](./media/entitlement-management-request-access/my-access-request-access-button.png)
+
 1. If the **Business justification** box is displayed, type a justification for needing access.
 
 1. If **Request for specific period?** is enabled, select **Yes** or **No**.
@@ -77,6 +78,12 @@ Once you have found the access package in the My Access portal, you can submit a
 
     If the access package requires approval, the request is now in a pending approval state.
 
+### Select a policy
+
+If you request access to an access package that has multiple policies that apply, you might be asked to select a policy. For example, an access package manager might configure an access package with two policies for two groups of internal employees. The first policy might allow access for 60 days and require approval. The second policy might allow access for 2 days and not require approval. If you encounter this scenario, you must select the policy you want to use.
+
+![My Access portal - Request access - multiple policies](./media/entitlement-management-request-access/my-access-multiple-policies.png)
+
 ## Cancel a request
 
 If you submit an access request and the request is still in the **pending approval** state, you can cancel the request.
@@ -93,12 +100,6 @@ If you submit an access request and the request is still in the **pending approv
 
 1. Click **Request history** to confirm the request was canceled.
 
-## Select a policy
-
-If you are requesting access to an access package that has multiple policies that apply, you might be asked to select a policy. For example, an access package manager might configure an access package with two policies for two groups of internal employees. The first policy might allow access for 60 days and require approval. The second policy might allow access for 2 days and not require approval. If you encounter this scenario, you must select the policy you want to use.
-
-**Prerequisite role:** Requestor
-
 ## Next steps
 
 - [Approve or deny access requests](entitlement-management-request-approve.md)

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

@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.subservice: compliance
-ms.date: 04/18/2019
+ms.date: 10/27/2019
 ms.author: ajburnle
 ms.reviewer: mamkumar
 ms.collection: M365-identity-device-management
@@ -68,7 +68,7 @@ After you open an access request pending approval, you can see details that will
 
 1. If necessary, enter a reason.
 
-    ![My Access portal - Access request](./media/entitlement-management-shared/my-access-approve-request.png)
+    ![My Access portal - Access request](./media/entitlement-management-request-approve/my-access-approve-request.png)
 
 1. Click **Submit** to submit your decision.
 

articles/active-directory/governance/media/entitlement-management-request-access/elm-myaccess-resource-search.png

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: tutorial
-ms.date: 02/15/2019
+ms.date: 10/24/2019
 ms.author: jeedes
 
 ms.collection: M365-identity-device-management
@@ -34,7 +34,7 @@ If you don't have an Azure subscription, [create a free account](https://azure.m
 
 To configure Azure AD integration with Help Scout, you need the following items:
 
-* An Azure AD subscription. If you don't have an Azure AD environment, you can get one-month trial [here](https://azure.microsoft.com/pricing/free-trial/)
+* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
 * Help Scout single sign-on enabled subscription
 
 ## Scenario description
@@ -48,39 +48,28 @@ In this tutorial, you configure and test Azure AD single sign-on in a test envir
 
 To configure the integration of Help Scout into Azure AD, you need to add Help Scout from the gallery to your list of managed SaaS apps.
 
-**To add Help Scout from the gallery, perform the following steps:**
-
-1. In the **[Azure portal](https://portal.azure.com)**, on the left navigation panel, click **Azure Active Directory** icon.
-
-	![The Azure Active Directory button](common/select-azuread.png)
-
-2. Navigate to **Enterprise Applications** and then select the **All Applications** option.
-
-	![The Enterprise applications blade](common/enterprise-applications.png)
-
-3. To add new application, click **New application** button on the top of dialog.
-
-	![The New application button](common/add-new-app.png)
-
-4. In the search box, type **Help Scout**, select **Help Scout** from result panel then click **Add** button to add the application.
-
-	 ![Help Scout in the results list](common/search-new-app.png)
+1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
+1. On the left navigation pane, select the **Azure Active Directory** service.
+1. Navigate to **Enterprise Applications** and then select **All Applications**.
+1. To add new application, select **New application**.
+1. In the **Add from the gallery** section, type **Help Scout** in the search box.
+1. Select **Help Scout** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
 
 ## Configure and test Azure AD single sign-on
 
-In this section, you configure and test Azure AD single sign-on with Help Scout based on a test user called **Britta Simon**.
+In this section, you configure and test Azure AD single sign-on with Help Scout based on a test user called **B.Simon**.
 For single sign-on to work, a link relationship between an Azure AD user and the related user in Help Scout needs to be established.
 
 To configure and test Azure AD single sign-on with Help Scout, you need to complete the following building blocks:
 
-1. **[Configure Azure AD Single Sign-On](#configure-azure-ad-single-sign-on)** - to enable your users to use this feature.
-2. **[Configure Help Scout Single Sign-On](#configure-help-scout-single-sign-on)** - to configure the Single Sign-On settings on application side.
-3. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with Britta Simon.
-4. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable Britta Simon to use Azure AD single sign-on.
-5. **[Create Help Scout test user](#create-help-scout-test-user)** - to have a counterpart of Britta Simon in Help Scout that is linked to the Azure AD representation of user.
-6. **[Test single sign-on](#test-single-sign-on)** - to verify whether the configuration works.
+1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
+    * **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
+    * **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
+1. **[Configure Help Scout SSO](#configure-help-scout-sso)** - to configure the single sign-on settings on application side.
+    * **[Create Help Scout test user](#create-help-scout-test-user)** - to have a counterpart of B.Simon in Help Scout that is linked to the Azure AD representation of user.
+1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
 
-### Configure Azure AD single sign-on
+### Configure Azure AD SSO
 
 In this section, you enable Azure AD single sign-on in the Azure portal.
 
@@ -90,15 +79,15 @@ To configure Azure AD single sign-on with Help Scout, perform the following step
 
     ![Configure single sign-on link](common/select-sso.png)
 
-2. On the **Select a Single sign-on method** dialog, select **SAML/WS-Fed** mode to enable single sign-on.
+1. On the **Select a Single sign-on method** dialog, select **SAML/WS-Fed** mode to enable single sign-on.
 
     ![Single sign-on select mode](common/select-saml-option.png)
 
-3. On the **Set up Single Sign-On with SAML** page, click **Edit** icon to open **Basic SAML Configuration** dialog.
+1. On the **Set up Single Sign-On with SAML** page, click **Edit** icon to open **Basic SAML Configuration** dialog.
 
 	![Edit Basic SAML Configuration](common/edit-urls.png)
 
-4. On the **Basic SAML Configuration** section, If you wish to configure the application in **IDP** initiated mode, perform the following steps:
+1. On the **Basic SAML Configuration** section, If you wish to configure the application in **IDP** initiated mode, perform the following steps:
 
     ![Help Scout Domain and URLs single sign-on information](common/idp-intiated.png)
 
@@ -109,17 +98,17 @@ To configure Azure AD single sign-on with Help Scout, perform the following step
 	> [!NOTE]
 	> The values in these URLs are for demonstration only. You need to update these values from actual Reply URL and Identifier. You get these values from the **Single Sign-On** tab under Authentication section, which is explained later in the tutorial.
 
-5. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
+1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
 
     ![Help Scout Domain and URLs single sign-on information](common/metadata-upload-additional-signon.png)
 
     In the **Sign-on URL** textbox, type a URL as: `https://secure.helpscout.net/members/login/`
 
-6. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Certificate (Base64)** from the given options as per your requirement and save it on your computer.
+1. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Certificate (Base64)** from the given options as per your requirement and save it on your computer.
 
 	![The Certificate download link](common/certificatebase64.png)
 
-7. On the **Set up Help Scout** section, copy the appropriate URL(s) as per your requirement.
+1. On the **Set up Help Scout** section, copy the appropriate URL(s) as per your requirement.
 
 	![Copy configuration URLs](common/copy-configuration-urls.png)
 
@@ -129,43 +118,9 @@ To configure Azure AD single sign-on with Help Scout, perform the following step
 
 	c. Logout URL
 
-### Configure Help Scout Single Sign-On
-
-1. In a different web browser window, log in to your Help Scout company site as an administrator.
-
-2. Click on **Manage** from the top menu and then select **Company** from the dropdown menu.
-
-	![Configure Single Sign-On](./media/helpscout-tutorial/settings1.png)
-
-3. Select **Authentication** from the left navigation pane.
-
-	![Configure Single Sign-On](./media/helpscout-tutorial/settings2.png)
-
-4. This takes you to the SAML settings section and perform the following steps:
-
-	![Configure Single Sign-On](./media/helpscout-tutorial/settings3.png)
-
-	a. Copy the **Post-back URL (Assertion Consumer Service URL)** value and paste the value in the **Reply URL** text box in the **Basic SAML Configuration** section in the Azure portal.
-
-	b. Copy the **Audience URI (Service Provider Entity ID)** value and paste the value in the **Identifier** text box in the **Basic SAML Configuration** section in the Azure portal.
-
-5. Toggle **Enable SAML** on and perform the following steps:
-
-	![Configure Single Sign-On](./media/helpscout-tutorial/settings4.png)
-
-	a. In **Single Sign-On URL** textbox, paste the value of **Login URL**, which you have copied from Azure portal.
-
-	b. Click **Upload Certificate** to upload the **Certificate(Base64)** downloaded from Azure portal.
-
-	c. Enter your organization's email domain(s) e.x.- `contoso.com` in the **Email Domains** textbox. You can separate multiple domains with a comma. Anytime a Help Scout User or Administrator who enters that specific domain on the [Help Scout log-in page](https://secure.helpscout.net/members/login/) will be routed to Identity Provider to authenticate with their credentials.
-
-	d. Lastly, you can toggle **Force SAML Sign-on** if you want Users to only log in to Help Scout via through this method. If you'd still like to leave the option for them to sign in with their Help Scout credentials, you can leave it toggled off. Even if this is enabled, an Account Owner will always be able to log in to Help Scout with their account password.
-
-	e. Click **Save**.
-
 ### Create an Azure AD test user
 
-The objective of this section is to create a test user in the Azure portal called Britta Simon.
+The objective of this section is to create a test user in the Azure portal called B.Simon.
 
 1. In the Azure portal, in the left pane, select **Azure Active Directory**, select **Users**, and then select **All users**.
 
@@ -179,18 +134,18 @@ The objective of this section is to create a test user in the Azure portal calle
 
     ![The User dialog box](common/user-properties.png)
 
-    a. In the **Name** field enter **BrittaSimon**.
+    a. In the **Name** field enter **B.Simon**.
 
-    b. In the **User name** field type **brittasimon\@yourcompanydomain.extension**  
-    For example, BrittaSimon@contoso.com
+    b. In the **User name** field type **B.Simon\@yourcompanydomain.extension**  
+    For example, B.Simon@contoso.com
 
     c. Select **Show password** check box, and then write down the value that's displayed in the Password box.
 
     d. Click **Create**.
 
 ### Assign the Azure AD test user
 
-In this section, you enable Britta Simon to use Azure single sign-on by granting access to Help Scout.
+In this section, you enable B.Simon to use Azure single sign-on by granting access to Help Scout.
 
 1. In the Azure portal, select **Enterprise Applications**, select **All applications**, then select **Help Scout**.
 
@@ -208,17 +163,59 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
 
     ![The Add Assignment pane](common/add-assign-user.png)
 
-5. In the **Users and groups** dialog select **Britta Simon** in the Users list, then click the **Select** button at the bottom of the screen.
+5. In the **Users and groups** dialog select **B.Simon** in the Users list, then click the **Select** button at the bottom of the screen.
 
 6. If you are expecting any role value in the SAML assertion then in the **Select Role** dialog select the appropriate role for the user from the list, then click the **Select** button at the bottom of the screen.
 
 7. In the **Add Assignment** dialog click the **Assign** button.
 
+## Configure Help Scout SSO
+
+1. To automate the configuration within Help Scout, you need to install **My Apps Secure Sign-in browser extension** by clicking **Install the extension**.
+
+	![My apps extension](common/install-myappssecure-extension.png)
+
+1. After adding extension to the browser, click on **Set up Help Scout** will direct you to the Help Scout application. From there, provide the admin credentials to sign into Help Scout. The browser extension will automatically configure the application for you and automate steps 3-7.
+
+	![Setup configuration](common/setup-sso.png)
+
+1. If you want to setup Help Scout manually, open a new web browser window and sign into your Help Scout company site as an administrator and perform the following steps:
+
+1. Click on **Manage** from the top menu and then select **Company** from the dropdown menu.
+
+	![Configure Single Sign-On](./media/helpscout-tutorial/settings1.png)
+
+1. Select **Authentication** from the left navigation pane.
+
+	![Configure Single Sign-On](./media/helpscout-tutorial/settings2.png)
+
+1. This takes you to the SAML settings section and perform the following steps:
+
+	![Configure Single Sign-On](./media/helpscout-tutorial/settings3.png)
+
+	a. Copy the **Post-back URL (Assertion Consumer Service URL)** value and paste the value in the **Reply URL** text box in the **Basic SAML Configuration** section in the Azure portal.
+
+	b. Copy the **Audience URI (Service Provider Entity ID)** value and paste the value in the **Identifier** text box in the **Basic SAML Configuration** section in the Azure portal.
+
+1. Toggle **Enable SAML** on and perform the following steps:
+
+	![Configure Single Sign-On](./media/helpscout-tutorial/settings4.png)
+
+	a. In **Single Sign-On URL** textbox, paste the value of **Login URL**, which you have copied from Azure portal.
+
+	b. Click **Upload Certificate** to upload the **Certificate(Base64)** downloaded from Azure portal.
+
+	c. Enter your organization's email domain(s) e.x.- `contoso.com` in the **Email Domains** textbox. You can separate multiple domains with a comma. Anytime a Help Scout User or Administrator who enters that specific domain on the [Help Scout log-in page](https://secure.helpscout.net/members/login/) will be routed to Identity Provider to authenticate with their credentials.
+
+	d. Lastly, you can toggle **Force SAML Sign-on** if you want Users to only log in to Help Scout via through this method. If you'd still like to leave the option for them to sign in with their Help Scout credentials, you can leave it toggled off. Even if this is enabled, an Account Owner will always be able to log in to Help Scout with their account password.
+
+	e. Click **Save**.
+
 ### Create Help Scout test user
 
-In this section, a user called Britta Simon is created in Help Scout. Help Scout supports just-in-time user provisioning, which is enabled by default. There is no action item for you in this section. If a user doesn't already exist in Help Scout, a new one is created after authentication.
+In this section, a user called B.Simon is created in Help Scout. Help Scout supports just-in-time user provisioning, which is enabled by default. There is no action item for you in this section. If a user doesn't already exist in Help Scout, a new one is created after authentication.
 
-### Test single sign-on
+### Test SSO
 
 In this section, you test your Azure AD single sign-on configuration using the Access Panel.
 
@@ -230,4 +227,6 @@ When you click the Help Scout tile in the Access Panel, you should be automatica
 
 - [What is application access and single sign-on with Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
 
-- [What is Conditional Access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
+- [What is Conditional Access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
+
+- [Try Help Scout with Azure AD](https://aad.portal.azure.com/)