autopilot tweaks

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/Autopilot/Invoke-AddAutopilotConfig.ps1

@@ -12,14 +12,18 @@ function Invoke-AddAutopilotConfig {
     $Profbod = [pscustomobject]$Request.Body
     $UserType = if ($Profbod.NotLocalAdmin -eq 'true') { 'standard' } else { 'administrator' }
     $DeploymentMode = if ($Profbod.DeploymentMode -eq 'true') { 'shared' } else { 'singleUser' }
+
+    # If deployment mode is shared, disable white glove (pre-provisioning) as it's not supported
+    $AllowWhiteGlove = if ($DeploymentMode -eq 'shared') { $false } else { $Profbod.allowWhiteGlove }
+
     $profileParams = @{
         DisplayName        = $Request.Body.DisplayName
         Description        = $Request.Body.Description
         UserType           = $UserType
         DeploymentMode     = $DeploymentMode
         AssignTo           = $Request.Body.Assignto
         DeviceNameTemplate = $Profbod.DeviceNameTemplate
-        AllowWhiteGlove    = $Profbod.allowWhiteGlove
+        AllowWhiteGlove    = $AllowWhiteGlove
         CollectHash        = $Profbod.CollectHash
         HideChangeAccount  = $Profbod.HideChangeAccount
         HidePrivacy        = $Profbod.HidePrivacy

Modules/CIPPCore/Public/Set-CIPPDefaultAPDeploymentProfile.ps1

@@ -23,17 +23,16 @@ function Set-CIPPDefaultAPDeploymentProfile {
 
     try {
         $ObjBody = [pscustomobject]@{
-            '@odata.type'                            = '#microsoft.graph.azureADWindowsAutopilotDeploymentProfile'
-            'displayName'                            = "$($DisplayName)"
-            'description'                            = "$($Description)"
-            'deviceNameTemplate'                     = "$($DeviceNameTemplate)"
-            'language'                               = "$($Language)"
-            'enableWhiteGlove'                       = $([bool]($AllowWhiteGlove))
-            'deviceType'                             = 'windowsPc'
-            'extractHardwareHash'                    = $([bool]($CollectHash))
-            'roleScopeTagIds'                        = @()
-            'hybridAzureADJoinSkipConnectivityCheck' = $false
-            'outOfBoxExperienceSetting'              = @{
+            '@odata.type'                   = '#microsoft.graph.azureADWindowsAutopilotDeploymentProfile'
+            'displayName'                   = "$($DisplayName)"
+            'description'                   = "$($Description)"
+            'deviceNameTemplate'            = "$($DeviceNameTemplate)"
+            'locale'                        = "$($Language ?? 'os-default')"
+            'preprovisioningAllowed'        = $([bool]($AllowWhiteGlove))
+            'deviceType'                    = 'windowsPc'
+            'hardwareHashExtractionEnabled' = $([bool]($CollectHash))
+            'roleScopeTagIds'               = @()
+            'outOfBoxExperienceSetting'     = @{
                 'deviceUsageType'              = "$DeploymentMode"
                 'escapeLinkHidden'             = $([bool]($HideChangeAccount))
                 'privacySettingsHidden'        = $([bool]($HidePrivacy))
@@ -42,7 +41,9 @@ function Set-CIPPDefaultAPDeploymentProfile {
                 'keyboardSelectionPageSkipped' = $([bool]($AutoKeyboard))
             }
         }
-        $Body = ConvertTo-Json -InputObject $ObjBody
+        $Body = ConvertTo-Json -InputObject $ObjBody -Depth 10
+
+        Write-Information $Body
 
         $Profiles = New-GraphGETRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeploymentProfiles' -tenantid $TenantFilter | Where-Object -Property displayName -EQ $DisplayName
         if ($Profiles.count -gt 1) {