fix for null subscription

Author: JohnDuprey

Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1

@@ -24,10 +24,12 @@ function Get-CIPPAuthentication {
             $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
             try {
                 $Context = Get-AzContext
-                Write-Information "Current context: $($Context | ConvertTo-Json)"
-                if ($Context.Subscription.Id -ne $SubscriptionId) {
-                    Write-Information "Setting context to subscription $SubscriptionId"
-                    $null = Set-AzContext -SubscriptionId $SubscriptionId
+                if ($Context.Subscription) {
+                    #Write-Information "Current context: $($Context | ConvertTo-Json)"
+                    if ($Context.Subscription.Id -ne $SubscriptionId) {
+                        Write-Information "Setting context to subscription $SubscriptionId"
+                        $null = Set-AzContext -SubscriptionId $SubscriptionId
+                    }
                 }
             } catch {
                 Write-Information "ERROR: Could not set context to subscription $SubscriptionId."

Modules/CippExtensions/Public/Extension Functions/Get-ExtensionAPIKey.ps1

@@ -23,7 +23,13 @@ function Get-ExtensionAPIKey {
             $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
+            $Context = Get-AzContext
+            if ($Context.Subscription) {
+                if ($Context.Subscription.Id -ne $SubscriptionId) {
+                    Write-Information "Setting context to subscription $SubscriptionId"
+                    $null = Set-AzContext -SubscriptionId $SubscriptionId
+                }
+            }
             $APIKey = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name $Extension -AsPlainText)
         }
         Set-Item -Path "env:$Var" -Value $APIKey -Force -ErrorAction SilentlyContinue

Modules/CippExtensions/Public/Extension Functions/Set-ExtensionAPIKey.ps1

@@ -26,7 +26,13 @@ function Set-ExtensionAPIKey {
             $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
+            $Context = Get-AzContext
+            if ($Context.Subscription) {
+                if ($Context.Subscription.Id -ne $SubscriptionId) {
+                    Write-Information "Setting context to subscription $SubscriptionId"
+                    $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