Update Get-CIPPAuthentication.ps1

Author: JohnDuprey

Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1

@@ -19,9 +19,19 @@ function Get-CIPPAuthentication {
                 }
             }
         } else {
+            Write-Information 'Connecting to Azure'
             Connect-AzAccount -Identity
             $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
-            $null = Set-AzContext -SubscriptionId $SubscriptionId
+            try {
+                $Context = Get-AzContext
+                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."
+            }
+
             $keyvaultname = ($env:WEBSITE_DEPLOYMENT_ID -split '-')[0]
             $Variables | ForEach-Object {
                 Set-Item -Path env:$_ -Value (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name $_ -AsPlainText -ErrorAction Stop) -Force