Merge pull request #107 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 4a2559514f63 · 2025-03-03T18:41:05.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/AuditLogs/New-CIPPAuditLogSearchResultsCache.ps1 b/Modules/CIPPCore/Public/AuditLogs/New-CIPPAuditLogSearchResultsCache.ps1
@@ -74,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-AzDataTableEntity @FailedDownloadsTable -Entity $failedEntities
+                    Remove-AzDataTableEntity @FailedDownloadsTable -Entity $failedEntities -Force
                     Write-Information "Removed failed download records for search ID: $SearchId, tenant: $TenantFilter"
                 }
             } catch {
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Webhooks/Push-AuditLogTenantProcess.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Webhooks/Push-AuditLogTenantProcess.ps1
@@ -20,8 +20,10 @@ function Push-AuditLogTenantProcess {
         if ($Rows.Count -gt 0) {
             Write-Information "Retrieved $($Rows.Count) rows from cache for processing"
             Test-CIPPAuditLogRules -TenantFilter $TenantFilter -Rows $Rows
+            exit 0
         } else {
             Write-Information 'No rows found in cache for the provided row IDs'
+            exit 0
         }
     } catch {
         Write-Information ('Push-AuditLogTenant: Error {0} line {1} - {2}' -f $_.InvocationInfo.ScriptName, $_.InvocationInfo.ScriptLineNumber, $_.Exception.Message)
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-ListScheduledItems.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-ListScheduledItems.ps1
@@ -49,8 +49,11 @@ Function Invoke-ListScheduledItems {
     }
 
     $AllowedTenants = Test-CIPPAccess -Request $Request -TenantList
+
     if ($AllowedTenants -notcontains 'AllTenants') {
-        $Tasks = $Tasks | Where-Object -Property TenantId -In $AllowedTenants
+        $TenantList = Get-Tenants -IncludeErrors | Select-Object customerId, defaultDomainName
+        $AllowedTenantDomains = $TenantList | Where-Object -Property customerId -In $AllowedTenants | Select-Object -ExpandProperty defaultDomainName
+        $Tasks = $Tasks | Where-Object -Property Tenant -In $AllowedTenantDomains
     }
     $ScheduledTasks = foreach ($Task in $tasks) {
         if ($Task.Parameters) {
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Invoke-ExecStartManagedFolderAssistant.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Invoke-ExecStartManagedFolderAssistant.ps1
@@ -14,24 +14,32 @@ Function Invoke-ExecStartManagedFolderAssistant {
     $Headers = $Request.Headers
     Write-LogMessage -Headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
-
     # Interact with query parameters or the body of the request.
     $Tenant = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
-    $ID = $Request.Query.ID ?? $Request.Body.ID
+    $ID = $Request.Query.Id ?? $Request.Body.Id
+    $UserPrincipalName = $Request.Body.UserPrincipalName
+    $Identity = $ID ?? $UserPrincipalName
+    $ShownName = $UserPrincipalName ?? $ID
+
+
+    $ExoParams = @{
+        Identity          = $Identity
+        AggMailboxCleanup = $true
+        FullCrawl         = $true
+    }
 
     try {
-        $null = New-ExoRequest -tenantid $Tenant -cmdlet 'Start-ManagedFolderAssistant' -cmdParams @{Identity = $ID }
-        $Result = "Successfully started Managed Folder Assistant for mailbox $($ID)."
+        $null = New-ExoRequest -tenantid $Tenant -cmdlet 'Start-ManagedFolderAssistant' -cmdParams $ExoParams
+        $Result = "Successfully started Managed Folder Assistant for mailbox $($ShownName)."
         $Severity = 'Info'
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        $Result = "Failed to start Managed Folder Assistant for mailbox $($ID). Error: $($ErrorMessage.NormalizedError)"
+        $Result = "Failed to start Managed Folder Assistant for mailbox $($ShownName). Error: $($ErrorMessage.NormalizedError)"
         $Severity = 'Error'
         $StatusCode = [HttpStatusCode]::InternalServerError
     } finally {
         Write-LogMessage -Headers $Headers -API $APIName -tenant $Tenant -message $Result -Sev $Severity -LogData $ErrorMessage
-
     }
 
     $Body = [pscustomobject] @{ 'Results' = $Result }
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-ListTenants.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-ListTenants.ps1
@@ -23,8 +23,8 @@ Function Invoke-ListTenants {
     }
 
     # Clear Cache
-    if ($Request.Query.ClearCache -eq $true) {
-        Remove-CIPPCache -tenantsOnly $Request.Query.TenantsOnly
+    if ($Request.Body.ClearCache -eq $true) {
+        $Results = Remove-CIPPCache -tenantsOnly $Request.Body.TenantsOnly
 
         $InputObject = [PSCustomObject]@{
             Batch            = @(
@@ -40,7 +40,12 @@ Function Invoke-ListTenants {
         $GraphRequest = [pscustomobject]@{'Results' = 'Cache has been cleared and a tenant refresh is queued.' }
         Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
                 StatusCode = [HttpStatusCode]::OK
-                Body       = $GraphRequest
+                Body       = @{
+                    Results = @($GraphRequest)
+                    Metadata = @{
+                        Details = $Results
+                    }
+                }
             })
         #Get-Tenants -IncludeAll -TriggerRefresh
         return
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListKnownIPDb.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListKnownIPDb.ps1
@@ -16,7 +16,7 @@ Function Invoke-ListKnownIPDb {
 
     # Write to the Azure Functions log stream.
     Write-Host 'PowerShell HTTP trigger function processed a request.'
-    $Table = Get-CIPPTable -TableName 'knownlocationdb'
+    $Table = Get-CIPPTable -TableName 'knownlocationdbv2'
     $Filter = "Tenant eq '$($Request.Query.TenantFilter)'"
     $KnownIPDb = Get-CIPPAzDataTableEntity @Table -Filter $Filter
 
diff --git a/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-AuditLogOrchestrator.ps1 b/Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-AuditLogOrchestrator.ps1
@@ -39,10 +39,10 @@ function Start-AuditLogOrchestrator {
                     $ProcessQueue = New-CippQueueEntry -Name 'Audit Logs Process' -Reference 'AuditLogsProcess' -TotalTasks ($TenantGroups | Measure-Object -Property Count -Sum).Sum
                     $ProcessBatch = foreach ($TenantGroup in $TenantGroups) {
                         $TenantFilter = $TenantGroup.Name
-                        $RowIds = $TenantGroup.Group.RowKey
+                        $RowIds = @($TenantGroup.Group.RowKey)
                         for ($i = 0; $i -lt $RowIds.Count; $i += 1000) {
+                            Write-Host "Processing $TenantFilter with $($RowIds.Count) row IDs. We're processing id $($RowIds[$i]) to $($RowIds[[Math]::Min($i + 999, $RowIds.Count - 1)])"
                             $BatchRowIds = $RowIds[$i..([Math]::Min($i + 999, $RowIds.Count - 1))]
-
                             [PSCustomObject]@{
                                 TenantFilter = $TenantFilter
                                 RowIds       = $BatchRowIds
diff --git a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-TableCleanup.ps1 b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-TableCleanup.ps1
@@ -48,7 +48,27 @@ function Start-TableCleanup {
         }
     )
 
+    $DeleteTables = @(
+        'knownlocationdb'
+    )
+
     if ($PSCmdlet.ShouldProcess('Start-TableCleanup', 'Starting Table Cleanup')) {
+        foreach ($Table in $DeleteTables) {
+            try {
+                $Table = Get-CIPPTable -tablename $Table
+                if ($Table) {
+                    Write-Information "Deleting table $($Table.Context.TableName)"
+                    try {
+                        Remove-AzDataTable -Context $Table.Context -Force
+                    } catch {
+                        Write-LogMessage -API 'TableCleanup' -message "Failed to delete table $($Table.Context.TableName)" -sev Error -LogData (Get-CippException -Exception $_)
+                    }
+                }
+            } catch {
+                Write-Information "Table $Table not found"
+            }
+        }
+
         Write-Information 'Starting table cleanup'
         foreach ($Rule in $CleanupRules) {
             if ($Rule.Where) {
diff --git a/Modules/CIPPCore/Public/GraphHelper/Remove-CIPPCache.ps1 b/Modules/CIPPCore/Public/GraphHelper/Remove-CIPPCache.ps1
@@ -13,28 +13,36 @@ function Remove-CIPPCache {
     if ($ClearIncludedTenants) {
         Remove-AzDataTableEntity -Force @TenantsTable -Entity $ClearIncludedTenants
     }
+    "Removed $($ClearIncludedTenants.Count) tenants"
 
-    if ($TenantsOnly -eq 'false') {
-        Write-Host 'Clearing all'
+    if ($TenantsOnly -eq $false) {
+        'Clearing all cached table data'
+        $Context = New-AzDataTableContext -ConnectionString $env:AzureWebJobsStorage
+        $Tables = Get-AzDataTable -Context $Context
+        foreach ($Table in $Tables) {
+            if ($Table -match '^cache') {
+                "Removing cache table $Table"
+                $TableContext = Get-CIPPTable -TableName $Table
+                Remove-AzDataTable @TableContext
+            }
+        }
+
+        'Clearing domain analyser results'
         # Remove Domain Analyser cached results
         $DomainsTable = Get-CippTable -tablename 'Domains'
         $Filter = "PartitionKey eq 'TenantDomains'"
         $ClearDomainAnalyserRows = Get-CIPPAzDataTableEntity @DomainsTable -Filter $Filter | ForEach-Object {
-            $_.DomainAnalyser = ''
+            $_ | Add-Member -MemberType NoteProperty -Name DomainAnalyser -Value '' -Force
             $_
         }
         if ($ClearDomainAnalyserRows) {
             Update-AzDataTableEntity -Force @DomainsTable -Entity $ClearDomainAnalyserRows
         }
-        #Clear BPA
-        $BPATable = Get-CippTable -tablename 'cachebpav2'
-        $ClearBPARows = Get-CIPPAzDataTableEntity @BPATable
-        if ($ClearBPARows) {
-            Remove-AzDataTableEntity -Force @BPATable -Entity $ClearBPARows
-        }
+
         $ENV:SetFromProfile = $null
         $Script:SkipListCache = $Null
         $Script:SkipListCacheEmpty = $Null
         $Script:IncludedTenantsCache = $Null
     }
+    'Cache cleanup complete'
 }
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAPConfig.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAPConfig.ps1
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAPESP.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAPESP.ps1
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1
@@ -0,0 +1,76 @@
+function Invoke-CIPPStandardAutopilotProfile {
+    <#
+    .FUNCTIONALITY
+        Internal
+    .COMPONENT
+        (APIName) AutopilotProfile
+    .SYNOPSIS
+        (Label) Enable Autopilot Profile
+    .DESCRIPTION
+        (Helptext) Assign the appropriate Autopilot profile to streamline device deployment.
+        (DocsDescription) This standard allows the deployment of Autopilot profiles to devices, including settings such as unique name templates, language options, and local admin privileges.
+    .NOTES
+        CAT
+            Device Management Standards
+        TAG
+        DISABLEDFEATURES
+            
+        ADDEDCOMPONENT
+            {"type":"textField","name":"standards.AutopilotProfile.DisplayName","label":"Profile Display Name"}
+            {"type":"textField","name":"standards.AutopilotProfile.Description","label":"Profile Description"}
+            {"type":"textField","name":"standards.AutopilotProfile.DeviceNameTemplate","label":"Unique Device Name Template"}
+            {"type":"autoComplete","multiple":false,"creatable":false,"name":"standards.AutopilotProfile.Languages","label":"Languages","api":{"url":"/languageList.json","labelField":"language","valueField":"tag"}}
+            {"type":"switch","name":"standards.AutopilotProfile.CollectHash","label":"Convert all targeted devices to Autopilot","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.AssignToAllDevices","label":"Assign to all devices","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.SelfDeployingMode","label":"Enable Self-deploying Mode","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.HideTerms","label":"Hide Terms and Conditions","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.HidePrivacy","label":"Hide Privacy Settings","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.HideChangeAccount","label":"Hide Change Account Options","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.NotLocalAdmin","label":"Setup user as a standard user (not local admin)","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.AllowWhiteGlove","label":"Allow White Glove OOBE","defaultValue":true}
+            {"type":"switch","name":"standards.AutopilotProfile.AutoKeyboard","label":"Automatically configure keyboard","defaultValue":true}
+        IMPACT
+            Low Impact
+        ADDEDDATE
+            2023-12-30
+        RECOMMENDEDBY
+        UPDATECOMMENTBLOCK
+            Run the Tools\Update-StandardsComments.ps1 script to update this comment block
+    .LINK
+        https://docs.cipp.app/user-documentation/tenant/standards/list-standards/
+    #>
+    param($Tenant, $Settings)
+    ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'APConfig'
+
+    If ($Settings.remediate -eq $true) {
+
+        try {
+            Write-Host $($settings | ConvertTo-Json -Depth 100)
+            if ($settings.NotLocalAdmin -eq $true) { $usertype = 'Standard' } else { $usertype = 'Administrator' }
+            $DeploymentMode = if ($settings.DeploymentMode -eq 'true') { 'shared' } else { 'singleUser' }
+
+            $Parameters = @{
+                tenantFilter       = $tenant
+                displayname        = $settings.DisplayName
+                description        = $settings.Description
+                usertype           = $usertype
+                DeploymentMode     = $DeploymentMode
+                assignto           = $settings.Assignto
+                devicenameTemplate = $Settings.DeviceNameTemplate
+                allowWhiteGlove    = $Settings.allowWhiteglove
+                CollectHash        = $Settings.CollectHash
+                hideChangeAccount  = $Settings.HideChangeAccount
+                hidePrivacy        = $Settings.HidePrivacy
+                hideTerms          = $Settings.HideTerms
+                Autokeyboard       = $Settings.Autokeyboard
+                Language           = $Settings.languages.value
+            }
+            Set-CIPPDefaultAPDeploymentProfile @Parameters
+        } catch {
+            $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+            # Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create Default Autopilot config: $ErrorMessage" -sev 'Error'
+            throw $ErrorMessage
+        }
+
+    }
+}
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1
diff --git a/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1 b/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1
diff --git a/Modules/CippEntrypoints/CippEntrypoints.psm1 b/Modules/CippEntrypoints/CippEntrypoints.psm1

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ function New-CIPPAuditLogSearchResultsCache {`
`74`	`74`	`$FailedDownloadsTable = Get-CippTable -TableName 'FailedAuditLogDownloads'`
`75`	`75`	`$failedEntities = Get-CIPPAzDataTableEntity @FailedDownloadsTable -Filter "PartitionKey eq '$TenantFilter' and SearchId eq '$SearchId'"`
`76`	`76`	`if ($failedEntities) {`
`77`		`- Remove-AzDataTableEntity @FailedDownloadsTable -Entity $failedEntities`
	`77`	`+ Remove-AzDataTableEntity @FailedDownloadsTable -Entity $failedEntities -Force`
`78`	`78`	`Write-Information "Removed failed download records for search ID: $SearchId, tenant: $TenantFilter"`
`79`	`79`	`}`
`80`	`80`	`} catch {`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,11 @@ Function Invoke-ListScheduledItems {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`$AllowedTenants = Test-CIPPAccess -Request $Request -TenantList`
	`52`	`+`
`52`	`53`	`if ($AllowedTenants -notcontains 'AllTenants') {`
`53`		`- $Tasks = $Tasks \| Where-Object -Property TenantId -In $AllowedTenants`
	`54`	`+ $TenantList = Get-Tenants -IncludeErrors \| Select-Object customerId, defaultDomainName`
	`55`	`+ $AllowedTenantDomains = $TenantList \| Where-Object -Property customerId -In $AllowedTenants \| Select-Object -ExpandProperty defaultDomainName`
	`56`	`+ $Tasks = $Tasks \| Where-Object -Property Tenant -In $AllowedTenantDomains`
`54`	`57`	`}`
`55`	`58`	`$ScheduledTasks = foreach ($Task in $tasks) {`
`56`	`59`	`if ($Task.Parameters) {`