Refactor Invoke-ExecDeviceAction and New-CIPPDeviceAction to improve logging and add support for changing primary user

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-ExecDeviceAction.ps1

@@ -15,36 +15,45 @@ Function Invoke-ExecDeviceAction {
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
     # Interact with Body parameters or the body of the request.
-
+    $Action = $Request.Body.Action
+    $DeviceFilter = $Request.Body.GUID
+    $TenantFilter = $Request.Body.tenantFilter
 
     try {
-        if ($Request.Body.Action -eq 'setDeviceName') {
-            $ActionBody = @{ deviceName = $Request.Body.input } | ConvertTo-Json -Compress
-        }
-        else {
-            $ActionBody = $Request.Body | ConvertTo-Json -Compress
+        switch ($Action) {
+            'setDeviceName' {
+                $ActionBody = @{ deviceName = $Request.Body.input } | ConvertTo-Json -Compress
+                break
+            }
+            'users' {
+                $ActionBody = @{ '@odata.id' = "https://graph.microsoft.com/beta/users('$($Request.Body.user.value)')" } | ConvertTo-Json -Compress
+                Write-Host "ActionBody: $ActionBody"
+                break
+            }
+            Default { $ActionBody = $Request.Body | ConvertTo-Json -Compress }
         }
 
-        $cmdparams = @{
-            Action = $Request.Body.Action
-            ActionBody = $ActionBody
-            DeviceFilter = $Request.Body.GUID
-            TenantFilter = $Request.Body.TenantFilter
-            Headers = $Request.Headers
-            APINAME = $APINAME
+        $cmdParams = @{
+            Action       = $Action
+            ActionBody   = $ActionBody
+            DeviceFilter = $DeviceFilter
+            TenantFilter = $TenantFilter
+            Headers      = $Headers
+            APINAME      = $APIName
         }
-        $ActionResult = New-CIPPDeviceAction @cmdparams
+        $ActionResult = New-CIPPDeviceAction @cmdParams
 
-        $body = [pscustomobject]@{'Results' = "$ActionResult" }
+        $StatusCode = [HttpStatusCode]::OK
+        $Results = "$ActionResult"
 
     } catch {
-        $body = [pscustomobject]@{'Results' = "Failed to queue action $action on $DeviceFilter $($_.Exception.Message)" }
+        $StatusCode = [HttpStatusCode]::InternalServerError
+        $Results = "$($_.Exception.Message)"
     }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-            StatusCode = [HttpStatusCode]::OK
-            Body       = $body
+            StatusCode = $StatusCode
+            Body       = @{ 'Results' = $Results }
         })
-
 }

Modules/CIPPCore/Public/New-CIPPDeviceAction.ps1

@@ -6,20 +6,27 @@ function New-CIPPDeviceAction {
         $DeviceFilter,
         $TenantFilter,
         $Headers,
-        $APINAME
+        $APIName
     )
     try {
-        if ($action -eq 'delete') {
-            $null = New-Graphpostrequest -uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices/$DeviceFilter" -type DELETE -tenantid $TenantFilter
-            Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantFilter -message "Queued $Action on $DeviceFilter" -Sev 'Info'
-            return "Queued $Action on $DeviceFilter"
+        if ($Action -eq 'delete') {
+            $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices/$DeviceFilter" -type DELETE -tenantid $TenantFilter
+        } elseif ($Action -eq 'users') {
+            $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices('$DeviceFilter')/$($Action)/`$ref" -type POST -tenantid $TenantFilter -body $ActionBody
+            $regex = "(?<=\(')([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})(?='|\))"
+            $PrimaryUser = $ActionBody | Select-String -Pattern $regex -AllMatches | Select-Object -ExpandProperty Matches | Select-Object -ExpandProperty Value
+            $Result = "Changed primary user on device $DeviceFilter to $PrimaryUser"
+        } else {
+            $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices('$DeviceFilter')/$($Action)" -type POST -tenantid $TenantFilter -body $ActionBody
+            $Result = "Queued $Action on $DeviceFilter"
         }
-        $null = New-Graphpostrequest -uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices('$DeviceFilter')/$($Action)" -type POST -tenantid $TenantFilter -body $ActionBody
-        Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantFilter -message "Queued $Action on $DeviceFilter" -Sev 'Info'
-        return "Queued $Action on $DeviceFilter"
+
+        Write-LogMessage -headers $Headers -API $APIName -tenant $TenantFilter -message $Result -Sev Info
+        return $Result
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantFilter -message "Failed to queue action $Action on $DeviceFilter : $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage
-        return    "Failed to queue action $Action on $DeviceFilter $($ErrorMessage.NormalizedError)"
+        $Result = "Failed to queue action $Action on $DeviceFilter : $($ErrorMessage.NormalizedError)"
+        Write-LogMessage -headers $Headers -API $APIName -tenant $TenantFilter -message $Result -Sev Error -LogData $ErrorMessage
+        throw $Result
     }
 }