Merge pull request #378 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -125,7 +125,7 @@ function New-CippAuditLogSearch {
     )
 
     $SearchParams = @{
-        displayName         = 'CIPP Audit Search - ' + (Get-Date).ToString('yyyy-MM-dd HH:mm:ss')
+        displayName         = $DisplayName
         filterStartDateTime = $StartTime.ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss')
         filterEndDateTime   = $EndTime.AddHours(1).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss')
     }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-ExecAuditLogSearch.ps1

@@ -28,6 +28,19 @@ function Invoke-ExecAuditLogSearch {
         return
     }
 
+    # Convert StartTime and EndTime to DateTime from unixtime
+    if ($Query.StartTime -match '^\d+$') {
+        $Query.StartTime = [DateTime]::UnixEpoch.AddSeconds([long]$Query.StartTime)
+    } else {
+        $Query.StartTime = [DateTime]$Query.StartTime
+    }
+
+    if ($Query.EndTime -match '^\d+$') {
+        $Query.EndTime = [DateTime]::UnixEpoch.AddSeconds([long]$Query.EndTime)
+    } else {
+        $Query.EndTime = [DateTime]$Query.EndTime
+    }
+
     $Command = Get-Command New-CippAuditLogSearch
     $AvailableParameters = $Command.Parameters.Keys
     $BadProps = foreach ($Prop in $Query.PSObject.Properties.Name) {
@@ -44,8 +57,23 @@ function Invoke-ExecAuditLogSearch {
     }
 
     try {
+        Write-Information "Executing audit log search with parameters: $($Query | ConvertTo-Json -Depth 10)"
+
         $Query = $Query | ConvertTo-Json -Depth 10 | ConvertFrom-Json -AsHashtable
-        $Results = New-CippAuditLogSearch @Query
+        $NewSearch = New-CippAuditLogSearch @Query
+
+        if ($NewSearch) {
+            $Results = @{
+                resultText = "Created audit log search: $($NewSearch.displayName)"
+                state      = 'success'
+                details    = $NewSearch
+            }
+        } else {
+            $Results = @{
+                resultText = 'Failed to initiate search'
+                state      = 'error'
+            }
+        }
         Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
                 StatusCode = [HttpStatusCode]::OK
                 Body       = $Results

Modules/CIPPCore/Public/Get-CIPPTenantCapabilities.ps1

@@ -21,10 +21,10 @@ function Get-CIPPTenantCapabilities {
         }
         Add-CIPPAzDataTableEntity @ConfigTable -Entity $Entity -Force
     }
-    $Plans = $Org.servicePlans | Where-Object { $_.provisioningStatus -eq 'Success' -or $_.provisioningStatus -eq 'PendingInput' } | Sort-Object -Property serviceplanName -Unique | Select-Object servicePlanName, provisioningStatus
+    $Plans = $Org.servicePlans | Where-Object { $_.provisioningStatus -ne 'disabled' } | Sort-Object -Property serviceplanName -Unique | Select-Object servicePlanName, provisioningStatus
     $Results = @{}
     foreach ($Plan in $Plans) {
-        $Results."$($Plan.servicePlanName)" = $Plan.provisioningStatus -eq 'Success' -or $Plan.provisioningStatus -eq 'PendingInput'
+        $Results."$($Plan.servicePlanName)" = $Plan.provisioningStatus -ne 'disabled'
     }
     [PSCustomObject]$Results
 }

Modules/CippExtensions/Public/HIBP/New-BreachTenantSearch.ps1

@@ -30,7 +30,12 @@ function New-BreachTenantSearch {
 
     #Add user breaches to table
     if ($usersResults) {
-        $entity = Add-CIPPAzDataTableEntity @Table -Entity $usersResults -Force
-        return $LatestBreach.Result
+        try {
+            $null = Add-CIPPAzDataTableEntity @Table -Entity $usersResults -Force
+            return $LatestBreach.Result
+        } catch {
+            Write-Error "Failed to add breaches to table: $($_.Exception.Message)"
+            return $null
+        }
     }
 }