Merge pull request #43 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 748397961e86 · 2026-04-20T05:36:30.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Assert-CippVersion.ps1 b/Modules/CIPPCore/Public/Assert-CippVersion.ps1
@@ -13,8 +13,8 @@ function Assert-CippVersion {
     param($CIPPVersion)
     $APIVersion = (Get-Content -Path (Join-Path $env:CIPPRootPath 'version_latest.txt')).trim()
 
-    $RemoteAPIVersion = (Invoke-RestMethod -Uri 'https://raw.githubusercontent.com/KelvinTegelaar/CIPP-API/master/version_latest.txt').trim()
-    $RemoteCIPPVersion = (Invoke-RestMethod -Uri 'https://raw.githubusercontent.com/KelvinTegelaar/CIPP/main/public/version.json').version
+    $RemoteAPIVersion = (Invoke-CIPPRestMethod -Uri 'https://raw.githubusercontent.com/KelvinTegelaar/CIPP-API/master/version_latest.txt').trim()
+    $RemoteCIPPVersion = (Invoke-CIPPRestMethod -Uri 'https://raw.githubusercontent.com/KelvinTegelaar/CIPP/main/public/version.json').version
 
     [PSCustomObject]@{
         LocalCIPPVersion     = $CIPPVersion
diff --git a/Modules/CIPPCore/Public/Authentication/Get-CIPPAzIdentityToken.ps1 b/Modules/CIPPCore/Public/Authentication/Get-CIPPAzIdentityToken.ps1
@@ -55,7 +55,7 @@ function Get-CIPPAzIdentityToken {
             'X-IDENTITY-HEADER' = $Secret
         }
 
-        $TokenResponse = Invoke-RestMethod -Method Get -Headers $Headers -Uri $TokenUri -ErrorAction Stop
+        $TokenResponse = Invoke-CIPPRestMethod -Method Get -Headers $Headers -Uri $TokenUri -ErrorAction Stop
 
         # Calculate expiration time
         $ExpiresOn = [int](Get-Date -UFormat %s -Millisecond 0) + $TokenResponse.expires_in
diff --git a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-CIPPStatsTimer.ps1 b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-CIPPStatsTimer.ps1
@@ -54,11 +54,11 @@ function Start-CIPPStatsTimer {
             GitHub              = $RawExt.GitHub.Enabled
         } | ConvertTo-Json
         try {
-            Invoke-RestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'
+            Invoke-CIPPRestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'
         } catch {
             $rand = Get-Random -Minimum 0.5 -Maximum 5.5
             Start-Sleep -Seconds $rand
-            Invoke-RestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'
+            Invoke-CIPPRestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'
         }
     }
 }
diff --git a/Modules/CIPPCore/Public/Get-ApplicationInsightsQuery.ps1 b/Modules/CIPPCore/Public/Get-ApplicationInsightsQuery.ps1
@@ -32,7 +32,7 @@ function Get-ApplicationInsightsQuery {
     $headerParams = @{'Authorization' = "Bearer $Token" }
     $logAnalyticsBaseURI = 'https://api.loganalytics.io/v1'
 
-    $result = Invoke-RestMethod -Method POST -Uri "$($logAnalyticsBaseURI)/$AppInsightsQuery" -Headers $headerParams -Body $Body -ContentType 'application/json' -ErrorAction Stop
+    $result = Invoke-CIPPRestMethod -Method POST -Uri "$($logAnalyticsBaseURI)/$AppInsightsQuery" -Headers $headerParams -Body $Body -ContentType 'application/json' -ErrorAction Stop
 
     # Format Result to PSObject
     $headerRow = $null
diff --git a/Modules/CIPPCore/Public/Get-CIPPGeoIPLocation.ps1 b/Modules/CIPPCore/Public/Get-CIPPGeoIPLocation.ps1
@@ -11,7 +11,7 @@ function Get-CIPPGeoIPLocation {
     if ($GeoIP) {
         return ($GeoIP.Data | ConvertFrom-Json)
     }
-    $location = Invoke-RestMethod "https://geoipdb.azurewebsites.net/api/GetIPInfo?IP=$IP"
+    $location = Invoke-CIPPRestMethod -Uri "https://geoipdb.azurewebsites.net/api/GetIPInfo?IP=$IP"
     if ($location.status -eq 'FAIL') { throw "Could not get location for $IP" }
     $CacheGeo = @{
         PartitionKey = 'IP'
diff --git a/Modules/CIPPCore/Public/Get-CIPPPartnerAzSubscriptions.ps1 b/Modules/CIPPCore/Public/Get-CIPPPartnerAzSubscriptions.ps1
@@ -6,7 +6,7 @@ function Get-CIPPPartnerAzSubscriptions {
 
     try {
         if ($variable -notmatch '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}') {
-            $TenantFilter = (Invoke-RestMethod -Method GET "https://login.windows.net/$TenantFilter/.well-known/openid-configuration").token_endpoint.Split('/')[3]
+            $TenantFilter = (Invoke-CIPPRestMethod -Method GET -Uri "https://login.windows.net/$TenantFilter/.well-known/openid-configuration").token_endpoint.Split('/')[3]
         }
     } catch {
         throw "Tenant $($TenantFilter) could not be found"
diff --git a/Modules/CIPPCore/Public/Get-CippKeyVaultSecret.ps1 b/Modules/CIPPCore/Public/Get-CippKeyVaultSecret.ps1
@@ -55,7 +55,7 @@ function Get-CippKeyVaultSecret {
 
         for ($i = 0; $i -lt $maxRetries; $i++) {
             try {
-                $response = Invoke-RestMethod -Uri $uri -Headers @{
+                $response = Invoke-CIPPRestMethod -Uri $uri -Headers @{
                     Authorization = "Bearer $token"
                 } -Method Get -ErrorAction Stop
                 break
diff --git a/Modules/CIPPCore/Public/Get-TenantIdFromSubscriptionId.ps1 b/Modules/CIPPCore/Public/Get-TenantIdFromSubscriptionId.ps1
@@ -6,21 +6,19 @@ function Get-TenantIdFromSubscriptionId {
 
     # Full credit goes to Jos Lieben
     # https://www.lieben.nu/liebensraum/2020/08/get-tenant-id-using-azure-subscription-id/
-    
-    try {
-        Invoke-WebRequest -UseBasicParsing -Uri "https://management.azure.com/subscriptions/$($SubscriptionId)`?api-version=2015-01-01" -ErrorAction Stop
-    } catch {
-        # The error response contains the WWW-Authenticate header with the tenant ID
-        $response = $_.Exception.Response
-    }
-    
-    # Extract tenant ID from WWW-Authenticate header
-    $authHeader = $response.Headers.GetValues("WWW-Authenticate")[0]
-    
+
+    # An unauthenticated request to ARM returns 401 with a WWW-Authenticate
+    # header that embeds the tenant ID. SkipHttpErrorCheck keeps the response
+    # flowing so we can read the header off the result.
+    $null = Invoke-CIPPRestMethod -Uri "https://management.azure.com/subscriptions/$($SubscriptionId)`?api-version=2015-01-01" -Method Get -SkipHttpErrorCheck -ResponseHeadersVariable 'AuthResponseHeaders' -ErrorAction SilentlyContinue
+
+    $authHeaderValue = $AuthResponseHeaders['WWW-Authenticate']
+    if ($authHeaderValue -is [array]) { $authHeaderValue = $authHeaderValue[0] }
+
     # Use regex to extract the tenant ID
-    if ($authHeader -match "login\.windows\.net\/([0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12})") {
+    if ($authHeaderValue -match 'login\.windows\.net\/([0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12})') {
         return $matches[1]
     }
-    
+
     return $null
 }
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-ClassicAPIToken.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-ClassicAPIToken.ps1
@@ -19,7 +19,7 @@ function Get-ClassicAPIToken($tenantID, $Resource) {
         }
         try {
             if (!$script:classictoken) { $script:classictoken = [HashTable]::Synchronized(@{}) }
-            $script:classictoken.$TokenKey = Invoke-RestMethod $uri -Body $body -ContentType 'application/x-www-form-urlencoded' -ErrorAction SilentlyContinue -Method post
+            $script:classictoken.$TokenKey = Invoke-CIPPRestMethod -Uri $uri -Body $body -ContentType 'application/x-www-form-urlencoded' -ErrorAction SilentlyContinue -Method post
             return $script:classictoken.$TokenKey
         } catch {
             # Track consecutive Graph API failures
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-GraphTokenFromCert.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-GraphTokenFromCert.ps1
@@ -109,7 +109,7 @@ function Get-GraphTokenFromCert {
     }
 
     try {
-        return Invoke-RestMethod @PostSplat
+        return Invoke-CIPPRestMethod @PostSplat
     } catch {
         Write-Error $_
     }
diff --git a/Modules/CIPPCore/Public/GraphHelper/New-ClassicAPIGetRequest.ps1 b/Modules/CIPPCore/Public/GraphHelper/New-ClassicAPIGetRequest.ps1
@@ -10,7 +10,7 @@ function New-ClassicAPIGetRequest($TenantID, $Uri, $Method = 'GET', $Resource =
         $NextURL = $Uri
         $ReturnedData = do {
             try {
-                $Data = Invoke-RestMethod -ContentType "$ContentType;charset=UTF-8" -Uri $NextURL -Method $Method -Headers @{
+                $Data = Invoke-CIPPRestMethod -ContentType "$ContentType;charset=UTF-8" -Uri $NextURL -Method $Method -Headers @{
                     Authorization            = "Bearer $($token.access_token)"
                     'x-ms-client-request-id' = [guid]::NewGuid().ToString()
                     'x-ms-client-session-id' = [guid]::NewGuid().ToString()
diff --git a/Modules/CIPPCore/Public/GraphHelper/New-DeviceLogin.ps1 b/Modules/CIPPCore/Public/GraphHelper/New-DeviceLogin.ps1
@@ -14,13 +14,13 @@ function New-DeviceLogin {
     $encodedscope = [uri]::EscapeDataString($scope)
     if ($FirstLogon) {
         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 "client_id=$($Clientid)&scope=$encodedscope+offline_access+profile+openid"
 
         } 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 "client_id=$($Clientid)&scope=$encodedscope+offline_access+profile+openid"
         }
     } 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)"
+        $Checking = Invoke-CIPPRestMethod -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)"
         if ($checking.refresh_token) {
             $ReturnCode = $Checking
         } else {
diff --git a/Modules/CIPPCore/Public/New-CIPPBackup.ps1 b/Modules/CIPPCore/Public/New-CIPPBackup.ps1
@@ -60,7 +60,12 @@ function New-CIPPBackup {
                     )
                     $CSVfile = foreach ($CSVTable in $BackupTables) {
                         $Table = Get-CippTable -tablename $CSVTable
-                        Get-AzDataTableEntity @Table | Select-Object * -ExcludeProperty DomainAnalyser, table, Timestamp, ETag, Results | Select-Object *, @{l = 'table'; e = { $CSVTable } }
+                        $Entities = if ($CSVTable -eq 'ScheduledTasks') {
+                            Get-AzDataTableEntity @Table -Filter "TaskState ne 'Completed'"
+                        } else {
+                            Get-AzDataTableEntity @Table
+                        }
+                        $Entities | Select-Object * -ExcludeProperty DomainAnalyser, table, Timestamp, ETag, Results | Select-Object *, @{l = 'table'; e = { $CSVTable } }
                     }
                     $RowKey = 'CIPPBackup' + '_' + (Get-Date).ToString('yyyy-MM-dd-HHmm')
                     $BackupData = [string]($CSVfile | ConvertTo-Json -Compress -Depth 100)
diff --git a/Modules/CIPPCore/Public/Remove-CippKeyVaultSecret.ps1 b/Modules/CIPPCore/Public/Remove-CippKeyVaultSecret.ps1
@@ -33,7 +33,7 @@ function Remove-CippKeyVaultSecret {
         $token = Get-CIPPAzIdentityToken -ResourceUrl 'https://vault.azure.net'
         $uri = "https://$VaultName.vault.azure.net/secrets/$Name`?api-version=7.4"
 
-        $response = Invoke-RestMethod -Uri $uri -Headers @{ Authorization = "Bearer $token" } -Method Delete -ErrorAction Stop
+        $response = Invoke-CIPPRestMethod -Uri $uri -Headers @{ Authorization = "Bearer $token" } -Method Delete -ErrorAction Stop
 
         return @{
             Name      = $Name
diff --git a/Modules/CIPPCore/Public/Send-CIPPAlert.ps1 b/Modules/CIPPCore/Public/Send-CIPPAlert.ps1
@@ -255,31 +255,31 @@ function Send-CIPPAlert {
                         '*webhook.office.com*' {
                             if ($UseStandardizedWebhookSchema) {
                                 $RestMethod['Body'] = $ReplacedContent
-                                $WebhookResponse = Invoke-RestMethod @RestMethod
+                                $WebhookResponse = Invoke-CIPPRestMethod @RestMethod
                             } else {
                                 $TeamsBody = [PSCustomObject]@{
                                     text = "You've setup your alert policies to be alerted whenever specific events happen. We've found some of these events in the log. <br><br>$ReplacedContent"
                                 } | ConvertTo-Json -Compress
                                 $RestMethod['Body'] = $TeamsBody
-                                $WebhookResponse = Invoke-RestMethod @RestMethod
+                                $WebhookResponse = Invoke-CIPPRestMethod @RestMethod
                             }
                         }
                         '*discord.com*' {
                             if ($UseStandardizedWebhookSchema) {
                                 $RestMethod['Body'] = $ReplacedContent
-                                $WebhookResponse = Invoke-RestMethod @RestMethod
+                                $WebhookResponse = Invoke-CIPPRestMethod @RestMethod
                             } else {
                                 $DiscordBody = [PSCustomObject]@{
                                     content = "You've setup your alert policies to be alerted whenever specific events happen. We've found some of these events in the log. ``````$ReplacedContent``````"
                                 } | ConvertTo-Json -Compress
                                 $RestMethod['Body'] = $DiscordBody
-                                $WebhookResponse = Invoke-RestMethod @RestMethod
+                                $WebhookResponse = Invoke-CIPPRestMethod @RestMethod
                             }
                         }
                         '*slack.com*' {
                             if ($UseStandardizedWebhookSchema) {
                                 $RestMethod['Body'] = $ReplacedContent
-                                $WebhookResponse = Invoke-RestMethod @RestMethod
+                                $WebhookResponse = Invoke-CIPPRestMethod @RestMethod
                             } else {
                                 $SlackBlocks = Get-SlackAlertBlocks -JSONBody $JSONContent
                                 if ($SlackBlocks.blocks) {
@@ -290,12 +290,12 @@ function Send-CIPPAlert {
                                     } | ConvertTo-Json -Compress
                                 }
                                 $RestMethod['Body'] = $SlackBody
-                                $WebhookResponse = Invoke-RestMethod @RestMethod
+                                $WebhookResponse = Invoke-CIPPRestMethod @RestMethod
                             }
                         }
                         default {
                             $RestMethod['Body'] = $ReplacedContent
-                            $WebhookResponse = Invoke-RestMethod @RestMethod
+                            $WebhookResponse = Invoke-CIPPRestMethod @RestMethod
                         }
                     }
                 }
diff --git a/Modules/CIPPCore/Public/Set-CippKeyVaultSecret.ps1 b/Modules/CIPPCore/Public/Set-CippKeyVaultSecret.ps1
@@ -56,7 +56,7 @@ function Set-CippKeyVaultSecret {
 
         # Call Key Vault REST API
         $uri = "https://$VaultName.vault.azure.net/secrets/$Name`?api-version=7.4"
-        $response = Invoke-RestMethod -Uri $uri -Headers @{
+        $response = Invoke-CIPPRestMethod -Uri $uri -Headers @{
             Authorization = "Bearer $token"
             'Content-Type' = 'application/json'
         } -Method Put -Body $body -ErrorAction Stop
diff --git a/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecGraphRequestProfile.ps1 b/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecGraphRequestProfile.ps1
@@ -8,6 +8,34 @@ function Invoke-ExecGraphRequestProfile {
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
 
+    $Mode = $Request.Query.Mode
+
+    # ── Diagnostics-only mode ───────────────────────────────────────────
+    # Returns a point-in-time snapshot of the CIPPHttp DLL runtime state —
+    # pool usage counters, top hosts, status code distribution, and the
+    # CIPPTokenCache entry count. No Graph/EXO calls, no tenant required.
+    if ($Mode -eq 'Diagnostics') {
+        $Reset = [System.Convert]::ToBoolean($Request.Query.Reset ?? $false)
+
+        $RestDiag  = [CIPP.CIPPRestClient]::GetDiagnostics() | ConvertFrom-Json
+        $CacheDiag = [CIPP.CIPPTokenCache]::GetDiagnostics()  | ConvertFrom-Json
+
+        if ($Reset) {
+            [CIPP.CIPPRestClient]::ResetDiagnostics()
+        }
+
+        return [HttpResponseContext]@{
+            StatusCode = 200
+            Body       = [PSCustomObject]@{
+                Mode              = 'Diagnostics'
+                CapturedAt        = (Get-Date).ToUniversalTime().ToString('o')
+                CountersReset     = $Reset
+                RestClient        = $RestDiag
+                TokenCache        = $CacheDiag
+            }
+        }
+    }
+
     $TenantFilter = $Request.Query.tenantFilter
     $Endpoint = $Request.Query.Endpoint
     if (!$TenantFilter -or !$Endpoint) {
diff --git a/Shared/CIPPHttp/CIPPHttpClient.cs b/Shared/CIPPHttp/CIPPHttpClient.cs
diff --git a/Shared/CIPPHttp/bin/CIPPHttp.dll b/Shared/CIPPHttp/bin/CIPPHttp.dll

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function Get-CIPPAzIdentityToken {`
`55`	`55`	`'X-IDENTITY-HEADER' = $Secret`
`56`	`56`	`}`
`57`	`57`
`58`		`- $TokenResponse = Invoke-RestMethod -Method Get -Headers $Headers -Uri $TokenUri -ErrorAction Stop`
	`58`	`+ $TokenResponse = Invoke-CIPPRestMethod -Method Get -Headers $Headers -Uri $TokenUri -ErrorAction Stop`
`59`	`59`
`60`	`60`	`# Calculate expiration time`
`61`	`61`	`$ExpiresOn = [int](Get-Date -UFormat %s -Millisecond 0) + $TokenResponse.expires_in`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ function Start-CIPPStatsTimer {`
`54`	`54`	`GitHub = $RawExt.GitHub.Enabled`
`55`	`55`	`} \| ConvertTo-Json`
`56`	`56`	`try {`
`57`		`- Invoke-RestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'`
	`57`	`+ Invoke-CIPPRestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'`
`58`	`58`	`} catch {`
`59`	`59`	`$rand = Get-Random -Minimum 0.5 -Maximum 5.5`
`60`	`60`	`Start-Sleep -Seconds $rand`
`61`		`- Invoke-RestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'`
	`61`	`+ Invoke-CIPPRestMethod -Uri 'https://management.cipp.app/api/stats' -Method POST -Body $SendingObject -ContentType 'application/json'`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function Get-CIPPGeoIPLocation {`
`11`	`11`	`if ($GeoIP) {`
`12`	`12`	`return ($GeoIP.Data \| ConvertFrom-Json)`
`13`	`13`	`}`
`14`		`- $location = Invoke-RestMethod "https://geoipdb.azurewebsites.net/api/GetIPInfo?IP=$IP"`
	`14`	`+ $location = Invoke-CIPPRestMethod -Uri "https://geoipdb.azurewebsites.net/api/GetIPInfo?IP=$IP"`
`15`	`15`	`if ($location.status -eq 'FAIL') { throw "Could not get location for $IP" }`
`16`	`16`	`$CacheGeo = @{`
`17`	`17`	`PartitionKey = 'IP'`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ function Get-CIPPPartnerAzSubscriptions {`
`6`	`6`
`7`	`7`	`try {`
`8`	`8`	`if ($variable -notmatch '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}') {`
`9`		`- $TenantFilter = (Invoke-RestMethod -Method GET "https://login.windows.net/$TenantFilter/.well-known/openid-configuration").token_endpoint.Split('/')[3]`
	`9`	`+ $TenantFilter = (Invoke-CIPPRestMethod -Method GET -Uri "https://login.windows.net/$TenantFilter/.well-known/openid-configuration").token_endpoint.Split('/')[3]`
`10`	`10`	`}`
`11`	`11`	`} catch {`
`12`	`12`	`throw "Tenant $($TenantFilter) could not be found"`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function Get-ClassicAPIToken($tenantID, $Resource) {`
`19`	`19`	`}`
`20`	`20`	`try {`
`21`	`21`	`if (!$script:classictoken) { $script:classictoken = [HashTable]::Synchronized(@{}) }`
`22`		`- $script:classictoken.$TokenKey = Invoke-RestMethod $uri -Body $body -ContentType 'application/x-www-form-urlencoded' -ErrorAction SilentlyContinue -Method post`
	`22`	`+ $script:classictoken.$TokenKey = Invoke-CIPPRestMethod -Uri $uri -Body $body -ContentType 'application/x-www-form-urlencoded' -ErrorAction SilentlyContinue -Method post`
`23`	`23`	`return $script:classictoken.$TokenKey`
`24`	`24`	`} catch {`
`25`	`25`	`# Track consecutive Graph API failures`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ function Get-GraphTokenFromCert {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`try {`
`112`		`- return Invoke-RestMethod @PostSplat`
	`112`	`+ return Invoke-CIPPRestMethod @PostSplat`
`113`	`113`	`} catch {`
`114`	`114`	`Write-Error $_`
`115`	`115`	`}`