Merge pull request #996 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Assert-CippVersion.ps1

@@ -11,7 +11,15 @@ function Assert-CippVersion {
 
     #>
     param($CIPPVersion)
-    $APIVersion = (Get-Content -Path (Join-Path $env:CIPPRootPath 'version_latest.txt')).trim()
+
+    if ($env:CIPPNG -eq 'true') {
+        $APIVersion = $env:APP_VERSION
+        if (!$CIPPVersion) {
+            $CIPPVersion = $env:APP_VERSION
+        }
+    } else {
+        $APIVersion = (Get-Content -Path (Join-Path $env:CIPPRootPath 'version_latest.txt')).trim()
+    }
 
     $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

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-ListScheduledItemDetails.ps1

@@ -40,6 +40,10 @@ function Invoke-ListScheduledItemDetails {
     # Process the task (similar to the way it's done in Invoke-ListScheduledItems)
     if ($Task.Parameters) {
         $Task.Parameters = $Task.Parameters | ConvertFrom-Json -ErrorAction SilentlyContinue
+        # Remove headers from parameters for cleaner display, and because they may contain sensitive information. Headers are only used for execution, not needed for display.
+        if ($Task.Parameters.Headers) {
+            $Task.Parameters.PSObject.Properties.Remove('Headers')
+        }
     } else {
         $Task | Add-Member -NotePropertyName Parameters -NotePropertyValue @{}
     }

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-ListScheduledItems.ps1

@@ -78,6 +78,10 @@ function Invoke-ListScheduledItems {
 
         if ($Task.Parameters) {
             $Task.Parameters = $Task.Parameters | ConvertFrom-Json -ErrorAction SilentlyContinue
+            # Remove headers from parameters for cleaner display, and because they may contain sensitive information. Headers are only used for execution, not needed for display.
+            if ($Task.Parameters.Headers) {
+                $Task.Parameters.PSObject.Properties.Remove('Headers')
+            }
         } else {
             $Task | Add-Member -NotePropertyName Parameters -NotePropertyValue @{}
         }

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecUpdateRefreshToken.ps1

@@ -31,13 +31,13 @@ function Invoke-ExecUpdateRefreshToken {
             Add-CIPPAzDataTableEntity @DevSecretsTable -Entity $Secret -Force
         } else {
             if ($IsPartnerTenant) {
-                Set-CippKeyVaultSecret -VaultName $kv -Name 'RefreshToken' -SecretValue (ConvertTo-SecureString -String $Request.body.refreshtoken -AsPlainText -Force)
+                $null = Set-CippKeyVaultSecret -VaultName $kv -Name 'RefreshToken' -SecretValue (ConvertTo-SecureString -String $Request.body.refreshtoken -AsPlainText -Force)
                 Set-Item -Path env:RefreshToken -Value $Request.body.refreshtoken -Force
             } else {
                 Write-Information "$($env:TenantID) does not match $($Request.body.tenantId) - adding a new secret for the tenant."
                 $name = $Request.body.tenantId
                 try {
-                    Set-CippKeyVaultSecret -VaultName $kv -Name $name -SecretValue (ConvertTo-SecureString -String $Request.body.refreshtoken -AsPlainText -Force)
+                    $null = Set-CippKeyVaultSecret -VaultName $kv -Name $name -SecretValue (ConvertTo-SecureString -String $Request.body.refreshtoken -AsPlainText -Force)
                     Set-Item -Path env:$name -Value $Request.body.refreshtoken -Force
                 } catch {
                     Write-Information "Failed to set secret $name in KeyVault. $($_.Exception.Message)"
@@ -60,7 +60,7 @@ function Invoke-ExecUpdateRefreshToken {
                     OrchestratorName = 'UpdatePermissionsOrchestrator'
                     Batch            = @($TenantBatch)
                 }
-                Start-CIPPOrchestrator -InputObject $InputObject
+                $null = Start-CIPPOrchestrator -InputObject $InputObject
                 Write-Information 'Started permissions update orchestrator for Partner Tenant'
             } catch {
                 Write-Warning "Failed to start permissions orchestrator: $($_.Exception.Message)"
@@ -76,6 +76,11 @@ function Invoke-ExecUpdateRefreshToken {
             'resultText' = "Successfully updated the credentials for $($TenantName). You may continue to the next step, or add additional tenants if required."
             'state'      = 'success'
         }
+
+        return ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = $Results
+            })
     } catch {
         $Results = [pscustomobject]@{
             'Results' = @{