Update mqtt-client-azure-ad-token-and-rbac.md

Author: Venkata Yaddanapudi

articles/event-grid/mqtt-client-azure-ad-token-and-rbac.md

@@ -1,25 +1,25 @@
 ---
-title: Azure AD JWT authentication and RBAC authorization for clients with Azure AD identity
-description: Describes JWT authentication and RBAC roles to authorize clients with Azure AD identity to publish or subscribe MQTT messages
+title: Microsoft Entra JWT authentication and RBAC authorization for clients with Microsoft Entra identity
+description: Describes JWT authentication and RBAC roles to authorize clients with Microsoft Entra identity to publish or subscribe MQTT messages
 ms.topic: conceptual
-ms.date: 8/11/2023
+ms.date: 10/24/2023
 author: veyaddan
 ms.author: veyaddan
 ---
 
-# Azure AD JWT authentication and Azure RBAC authorization to publish or subscribe MQTT messages
-You can authenticate MQTT clients with Azure AD JWT to connect to Event Grid namespace.  You can use Azure role-based access control (Azure RBAC) to enable MQTT clients, with Azure Active Directory identity, to publish or subscribe access to specific topic spaces.
+# Microsoft Entra JWT authentication and Azure RBAC authorization to publish or subscribe MQTT messages
+You can authenticate MQTT clients with Microsoft Entra JWT to connect to Event Grid namespace.  You can use Azure role-based access control (Azure RBAC) to enable MQTT clients, with Microsoft Entra identity, to publish or subscribe access to specific topicspaces.
 
 > [!IMPORTANT]
-> This feature is supported only when using MQTT v5
+> This feature is supported only when using MQTT v5 protocol version
 
 ## Prerequisites
 - You need an Event Grid namespace with MQTT enabled.  Learn about [creating Event Grid namespace](/azure/event-grid/create-view-manage-namespaces#create-a-namespace)
-- Review the process to [create a custom role](/azure/role-based-access-control/custom-roles-portal)
 
+<a name='authentication-using-azure-ad-jwt'></a>
 
-## Authentication using Azure AD JWT
-You can use the MQTT v5 CONNECT packet to provide the Azure AD JWT token to authenticate your client, and you can use the MQTT v5 AUTH packet to refresh the token.  
+## Authentication using Microsoft Entra JWT
+You can use the MQTT v5 CONNECT packet to provide the Microsoft Entra JWT token to authenticate your client, and you can use the MQTT v5 AUTH packet to refresh the token.  
 
 In CONNECT packet, you can provide required values in the following fields:
 
@@ -42,103 +42,37 @@ Authenticate Reason Code with value 25 signifies reauthentication.
 > Audience: “aud” claim must be set to "https://eventgrid.azure.net/".
 
 ## Authorization to grant access permissions
-A client using Azure AD based JWT authentication needs to be authorized to communicate with the Event Grid namespace.  You can create custom roles to enable the client to communicate with Event Grid instances in your resource group, and then assign the roles to the client.  You can use following two data actions to provide publish or subscribe permissions, to clients with Azure AD identities, on specific topic spaces.
+A client using Microsoft Entra ID based JWT authentication needs to be authorized to communicate with the Event Grid namespace.  You can assign the following two built-in roles to provide either publish or subscribe permissions, to clients with Microsoft Entra identities.
 
-**Topic spaces publish** data action
-Microsoft.EventGrid/topicSpaces/publish/action
+- Use **EventGrid TopicSpaces Publisher** role to provide MQTT message publisher access
+- Use **EventGrid TopicSpaces Subscriber** role to provide MQTT message subscriber access
 
-**Topic spaces subscribe** data action
-Microsoft.EventGrid/topicSpaces/subscribe/action
+You can use these roles to provide permissions at subscription, resource group, Event Grid namespace or Event Grid topicspace scope.
 
-> [!NOTE]
-> Currently, we recommend using custom roles with the actions provided.
-
-### Custom roles
-
-You can create custom roles using the publish and subscribe actions.
-
-The following are sample role definitions that allow you to publish and subscribe to MQTT messages.  These custom roles give permissions at topic space scope.  You can also create roles to provide permissions at subscription, resource group scope.
-
-**EventGridMQTTPublisherRole.json**: MQTT messages publish operation.
-
-```json
-{
-  "roleName": "Event Grid namespace MQTT publisher",
-  "description": "Event Grid namespace MQTT message publisher role",
-  "assignableScopes": [
-    "/subscriptions/<subscription ID>/resourceGroups/<resource group name>/Microsoft.EventGrid/namespaces/<namespace name>/topicSpaces/<topicspace name>"
-  ],
-  "permissions": [
-      {
-          "actions": [],
-          "notActions": [],
-          "dataActions": [
-              "Microsoft.EventGrid/topicSpaces/publish/action"
-          ],
-          "notDataActions": []
-      }
-  ]
-}
-```
-
-**EventGridMQTTSubscriberRole.json**: MQTT messages subscribe operation.
-
-```json
-{
-  "roleName": "Event Grid namespace MQTT subscriber",
-  "description": "Event Grid namespace MQTT message subscriber role",
-  "assignableScopes": [
-    "/subscriptions/<subscription ID>/resourceGroups/<resource group name>/Microsoft.EventGrid/namespaces/<namespace name>/topicSpaces/<topicspace name>"
-  ]
-  "permissions": [
-      {
-          "actions": [],
-          "notActions": [],
-          "dataActions": [
-              "Microsoft.EventGrid/topicSpaces/subscribe/action"
-          ],
-          "notDataActions": []
-      }
-  ]
-}
-```
-
-## Create custom roles
-1. Navigate to topic spaces page in your Event Grid namespace
-1. Select the topic space for which the custom RBAC role needs to be created
-1. Navigate to the Access control (IAM) page within the topic space
-1. In the Roles tab, right select any of the roles to clone a new custom role.  Provide the custom role name.
-1. Switch the Baseline permissions to **Start from scratch**
-1. On the Permissions tab, select **Add permissions**
-1. In the selection page, find and select Microsoft Event Grid
-    :::image type="content" source="./media/mqtt-client-azure-ad-token-and-rbac/event-grid-custom-role-permissions.png" lightbox="./media/mqtt-client-azure-ad-token-and-rbac/event-grid-custom-role-permissions.png" alt-text="Screenshot showing the Microsoft Event Grid option to find the permissions.":::
-1. Navigate to Data Actions
-1. Select **Topic spaces publish** data action and select **Add**
-    :::image type="content" source="./media/mqtt-client-azure-ad-token-and-rbac/event-grid-custom-role-permissions-data-actions.png" lightbox="./media/mqtt-client-azure-ad-token-and-rbac/event-grid-custom-role-permissions-data-actions.png" alt-text="Screenshot showing the data action selection.":::
-1. Select Next to see the topic space in the Assignable scopes tab.  You can add other assignable scopes if needed.
-1. Select **Create** in Review + create tab to create the custom role.
-1. Once the custom role is created, you can assign the role to an identity to provide the publish permission on the topic space.  You can learn how to assign roles [here](/azure/role-based-access-control/role-assignments-portal).
-
-## Assign the custom role to your Azure AD identity
+<a name='assign-the-custom-role-to-your-azure-ad-identity'></a>
+
+## Assigning the publisher role to your Microsoft Entra identity at topicspace scope
 1. In the Azure portal, navigate to your Event Grid namespace
-1. Navigate to the topic space to which you want to authorize access.
-1. Go to the Access control (IAM) page of the topic space
+1. Navigate to the topicspace to which you want to authorize access.
+1. Go to the Access control (IAM) page of the topicspace
 1. Select the **Role assignments** tab to view the role assignments at this scope.
 1. Select **+ Add** and Add role assignment.
-1. On the Role tab, select the role that you created in the previous step.
-1. On the Members tab, select User, group, or service principal to assign the selected role to one or more service principals (applications).
+1. On the Role tab, select the "EventGrid TopicSpaces Publisher" role.
+1. On the Members tab, for **Assign access to**, select User, group, or service principal option to assign the selected role to one or more service principals (applications).
     - Users and groups work when user/group belong to fewer than 200 groups.
-1. Select **Select members**.
+1. Select **+ Select members**.
 1. Find and select the users, groups, or service principals.
+1. Select **Next**
 1. Select **Review + assign** on the Review + assign tab.
 
 > [!NOTE]
-> You can follow similar steps to create and assign a custom Event Grid MQTT subscriber permission to a topic space.
+> You can follow similar steps to assign the built-in EventGrid TopicSpaces Subscriber role at topicspace scope.
 
 ## Next steps
 - See [Publish and subscribe to MQTT message using Event Grid](mqtt-publish-and-subscribe-portal.md)
 - To learn more about how Managed Identities work, you can refer to [How managed identities for Azure resources work with Azure virtual machines - Microsoft Entra](/azure/active-directory/managed-identities-azure-resources/how-managed-identities-work-vm)  
-- To learn more about how to obtain tokens from Azure AD, you can refer to [obtaining Azure AD tokens](/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow#get-a-token)
+- To learn more about how to obtain tokens from Microsoft Entra ID, you can refer to [obtaining Microsoft Entra tokens](/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow#get-a-token)
 - To learn more about Azure Identity client library, you can refer to [using Azure Identity client library](/azure/active-directory/managed-identities-azure-resources/how-to-use-vm-token#get-a-token-using-the-azure-identity-client-library)
 - To learn more about implementing an interface for credentials that can provide a token, you can refer to [TokenCredential Interface](/java/api/com.azure.core.credential.tokencredential)
 - To learn more about how to authenticate using Azure Identity, you can refer to [examples](https://github.com/Azure/azure-sdk-for-java/wiki/Azure-Identity-Examples)
+- If you prefer to use custom roles, you can review the process to [create a custom role](/azure/role-based-access-control/custom-roles-portal)