Replace function app subid lookup with function

rvdwegen · rvdwegen · commit 06fc021b36d5 · 2025-12-15T12:58:53.000+01:00
diff --git a/Modules/CIPPCore/Public/Authentication/Get-CippApiAuth.ps1 b/Modules/CIPPCore/Public/Authentication/Get-CippApiAuth.ps1
@@ -12,7 +12,7 @@ function Get-CippApiAuth {
         if ($env:MSI_SECRET) {
             Disable-AzContextAutosave -Scope Process | Out-Null
             $null = Connect-AzAccount -Identity
-            $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $SubscriptionId = Get-CIPPAzFunctionAppSubId
             $Context = Set-AzContext -SubscriptionId $SubscriptionId
         } else {
             $Context = Get-AzContext
diff --git a/Modules/CIPPCore/Public/Authentication/Set-CippApiAuth.ps1 b/Modules/CIPPCore/Public/Authentication/Set-CippApiAuth.ps1
@@ -10,7 +10,7 @@ function Set-CippApiAuth {
     if ($env:MSI_SECRET) {
         Disable-AzContextAutosave -Scope Process | Out-Null
         $null = Connect-AzAccount -Identity
-        $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+        $SubscriptionId = Get-CIPPAzFunctionAppSubId
         $Context = Set-AzContext -SubscriptionId $SubscriptionId
     } else {
         $Context = Get-AzContext
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecBackendURLs.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecBackendURLs.ps1
@@ -7,7 +7,7 @@ function Invoke-ExecBackendURLs {
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
-    $Subscription = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+    $Subscription = Get-CIPPAzFunctionAppSubId
     $SWAName = $env:WEBSITE_SITE_NAME -replace 'cipp', 'CIPP-SWA-'
 
     # Write to the Azure Functions log stream.
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecMaintenanceScripts.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecMaintenanceScripts.ps1
@@ -17,7 +17,7 @@ Function Invoke-ExecMaintenanceScripts {
             '##TENANTID##'      = $env:TenantID
             '##RESOURCEGROUP##' = $env:WEBSITE_RESOURCE_GROUP
             '##FUNCTIONAPP##'   = $env:WEBSITE_SITE_NAME
-            '##SUBSCRIPTION##'  = (($env:WEBSITE_OWNER_NAME).split('+') | Select-Object -First 1)
+            '##SUBSCRIPTION##'  = Get-CIPPAzFunctionAppSubId
             '##TOKENIP##'       = $AccessTokenDetails.IPAddress
         }
     } catch { Write-Host $_.Exception.Message }
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecTimeSettings.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecTimeSettings.ps1
@@ -9,7 +9,7 @@ function Invoke-ExecTimeSettings {
     param($Request, $TriggerMetadata)
 
     try {
-        $Subscription = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+        $Subscription = Get-CIPPAzFunctionAppSubId
         $Owner = $env:WEBSITE_OWNER_NAME
 
         if ($env:WEBSITE_SKU -ne 'FlexConsumption' -and $Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCombinedSetup.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCombinedSetup.ps1
@@ -15,7 +15,7 @@ function Invoke-ExecCombinedSetup {
         if (($env:AzureWebJobsStorage -ne 'UseDevelopmentStorage=true' -or $env:NonLocalHostAzurite -ne 'true') -and $env:MSI_SECRET) {
             Disable-AzContextAutosave -Scope Process | Out-Null
             $null = Connect-AzAccount -Identity
-            $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $SubscriptionId = Get-CIPPAzFunctionAppSubId
             $null = Set-AzContext -SubscriptionId $SubscriptionId
         }
         if ($request.body.selectedBaselines -and $request.body.baselineOption -eq 'downloadBaselines') {
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
@@ -39,7 +39,7 @@ function Invoke-ExecSAMSetup {
         if ($env:MSI_SECRET) {
             Disable-AzContextAutosave -Scope Process | Out-Null
             $null = Connect-AzAccount -Identity
-            $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $SubscriptionId = Get-CIPPAzFunctionAppSubId
             $null = Set-AzContext -SubscriptionId $SubscriptionId
         }
     }
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecListAppId.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecListAppId.ps1
@@ -18,7 +18,7 @@ Function Invoke-ExecListAppId {
     } else {
         Write-Information 'Connecting to Azure'
         Connect-AzAccount -Identity
-        $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+        $SubscriptionId = Get-CIPPAzFunctionAppSubId
         try {
             $Context = Get-AzContext
             if ($Context.Subscription) {
diff --git a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-UpdateTokensTimer.ps1 b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-UpdateTokensTimer.ps1
@@ -26,7 +26,7 @@ function Start-UpdateTokensTimer {
                 if ($env:MSI_SECRET) {
                     Disable-AzContextAutosave -Scope Process | Out-Null
                     $null = Connect-AzAccount -Identity
-                    $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+                    $SubscriptionId = Get-CIPPAzFunctionAppSubId
                     $null = Set-AzContext -SubscriptionId $SubscriptionId
                 }
                 $KV = ($env:WEBSITE_DEPLOYMENT_ID -split '-')[0]
diff --git a/Modules/CIPPCore/Public/Get-ApplicationInsightsQuery.ps1 b/Modules/CIPPCore/Public/Get-ApplicationInsightsQuery.ps1
@@ -13,7 +13,7 @@ function Get-ApplicationInsightsQuery {
         $null = Connect-AzAccount -Identity
     }
 
-    $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+    $SubscriptionId = Get-CIPPAzFunctionAppSubId
     if ($env:WEBSITE_SKU -ne 'FlexConsumption' -and $Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
         $RGName = $Matches.RGName
     } else {
diff --git a/Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1 b/Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1
@@ -36,7 +36,7 @@ function Get-CIPPAuthentication {
         } else {
             Write-Information 'Connecting to Azure'
             Connect-AzAccount -Identity
-            $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+            $SubscriptionId = Get-CIPPAzFunctionAppSubId
             try {
                 $Context = Get-AzContext
                 if ($Context.Subscription) {
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-CIPPAzFunctionAppSubId.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-CIPPAzFunctionAppSubId.ps1
@@ -0,0 +1,15 @@
+function Get-CIPPAzFunctionAppSubId {
+    <#
+    .SYNOPSIS
+    Get the subscription ID for the current function app
+    .DESCRIPTION
+    Get the subscription ID for the current function app
+    .EXAMPLE
+    Get-CIPPAzFunctionAppSubId
+    #>
+    [CmdletBinding()]
+    param()
+
+    $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+    return $SubscriptionId
+}
diff --git a/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 b/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1
@@ -35,7 +35,7 @@ function Test-CIPPAccessPermissions {
             try {
                 Disable-AzContextAutosave -Scope Process | Out-Null
                 $null = Connect-AzAccount -Identity
-                $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+                $SubscriptionId = Get-CIPPAzFunctionAppSubId
                 $null = Set-AzContext -SubscriptionId $SubscriptionId
 
                 $KV = $env:WEBSITE_DEPLOYMENT_ID
diff --git a/Modules/CippExtensions/Public/Extension Functions/Get-ExtensionAPIKey.ps1 b/Modules/CippExtensions/Public/Extension Functions/Get-ExtensionAPIKey.ps1
@@ -22,7 +22,7 @@ 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
+            $SubscriptionId = Get-CIPPAzFunctionAppSubId
             $Context = Get-AzContext
             if ($Context.Subscription) {
                 if ($Context.Subscription.Id -ne $SubscriptionId) {
diff --git a/Modules/CippExtensions/Public/Extension Functions/Set-ExtensionAPIKey.ps1 b/Modules/CippExtensions/Public/Extension Functions/Set-ExtensionAPIKey.ps1
@@ -25,7 +25,7 @@ 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
+            $SubscriptionId = Get-CIPPAzFunctionAppSubId
             $Context = Get-AzContext
             if ($Context.Subscription) {
                 if ($Context.Subscription.Id -ne $SubscriptionId) {
diff --git a/Modules/CippExtensions/Public/Gradient/Get-GradientToken.ps1 b/Modules/CippExtensions/Public/Gradient/Get-GradientToken.ps1
@@ -4,7 +4,7 @@ function Get-GradientToken {
     )
     if ($Configuration.vendorKey) {
         $null = Connect-AzAccount -Identity
-        $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+        $SubscriptionId = Get-CIPPAzFunctionAppSubId
         $null = Set-AzContext -SubscriptionId $SubscriptionId
         $keyvaultname = ($env:WEBSITE_DEPLOYMENT_ID -split '-')[0]
         $partnerApiKey = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name 'Gradient' -AsPlainText)
diff --git a/Modules/CippExtensions/Public/HIBP/Get-HIBPAuth.ps1 b/Modules/CippExtensions/Public/HIBP/Get-HIBPAuth.ps1
@@ -10,7 +10,7 @@ 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
+            $SubscriptionId = Get-CIPPAzFunctionAppSubId
             $null = Set-AzContext -SubscriptionId $SubscriptionId
 
             $VaultName = ($env:WEBSITE_DEPLOYMENT_ID -split '-')[0]

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Function Invoke-ExecMaintenanceScripts {`
`17`	`17`	`'##TENANTID##' = $env:TenantID`
`18`	`18`	`'##RESOURCEGROUP##' = $env:WEBSITE_RESOURCE_GROUP`
`19`	`19`	`'##FUNCTIONAPP##' = $env:WEBSITE_SITE_NAME`
`20`		`- '##SUBSCRIPTION##' = (($env:WEBSITE_OWNER_NAME).split('+') \| Select-Object -First 1)`
	`20`	`+ '##SUBSCRIPTION##' = Get-CIPPAzFunctionAppSubId`
`21`	`21`	`'##TOKENIP##' = $AccessTokenDetails.IPAddress`
`22`	`22`	`}`
`23`	`23`	`} catch { Write-Host $_.Exception.Message }`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ function Invoke-ExecCombinedSetup {`
`15`	`15`	`if (($env:AzureWebJobsStorage -ne 'UseDevelopmentStorage=true' -or $env:NonLocalHostAzurite -ne 'true') -and $env:MSI_SECRET) {`
`16`	`16`	`Disable-AzContextAutosave -Scope Process \| Out-Null`
`17`	`17`	`$null = Connect-AzAccount -Identity`
`18`		`- $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`18`	`+ $SubscriptionId = Get-CIPPAzFunctionAppSubId`
`19`	`19`	`$null = Set-AzContext -SubscriptionId $SubscriptionId`
`20`	`20`	`}`
`21`	`21`	`if ($request.body.selectedBaselines -and $request.body.baselineOption -eq 'downloadBaselines') {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ function Invoke-ExecSAMSetup {`
`39`	`39`	`if ($env:MSI_SECRET) {`
`40`	`40`	`Disable-AzContextAutosave -Scope Process \| Out-Null`
`41`	`41`	`$null = Connect-AzAccount -Identity`
`42`		`- $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`42`	`+ $SubscriptionId = Get-CIPPAzFunctionAppSubId`
`43`	`43`	`$null = Set-AzContext -SubscriptionId $SubscriptionId`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function Start-UpdateTokensTimer {`
`26`	`26`	`if ($env:MSI_SECRET) {`
`27`	`27`	`Disable-AzContextAutosave -Scope Process \| Out-Null`
`28`	`28`	`$null = Connect-AzAccount -Identity`
`29`		`- $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`29`	`+ $SubscriptionId = Get-CIPPAzFunctionAppSubId`
`30`	`30`	`$null = Set-AzContext -SubscriptionId $SubscriptionId`
`31`	`31`	`}`
`32`	`32`	`$KV = ($env:WEBSITE_DEPLOYMENT_ID -split '-')[0]`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ function Get-ApplicationInsightsQuery {`
`13`	`13`	`$null = Connect-AzAccount -Identity`
`14`	`14`	`}`
`15`	`15`
`16`		`- $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' \| Select-Object -First 1`
	`16`	`+ $SubscriptionId = Get-CIPPAzFunctionAppSubId`
`17`	`17`	`if ($env:WEBSITE_SKU -ne 'FlexConsumption' -and $Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {`
`18`	`18`	`$RGName = $Matches.RGName`
`19`	`19`	`} else {`