updates to caches

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCombinedSetup.ps1

@@ -51,7 +51,8 @@ Function Invoke-ExecCombinedSetup {
             }
         }
         if ($Request.body.email -or $Request.body.webhook) {
-            $notificationConfig = $request.body
+            #create hashtable from pscustomobject
+            $notificationConfig = $request.body | Select-Object email, webhook, onepertenant, logsToInclude, sendtoIntegration, sev | ConvertTo-Json | ConvertFrom-Json -AsHashtable
             $notificationResults = Set-CIPPNotificationConfig @notificationConfig
             $Results.add($notificationResults)
         }

Modules/CIPPCore/Public/GraphHelper/Remove-CIPPCache.ps1

@@ -8,7 +8,7 @@ function Remove-CIPPCache {
     )
     # Remove all tenants except excluded
     $TenantsTable = Get-CippTable -tablename 'Tenants'
-    $Filter = "PartitionKey eq 'Tenants' and Excluded eq false"
+    $Filter = "PartitionKey eq 'Tenants' and Excluded eq false and delegatedPrivilegeStatus eq 'granularDelegatedAdminPrivileges'"
     $ClearIncludedTenants = Get-CIPPAzDataTableEntity @TenantsTable -Filter $Filter -Property PartitionKey, RowKey
     if ($ClearIncludedTenants) {
         Remove-AzDataTableEntity -Force @TenantsTable -Entity $ClearIncludedTenants