updated scripts

Author: spelluru

articles/event-grid/scripts/powershell-webhook-secure-delivery-microsoft-entra-app.md

@@ -34,10 +34,10 @@ try {
 
     Function CreateAppRole([string] $Name, [string] $Description)
     {
-        $appRole = New-Object Microsoft.Open.AzureAD.Model.AppRole
+        $appRole = New-Object Microsoft.Graph.PowerShell.Models.MicrosoftGraphAppRole
         $appRole.AllowedMemberTypes = New-Object System.Collections.Generic.List[string]
-        $appRole.AllowedMemberTypes.Add("Application");
-        $appRole.AllowedMemberTypes.Add("User");
+        $appRole.AllowedMemberTypes += "Application";
+        $appRole.AllowedMemberTypes += "User";
         $appRole.DisplayName = $Name
         $appRole.Id = New-Guid
         $appRole.IsEnabled = $true
@@ -53,36 +53,35 @@ try {
 
     $eventGridAppId = "4962773b-9cdb-44cf-a8bf-237846a00ab7" # Azure Public Cloud
     # $eventGridAppId = "54316b56-3481-47f9-8f30-0300f5542a7b" # Azure Government Cloud
-    $eventGridRoleName = "AzureEventGridSecureWebhookSubscriber" # You don't need to modify this role name
     $eventGridSP = Get-MgServicePrincipal -Filter ("appId eq '" + $eventGridAppId + "'")
-    if ($eventGridSP -match "Microsoft.EventGrid")
+    if ($eventGridSP.DisplayName -match "Microsoft.EventGrid")
     {
-        Write-Host "The Microsoft Entra Application is already defined.`n"
+        Write-Host "The Event Grid Microsoft Entra Application is already defined.`n"
     } else {
         Write-Host "Creating the Azure Event Grid Microsoft Entra Application"
         $eventGridSP = New-MgServicePrincipal -AppId $eventGridAppId
     }
 
     # Creates the Azure app role for the webhook Microsoft Entra application
-
+    $eventGridRoleName = "AzureEventGridSecureWebhookSubscriber" # You don't need to modify this role name
     $app = Get-MgApplication -ObjectId $webhookAppObjectId
     $appRoles = $app.AppRoles
 
     Write-Host "Microsoft Entra App roles before addition of the new role..."
-    Write-Host $appRoles
+    Write-Host $appRoles.DisplayName
     
-    if ($appRoles -match $eventGridRoleName)
+    if ($appRoles.DisplayName -match $eventGridRoleName)
     {
         Write-Host "The Azure Event Grid role is already defined.`n"
     } else {      
         Write-Host "Creating the Azure Event Grid role in Microsoft Entra Application: " $webhookAppObjectId
         $newRole = CreateAppRole -Name $eventGridRoleName -Description "Azure Event Grid Role"
-        $appRoles.Add($newRole)
-        Update-MgApplication -ObjectId $app.ObjectId -AppRoles $appRoles
+        $appRoles += $newRole
+        Update-MgApplication -ApplicationId $webhookAppObjectId -AppRoles $appRoles
     }
 
     Write-Host "Microsoft Entra App roles after addition of the new role..."
-    Write-Host $appRoles
+    Write-Host $appRoles.DisplayName
 
     # Creates the user role assignment for the app that will create event subscription
 

articles/event-grid/scripts/powershell-webhook-secure-delivery-microsoft-entra-user.md

@@ -18,12 +18,12 @@ Here are the high level steps from the script:
 1. Add service principal of user who is creating the subscription to the AzureEventGridSecureWebhookSubscriber role.
 1. Add service principal of Microsoft.EventGrid to the AzureEventGridSecureWebhookSubscriber.
 
-## Sample script - stable
+## Sample script
 
 ```azurepowershell
 # NOTE: Before run this script ensure you are logged in Azure by using "az login" command.
 
-$webhookAppObjectId = "[REPLACE_WITH_YOUR_ID]"
+$webhookAppId = "[REPLACE_WITH_YOUR_ID]"
 $eventSubscriptionWriterUserPrincipalName = "[REPLACE_WITH_USER_PRINCIPAL_NAME_OF_THE_USER_WHO_WILL_CREATE_THE_SUBSCRIPTION]"
 
 # Start execution
@@ -33,10 +33,10 @@ try {
 
     Function CreateAppRole([string] $Name, [string] $Description)
     {
-        $appRole = New-Object Microsoft.Open.AzureAD.Model.AppRole
+        $appRole = New-Object Microsoft.Graph.PowerShell.Models.MicrosoftGraphAppRole
         $appRole.AllowedMemberTypes = New-Object System.Collections.Generic.List[string]
-        $appRole.AllowedMemberTypes.Add("Application");
-        $appRole.AllowedMemberTypes.Add("User");
+        $appRole.AllowedMemberTypes += "Application";
+        $appRole.AllowedMemberTypes += "User";
         $appRole.DisplayName = $Name
         $appRole.Id = New-Guid
         $appRole.IsEnabled = $true
@@ -52,36 +52,36 @@ try {
    
     $eventGridAppId = "4962773b-9cdb-44cf-a8bf-237846a00ab7" # Azure Public Cloud
     # $eventGridAppId = "54316b56-3481-47f9-8f30-0300f5542a7b" # Azure Government Cloud
-    $eventGridRoleName = "AzureEventGridSecureWebhookSubscriber" # You don't need to modify this role name
     $eventGridSP = Get-MgServicePrincipal -Filter ("appId eq '" + $eventGridAppId + "'")
-    if ($eventGridSP -match "Microsoft.EventGrid")
+    if ($eventGridSP.DisplayName -match "Microsoft.EventGrid")
     {
-        Write-Host "The Microsoft Entra Application is already defined.`n"
+        Write-Host "The Event Grid Microsoft Entra Application is already defined.`n"
     } else {
         Write-Host "Creating the Azure Event Grid Microsoft Entra Application"
         $eventGridSP = New-MgServicePrincipal -AppId $eventGridAppId
     }
 
     # Creates the Azure app role for the webhook Microsoft Entra application
+    $eventGridRoleName = "AzureEventGridSecureWebhookSubscriber" # You don't need to modify this role name
 
-    $app = Get-MgApplication -ObjectId $webhookAppObjectId
+    $app = Get-MgApplication -ApplicationId $webhookAppObjectId 
     $appRoles = $app.AppRoles
 
     Write-Host "Microsoft Entra App roles before addition of the new role..."
-    Write-Host $appRoles
+    Write-Host $appRoles.DisplayName
     
-    if ($appRoles -match $eventGridRoleName)
+    if ($appRoles.DisplayName -match $eventGridRoleName)
     {
         Write-Host "The Azure Event Grid role is already defined.`n"
     } else {      
         Write-Host "Creating the Azure Event Grid role in Microsoft Entra Application: " $webhookAppObjectId
         $newRole = CreateAppRole -Name $eventGridRoleName -Description "Azure Event Grid Role"
-        $appRoles.Add($newRole)
-        Update-MgApplication -ObjectId $app.ObjectId -AppRoles $appRoles
+        $appRoles += $newRole
+        Update-MgApplication -ApplicationId $webhookAppObjectId -AppRoles $appRoles
     }
 
     Write-Host "Microsoft Entra App roles after addition of the new role..."
-    Write-Host $appRoles
+    Write-Host $appRoles.DisplayName
 
     # Creates the user role assignment for the user who will create event subscription
 
@@ -90,9 +90,9 @@ try {
     try
     {
         Write-Host "Creating the Microsoft Entra App Role assignment for user: " $eventSubscriptionWriterUserPrincipalName
-        $eventSubscriptionWriterUser = Get-MgUser -ObjectId $eventSubscriptionWriterUserPrincipalName
+        $eventSubscriptionWriterUser = Get-MgUser -UserId $eventSubscriptionWriterUserPrincipalName
         $eventGridAppRole = $app.AppRoles | Where-Object -Property "DisplayName" -eq -Value $eventGridRoleName
-        New-MgUserAppRoleAssignment -Id $eventGridAppRole.Id -ResourceId $servicePrincipal.ObjectId -ObjectId $eventSubscriptionWriterUser.ObjectId -PrincipalId $eventSubscriptionWriterUser.ObjectId        
+        New-MgUserAppRoleAssignment -Id $eventGridAppRole.Id -ResourceId $servicePrincipal.Id -UserId $eventSubscriptionWriterUser.Id -PrincipalId $eventSubscriptionWriterUser.Id        
     }
     catch
     {
@@ -110,12 +110,12 @@ try {
     # Creates the service app role assignment for Event Grid Microsoft Entra Application
 
     $eventGridAppRole = $app.AppRoles | Where-Object -Property "DisplayName" -eq -Value $eventGridRoleName
-    New-MgServicePrincipalAppRoleAssignment -Id $eventGridAppRole.Id -ResourceId $servicePrincipal.ObjectId -ObjectId $eventGridSP.ObjectId -PrincipalId $eventGridSP.ObjectId
+    New-MgServicePrincipalAppRoleAssignment -Id $eventGridAppRole.Id -ResourceId $servicePrincipal.Id -ServicePrincipalId $eventGridSP.Id -PrincipalId $eventGridSP.Id
     
     # Print output references for backup
 
     Write-Host ">> Webhook's Microsoft Entra Application Id: $($app.AppId)"
-    Write-Host ">> Webhook's Microsoft Entra Application ObjectId Id: $($app.ObjectId)"
+    Write-Host ">> Webhook's Microsoft Entra Application Object Id: $($app.Id)"
 }
 catch {
   Write-Host ">> Exception:"