ZenTopBrandon
diff --git a/‎Modules/CIPPCore/Public/Authentication/Get-CippApiAuth.ps1‎
Lines changed: 4 additions & 1 deletion b/‎Modules/CIPPCore/Public/Authentication/Get-CippApiAuth.ps1‎
Lines changed: 4 additions & 1 deletion
@@ -41,9 +41,12 @@ function Get-CippApiAuth {
             }
         }
 
+        $ExtractedTenantId = $Issuer -replace 'https://sts.windows.net/', '' -replace 'https://login.microsoftonline.com/', '' -replace '/v2.0', ''
+        $TenantId = if ($ExtractedTenantId -eq 'common') { $env:TenantID } else { $ExtractedTenantId }
+
         [PSCustomObject]@{
             ApiUrl    = "https://$($env:WEBSITE_HOSTNAME)"
-            TenantID  = $Issuer -replace 'https://sts.windows.net/', '' -replace 'https://login.microsoftonline.com/', '' -replace '/v2.0', ''
+            TenantID  = $TenantId
             ClientIDs = $AllowedApps
             Enabled   = $AAD.enabled
         }
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,12 @@ function Get-CippApiAuth {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ $ExtractedTenantId = $Issuer -replace 'https://sts.windows.net/', '' -replace 'https://login.microsoftonline.com/', '' -replace '/v2.0', ''`
	`45`	`+ $TenantId = if ($ExtractedTenantId -eq 'common') { $env:TenantID } else { $ExtractedTenantId }`
	`46`	`+`
`44`	`47`	`[PSCustomObject]@{`
`45`	`48`	`ApiUrl = "https://$($env:WEBSITE_HOSTNAME)"`
`46`		`- TenantID = $Issuer -replace 'https://sts.windows.net/', '' -replace 'https://login.microsoftonline.com/', '' -replace '/v2.0', ''`
	`49`	`+ TenantID = $TenantId`
`47`	`50`	`ClientIDs = $AllowedApps`
`48`	`51`	`Enabled = $AAD.enabled`
`49`	`52`	`}`