Merge pull request #178 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Authentication/Get-CippApiAuth.ps1

@@ -1,17 +1,17 @@
 function Get-CippApiAuth {
-    Param(
+    param(
         [string]$RGName,
         [string]$FunctionAppName
     )
 
     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
     } else {
         $Context = Get-AzContext
+        $SubscriptionId = $Context.Subscription.Id
     }
-    # Get subscription id
-    $SubscriptionId = $Context.Subscription.Id
 
     # Get auth settings
     $AuthSettings = Invoke-AzRestMethod -Uri "https://management.azure.com/subscriptions/$SubscriptionId/resourceGroups/$RGName/providers/Microsoft.Web/sites/$($FunctionAppName)/config/authsettingsV2/list?api-version=2020-06-01" -ErrorAction Stop | Select-Object -ExpandProperty Content | ConvertFrom-Json

Modules/CIPPCore/Public/Authentication/Set-CippApiAuth.ps1

@@ -14,9 +14,8 @@ function Set-CippApiAuth {
         $Context = Set-AzContext -SubscriptionId $SubscriptionId
     } else {
         $Context = Get-AzContext
+        $SubscriptionId = $Context.Subscription.Id
     }
-    # Get subscription id
-    $SubscriptionId = $Context.Subscription.Id
 
     # Get auth settings
     $AuthSettings = Invoke-AzRestMethod -Uri "https://management.azure.com/subscriptions/$SubscriptionId/resourceGroups/$RGName/providers/Microsoft.Web/sites/$($FunctionAppName)/config/authsettingsV2/list?api-version=2020-06-01" | Select-Object -ExpandProperty Content | ConvertFrom-Json