Merge pull request #263457 from shikhagarg1/main

clear differentiation bw redirect uri and adme url

Author: v-dirichards

articles/energy-data-services/how-to-generate-auth-token.md

@@ -21,7 +21,6 @@ In this article, you learn how to generate the service principal auth token, a u
 
    :::image type="content" source="media/how-to-generate-auth-token/app-registration-uri.png" alt-text="Screenshot that shows adding the URI to the app.":::
 
-1. Fetch the `redirect-uri` (or reply URL) for your app to receive responses from Microsoft Entra ID.
 
 ## Fetch parameters
 
@@ -66,15 +65,24 @@ A `client-secret` is a string value your app can use in place of a certificate t
 
    :::image type="content" source="media/how-to-generate-auth-token/client-secret.png" alt-text="Screenshot that shows finding the client secret.":::
 
-#### Find the URL for your Azure Data Manager for Energy instance
+### Find redirect-uri
+The `redirect-uri` of your app, where your app sends and receives the authentication responses. It must exactly match one of the redirect URIs that you registered in the portal, except that it must be URL encoded.
+
+1. Go to **App registrations**.
+1. Under the **Manage** section, select **Authentication**.
+1. Fetch the `redirect-uri` (or reply URL) for your app to receive responses from Microsoft Entra ID.
+
+ :::image type="content" source="media/how-to-generate-auth-token/redirect-uri.png" alt-text="Screenshot that shows redirect-uri.":::
+
+### Find the adme-url for your Azure Data Manager for Energy instance
 
 1. Create an [Azure Data Manager for Energy instance](quickstart-create-microsoft-energy-data-services-instance.md).
 1. Go to your Azure Data Manager for Energy **Overview** page on the Azure portal.
 1. On the **Essentials** pane, copy the URI.
 
    :::image type="content" source="media/how-to-generate-auth-token/endpoint-url.png" alt-text="Screenshot that shows finding the URI for the Azure Data Manager for Energy instance.":::
 
-#### Find data-partition-id
+### Find data-partition-id
 
 You have two ways to get the list of data partitions in your Azure Data Manager for Energy instance.
 
@@ -119,7 +127,7 @@ curl --location --request POST 'https://login.microsoftonline.com/<tenant-id>/oa
 
 Generating a user's auth token is a two-step process.
 
-### Get the authorization code
+### Get the authorization-code
 
 The first step to get an access token for many OpenID Connect (OIDC) and OAuth 2.0 flows is to redirect the user to the Microsoft identity platform `/authorize` endpoint. Microsoft Entra ID signs the user in and requests their consent for the permissions your app requests. In the authorization code grant flow, after consent is obtained, Microsoft Entra ID returns an authorization code to your app that it can redeem at the Microsoft identity platform `/token` endpoint for an access token.
 
@@ -131,7 +139,7 @@ The first step to get an access token for many OpenID Connect (OIDC) and OAuth 2
 
 1. The browser redirects to `http://localhost:8080/?code={authorization code}&state=...` upon successful authentication.
 1. Copy the response from the URL bar of the browser and fetch the text between `code=` and `&state`.
-1. Keep this authorization code handy for future use.
+1. Keep this `authorization-code` handy for future use.
 
 #### Request format
 
@@ -180,8 +188,8 @@ The second step is to get the auth token and the refresh token. Your app uses th
 ```bash
   curl -X POST -H "Content-Type: application/x-www-form-urlencoded" -d 'client_id={client-id}
   &scope={client-id}%2f.default openid profile offline_access
-  &code={authorization code}
-  &redirect_uri=http%3A%2F%2Flocalhost%3a8080
+  &code={authorization-code}
+  &redirect_uri={redirect-uri}
   &grant_type=authorization_code
   &client_secret={client-secret}' 'https://login.microsoftonline.com/{tenant-id}/oauth2/v2.0/token'
 ```

articles/energy-data-services/how-to-manage-acls.md

@@ -19,7 +19,7 @@ Run the following curl command in Azure Cloud Shell to create a new data group,
 **Request format**
 
 ```bash
-    curl --location --request POST "https://<URI>/api/entitlements/v2/groups/" \
+    curl --location --request POST "https://<adme-url>/api/entitlements/v2/groups/" \
     --header 'data-partition-id: <data-partition>' \
     --header 'Authorization: Bearer <access_token>'
     --data-raw '{
@@ -37,7 +37,7 @@ In case, a data record has 2 ACLs, ACL_1 and ACL_2, and a given user is member o
 **Request format**
 
 ```bash
-curl --location --request PUT 'https://osdu-ship.msft-osdu-test.org/api/storage/v2/records/' \
+curl --location --request PUT 'https://<adme-url>/api/storage/v2/records/' \
 --header 'data-partition-id: opendes' \
 --header 'Accept: application/json' \
 --header 'Authorization: Bearer <token>’ \
@@ -98,7 +98,7 @@ Keep the record ID from the response handy for future references.
 **Request format**
 
 ```bash
-curl --location 'https://osdu-ship.msft-osdu-test.org/api/storage/v2/records/opendes:master-data--Well:999736019023' \
+curl --location 'https://<adme-url>/api/storage/v2/records/opendes:master-data--Well:999736019023' \
 --header 'data-partition-id: opendes' \
 --header 'Authorization: Bearer <token>’
 ```
@@ -147,7 +147,7 @@ The first `/acl/owners/0` operation removes ACL from 0th position in the array o
 **Request format**
 
 ```bash
-curl --location --request PATCH 'https://osdu-ship.msft-osdu-test.org/api/storage/v2/records/' \
+curl --location --request PATCH 'https://<adme-url>/api/storage/v2/records/' \
 --header 'data-partition-id: opendes' \
 --header 'Accept: application/json' \
 --header 'Authorization: Bearer <token>’\

articles/energy-data-services/how-to-manage-users.md

@@ -50,7 +50,7 @@ The object ID (OID) is the Microsoft Entra user OID.
 Run the following curl command in Azure Cloud Shell to get all the groups that are available for you or that you have access to in the specific data partition of the Azure Data Manager for Energy instance.
 
 ```bash
-    curl --location --request GET "https://<URI>/api/entitlements/v2/groups/" \
+    curl --location --request GET "https://<adme-url>/api/entitlements/v2/groups/" \
     --header 'data-partition-id: <data-partition>' \
     --header 'Authorization: Bearer <access_token>'
 ```
@@ -61,7 +61,7 @@ Run the following curl command in Azure Cloud Shell to get all the groups that a
 1. The value to be sent for the parameter `email` is the OID of the user and not the user's email address.
 
     ```bash
-        curl --location --request POST 'https://<URI>/api/entitlements/v2/groups/<group-name>@<data-partition-id>.dataservices.energy/members' \
+        curl --location --request POST 'https://<adme-url>/api/entitlements/v2/groups/<group-name>@<data-partition-id>.dataservices.energy/members' \
         --header 'data-partition-id: <data-partition-id>' \
         --header 'Authorization: Bearer <access_token>' \
         --header 'Content-Type: application/json' \
@@ -118,7 +118,7 @@ Run the following curl command in Azure Cloud Shell to get all the groups that a
 1. Run the following curl command in Azure Cloud Shell to get all the groups associated with the user.
 
     ```bash
-        curl --location --request GET 'https://<URI>/api/entitlements/v2/members/<OBJECT_ID>/groups?type=none' \
+        curl --location --request GET 'https://<adme-url>/api/entitlements/v2/members/<OBJECT_ID>/groups?type=none' \
         --header 'data-partition-id: <data-partition-id>' \
         --header 'Authorization: Bearer <access_token>'
     ```
@@ -160,7 +160,7 @@ Run the following curl command in Azure Cloud Shell to get all the groups that a
 1. *Do not* delete the OWNER of a group unless you have another OWNER who can manage users in that group.
 
     ```bash
-        curl --location --request DELETE 'https://<URI>/api/entitlements/v2/members/<OBJECT_ID>' \
+        curl --location --request DELETE 'https://<adme-url>/api/entitlements/v2/members/<OBJECT_ID>' \
         --header 'data-partition-id: <data-partition-id>' \
         --header 'Authorization: Bearer <access_token>'
     ```