Merge pull request KelvinTegelaar#1609 from kris6673/esp-fix

Feat: Refactor and enhance enrollment functions with Windows updates option

Author: JohnDuprey

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

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-AddEnrollment {
+function Invoke-AddEnrollment {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -14,22 +14,29 @@ Function Invoke-AddEnrollment {
     $Headers = $Request.Headers
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
-
-
-
     # Input bindings are passed in via param block.
-    $Tenants = $Request.body.selectedTenants.value
-    $Profbod = $Request.body
-    $results = foreach ($Tenant in $tenants) {
-        Set-CIPPDefaultAPEnrollment -TenantFilter $Tenant -ShowProgress $Profbod.ShowProgress -BlockDevice $Profbod.blockDevice -AllowReset $Profbod.AllowReset -EnableLog $Profbod.EnableLog -ErrorMessage $Profbod.ErrorMessage -TimeOutInMinutes $Profbod.TimeOutInMinutes -AllowFail $Profbod.AllowFail -OBEEOnly $Profbod.OBEEOnly
+    $Tenants = $Request.Body.selectedTenants.value
+    $Profbod = $Request.Body
+    $Results = foreach ($Tenant in $Tenants) {
+        $ParamSplat = @{
+            TenantFilter          = $Tenant
+            ShowProgress          = $Profbod.ShowProgress
+            BlockDevice           = $Profbod.blockDevice
+            AllowReset            = $Profbod.AllowReset
+            EnableLog             = $Profbod.EnableLog
+            ErrorMessage          = $Profbod.ErrorMessage
+            TimeOutInMinutes      = $Profbod.TimeOutInMinutes
+            AllowFail             = $Profbod.AllowFail
+            OBEEOnly              = $Profbod.OBEEOnly
+            InstallWindowsUpdates = $Profbod.InstallWindowsUpdates
+        }
+        Set-CIPPDefaultAPEnrollment @ParamSplat
     }
 
-    $body = [pscustomobject]@{'Results' = $results }
-
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
-            Body       = $body
+            Body       = @{'Results' = $Results }
         })
 
 }

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

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ListAutopilotconfig {
+function Invoke-ListAutopilotconfig {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -15,18 +15,16 @@ Function Invoke-ListAutopilotconfig {
     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
-    $userid = $Request.Query.UserID
     try {
-        if ($request.query.type -eq 'ApProfile') {
+        if ($Request.Query.type -eq 'ApProfile') {
             $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeploymentProfiles?`$expand=assignments" -tenantid $TenantFilter
         }
 
-        if ($request.query.type -eq 'ESP') {
-            $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceManagement/deviceEnrollmentConfigurations?`$expand=assignments" -tenantid $TenantFilter | Where-Object -Property '@odata.type' -EQ '#microsoft.graph.windows10EnrollmentCompletionPageConfiguration'
+        if ($Request.Query.type -eq 'ESP') {
+            $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceManagement/deviceEnrollmentConfigurations?`$expand=assignments" -tenantid $TenantFilter |
+                Where-Object -Property '@odata.type' -EQ '#microsoft.graph.windows10EnrollmentCompletionPageConfiguration'
         }
         $StatusCode = [HttpStatusCode]::OK
     } catch {

Modules/CIPPCore/Public/Set-CIPPDefaultAPEnrollment.ps1

@@ -8,14 +8,13 @@ function Set-CIPPDefaultAPEnrollment {
         $EnableLog,
         $ErrorMessage,
         $TimeOutInMinutes,
+        $InstallWindowsUpdates,
         $AllowFail,
         $OBEEOnly,
         $Headers,
         $APIName = 'Add Default Enrollment Status Page'
     )
 
-    $User = $Request.Headers
-
     try {
         $ObjBody = [pscustomobject]@{
             '@odata.type'                             = '#microsoft.graph.windows10EnrollmentCompletionPageConfiguration'
@@ -28,6 +27,7 @@ function Set-CIPPDefaultAPEnrollment {
             'allowLogCollectionOnInstallFailure'      = [bool]$EnableLog
             'customErrorMessage'                      = "$ErrorMessage"
             'installProgressTimeoutInMinutes'         = $TimeOutInMinutes
+            'installQualityUpdates'                   = [bool]$InstallWindowsUpdates
             'allowDeviceUseOnInstallFailure'          = [bool]$AllowFail
             'selectedMobileAppIds'                    = @()
             'trackInstallProgressForAutopilotOnly'    = [bool]$OBEEOnly
@@ -40,11 +40,11 @@ function Set-CIPPDefaultAPEnrollment {
         if ($PSCmdlet.ShouldProcess($ExistingStatusPage.ID, 'Set Default Enrollment Status Page')) {
             $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/deviceEnrollmentConfigurations/$($ExistingStatusPage.ID)" -body $Body -Type PATCH -tenantid $TenantFilter
             "Successfully changed default enrollment status page for $TenantFilter"
-            Write-LogMessage -Headers $User -API $APIName -tenant $TenantFilter -message "Added Autopilot Enrollment Status Page $($ExistingStatusPage.displayName)" -Sev 'Info'
+            Write-LogMessage -Headers $Headers -API $APIName -tenant $TenantFilter -message "Added Autopilot Enrollment Status Page $($ExistingStatusPage.displayName)" -Sev 'Info'
         }
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        Write-LogMessage -Headers $User -API $APIName -tenant $TenantFilter -message "Failed adding Autopilot Enrollment Status Page $($ExistingStatusPage.displayName). Error: $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage
+        Write-LogMessage -Headers $Headers -API $APIName -tenant $TenantFilter -message "Failed adding Autopilot Enrollment Status Page $($ExistingStatusPage.displayName). Error: $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage
         throw "Failed to change default enrollment status page for $($TenantFilter): $($ErrorMessage.NormalizedError)"
     }
 }