TenantID case sensitivity

OfficialEsco · OfficialEsco · commit 8fbff949871c · 2024-08-22T22:23:14.000+02:00
diff --git a/Cleanup_OldAuditLogs/run.ps1 b/Cleanup_OldAuditLogs/run.ps1
@@ -2,8 +2,8 @@
 param($Timer)
 
 try {
-    $Tenants = Get-Tenants -IncludeAll | Where-Object { $_.customerId -ne $env:TenantId -and $_.Excluded -eq $false }
+    $Tenants = Get-Tenants -IncludeAll | Where-Object { $_.customerId -ne $env:TenantID -and $_.Excluded -eq $false }
     $Tenants | ForEach-Object {
         Remove-CIPPGraphSubscription -cleanup $true -TenantFilter $_.defaultDomainName
     }
-} catch {}
+} catch {}
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecPartnerWebhook.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecPartnerWebhook.ps1
@@ -34,7 +34,7 @@ function Invoke-ExecPartnerWebhook {
         'CreateSubscription' {
             $BaseURL = ([System.Uri]$Request.Headers.'x-ms-original-url').Host
             $Webhook = @{
-                TenantFilter  = $env:TenantId
+                TenantFilter  = $env:TenantID
                 PartnerCenter = $true
                 BaseURL       = $BaseURL
                 EventType     = $Request.Body.EventType
@@ -74,4 +74,4 @@ function Invoke-ExecPartnerWebhook {
         StatusCode = [System.Net.HttpStatusCode]::OK
         Body       = $Body
     }
-}
+}
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecServicePrincipals.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecServicePrincipals.ps1
@@ -8,7 +8,7 @@ function Invoke-ExecServicePrincipals {
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
 
-    $TenantFilter = $env:TenantId
+    $TenantFilter = $env:TenantID
 
     $Success = $true
 
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecAccessChecks.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecAccessChecks.ps1
@@ -17,7 +17,7 @@ Function Invoke-ExecAccessChecks {
     # Write to the Azure Functions log stream.
     Write-Host 'PowerShell HTTP trigger function processed a request.'
     if ($Request.Query.Permissions -eq 'true') {
-        $Results = Test-CIPPAccessPermissions -tenantfilter $ENV:tenantid -APIName $APINAME -ExecutingUser $Request.Headers.'x-ms-client-principal'
+        $Results = Test-CIPPAccessPermissions -tenantfilter $ENV:TenantID -APIName $APINAME -ExecutingUser $Request.Headers.'x-ms-client-principal'
     }
 
     if ($Request.Query.Tenants -eq 'true') {
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecCPVPermissions.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecCPVPermissions.ps1
@@ -31,7 +31,7 @@ Function Invoke-ExecCPVPermissions {
         if ($TenantFilter -ne 'PartnerTenant') {
             Set-CIPPCPVConsent @CPVConsentParams
         } else {
-            $TenantFilter = $env:TenantId
+            $TenantFilter = $env:TenantID
         }
         Add-CIPPApplicationPermission -RequiredResourceAccess 'CippDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $TenantFilter
         Add-CIPPDelegatedPermission -RequiredResourceAccess 'CippDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $TenantFilter
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
@@ -82,7 +82,7 @@ Function Invoke-ExecSAMSetup {
         if ($Request.Query.code) {
             try {
                 $TenantId = $Rows.tenantid
-                if (!$TenantId) { $TenantId = $ENV:TenantId }
+                if (!$TenantId) { $TenantId = $ENV:TenantID }
                 $AppID = $Rows.appid
                 if (!$AppID) { $appid = $ENV:ApplicationID }
                 $URL = ($Request.headers.'x-ms-original-url').split('?') | Select-Object -First 1
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListFunctionParameters.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListFunctionParameters.ps1
@@ -33,7 +33,7 @@ function Invoke-ListFunctionParameters {
         if ($Module -eq 'ExchangeOnlineManagement') {
             $ExoRequest = @{
                 AvailableCmdlets = $true
-                tenantid         = $env:TenantId
+                tenantid         = $env:TenantID
                 NoAuthCheck      = $true
             }
             if ($Request.Query.Compliance -eq $true) {
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListInactiveAccounts.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListInactiveAccounts.ps1
@@ -21,7 +21,7 @@ Function Invoke-ListInactiveAccounts {
     $TenantFilter = $Request.Query.TenantFilter
     if ($TenantFilter -eq 'AllTenants') { $TenantFilter = (get-tenants).customerId }
     try {
-        $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/managedTenants/inactiveUsers?`$count=true" -tenantid $env:TenantId | Where-Object { $_.tenantId -in $TenantFilter }
+        $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/managedTenants/inactiveUsers?`$count=true" -tenantid $env:TenantID | Where-Object { $_.tenantId -in $TenantFilter }
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-AuthorisedRequest.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-AuthorisedRequest.ps1
@@ -10,14 +10,14 @@ function Get-AuthorisedRequest {
         [string]$Uri
     )
     if (!$TenantID) {
-        $TenantID = $env:TenantId
+        $TenantID = $env:TenantID
     }
     if ($Uri -like 'https://graph.microsoft.com/beta/contracts*' -or $Uri -like '*/customers/*' -or $Uri -eq 'https://graph.microsoft.com/v1.0/me/sendMail' -or $Uri -like '*/tenantRelationships/*') {
         return $true
     }
     $Tenants = Get-Tenants -IncludeErrors
     $SkipList = Get-Tenants -SkipList
-    if (($env:PartnerTenantAvailable -eq $true -and $SkipList.customerId -notcontains $TenantID -and $SkipList.defaultDomainName -notcontains $TenantID) -or (($Tenants.customerId -contains $TenantID -or $Tenants.defaultDomainName -contains $TenantID) -and $TenantID -ne $env:TenantId)) {
+    if (($env:PartnerTenantAvailable -eq $true -and $SkipList.customerId -notcontains $TenantID -and $SkipList.defaultDomainName -notcontains $TenantID) -or (($Tenants.customerId -contains $TenantID -or $Tenants.defaultDomainName -contains $TenantID) -and $TenantID -ne $env:TenantID)) {
         return $true
     } else {
         return $false
diff --git a/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1 b/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1
@@ -48,7 +48,7 @@ function Get-GraphRequestList {
     #>
     [CmdletBinding()]
     Param(
-        [string]$TenantFilter = $env:TenantId,
+        [string]$TenantFilter = $env:TenantID,
         [Parameter(Mandatory = $true)]
         [string]$Endpoint,
         [hashtable]$Parameters = @{},
@@ -294,7 +294,7 @@ function Get-GraphRequestList {
                                     method = 'GET'
                                 }
                             }
-                            $TenantInfo = New-GraphBulkRequest -Requests @($ReverseLookupRequests) -tenantid $env:TenantId -NoAuthCheck $true -asapp $true
+                            $TenantInfo = New-GraphBulkRequest -Requests @($ReverseLookupRequests) -tenantid $env:TenantID -NoAuthCheck $true -asapp $true
 
                             $GraphRequestResults | Select-Object @{n = 'TenantInfo'; e = { Get-GraphBulkResultByID -Results @($TenantInfo) -ID $_.$ReverseTenantLookupProperty } }, *
 
diff --git a/Modules/CIPPCore/Public/New-CIPPAPIConfig.ps1 b/Modules/CIPPCore/Public/New-CIPPAPIConfig.ps1
@@ -39,7 +39,7 @@ function New-CIPPAPIConfig {
             $currentSettings.properties.identityProviders.azureActiveDirectory = @{
                 registration = @{
                     clientId     = $APIApp.appId
-                    openIdIssuer = "https://sts.windows.net/$($ENV:TenantId)/v2.0"
+                    openIdIssuer = "https://sts.windows.net/$($ENV:TenantID)/v2.0"
                 }
                 validation   = @{
                     allowedAudiences = @("api://$($APIApp.appId)")
diff --git a/Modules/CIPPCore/Public/New-CIPPApplicationCopy.ps1 b/Modules/CIPPCore/Public/New-CIPPApplicationCopy.ps1
@@ -6,11 +6,11 @@ function New-CIPPApplicationCopy {
     )
     $CurrentInfo = New-GraphGetRequest -Uri 'https://graph.microsoft.com/beta/servicePrincipals?$top=999' -tenantid $env:TenantID -NoAuthCheck $true
     try {
-        $ExistingApp = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/Applications(appId='$($app)')" -tenantid $ENV:tenantid -NoAuthCheck $true
+        $ExistingApp = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/Applications(appId='$($app)')" -tenantid $ENV:TenantID -NoAuthCheck $true
         $Type = 'Application'
     } catch {
-        $ExistingApp = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals(appId='$($app)')/oauth2PermissionGrants" -tenantid $ENV:tenantid -NoAuthCheck $true
-        $ExistingAppRoleAssignments = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals(appId='$($app)')/appRoleAssignments" -tenantid $ENV:tenantid -NoAuthCheck $true
+        $ExistingApp = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals(appId='$($app)')/oauth2PermissionGrants" -tenantid $ENV:TenantID -NoAuthCheck $true
+        $ExistingAppRoleAssignments = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals(appId='$($app)')/appRoleAssignments" -tenantid $ENV:TenantID -NoAuthCheck $true
         $Type = 'ServicePrincipal'
     }
     if (!$ExistingApp) {
diff --git a/Modules/CIPPCore/Public/Set-CIPPGDAPAutoExtend.ps1 b/Modules/CIPPCore/Public/Set-CIPPGDAPAutoExtend.ps1
@@ -8,12 +8,12 @@ function Set-CIPPGDAPAutoExtend {
     )
 
     $ReturnedData = if ($All -eq $true) {
-        $Relationships = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships' -tenantid $env:tenantid -NoAuthCheck $true | Where-Object -Property autoExtendDuration -EQ 'PT0S'
+        $Relationships = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships' -tenantid $env:TenantID -NoAuthCheck $true | Where-Object -Property autoExtendDuration -EQ 'PT0S'
         foreach ($Relation in $Relationships) {
             try {
                 $AddedHeader = @{'If-Match' = $Relation.'@odata.etag' }
                 if ($PSCmdlet.ShouldProcess($Relation.id, "Set auto renew for $($Relation.customer.displayName)")) {
-                    $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships/$($Relation.id)" -tenantid $env:tenantid -type PATCH -body '{"autoExtendDuration":"P180D"}' -Verbose -NoAuthCheck $true -AddedHeaders $AddedHeader
+                    $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships/$($Relation.id)" -tenantid $env:TenantID -type PATCH -body '{"autoExtendDuration":"P180D"}' -Verbose -NoAuthCheck $true -AddedHeaders $AddedHeader
                     Write-LogMessage -user $ExecutingUser -API $APIName -message "Successfully set auto renew for tenant $($Relation.customer.displayName) with ID $($RelationShipid)" -Sev 'Info'
                     @("Successfully set auto renew for tenant $($Relation.customer.displayName) with ID $($Relation.id)" )
                 }
@@ -25,10 +25,10 @@ function Set-CIPPGDAPAutoExtend {
         }
     } else {
         try {
-            $Relationship = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships' -tenantid $env:tenantid -NoAuthCheck $true | Where-Object -Property id -EQ $RelationShipid
+            $Relationship = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships' -tenantid $env:TenantID -NoAuthCheck $true | Where-Object -Property id -EQ $RelationShipid
             $AddedHeader = @{'If-Match' = $Relationship.'@odata.etag' }
             if ($PSCmdlet.ShouldProcess($RelationShipid, "Set auto renew for $($Relationship.customer.displayName)")) {
-                $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships/$($RelationShipid)" -tenantid $env:tenantid -type PATCH -body '{"autoExtendDuration":"P180D"}' -Verbose -NoAuthCheck $true -AddedHeaders $AddedHeader
+                $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships/$($RelationShipid)" -tenantid $env:TenantID -type PATCH -body '{"autoExtendDuration":"P180D"}' -Verbose -NoAuthCheck $true -AddedHeaders $AddedHeader
                 write-LogMessage -user $ExecutingUser -API $APIName -message "Successfully set auto renew for tenant $($Relationship.customer.displayName) with ID $($RelationShipid)" -Sev 'Info'
                 @("Successfully set auto renew for tenant $($Relationship.customer.displayName) with ID $($RelationShipid)" )
             }
diff --git a/Modules/CIPPCore/Public/Test-CIPPAccessTenant.ps1 b/Modules/CIPPCore/Public/Test-CIPPAccessTenant.ps1
@@ -42,7 +42,7 @@ function Test-CIPPAccessTenant {
             #Write-Host ($GDAPRolesGraph.body.value | ConvertTo-Json -Depth 10)
             foreach ($RoleId in $ExpectedRoles) {
                 $GraphRole = $GDAPRolesGraph.body.value | Where-Object -Property roleDefinitionId -EQ $RoleId.Id
-                $Role = $GraphRole.principal | Where-Object -Property organizationId -EQ $ENV:tenantid
+                $Role = $GraphRole.principal | Where-Object -Property organizationId -EQ $ENV:TenantID
 
                 if (!$Role) {
                     $MissingRoles.Add(
diff --git a/Modules/CIPPCore/Public/Webhooks/Get-CIPPAuditLogContentBundles.ps1 b/Modules/CIPPCore/Public/Webhooks/Get-CIPPAuditLogContentBundles.ps1
@@ -51,7 +51,7 @@ function Get-CIPPAuditLogContentBundles {
 
     $Parameters = @{
         'contentType'         = $ContentType
-        'PublisherIdentifier' = $env:TenantId
+        'PublisherIdentifier' = $env:TenantID
     }
 
     if (!$ShowAll.IsPresent) {
diff --git a/Modules/CIPPCore/Public/Webhooks/New-CIPPGraphSubscription.ps1 b/Modules/CIPPCore/Public/Webhooks/New-CIPPGraphSubscription.ps1
@@ -47,7 +47,7 @@ function New-CIPPGraphSubscription {
                     }
                     Write-Host "Creating webhook subscription for $EventType"
 
-                    $AuditLog = New-GraphPOSTRequest -type POST -uri "https://manage.office.com/api/v1.0/$($TenantFilter)/activity/feed/subscriptions/start?contentType=$EventType&PublisherIdentifier=$($env:TenantId)" -tenantid $TenantFilter -scope 'https://manage.office.com/.default' -body '{}' -verbose
+                    $AuditLog = New-GraphPOSTRequest -type POST -uri "https://manage.office.com/api/v1.0/$($TenantFilter)/activity/feed/subscriptions/start?contentType=$EventType&PublisherIdentifier=$($env:TenantID)" -tenantid $TenantFilter -scope 'https://manage.office.com/.default' -body '{}' -verbose
                     Write-LogMessage -user $ExecutingUser -API $APIName -message "Created Webhook subscription for $($TenantFilter) for the log $($EventType)" -Sev 'Info' -tenant $TenantFilter
                     return @{ Success = $true; message = "Created Webhook subscription for $($TenantFilter) for the log $($EventType)" }
                 } else {
@@ -80,9 +80,9 @@ function New-CIPPGraphSubscription {
                 }
             }
         } elseif ($PartnerCenter.IsPresent) {
-            $WebhookFilter = "PartitionKey eq '$($env:TenantId)'"
+            $WebhookFilter = "PartitionKey eq '$($env:TenantID)'"
             $ExistingWebhooks = Get-CIPPAzDataTableEntity @WebhookTable -Filter $WebhookFilter
-            $CIPPID = $env:TenantId
+            $CIPPID = $env:TenantID
             $MatchedWebhook = $ExistingWebhooks | Where-Object { $_.Resource -eq 'PartnerCenter' -and $_.RowKey -eq $CIPPID }
 
             # Required event types
@@ -107,7 +107,7 @@ function New-CIPPGraphSubscription {
             try {
                 $Uri = 'https://api.partnercenter.microsoft.com/webhooks/v1/registration'
                 try {
-                    $Existing = New-GraphGetRequest -NoAuthCheck $true -uri $Uri -tenantid $env:TenantId -scope 'https://api.partnercenter.microsoft.com/.default'
+                    $Existing = New-GraphGetRequest -NoAuthCheck $true -uri $Uri -tenantid $env:TenantID -scope 'https://api.partnercenter.microsoft.com/.default'
                 } catch { $Existing = $false }
                 if (!$Existing -or $Existing.webhookUrl -ne $MatchedWebhook.WebhookNotificationUrl -or $EventCompare) {
                     if ($Existing.WebhookUrl) {
@@ -119,7 +119,7 @@ function New-CIPPGraphSubscription {
                     }
 
                     $Uri = 'https://api.partnercenter.microsoft.com/webhooks/v1/registration'
-                    $GraphRequest = New-GraphPOSTRequest -uri $Uri -type $Method -tenantid $env:TenantId -scope 'https://api.partnercenter.microsoft.com/.default' -body ($Body | ConvertTo-Json) -NoAuthCheck $true
+                    $GraphRequest = New-GraphPOSTRequest -uri $Uri -type $Method -tenantid $env:TenantID -scope 'https://api.partnercenter.microsoft.com/.default' -body ($Body | ConvertTo-Json) -NoAuthCheck $true
 
                     $WebhookRow = @{
                         PartitionKey           = [string]$CIPPID
diff --git a/UpdatePermissions/run.ps1 b/UpdatePermissions/run.ps1
@@ -2,7 +2,7 @@
 param($Timer)
 
 try {
-    $Tenants = Get-Tenants -IncludeAll | Where-Object { $_.customerId -ne $env:TenantId -and $_.Excluded -eq $false }
+    $Tenants = Get-Tenants -IncludeAll | Where-Object { $_.customerId -ne $env:TenantID -and $_.Excluded -eq $false }
     $CPVTable = Get-CIPPTable -TableName cpvtenants
     $CPVRows = Get-CIPPAzDataTableEntity @CPVTable
     $ModuleRoot = (Get-Module CIPPCore).ModuleBase

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Function Invoke-ExecAccessChecks {`
`17`	`17`	`# Write to the Azure Functions log stream.`
`18`	`18`	`Write-Host 'PowerShell HTTP trigger function processed a request.'`
`19`	`19`	`if ($Request.Query.Permissions -eq 'true') {`
`20`		`- $Results = Test-CIPPAccessPermissions -tenantfilter $ENV:tenantid -APIName $APINAME -ExecutingUser $Request.Headers.'x-ms-client-principal'`
	`20`	`+ $Results = Test-CIPPAccessPermissions -tenantfilter $ENV:TenantID -APIName $APINAME -ExecutingUser $Request.Headers.'x-ms-client-principal'`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`if ($Request.Query.Tenants -eq 'true') {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ Function Invoke-ExecCPVPermissions {`
`31`	`31`	`if ($TenantFilter -ne 'PartnerTenant') {`
`32`	`32`	`Set-CIPPCPVConsent @CPVConsentParams`
`33`	`33`	`} else {`
`34`		`- $TenantFilter = $env:TenantId`
	`34`	`+ $TenantFilter = $env:TenantID`
`35`	`35`	`}`
`36`	`36`	`Add-CIPPApplicationPermission -RequiredResourceAccess 'CippDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $TenantFilter`
`37`	`37`	`Add-CIPPDelegatedPermission -RequiredResourceAccess 'CippDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $TenantFilter`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ function Invoke-ListFunctionParameters {`
`33`	`33`	`if ($Module -eq 'ExchangeOnlineManagement') {`
`34`	`34`	`$ExoRequest = @{`
`35`	`35`	`AvailableCmdlets = $true`
`36`		`- tenantid = $env:TenantId`
	`36`	`+ tenantid = $env:TenantID`
`37`	`37`	`NoAuthCheck = $true`
`38`	`38`	`}`
`39`	`39`	`if ($Request.Query.Compliance -eq $true) {`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@ function Get-AuthorisedRequest {`
`10`	`10`	`[string]$Uri`
`11`	`11`	`)`
`12`	`12`	`if (!$TenantID) {`
`13`		`- $TenantID = $env:TenantId`
	`13`	`+ $TenantID = $env:TenantID`
`14`	`14`	`}`
`15`	`15`	`if ($Uri -like 'https://graph.microsoft.com/beta/contracts' -or $Uri -like '/customers/' -or $Uri -eq 'https://graph.microsoft.com/v1.0/me/sendMail' -or $Uri -like '/tenantRelationships/*') {`
`16`	`16`	`return $true`
`17`	`17`	`}`
`18`	`18`	`$Tenants = Get-Tenants -IncludeErrors`
`19`	`19`	`$SkipList = Get-Tenants -SkipList`
`20`		`- if (($env:PartnerTenantAvailable -eq $true -and $SkipList.customerId -notcontains $TenantID -and $SkipList.defaultDomainName -notcontains $TenantID) -or (($Tenants.customerId -contains $TenantID -or $Tenants.defaultDomainName -contains $TenantID) -and $TenantID -ne $env:TenantId)) {`
	`20`	`+ if (($env:PartnerTenantAvailable -eq $true -and $SkipList.customerId -notcontains $TenantID -and $SkipList.defaultDomainName -notcontains $TenantID) -or (($Tenants.customerId -contains $TenantID -or $Tenants.defaultDomainName -contains $TenantID) -and $TenantID -ne $env:TenantID)) {`
`21`	`21`	`return $true`
`22`	`22`	`} else {`
`23`	`23`	`return $false`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ function New-CIPPAPIConfig {`
`39`	`39`	`$currentSettings.properties.identityProviders.azureActiveDirectory = @{`
`40`	`40`	`registration = @{`
`41`	`41`	`clientId = $APIApp.appId`
`42`		`- openIdIssuer = "https://sts.windows.net/$($ENV:TenantId)/v2.0"`
	`42`	`+ openIdIssuer = "https://sts.windows.net/$($ENV:TenantID)/v2.0"`
`43`	`43`	`}`
`44`	`44`	`validation = @{`
`45`	`45`	`allowedAudiences = @("api://$($APIApp.appId)")`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ function Get-CIPPAuditLogContentBundles {`
`51`	`51`
`52`	`52`	`$Parameters = @{`
`53`	`53`	`'contentType' = $ContentType`
`54`		`- 'PublisherIdentifier' = $env:TenantId`
	`54`	`+ 'PublisherIdentifier' = $env:TenantID`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if (!$ShowAll.IsPresent) {`