Merge pull request #163 from KelvinTegelaar/dev

pull[bot] · web-flow · commit bc881cfdfac3 · 2025-03-24T18:41:05.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Authentication/Set-CippApiAuth.ps1 b/Modules/CIPPCore/Public/Authentication/Set-CippApiAuth.ps1
@@ -1,6 +1,6 @@
 function Set-CippApiAuth {
     [CmdletBinding(SupportsShouldProcess)]
-    Param(
+    param(
         [string]$RGName,
         [string]$FunctionAppName,
         [string]$TenantId,
@@ -9,7 +9,9 @@ function Set-CippApiAuth {
 
     if ($env:MSI_SECRET) {
         Disable-AzContextAutosave -Scope Process | Out-Null
-        $Context = (Connect-AzAccount -Identity).Context
+        $null = Connect-AzAccount -Identity
+        $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+        $Context = Set-AzContext -SubscriptionId $SubscriptionId
     } else {
         $Context = Get-AzContext
     }
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecSAMSetup.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecSAMSetup.ps1
@@ -51,7 +51,9 @@ Function Invoke-ExecSAMSetup {
     } else {
         if ($env:MSI_SECRET) {
             Disable-AzContextAutosave -Scope Process | Out-Null
-            $AzSession = Connect-AzAccount -Identity
+            $null = Connect-AzAccount -Identity
+            $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $null = Set-AzContext -SubscriptionId $SubscriptionId
         }
     }
     if (!$ENV:SetFromProfile) {
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-AddStandardsTemplate.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-AddStandardsTemplate.ps1
@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-AddStandardsTemplate {
+function Invoke-AddStandardsTemplate {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -31,7 +31,7 @@ Function Invoke-AddStandardsTemplate {
 
     }
     Write-LogMessage -headers $Request.Headers -API $APINAME -message "Created CA Template $($Request.body.name) with GUID $GUID" -Sev 'Debug'
-    $body = [pscustomobject]@{'Results' = 'Successfully added template'; id = $GUID }
+    $body = [pscustomobject]@{'Results' = 'Successfully added template'; Metadata = @{id = $GUID } }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-UpdateTokensTimer.ps1 b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-UpdateTokensTimer.ps1
@@ -25,7 +25,9 @@ function Start-UpdateTokensTimer {
             } else {
                 if ($env:MSI_SECRET) {
                     Disable-AzContextAutosave -Scope Process | Out-Null
-                    $AzSession = Connect-AzAccount -Identity
+                    $null = Connect-AzAccount -Identity
+                    $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId
                 }
                 $KV = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]
                 if ($Refreshtoken) {
diff --git a/Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1 b/Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1
@@ -20,6 +20,8 @@ function Get-CIPPAuthentication {
             }
         } else {
             Connect-AzAccount -Identity
+            $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $null = Set-AzContext -SubscriptionId $SubscriptionId
             $keyvaultname = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]
             $Variables | ForEach-Object {
                 Set-Item -Path ENV:$_ -Value (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name $_ -AsPlainText -ErrorAction Stop) -Force
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1
@@ -69,7 +69,7 @@ function Invoke-CIPPStandardAppDeploy {
     }
 
     if ($Settings.report -eq $true) {
-        $StateIsCorrect = $MissingApps.Count -eq 0 ? $true : $MissingApps
+        $StateIsCorrect = $MissingApps.Count -eq 0 ? $true : @{appids = $MissingApps -join ',' }
         Set-CIPPStandardsCompareField -FieldName 'standards.AppDeploy' -FieldValue $StateIsCorrect -TenantFilter $tenant
         Add-CIPPBPAField -FieldName 'AppDeploy' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant
     }
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMessagingPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMessagingPolicy.ps1
@@ -97,7 +97,7 @@ Function Invoke-CIPPStandardTeamsMessagingPolicy {
         }
     }
 
-    if ($Setings.report -eq $true) {
+    if ($Settings.report -eq $true) {
         Add-CIPPBPAField -FieldName 'TeamsMessagingPolicy' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant
 
         if ($StateIsCorrect) {
diff --git a/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 b/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1
@@ -34,7 +34,9 @@ function Test-CIPPAccessPermissions {
         if ($env:MSI_SECRET) {
             try {
                 Disable-AzContextAutosave -Scope Process | Out-Null
-                $AzSession = Connect-AzAccount -Identity
+                $null = Connect-AzAccount -Identity
+                $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+                $null = Set-AzContext -SubscriptionId $SubscriptionId
 
                 $KV = $ENV:WEBSITE_DEPLOYMENT_ID
                 $KeyVaultRefresh = Get-AzKeyVaultSecret -VaultName $kv -Name 'RefreshToken' -AsPlainText
diff --git a/Modules/CippExtensions/Public/Extension Functions/Get-ExtensionAPIKey.ps1 b/Modules/CippExtensions/Public/Extension Functions/Get-ExtensionAPIKey.ps1
@@ -22,6 +22,8 @@ function Get-ExtensionAPIKey {
         } else {
             $keyvaultname = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]
             $null = Connect-AzAccount -Identity
+            $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $null = Set-AzContext -SubscriptionId $SubscriptionId
             $APIKey = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name $Extension -AsPlainText)
         }
         Set-Item -Path "ENV:$Var" -Value $APIKey -Force -ErrorAction SilentlyContinue
diff --git a/Modules/CippExtensions/Public/Extension Functions/Set-ExtensionAPIKey.ps1 b/Modules/CippExtensions/Public/Extension Functions/Set-ExtensionAPIKey.ps1
@@ -25,6 +25,8 @@ function Set-ExtensionAPIKey {
         } else {
             $keyvaultname = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]
             $null = Connect-AzAccount -Identity
+            $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $null = Set-AzContext -SubscriptionId $SubscriptionId
             $null = Set-AzKeyVaultSecret -VaultName $keyvaultname -Name $Extension -SecretValue (ConvertTo-SecureString -AsPlainText -Force -String $APIKey)
         }
         Set-Item -Path "ENV:$Var" -Value $APIKey -Force -ErrorAction SilentlyContinue
diff --git a/Modules/CippExtensions/Public/Gradient/Get-GradientToken.ps1 b/Modules/CippExtensions/Public/Gradient/Get-GradientToken.ps1
@@ -4,6 +4,8 @@ function Get-GradientToken {
     )
     if ($Configuration.vendorKey) {
         $null = Connect-AzAccount -Identity
+        $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+        $null = Set-AzContext -SubscriptionId $SubscriptionId
         $keyvaultname = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]
         $partnerApiKey = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name 'Gradient' -AsPlainText)
         $authorizationToken = [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes("$($configuration.vendorKey):$($partnerApiKey)"))
diff --git a/Modules/CippExtensions/Public/HIBP/Get-HIBPAuth.ps1 b/Modules/CippExtensions/Public/HIBP/Get-HIBPAuth.ps1
@@ -9,15 +9,21 @@ function Get-HIBPAuth {
             $Secret = (Get-CIPPAzDataTableEntity @DevSecretsTable -Filter "PartitionKey eq 'HIBP' and RowKey eq 'HIBP'").APIKey
         } else {
             $null = Connect-AzAccount -Identity
+            $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $null = Set-AzContext -SubscriptionId $SubscriptionId
+
             $VaultName = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]
             try {
                 $Secret = Get-AzKeyVaultSecret -VaultName $VaultName -Name 'HIBP' -AsPlainText -ErrorAction Stop
             } catch {
                 $Secret = $null
             }
 
-            if ([string]::IsNullOrEmpty($Secret) -and $ENV:WEBSITE_OWNER_NAME -like '3e625d35-bf18-4e55*' -or $ENV:WEBSITE_OWNER_NAME -like '61e84181-ff2a-4ba3*') {
+            if ([string]::IsNullOrEmpty($Secret) -and $ENV:CIPP_HOSTED -eq 'true') {
                 $VaultName = 'hibp-kv'
+                if ($SubscriptionId -ne $ENV:CIPP_HOSTED_KV_SUB -and $ENV:CIPP_HOSTED_KV_SUB -match '^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$') {
+                    $null = Set-AzContext -SubscriptionId $ENV:CIPP_HOSTED_KV_SUB
+                }
                 $Secret = Get-AzKeyVaultSecret -VaultName $VaultName -Name 'HIBP' -AsPlainText
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ Function Invoke-ExecSAMSetup {`
`51`	`51`	`} else {`
`52`	`52`	`if ($env:MSI_SECRET) {`
`53`	`53`	`Disable-AzContextAutosave -Scope Process \| Out-Null`
`54`		`- $AzSession = Connect-AzAccount -Identity`
	`54`	`+ $null = Connect-AzAccount -Identity`
	`55`	`+ $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`56`	`+ $null = Set-AzContext -SubscriptionId $SubscriptionId`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`	`if (!$ENV:SetFromProfile) {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ function Get-CIPPAuthentication {`
`20`	`20`	`}`
`21`	`21`	`} else {`
`22`	`22`	`Connect-AzAccount -Identity`
	`23`	`+ $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`24`	`+ $null = Set-AzContext -SubscriptionId $SubscriptionId`
`23`	`25`	`$keyvaultname = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]`
`24`	`26`	`$Variables \| ForEach-Object {`
`25`	`27`	`Set-Item -Path ENV:$_ -Value (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name $_ -AsPlainText -ErrorAction Stop) -Force`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function Invoke-CIPPStandardAppDeploy {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if ($Settings.report -eq $true) {`
`72`		`- $StateIsCorrect = $MissingApps.Count -eq 0 ? $true : $MissingApps`
	`72`	`+ $StateIsCorrect = $MissingApps.Count -eq 0 ? $true : @{appids = $MissingApps -join ',' }`
`73`	`73`	`Set-CIPPStandardsCompareField -FieldName 'standards.AppDeploy' -FieldValue $StateIsCorrect -TenantFilter $tenant`
`74`	`74`	`Add-CIPPBPAField -FieldName 'AppDeploy' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ Function Invoke-CIPPStandardTeamsMessagingPolicy {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- if ($Setings.report -eq $true) {`
	`100`	`+ if ($Settings.report -eq $true) {`
`101`	`101`	`Add-CIPPBPAField -FieldName 'TeamsMessagingPolicy' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant`
`102`	`102`
`103`	`103`	`if ($StateIsCorrect) {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ function Get-ExtensionAPIKey {`
`22`	`22`	`} else {`
`23`	`23`	`$keyvaultname = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]`
`24`	`24`	`$null = Connect-AzAccount -Identity`
	`25`	`+ $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`26`	`+ $null = Set-AzContext -SubscriptionId $SubscriptionId`
`25`	`27`	`$APIKey = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name $Extension -AsPlainText)`
`26`	`28`	`}`
`27`	`29`	`Set-Item -Path "ENV:$Var" -Value $APIKey -Force -ErrorAction SilentlyContinue`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ function Set-ExtensionAPIKey {`
`25`	`25`	`} else {`
`26`	`26`	`$keyvaultname = ($ENV:WEBSITE_DEPLOYMENT_ID -split '-')[0]`
`27`	`27`	`$null = Connect-AzAccount -Identity`
	`28`	`+ $SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`29`	`+ $null = Set-AzContext -SubscriptionId $SubscriptionId`
`28`	`30`	`$null = Set-AzKeyVaultSecret -VaultName $keyvaultname -Name $Extension -SecretValue (ConvertTo-SecureString -AsPlainText -Force -String $APIKey)`
`29`	`31`	`}`
`30`	`32`	`Set-Item -Path "ENV:$Var" -Value $APIKey -Force -ErrorAction SilentlyContinue`