Merge pull request #906 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 2a6ba3422c0a · 2026-04-10T00:41:07.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1
@@ -335,7 +335,7 @@ function Push-ExecOnboardTenantQueue {
                             Recurrence    = ''
                             ScheduledTime = $RetryEpoch
                         }
-                        $null = Add-CIPPScheduledTask -Task $RetryTask -Hidden $true -DesiredStartTime ([string]$RetryEpoch)
+                        $null = Add-CIPPScheduledTask -Task $RetryTask -DesiredStartTime ([string]$RetryEpoch)
                         $RetryMessage = 'Rescheduled: GDAP relationship was activated {0:N1} minutes ago. Retrying in 15 minutes to allow Microsoft propagation to settle.' -f $MinutesSinceActivation
                         $OnboardingSteps.Step4.Status = 'pending'
                         $OnboardingSteps.Step4.Message = $RetryMessage
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/Autopilot/Invoke-AddAPDevice.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/Autopilot/Invoke-AddAPDevice.ps1
@@ -51,36 +51,9 @@ function Invoke-AddAPDevice {
         if ($NewStatus.status -ne 'finished') { throw 'Could not retrieve status of import - This job might still be running. Check the autopilot device list in 10 minutes for the latest status.' }
         Write-LogMessage -headers $Request.Headers -API $APIName -tenant $($Request.body.TenantFilter.value) -message "Created Autopilot devices group. Group ID is $GroupName" -Sev 'Info'
 
-        # Apply group tags from CSV if any devices have them
-        $DevicesWithGroupTags = @($rawDevices | Where-Object { $_.groupTag -and $_.groupTag.Trim() -ne '' })
-        $GroupTagResults = [System.Collections.Generic.List[string]]::new()
-        if ($DevicesWithGroupTags.Count -gt 0) {
-            $TenantFilter = $Request.Body.TenantFilter.value
-            try {
-                $AutopilotDevices = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeviceIdentities?$top=999' -tenantid $TenantFilter
-                foreach ($Device in $DevicesWithGroupTags) {
-                    try {
-                        $APDevice = $AutopilotDevices | Where-Object { $_.serialNumber -eq $Device.SerialNumber } | Select-Object -First 1
-                        if ($APDevice) {
-                            $body = @{ groupTag = $Device.groupTag } | ConvertTo-Json
-                            New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeviceIdentities/$($APDevice.id)/UpdateDeviceProperties" -tenantid $TenantFilter -body $body -method POST | Out-Null
-                            $GroupTagResults.Add("Set group tag '$($Device.groupTag)' for device '$($Device.SerialNumber)'")
-                        } else {
-                            $GroupTagResults.Add("Could not find Autopilot device for serial '$($Device.SerialNumber)' to set group tag - device may still be syncing")
-                        }
-                    } catch {
-                        $GroupTagResults.Add("Failed to set group tag for device '$($Device.SerialNumber)': $($_.Exception.Message)")
-                    }
-                }
-            } catch {
-                $GroupTagResults.Add("Failed to retrieve Autopilot devices for group tag assignment: $($_.Exception.Message)")
-            }
-        }
-
         [PSCustomObject]@{
-            Status         = 'Import Job Completed'
-            Devices        = @($NewStatus.devicesStatus)
-            GroupTagStatus = $GroupTagResults
+            Status  = 'Import Job Completed'
+            Devices = @($NewStatus.devicesStatus)
         }
         $StatusCode = [HttpStatusCode]::OK
     } catch {
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-AddUserDefaults.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-AddUserDefaults.ps1
@@ -73,7 +73,13 @@ function Invoke-AddUserDefaults {
 
         # Contact fields
         $MobilePhone = $Request.Body.mobilePhone
-        $BusinessPhones = $Request.Body.businessPhones[0]
+        $BusinessPhones = if ($null -ne $Request.Body.businessPhones) {
+            if ($Request.Body.businessPhones -is [array]) { $Request.Body.businessPhones[0] } else { $Request.Body.businessPhones }
+        } elseif ($null -ne $Request.Body.'businessPhones[0]') {
+            $Request.Body.'businessPhones[0]'
+        } else {
+            $null
+        }
         $OtherMails = $Request.Body.otherMails
 
         # User relations
@@ -86,36 +92,38 @@ function Invoke-AddUserDefaults {
 
         # Create template object with all fields from CippAddEditUser
         $TemplateObject = @{
-            tenantFilter     = $TenantFilter
-            templateName     = $TemplateName
-            defaultForTenant = [bool]$DefaultForTenant
-            givenName        = $GivenName
-            surname          = $Surname
-            displayName      = $DisplayName
-            usernameFormat   = $UsernameFormat
-            primDomain       = $PrimDomain
-            addedAliases     = $AddedAliases
-            Autopassword     = $Autopassword
-            password         = $Password
-            MustChangePass   = $MustChangePass
-            usageLocation    = $UsageLocation
-            licenses         = $Licenses
-            removeLicenses   = $RemoveLicenses
-            jobTitle         = $JobTitle
-            streetAddress    = $StreetAddress
-            city             = $City
-            state            = $State
-            postalCode       = $PostalCode
-            country          = $Country
-            companyName      = $CompanyName
-            department       = $Department
-            mobilePhone      = $MobilePhone
-            businessPhones   = $BusinessPhones
-            otherMails       = $OtherMails
-            setManager       = $SetManager
-            setSponsor       = $SetSponsor
-            copyFrom         = $CopyFrom
-            groupMemberships = $GroupMemberships
+            tenantFilter             = $TenantFilter
+            templateName             = $TemplateName
+            defaultForTenant         = [bool]$DefaultForTenant
+            givenName                = $GivenName
+            surname                  = $Surname
+            displayName              = $DisplayName
+            usernameFormat           = $UsernameFormat
+            usernameSpaceHandling    = $UsernameSpaceHandling
+            usernameSpaceReplacement = $UsernameSpaceReplacement
+            primDomain               = $PrimDomain
+            addedAliases             = $AddedAliases
+            Autopassword             = $Autopassword
+            password                 = $Password
+            MustChangePass           = $MustChangePass
+            usageLocation            = $UsageLocation
+            licenses                 = $Licenses
+            removeLicenses           = $RemoveLicenses
+            jobTitle                 = $JobTitle
+            streetAddress            = $StreetAddress
+            city                     = $City
+            state                    = $State
+            postalCode               = $PostalCode
+            country                  = $Country
+            companyName              = $CompanyName
+            department               = $Department
+            mobilePhone              = $MobilePhone
+            businessPhones           = $BusinessPhones
+            otherMails               = $OtherMails
+            setManager               = $SetManager
+            setSponsor               = $SetSponsor
+            copyFrom                 = $CopyFrom
+            groupMemberships         = $GroupMemberships
         }
 
         # Use existing GUID if editing, otherwise generate new one
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tools/Invoke-ListGeneratedReports.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tools/Invoke-ListGeneratedReports.ps1
@@ -19,12 +19,22 @@ function Invoke-ListGeneratedReports {
 
         if ($ReportGUID) {
             # Fetch specific report
+            $ReportGUID = ConvertTo-CIPPODataFilterValue -Value $ReportGUID -Type 'Guid'
             $Filter = "RowKey eq '$ReportGUID'"
             $Entities = @(Get-CIPPAzDataTableEntity @Table -Filter $Filter)
         } elseif ($TenantFilter) {
             # Fetch all reports for tenant
-            $Filter = "PartitionKey eq '$TenantFilter'"
-            $Entities = @(Get-CIPPAzDataTableEntity @Table -Filter $Filter)
+            $TenantFilter = ConvertTo-CIPPODataFilterValue -Value $TenantFilter -Type 'String'
+            if ($TenantFilter -ne 'AllTenants') {
+                $Filter = "PartitionKey eq '$TenantFilter'"
+                $Entities = @(Get-CIPPAzDataTableEntity @Table -Filter $Filter)
+            } else {
+                $Tenants = Get-Tenants -IncludeErrors
+                $AllReports = Get-CIPPAzDataTableEntity @Table
+                $Entities = foreach ($Tenant in $Tenants) {
+                    $AllReports | Where-Object { $_.PartitionKey -eq $Tenant.defaultDomainName }
+                }
+            }
         } else {
             # Fetch all reports
             $Entities = @(Get-CIPPAzDataTableEntity @Table)

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ function Push-ExecOnboardTenantQueue {`
`335`	`335`	`Recurrence = ''`
`336`	`336`	`ScheduledTime = $RetryEpoch`
`337`	`337`	`}`
`338`		`- $null = Add-CIPPScheduledTask -Task $RetryTask -Hidden $true -DesiredStartTime ([string]$RetryEpoch)`
	`338`	`+ $null = Add-CIPPScheduledTask -Task $RetryTask -DesiredStartTime ([string]$RetryEpoch)`
`339`	`339`	`$RetryMessage = 'Rescheduled: GDAP relationship was activated {0:N1} minutes ago. Retrying in 15 minutes to allow Microsoft propagation to settle.' -f $MinutesSinceActivation`
`340`	`340`	`$OnboardingSteps.Step4.Status = 'pending'`
`341`	`341`	`$OnboardingSteps.Step4.Message = $RetryMessage`