resources for removal

KelvinTegelaar · Dec 29, 2023 · 74cb6e2 · 74cb6e2
1 parent a656d90
commit 74cb6e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Modules/CIPPCore/Public/Invoke-RemoveWebhookAlert.ps1 b/Modules/CIPPCore/Public/Invoke-RemoveWebhookAlert.ps1
@@ -29,7 +29,7 @@ Function Invoke-RemoveWebhookAlert {
                     RowKey       = 'AllTenantsWebhookCreation'
                     PartitionKey = 'webhookcreation'
                 }
-                RemoveAzDataTableEntity @Table -Entity $CompleteObject -ErrorAction SilentlyContinue | Out-Null
+                Remove-AzDataTableEntity @Table -Entity $CompleteObject -ErrorAction SilentlyContinue | Out-Null
 
             } else {
                 $Tenants = $Request.query.TenantFilter

diff --git a/Modules/CIPPCore/Public/Remove-CIPPGraphSubscription.ps1 b/Modules/CIPPCore/Public/Remove-CIPPGraphSubscription.ps1
@@ -10,7 +10,7 @@ function Remove-CIPPGraphSubscription {
         $WebhookTable = Get-CIPPTable -TableName webhookTable
         $WebhookRow = Get-CIPPAzDataTableEntity @WebhookTable | Where-Object { $_.RowKey -eq $CIPPID }
         $Entity = $WebhookRow | Select-Object PartitionKey, RowKey
-        if ($WebhookRow.Resource -eq 'M365AuditLogsv2') {
+        if ($WebhookRow.Resource -in @('Audit.AzureActiveDirectory', 'Audit.Exchange', 'Audit.SharePoint', 'Audit.General')) {
             try {
                 $AuditLog = New-GraphPOSTRequest -uri "https://manage.office.com/api/v1.0/$($TenantFilter)/activity/feed/subscriptions/stop?contentType=$($WebhookRow.EventType)" -scope 'https://manage.office.com/.default' -tenantid $TenantFilter -type POST -body '{}' -verbose
             } catch {