Merge pull request #246 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 0d99203c4c0a · 2025-05-15T00:41:05.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ListMailboxRulesQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ListMailboxRulesQueue.ps1
@@ -26,7 +26,7 @@ function Push-ListMailboxRulesQueue {
                     Rules        = [string]($Rule | ConvertTo-Json)
                     RowKey       = [string](New-Guid).guid
                     Tenant       = [string]$domainName
-                    PartitionKey = 'mailboxrules'
+                    PartitionKey = 'MailboxRules'
                 }
 
             }
@@ -38,7 +38,7 @@ function Push-ListMailboxRulesQueue {
                 Rules        = [string]$Rules
                 RowKey       = [string]$domainName
                 Tenant       = [string]$domainName
-                PartitionKey = 'mailboxrules'
+                PartitionKey = 'MailboxRules'
             }
         }
     } catch {
@@ -49,7 +49,7 @@ function Push-ListMailboxRulesQueue {
             Rules        = [string]$Rules
             RowKey       = [string]$domainName
             Tenant       = [string]$domainName
-            PartitionKey = 'mailboxrules'
+            PartitionKey = 'MailboxRules'
         }
     }
     Add-CIPPAzDataTableEntity @Table -Entity $GraphRequest -Force | Out-Null
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ListMailboxRules.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ListMailboxRules.ps1
@@ -22,13 +22,24 @@ Function Invoke-ListMailboxRules {
         $Table.Filter = "Tenant eq '$TenantFilter'"
     }
     $Rows = Get-CIPPAzDataTableEntity @Table | Where-Object -Property Timestamp -GT (Get-Date).AddHours(-1)
+    $PartitionKey = 'MailboxRules'
+    $QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
+    $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
 
     $Metadata = @{}
-    if (!$Rows -or ($TenantFilter -eq 'AllTenants' -and ($Rows | Measure-Object).Count -eq 1)) {
+    # If a queue is running, we will not start a new one
+    if ($RunningQueue) {
         $Metadata = [PSCustomObject]@{
-            QueueMessage = 'Loading data. Please check back in 1 minute'
+            QueueMessage = "Still loading data for $TenantFilter. Please check back in a few more minutes"
+        }
+        [PSCustomObject]@{
+            Waiting = $true
+        }
+    } elseif ((!$Rows -and !$RunningQueue) -or ($TenantFilter -eq 'AllTenants' -and ($Rows | Measure-Object).Count -eq 1)) {
+        # If no rows are found and no queue is running, we will start a new one
+        $Metadata = [PSCustomObject]@{
+            QueueMessage = "Loading data for $TenantFilter. Please check back in 1 minute"
         }
-        $GraphRequest = @()
 
         if ($TenantFilter -eq 'AllTenants') {
             $Tenants = Get-Tenants -IncludeErrors | Select-Object defaultDomainName
@@ -37,7 +48,7 @@ Function Invoke-ListMailboxRules {
             $Tenants = @(@{ defaultDomainName = $TenantFilter })
             $Type = $TenantFilter
         }
-        $Queue = New-CippQueueEntry -Name "Mailbox Rules ($Type)" -TotalTasks ($Tenants | Measure-Object).Count
+        $Queue = New-CippQueueEntry -Name "Mailbox Rules ($Type)" -Reference $QueueReference -TotalTasks ($Tenants | Measure-Object).Count
         $Batch = $Tenants | Select-Object defaultDomainName, @{Name = 'FunctionName'; Expression = { 'ListMailboxRulesQueue' } }, @{Name = 'QueueName'; Expression = { $_.defaultDomainName } }, @{Name = 'QueueId'; Expression = { $Queue.RowKey } }
         if (($Batch | Measure-Object).Count -gt 0) {
             $InputObject = [PSCustomObject]@{
@@ -53,6 +64,7 @@ Function Invoke-ListMailboxRules {
     } else {
         if ($TenantFilter -ne 'AllTenants') {
             $Rows = $Rows | Where-Object -Property Tenant -EQ $TenantFilter
+            $Rows = $Rows
         }
         $GraphRequest = $Rows | ForEach-Object {
             $NewObj = $_.Rules | ConvertFrom-Json -ErrorAction SilentlyContinue
@@ -61,6 +73,8 @@ Function Invoke-ListMailboxRules {
         }
     }
 
+    # If no results are found, we will return an empty message to prevent null reference errors in the frontend
+    $GraphRequest = $GraphRequest ?? @()
     $Body = @{
         Results  = @($GraphRequest)
         Metadata = $Metadata
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecRestoreDeleted.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecRestoreDeleted.ps1
@@ -15,18 +15,27 @@ Function Invoke-ExecRestoreDeleted {
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
     # Interact with query parameters or the body of the request.
-    $TenantFilter = $Request.Query.TenantFilter ?? $Request.Body.TenantFilter
+    $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
     $RequestID = $Request.Query.ID ?? $Request.Body.ID
+    $UserPrincipalName = $Request.Body.userPrincipalName
+    $DisplayName = $Request.Body.displayName
 
     try {
         $null = New-GraphPostRequest -uri "https://graph.microsoft.com/v1.0/directory/deletedItems/$($RequestID)/restore" -tenantid $TenantFilter -type POST -body '{}' -Verbose
-        $Result = "Successfully restored deleted item with ID: $($RequestID)"
-        Write-LogMessage -headers $Request.Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Info'
+        $Result = "Successfully restored deleted item with ID: '$($RequestID)'"
+        if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
+        if ($DisplayName) { $Result += " Display Name: '$($DisplayName)'" }
+
+        Write-LogMessage -headers $Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Info'
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        $Result = "Failed to restore deleted item with ID: $($RequestID). Error: $($ErrorMessage.NormalizedError)"
-        Write-LogMessage -headers $Request.Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Error' -LogData $ErrorMessage
+        $Result = "Failed to restore deleted item with ID: '$($RequestID)'"
+        if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
+        if ($DisplayName) { $Result += " Display Name: '$($DisplayName)'" }
+        $Result += " Error: $($ErrorMessage.NormalizedError)"
+
+        Write-LogMessage -headers $Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Error' -LogData $ErrorMessage
         $StatusCode = [HttpStatusCode]::InternalServerError
     }
 
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListDeletedItems.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListDeletedItems.ps1
@@ -16,7 +16,7 @@ Function Invoke-ListDeletedItems {
     Write-LogMessage -Headers $Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
 
     # Interact with query parameters or the body of the request.
-    $Types = 'Application', 'User', 'Device', 'Group'
+    $Types = 'Application', 'User', 'Group'
     $GraphRequest = foreach ($Type in $Types) {
     (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/directory/deletedItems/microsoft.graph.$($Type)" -tenantid $TenantFilter) |
             Where-Object -Property '@odata.context' -NotLike '*graph.microsoft.com*' |
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-RemoveDeletedObject.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-RemoveDeletedObject.ps1
@@ -0,0 +1,49 @@
+using namespace System.Net
+
+Function Invoke-RemoveDeletedObject {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        Tenant.Directory.ReadWrite
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $APIName = $Request.Params.CIPPEndpoint
+    $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.
+    $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
+    $RequestID = $Request.Query.ID ?? $Request.Body.ID
+    $UserPrincipalName = $Request.Body.userPrincipalName
+    $DisplayName = $Request.Body.displayName
+
+    try {
+        $null = New-GraphPostRequest -uri "https://graph.microsoft.com/v1.0/directory/deletedItems/$($RequestID)" -tenantid $TenantFilter -type DELETE -body '{}' -Verbose
+        $Result = "Successfully permanently deleted item with ID: '$($RequestID)'"
+        if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
+        if ($DisplayName) { $Result += " Display Name: '$($DisplayName)'" }
+
+        Write-LogMessage -headers $Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Info'
+        $StatusCode = [HttpStatusCode]::OK
+    } catch {
+        $ErrorMessage = Get-CippException -Exception $_
+        $Result = "Failed to permanently delete item with ID: $($RequestID)"
+        if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
+        if ($DisplayName) { $Result += " Display Name: '$($DisplayName)'" }
+        $Result += " Error: $($ErrorMessage.NormalizedError)"
+
+        Write-LogMessage -headers $Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Error' -LogData $ErrorMessage
+        $StatusCode = [HttpStatusCode]::InternalServerError
+    }
+
+    $Results = [pscustomobject]@{'Results' = $Result }
+    # Associate values to output bindings by calling 'Push-OutputBinding'.
+    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            StatusCode = $StatusCode
+            Body       = $Results
+        })
+
+}
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-RemoveUser.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-RemoveUser.ps1
@@ -17,17 +17,20 @@ Function Invoke-RemoveUser {
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
     $UserID = $Request.Query.ID ?? $Request.Body.ID
+    $UserPrincipalName = $Request.Query.userPrincipalName ?? $Request.Body.userPrincipalName
 
     if (!$UserID) { exit }
     try {
         $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$($UserID)" -type DELETE -tenant $TenantFilter
-        $Result = "Successfully deleted $UserID."
+        $Result = "Successfully deleted user with ID: '$UserID'"
+        if ($UserPrincipalName) { $Result += " and User Principal Name: '$UserPrincipalName'" }
         Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev 'Info' -tenant $TenantFilter
         $StatusCode = [HttpStatusCode]::OK
 
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        $Result = "Could not delete user $($UserID). $($ErrorMessage.NormalizedError)"
+        $Result = "Failed to delete user $($UserID). $($ErrorMessage.NormalizedError)"
+        if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
         Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev 'Error' -tenant $TenantFilter -LogData $ErrorMessage
         $StatusCode = [HttpStatusCode]::InternalServerError
     }
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListTenantAllowBlockList.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListTenantAllowBlockList.ps1
@@ -16,7 +16,7 @@ Function Invoke-ListTenantAllowBlockList {
 
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Query.tenantFilter
-    $ListTypes = 'Sender', 'Url', 'FileHash'
+    $ListTypes = 'Sender', 'Url', 'FileHash', 'IP'
     try {
         $Results = $ListTypes | ForEach-Object -Parallel {
             Import-Module CIPPCore
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1
@@ -14,12 +14,12 @@ function Invoke-CIPPStandardAutopilotProfile {
             Device Management Standards
         TAG
         DISABLEDFEATURES
-            {"report":true,"warn":true,"remediate":false}
+            {"report":false,"warn":false,"remediate":false}
         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":"autoComplete","multiple":false,"creatable":false,"required":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}
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1
@@ -14,7 +14,7 @@ function Invoke-CIPPStandardAutopilotStatusPage {
             Device Management Standards
         TAG
         DISABLEDFEATURES
-            {"report":true,"warn":true,"remediate":false}
+            {"report":false,"warn":false,"remediate":false}
         ADDEDCOMPONENT
             {"type":"number","name":"standards.AutopilotStatusPage.TimeOutInMinutes","label":"Timeout in minutes","defaultValue":60}
             {"type":"textField","name":"standards.AutopilotStatusPage.ErrorMessage","label":"Custom Error Message","required":false}
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1
@@ -32,11 +32,12 @@ function Invoke-CIPPStandardDisableGuests {
     param($Tenant, $Settings)
     ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'DisableGuests'
 
-    $Lookup = (Get-Date).AddDays(-90).ToUniversalTime().ToString('o')
+    $90Days = (Get-Date).AddDays(-90).ToUniversalTime()
+    $Lookup = $90Days.ToString('o')
     $AuditLookup = (Get-Date).AddDays(-7).ToUniversalTime().ToString('o')
 
-    $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$filter=(signInActivity/lastSuccessfulSignInDateTime le $Lookup)&`$select=id,UserPrincipalName,signInActivity,mail,userType,accountEnabled" -scope 'https://graph.microsoft.com/.default' -tenantid $Tenant |
-        Where-Object { $_.userType -eq 'Guest' -and $_.AccountEnabled -eq $true }
+    $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$filter=createdDateTime le $Lookup and userType eq 'Guest' and accountEnabled eq true &`$select=id,UserPrincipalName,signInActivity,mail,userType,accountEnabled,createdDateTime,externalUserState" -scope 'https://graph.microsoft.com/.default' -tenantid $Tenant |
+        Where-Object { $_.signInActivity.lastSuccessfulSignInDateTime -le $90Days }
 
     $RecentlyReactivatedUsers = (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/auditLogs/directoryAudits?`$filter=activityDisplayName eq 'Enable account' and activityDateTime ge $AuditLookup" -scope 'https://graph.microsoft.com/.default' -tenantid $Tenant |
         ForEach-Object { $_.targetResources[0].id } | Select-Object -Unique)
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOutBoundSpamAlert.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOutBoundSpamAlert.ps1

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function Push-ListMailboxRulesQueue {`
`26`	`26`	`Rules = [string]($Rule \| ConvertTo-Json)`
`27`	`27`	`RowKey = [string](New-Guid).guid`
`28`	`28`	`Tenant = [string]$domainName`
`29`		`- PartitionKey = 'mailboxrules'`
	`29`	`+ PartitionKey = 'MailboxRules'`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`}`
`@@ -38,7 +38,7 @@ function Push-ListMailboxRulesQueue {`
`38`	`38`	`Rules = [string]$Rules`
`39`	`39`	`RowKey = [string]$domainName`
`40`	`40`	`Tenant = [string]$domainName`
`41`		`- PartitionKey = 'mailboxrules'`
	`41`	`+ PartitionKey = 'MailboxRules'`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`} catch {`
`@@ -49,7 +49,7 @@ function Push-ListMailboxRulesQueue {`
`49`	`49`	`Rules = [string]$Rules`
`50`	`50`	`RowKey = [string]$domainName`
`51`	`51`	`Tenant = [string]$domainName`
`52`		`- PartitionKey = 'mailboxrules'`
	`52`	`+ PartitionKey = 'MailboxRules'`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`Add-CIPPAzDataTableEntity @Table -Entity $GraphRequest -Force \| Out-Null`