Merge pull request #105 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/AuditLogs/New-CIPPAuditLogSearchResultsCache.ps1

@@ -26,7 +26,6 @@ function New-CIPPAuditLogSearchResultsCache {
         }
     } catch {
         Write-Information "Error checking for failed downloads: $($_.Exception.Message)"
-        # Continue with the process even if the rerun protection check fails
     }
 
     try {
@@ -75,7 +74,7 @@ function New-CIPPAuditLogSearchResultsCache {
                 $FailedDownloadsTable = Get-CippTable -TableName 'FailedAuditLogDownloads'
                 $failedEntities = Get-CIPPAzDataTableEntity @FailedDownloadsTable -Filter "PartitionKey eq '$TenantFilter' and SearchId eq '$SearchId'"
                 if ($failedEntities) {
-                    Remove-CIPPAzDataTableEntity @FailedDownloadsTable -Entity $entity
+                    Remove-AzDataTableEntity @FailedDownloadsTable -Entity $entity
                     Write-Information "Removed failed download records for search ID: $SearchId, tenant: $TenantFilter"
                 }
             } catch {

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1

@@ -140,15 +140,14 @@ Function Invoke-EditUser {
     if ($AddToGroups) {
         $AddToGroups | ForEach-Object {
 
-            $GroupType = $_.value.groupType -join ','
-            $GroupID = $_.value.groupid
-            $GroupName = $_.value.groupName
+            $GroupType = $_.addedFields.calculatedGroupType
+            $GroupID = $_.value
+            $GroupName = $_.label
             Write-Host "About to add $($UserObj.userPrincipalName) to $GroupName. Group ID is: $GroupID and type is: $GroupType"
 
             try {
 
                 if ($GroupType -eq 'Distribution list' -or $GroupType -eq 'Mail-Enabled Security') {
-
                     Write-Host 'Adding to group via Add-DistributionGroupMember '
                     $Params = @{ Identity = $GroupID; Member = $UserObj.id; BypassSecurityGroupManagerCheck = $true }
                     $null = New-ExoRequest -tenantid $UserObj.tenantFilter -cmdlet 'Add-DistributionGroupMember' -cmdParams $params -UseSystemMailbox $true

Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-TableCleanup.ps1

@@ -17,7 +17,7 @@ function Start-TableCleanup {
         @{
             DataTableProps = @{
                 Context  = (Get-CIPPTable -tablename 'AuditLogSearches').Context
-                Filter   = "Timestamp lt datetime'$((Get-Date).AddDays(-7).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
+                Filter   = "Timestamp lt datetime'$((Get-Date).AddDays(-1).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
                 First    = 10000
                 Property = @('PartitionKey', 'RowKey', 'ETag')
             }

Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1

@@ -55,7 +55,7 @@ function Test-CIPPAuditLogRules {
     if ($LogCount -gt 0) {
         $LocationTable = Get-CIPPTable -TableName 'knownlocationdb'
         $ProcessedData = foreach ($AuditRecord in $SearchResults) {
-            Write-Host "Auditlogs: The record is $($AuditRecord.operation) - $($TenantFilter)"
+            #Write-Host "Auditlogs: The record is $($AuditRecord.operation) - $($TenantFilter)"
             $RootProperties = $AuditRecord | Select-Object * -ExcludeProperty auditData
             $Data = $AuditRecord.auditData | Select-Object *, CIPPAction, CIPPClause, CIPPGeoLocation, CIPPBadRepIP, CIPPHostedIP, CIPPIPDetected, CIPPLocationInfo, CIPPExtendedProperties, CIPPDeviceProperties, CIPPParameters, CIPPModifiedProperties, AuditRecord -ErrorAction SilentlyContinue
             try {