tweaks

Author: Zacgoose

Modules/CIPPCore/Public/GraphHelper/New-DeviceLogin.ps1

@@ -11,16 +11,24 @@ function New-DeviceLogin {
         [string]$device_code,
         [string]$TenantId
     )
-    $encodedscope = [uri]::EscapeDataString($scope)
     if ($FirstLogon) {
+        $Body = @{
+            client_id = $Clientid
+            scope     = "$scope offline_access profile openid"
+        }
         if ($TenantID) {
-            $ReturnCode = Invoke-RestMethod -Uri "https://login.microsoftonline.com/$($TenantID)/oauth2/v2.0/devicecode" -Method POST -Body "client_id=$($Clientid)&scope=$encodedscope+offline_access+profile+openid"
-
+            $ReturnCode = Invoke-CIPPRestMethod -Uri "https://login.microsoftonline.com/$($TenantID)/oauth2/v2.0/devicecode" -Method POST -Body $Body -ContentType 'application/x-www-form-urlencoded'
         } else {
-            $ReturnCode = Invoke-RestMethod -Uri 'https://login.microsoftonline.com/organizations/oauth2/v2.0/devicecode' -Method POST -Body "client_id=$($Clientid)&scope=$encodedscope+offline_access+profile+openid"
+            $ReturnCode = Invoke-CIPPRestMethod -Uri 'https://login.microsoftonline.com/organizations/oauth2/v2.0/devicecode' -Method POST -Body $Body -ContentType 'application/x-www-form-urlencoded'
         }
     } else {
-        $Checking = Invoke-RestMethod -SkipHttpErrorCheck -Uri 'https://login.microsoftonline.com/organizations/oauth2/v2.0/token' -Method POST -Body "client_id=$($Clientid)&scope=$encodedscope+offline_access+profile+openid&grant_type=device_code&device_code=$($device_code)"
+        $Body = @{
+            client_id   = $Clientid
+            scope       = "$scope offline_access profile openid"
+            grant_type  = 'device_code'
+            device_code = $device_code
+        }
+        $Checking = Invoke-CIPPRestMethod -SkipHttpErrorCheck -Uri 'https://login.microsoftonline.com/organizations/oauth2/v2.0/token' -Method POST -Body $Body -ContentType 'application/x-www-form-urlencoded'
         if ($checking.refresh_token) {
             $ReturnCode = $Checking
         } else {

Modules/CIPPCore/Public/Invoke-CIPPRestMethod.ps1

@@ -128,8 +128,6 @@ function Invoke-CIPPRestMethod {
             $BodyString = ''
         } elseif ($Body -is [string]) {
             $BodyString = $Body
-            # Match Invoke-RestMethod default: string POST body → form-encoded
-            if ($null -eq $ContentType) { $ContentType = 'application/x-www-form-urlencoded' }
         } elseif (
             ($Body -is [System.Collections.IDictionary]) -and
             ($null -eq $ContentType -or $ContentType -like 'application/x-www-form-urlencoded*')