Merge pull request #106584 from Juliako/patch-3

Update media-services-portal-get-started-with-aad.md

Author: PMEds28

articles/media-services/previous/media-services-portal-get-started-with-aad.md

@@ -27,86 +27,41 @@ Learn how to use the Azure portal to access Azure Active Directory (Azure AD) au
 
 - An Azure account. If you don't have an account, start with an [Azure free trial](https://azure.microsoft.com/pricing/free-trial/). 
 - A Media Services account. For more information, see [Create an Azure Media Services account by using the Azure portal](media-services-portal-create-account.md).
-- Make sure you review the [Accessing Azure Media Services API with Azure AD authentication overview](media-services-use-aad-auth-to-access-ams-api.md). 
 
 When you use Azure AD authentication with Azure Media Services, you have two authentication options:
 
-- **User authentication**. Authenticate a person who is using the app to interact with Media Services resources. The interactive application should first prompt the user for credentials. An example is a management console app used by authorized users to monitor encoding jobs or live streaming. 
 - **Service principal authentication**. Authenticate a service. Applications that commonly use this authentication method are apps that run daemon services, middle-tier services, or scheduled jobs: web apps, function apps, logic apps, APIs, or a microservice.
+- **User authentication**. Authenticate a person who is using the app to interact with Media Services resources. The interactive application should first prompt the user for credentials. An example is a management console app used by authorized users to monitor encoding jobs or live streaming. 
 
-> [!IMPORTANT]
-> Currently, Media Services supports the Azure Access Control service authentication model. However, Access Control authorization will be deprecated on June 1, 2018. We recommend that you migrate to the Azure AD authentication model as soon as possible.
+## Access the Media Services API
 
-## Select the authentication method
+This page lets you select the authentication method you want to use to connect to the API. The page also provides the values you need to connect to the API.
 
 1. In the [Azure portal](https://portal.azure.com/), select your Media Services account.
 2. Select how to connect to the Media Services API.
+3. Under **Connect to Media Services API**, select the Media Services API version you want to connect to.
 
-	![Select connection method page](./media/media-services-portal-get-started-with-aad/media-services-portal-get-started01.png)
-
-## User authentication
-
-To connect to the Media Services API by using the user authentication option, the client app needs to request an Azure AD token that has the following parameters:  
-
-* Azure AD tenant endpoint
-* Media Services resource URI
-* Media Services (native) application client ID 
-* Media Services (native) application redirect URI 
-* Resource URI for REST Media Services
-
-You can get the values for these parameters on the **Media Services API with user authentication** page. 
-
-![Connect with user authentication page](./media/media-services-portal-get-started-with-aad/media-services-portal-get-started02.png)
-
-If you connect to the Media Services API by using the Media Services Microsoft .NET SDK, the required values are available to you as part of the SDK. For more information, see [Use Azure AD authentication to access the Azure Media Services API with .NET](media-services-dotnet-get-started-with-aad.md).
-
-If you're not using the Media Services .NET client SDK, you must manually create an Azure AD token request by using the parameters discussed earlier. For more information, see [How to use the Azure AD Authentication Library to get the Azure AD token](../../active-directory/azuread-dev/active-directory-authentication-libraries.md).
-
-## Service principal authentication
+## Service principal authentication  (recommended)
 
-To connect to the Media Services API by using the service principal option, your middle-tier app (web API or web application) needs to request an Azure AD token that has the following parameters:  
+Authenticates a service using an Azure Active Directory (Azure AD) app and secret. This is recommended for any middle-tier services calling to the Media Services API. Examples are Web Apps, Functions, Logic Apps, APIs, and microservices. This is the recommended authentication method.
 
-* Azure AD tenant endpoint
-* Media Services resource URI 
-* Resource URI for REST Media Services
-* Azure AD application values: the **client ID** and **client secret**
+### Manage your Azure AD app and secret
 
-You can get the values for these parameters on the **Connect to Media Services API with service principal** page. Use this page to create a new Azure AD application or to select an existing one. After you select the Azure AD app, you can get the client ID (Application ID) and generate the client secret (key) values. 
+The **Manage your AAD app and secret** section lets you select or create a new Azure AD app and generate a secret. For security purposes, the secret cannot be shown after the blade is closed. The application uses the application ID and secret for authentication to obtain a valid token for media services.
 
-![Connect with service principal page](./media/media-services-portal-get-started-with-aad/media-services-portal-get-started04.png)
+Make sure that you have sufficient permissions to register an application with your Azure AD tenant and to assign the application to a role in your Azure subscription. For more information, see [Required permissions](https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal#required-permissions).
 
-When the **Service Principal** blade opens, the first Azure AD application that meets the following criteria is selected:
+### Connect to Media Services API
 
-- It is a registered Azure AD application.
-- It has Contributor or Owner Role-Based Access Control permissions on the account.
+The **Connect to Media Services API** provides you with values that you use to connect your service principal application. You can get text values or copy the JSON or XML blocks.
 
-After you create or select an Azure AD app, you can create and copy a client secret (key) and the client ID (Application ID). The client secret and client ID are required to get the access token in this scenario.
-
-If you don't have permissions to create Azure AD apps in your domain, the Azure AD app controls of the blade are not shown, and a warning message is displayed.
-
-If you connect to the Media Services API by using the Media Services .NET SDK, see [Use Azure AD authentication to access the Azure Media Services API with .NET](media-services-dotnet-get-started-with-aad.md).
-
-If you are not using the Media Services .NET client SDK, you must manually create an Azure AD token request using the parameters discussed earlier. For more information, see [How to use the Azure AD Authentication Library to get the Azure AD token](../../active-directory/azuread-dev/active-directory-authentication-libraries.md).
-
-### Get the client ID and client secret
-
-After you select an existing Azure AD app or select the option to create a new one, the following buttons appear:
-
-![Manage permissions button and Manage application button](./media/media-services-portal-get-started-with-aad/media-services-portal-manage.png)
-
-To open the Azure AD application blade, click **Manage application**. On the **Manage application** blade, you can get the app's client ID (Application ID). To generate a client secret (key), select **Keys**.
-
-![Manage application blade Keys option](./media/media-services-portal-get-started-with-aad/media-services-portal-get-started06.png) 
-
-### Manage permissions and the application
-
-After you select the Azure AD application, you can manage the application and permissions. To set up your Azure AD application to access other applications, click **Manage permissions**. For management tasks, such as changing keys and reply URLs, or to edit the application’s manifest, click **Manage application**.
+## User authentication
 
-### Edit the app's settings or manifest
+This option could be used to authenticate an employee or member of an Azure Active Directory who is using an app to interact with Media Services resources. The interactive application should first prompt the user for the user's credentials. This authentication method should only be used for Management applications.
 
-To edit the app's settings or manifest, click **Manage application**.
+### Connect to Media Services API
 
-![Manage application page](./media/media-services-portal-get-started-with-aad/media-services-portal-get-started05.png)
+Copy your credentials to connect your user application from the **Connect to Media Services API** section. You can get text values or copy the JSON or XML blocks.
 
 ## Next steps
 

articles/media-services/video-indexer/connect-to-azure.md

@@ -120,8 +120,8 @@ If the connection to Azure failed, you can attempt to troubleshoot the problem b
 4. For Video Indexer to authenticate with Media Services API, an AD application needs to be created. The following steps guide you through the Azure AD authentication process described in [Get started with Azure AD authentication by using the Azure portal](../previous/media-services-portal-get-started-with-aad.md):
 
     1. In the new Media Services account, select **API access**.
-    2. Select [Service principal authentication method](../previous/media-services-portal-get-started-with-aad.md#service-principal-authentication).
-    3. Get the client ID and client secret, as described in the [Get the client ID and client secret](../previous/media-services-portal-get-started-with-aad.md#get-the-client-id-and-client-secret) section.
+    2. Select [Service principal authentication method](../previous/media-services-portal-get-started-with-aad.md).
+    3. Get the client ID and client secret
 
         After you select **Settings**->**Keys**, add **Description**, press **Save**, the key value gets populated.