Merge pull request #107780 from Juliako/accessapi

Accessapi

Author: GitHubber17

.openpublishing.redirection.json

@@ -49364,6 +49364,16 @@
       "redirect_url": "/azure/cognitive-services/speech-service",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/media-services/latest/access-api-portal.md",
+      "redirect_url": "/azure/media-services/latest/access-api-howto",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/media-services/latest/access-api-cli-how-to.md",
+      "redirect_url": "/azure/media-services/latest/access-api-howto",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/media-services/latest/create-account-portal.md",
       "redirect_url": "/azure/media-services/latest/create-account-howto",

articles/media-services/latest/TOC.yml

@@ -206,12 +206,9 @@
       displayName: portal, cli, storage
     - name: Reset the account credentials
       href: cli-reset-account-credentials.md   
-    - name: Access APIs
-      items:
-      - name: With portal
-        href: access-api-portal.md   
-      - name: With CLI
-        href: access-api-cli-how-to.md
+    - name: Access API
+      displayName: portal, cli
+      href: access-api-howto.md   
     - name: Scale Media Reserved Units
       href: media-reserved-units-cli-how-to.md   
     - name: Create an Asset

articles/media-services/latest/access-api-cli-how-to.md

@@ -1,6 +1,6 @@
 ---
-title: Get started with Azure AD authentication by using the Azure portal
-description: Learn how to use the Azure portal to access Azure Active Directory (Azure AD) authentication to consume the Azure Media Services API. 
+title: Get started with Azure AD authentication  
+description: Learn how to access Azure Active Directory (Azure AD) authentication to consume the Azure Media Services API. 
 services: media-services
 documentationcenter: ''
 author: Juliako
@@ -12,53 +12,65 @@ ms.workload: media
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: how-to
-ms.date: 03/09/2020
+ms.date: 03/15/2020
 ms.author: juliako
 ---
-# Use the Azure portal to get credentials to access Media Services API  
+# Get credentials to access Media Services API  
 
 When you use Azure AD authentication to access the Azure Media Services API, you have two authentication options:
 
-- **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. 
+- **Service principal authentication** (recommended)
 
-This article shows you how to use the Azure portal to get credentials to access Media Services API.
+    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. 
+
+This article describes steps for getting credentials to access Media Services API. Choose from the following tabs.
 
 ## Prerequisites
 
 - 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](create-account-portal.md).
+- A Media Services account. For more information, see [Create an Azure Media Services account by using the Azure portal](create-account-howto.md).
 
-## API access 
+## The Azure portal
+
+### API access 
 
 The **API access** 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 (V3 is the latest version of the service).
 
-## Service principal authentication  (recommended)
+### Service principal authentication  (recommended)
 
 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.
 
-### Manage your Azure AD app and secret
+#### Manage your Azure AD app and secret
 
 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.
 
 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).
 
-### Connect to Media Services API
+#### Connect to Media Services API
 
 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.
 
-## User authentication
+### User authentication
 
 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.
 
-### Connect to Media Services API
+#### Connect to Media Services API
 
 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.
 
+[!INCLUDE [media-services-cli-instructions](../../../includes/media-services-cli-instructions.md)]
+
+[!INCLUDE [media-services-v3-cli-access-api-include](../../../includes/media-services-v3-cli-access-api-include.md)]
+
+---
+
 ## Next steps
 
 [Tutorial: Upload, encode, and stream videos with Media Services v3](stream-files-tutorial-with-api.md).

articles/media-services/latest/access-api-portal.md renamed to articles/media-services/latest/access-api-howto.md

@@ -10,7 +10,7 @@ ms.author: juliako
 ms.custom: include file
 ---
 
-## CLI Shell
+## Use CLI Shell
 
 It is recommended to use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview?view=azure-cli-latest) to execute CLI commands. **Cloud Shell** is a free, interactive shell that you can use to run the steps in this article. Common Azure tools are preinstalled and configured in Cloud Shell for you to use with your account. It provides the flexibility of choosing the shell experience that best suits the way you work. Linux users can opt for a Bash experience, while Windows users can opt for PowerShell.
 
@@ -38,7 +38,7 @@ Relative path to the file (all OS)
 Absolute file path on Linux/Mac and Windows OS
 
 * `@ "/usr/home/mytestfile.json"`
-*	`@"c:\tmp\user\mytestfile.json"`
+*    `@"c:\tmp\user\mytestfile.json"`
 
 Use `{file}` if the command is asking for a path to the file. For example, `az ams transform create -a amsaccount -g resourceGroup -n custom --preset .\customPreset.json`. <br/> 
 Use `@{file}` if the command is going to load the specified file. For example, `az ams account-filter create -a amsaccount -g resourceGroup -n filterName --tracks @tracks.json`.

includes/media-services-cli-instructions.md

@@ -10,7 +10,7 @@ ms.author: juliako
 ms.custom: include file
 ---
 
-## Access the Media Services API
+### Access the Media Services API
 
 To connect to Azure Media Services APIs, you use the Azure AD service principal authentication. The following command creates an Azure AD application and attaches a service principal to the account. You should use the returned values to configure your application.