Merge pull request #104126 from MicrosoftDocs/master

2/12 AM Publish

Author: huypub

.openpublishing.redirection.json

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/18/2019
+ms.date: 02/12/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -68,7 +68,7 @@ Custom policy/Identity Experience Framework capabilities are under constant and
 | Relying Party OAUTH1 |  |  |  | Not supported. |
 | Relying Party OAUTH2 |  |  | X |  |
 | Relying Party OIDC |  |  | X |  |
-| Relying Party SAML | X |  |  |  |
+| Relying Party SAML |  |X  |  |  |
 | Relying Party WSFED | X |  |  |  |
 | REST API with basic and certificate auth |  |  | X | For example, Azure Logic Apps. |
 
@@ -81,7 +81,7 @@ Custom policy/Identity Experience Framework capabilities are under constant and
 | Azure Email subsystem for email verification |  |  | X |  |
 | Multi-language support|  |  | X |  |
 | Predicate Validations |  |  | X | For example, password complexity. |
-| Using third party email service providers | X |  |  |  |
+| Using third party email service providers |  |X  |  |  |
 
 ### Content Definition
 

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -64,7 +64,7 @@
   items:
   - name: Self-service password reset
     items:
-    - name: Deploy self-service password reset
+    - name: Deployment guide
       href: howto-sspr-deployment.md
     - name: Pre-register authentication data
       href: howto-sspr-authenticationdata.md
@@ -74,7 +74,7 @@
       href: howto-sspr-windows.md
   - name: Cloud-based MFA
     items:
-    - name: Deploy cloud-based MFA
+    - name: Deployment guide
       href: howto-mfa-getstarted.md
     - name: Per user MFA
       href: howto-mfa-userstates.md

articles/active-directory/authentication/TOC.yml

@@ -12,7 +12,7 @@ metadata:
   ms.topic: landing-page
   author: iainfoulds
   ms.author: iainfou
-  ms.date: 08/20/2019
+  ms.date: 02/11/2020
   ms.collection: M365-identity-device-management
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
@@ -43,16 +43,16 @@ landingContent:
             url: concept-sspr-howitworks.md
           - text: Password writeback
             url: concept-sspr-writeback.md
-      - linkListType: quickstart
+      - linkListType: tutorial
         links:
-          - text: Self-service password reset quickstart
-            url: quickstart-sspr.md
+          - text: Enable self-service password reset
+            url: tutorial-enable-sspr.md
+          - text: Enable password writeback to on-premises
+            url: tutorial-enable-writeback.md
       - linkListType: deploy
         links:
-          - text: Deploy Azure AD self-service password reset
+          - text: Deployment guide for self-service password reset
             url: howto-sspr-deployment.md
-          - text: Enable password writeback
-            url: howto-sspr-writeback.md
           - text: Enable password reset from the Windows login screen
             url: howto-sspr-windows.md
 
@@ -65,13 +65,13 @@ landingContent:
             url: concept-mfa-howitworks.md
       - linkListType: tutorial
         links:
-          - text: Pilot Azure MFA for specific applications
-            url: tutorial-mfa-applications.md
-          - text: Use risk detections to trigger Multi-Factor Authentication and password changes
+          - text: Enable Azure Multi-Factor Authentication
+            url: tutorial-enable-azure-mfa.md
+          - text: Enable risk-based Azure Multi-Factor Authentication
             url: tutorial-risk-based-sspr-mfa.md
       - linkListType: deploy
         links:
-          - text: Deploy Azure Multi-Factor Authentication
+          - text: Deployment guide for Azure Multi-Factor Authentication
             url: howto-mfa-getstarted.md
           - text: Use NPS extension to integrate on-premises applications
             url: howto-mfa-nps-extension.md

articles/active-directory/authentication/index.yml

@@ -0,0 +1,147 @@
+---
+
+title: Tutorial for bulk inviting B2B collaboration users - Azure Active Directory | Microsoft Docs
+description: In this tutorial, you learn how to use PowerShell and a CSV file to send bulk invitations to external Azure AD B2B collaboration guest users.
+
+services: active-directory
+ms.service: active-directory
+ms.subservice: B2B
+ms.topic: tutorial
+ms.date: 02/11/2020
+
+ms.author: mimart
+author: msmimart
+manager: celestedg
+ms.reviewer: mal
+
+#customer intent: As a tenant administrator, I want to send B2B invitations to multiple external users at the same time so that I can avoid having to send individual invitations to each user.
+
+ms.collection: M365-identity-device-management
+---
+
+# Tutorial: Use PowerShell to bulk invite Azure AD B2B collaboration users
+
+If you use Azure Active Directory (Azure AD) B2B collaboration to work with external partners, you can invite multiple guest users to your organization at the same time. In this tutorial, you learn how to use PowerShell to send bulk invitations to external users. Specifically, you do the following:
+
+> [!div class="checklist"]
+> * Prepare a comma-separated value (.csv) file with the user information
+> * Run a PowerShell script to send invitations
+> * Verify the users were added to the directory
+
+If you don’t have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin. 
+
+## Prerequisites
+
+### Install the latest AzureADPreview module
+
+Make sure that you install the latest version of the Azure AD PowerShell for Graph module (AzureADPreview). 
+
+First, check which modules you have installed. Open Windows PowerShell as an elevated user (Run as administrator), and run the following command:
+
+```powershell
+Get-Module -ListAvailable AzureAD*
+```
+
+Based on the output, do one of the following:
+
+- If no results are returned, run the following command to install the AzureADPreview module:
+  
+   ```powershell
+   Install-Module AzureADPreview
+   ```
+
+- If only the AzureAD module shows up in the results, run the following commands to install the AzureADPreview module: 
+
+   ```powershell
+   Uninstall-Module AzureAD
+   Install-Module AzureADPreview
+   ```
+
+- If only the AzureADPreview module shows up in the results, but you receive a message that indicates there's a later version, run the following commands to update the module:
+
+   ```powershell
+   Uninstall-Module AzureADPreview
+   Install-Module AzureADPreview
+   ```
+
+You may receive a prompt that you're installing the module from an untrusted repository. This occurs if you haven't previously set the PSGallery repository as a trusted repository. Press **Y** to install the module.
+
+### Get test email accounts
+
+You need two or more test email accounts that you can send the invitations to. The accounts must be from outside your organization. You can use any type of account, including social accounts such as gmail.com or outlook.com addresses.
+
+## Prepare the CSV file
+
+In Microsoft Excel, create a CSV file with the list of invitee user names and email addresses. Make sure to include the **Name** and **InvitedUserEmailAddress** column headings.
+
+For example, create a worksheet in the following format:
+
+![PowerShell output showing pending user acceptance](media/tutorial-bulk-invite/AddUsersExcel.png)
+
+Save the file as **C:\BulkInvite\Invitations.csv**. 
+
+If you don't have Excel, you can create a CSV file in any text editor, such as Notepad. Separate each value with a comma, and each row with a new line. 
+
+## Sign in to your tenant
+
+Run the following command to connect to the tenant domain:
+
+```powershell
+Connect-AzureAD -TenantDomain "<Tenant_Domain_Name>"
+```
+
+For example, `Connect-AzureAD -TenantDomain "contoso.onmicrosoft.com"`.
+
+When prompted, enter your credentials.
+
+## Send bulk invitations
+
+To send the invitations, run the following PowerShell script (where **c:\bulkinvite\invitations.csv** is the path of the CSV file):
+
+```powershell
+$invitations = import-csv c:\bulkinvite\invitations.csv
+
+$messageInfo = New-Object Microsoft.Open.MSGraph.Model.InvitedUserMessageInfo
+
+$messageInfo.customizedMessageBody = "Hello. You are invited to the Contoso organization."
+
+foreach ($email in $invitations)
+   {New-AzureADMSInvitation `
+      -InvitedUserEmailAddress $email.InvitedUserEmailAddress `
+      -InvitedUserDisplayName $email.Name `
+      -InviteRedirectUrl https://myapps.microsoft.com `
+      -InvitedUserMessageInfo $messageInfo `
+      -SendInvitationMessage $true
+   }
+```
+
+The script sends an invitation to the email addresses in the Invitations.csv file. You should see output similar to the following for each user:
+
+![PowerShell output showing pending user acceptance](media/tutorial-bulk-invite/B2BBulkImport.png)
+
+## Verify users exist in the directory
+
+To verify that the invited users were added to Azure AD, run the following command:
+
+```powershell
+ Get-AzureADUser -Filter "UserType eq 'Guest'"
+```
+
+You should see the users that you invited listed, with a user principal name (UPN) in the format *emailaddress*#EXT#\@*domain*. For example, *lstokes_fabrikam.com#EXT#\@contoso.onmicrosoft.com*, where contoso.onmicrosoft.com is the organization from which you sent the invitations.
+
+## Clean up resources
+
+When no longer needed, you can delete the test user accounts in the directory. Run the following command to delete a user account:
+
+```powershell
+ Remove-AzureADUser -ObjectId "<UPN>"
+```
+
+For example: `Remove-AzureADUser -ObjectId "lstokes_fabrikam.com#EXT#@contoso.onmicrosoft.com"`
+
+## Next steps
+
+In this tutorial, you sent bulk invitations to guest users outside of your organization. Next, learn how the invitation redemption process works.
+
+> [!div class="nextstepaction"]
+> [Learn about the Azure AD B2B collaboration invitation redemption process](redemption-experience.md)

articles/active-directory/b2b/bulk-invite-powershell.md

@@ -15,7 +15,9 @@
       href: b2b-quickstart-invite-powershell.md
   - name: Tutorials
     items:
-    - name: Bulk invite B2B guest users
+    - name: Bulk invite via PowerShell
+      href: bulk-invite-powershell.md
+    - name: Bulk invite via the portal (preview)
       href: tutorial-bulk-invite.md
     - name: Enforce multi-factor authentication
       href: b2b-tutorial-require-mfa.md

articles/active-directory/b2b/toc.yml

@@ -28,7 +28,7 @@ ms.collection: M365-identity-device-management
 
 > [!NOTE]
 > As of 12/22/2019, the Bulk invite users (Preview) feature has been temporarily disabled.
-> There is currently no known date for when this feature will be re-enabled in the Azure portal. To invite guest users in bulk using PowerShell, see [B2B code and PowerShell samples](code-samples.md).
+> There is currently no known date for when this feature will be re-enabled in the Azure portal. To invite guest users in bulk using PowerShell, see the [B2B bulk invite tutorial](bulk-invite-powershell.md) or the [B2B code and PowerShell samples](code-samples.md).
 
 If you use Azure Active Directory (Azure AD) B2B collaboration to work with external partners, you can invite multiple guest users to your organization at the same time. In this tutorial, you learn how to use the Azure portal to send bulk invitations to external users. Specifically, you do the following:
 

articles/active-directory/b2b/tutorial-bulk-invite.md

@@ -63,8 +63,7 @@ Azure AD Connect sync synchronizes changes occurring in your on-premises directo
  3. On the **Description** page, enter the following and click **Next**:
 
     **Name:** Give the rule a meaningful name<br>
-    **Description:** Add a meaningful description<br> 
-    
+    **Description:** Add a meaningful description<br>
     **Connected System:** Choose the AD connector that you are writing the custom sync rule for<br>
     **Connected System Object Type:** User<br>
     **Metaverse Object Type:** Person<br>

articles/active-directory/cloud-provisioning/tutorial-pilot-aadc-aadccp.md

@@ -72,15 +72,15 @@ conceptualContent:
 
     - title: Authentication
       links: 
-        - url: ./authentication/concept-mfa-howitworks.md
+        - url: ./authentication/overview-authentication.md
           itemType: concept
-          text: "How it works: Azure MFA"
-        - url: ./authentication/concept-sspr-howitworks.md
-          itemType: concept 
-          text: Azure AD self-service password reset 
-        - url: ./authentication/concept-password-ban-bad.md
-          itemType: concept
-          text: Azure AD password protection 
+          text: What is Azure AD Authentication?
+        - url: ./authentication/tutorial-enable-sspr.md
+          itemType: tutorial 
+          text: Enable self-service password reset 
+        - url: ./authentication/tutorial-enable-azure-mfa.md
+          itemType: tutorial
+          text: Enable Azure Multi-Factor Authentication
       footerLink: 
         url: ./authentication/index.yml
         text: See more

articles/active-directory/index.yml

@@ -8,8 +8,8 @@ ms.service: active-directory
 ms.subservice: app-mgmt
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 10/24/2019
-ms.author: celested
+ms.date: 02/12/2020
+ms.author: mimart
 ms.reviewer: japere
 ---
 # Secure access to on-premises APIs with Azure AD Application Proxy
@@ -47,19 +47,19 @@ To publish the SecretAPI web API through Application Proxy:
 
 1. Build and publish the sample SecretAPI project as an ASP.NET web app on your local computer or intranet. Make sure you can access the web app locally. 
 
-1. In the [Azure portal](https://portal.azure.com), select **Azure Active Directory** in the left navigation. Then, on the **Overview** page, select **Enterprise applications**.
+1. In the [Azure portal](https://portal.azure.com), select **Azure Active Directory**. Then select **Enterprise applications**.
 
 1. At the top of the **Enterprise applications - All applications** page, select **New application**.
 
-1. On the **Browse Azure AD Gallery** page, under **On-premises applications**, select **Add an on-premises application**. The **Add your own on-premises application** page appears.
+1. On the **Add an application** page, select **On-premises applications**. The **Add your own on-premises application** page appears.
 
 1. If you don't have an Application Proxy Connector installed, you'll be prompted to install it. Select **Download Application Proxy Connector** to download and install the connector. 
 
 1. Once you've installed the Application Proxy Connector, on the **Add your own on-premises application** page:
 
-   1. Enter *SecretAPI* next to **Name**.
+   1. Next to **Name**, enter *SecretAPI*.
 
-   1. Enter the URL you use to access the API from within your intranet next to **Internal Url**. 
+   1. Next to **Internal Url**, enter the URL you use to access the API from within your intranet.
 
    1. Make sure **Pre-Authentication** is set to **Azure Active Directory**.