updates

Author: KelvinTegelaar

Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1

@@ -22,13 +22,10 @@ function Get-CIPPAuthentication {
             #Get list of tenants that have 'directTenant' set to true
             $tenants = Get-Tenants -IncludeErrors | Where-Object -Property delegatedPrivilegeStatus -EQ 'directTenant'
             if ($tenants) {
-                Write-Host "Found $($tenants.Count) tenants with directTenant set to true"
                 $tenants | ForEach-Object {
                     $secretname = $_.customerId -replace '-', '_'
                     if ($secret.$secretname) {
                         $name = $_.customerId
-                        Write-Host "Setting $name to $($secret.$secretname)"
-
                         Set-Item -Path env:$name -Value $secret.$secretname -Force
                     }
                 }

Modules/CIPPCore/Public/GraphHelper/Get-GraphToken.ps1

@@ -7,8 +7,10 @@ function Get-GraphToken($tenantid, $scope, $AsApp, $AppID, $AppSecret, $refreshT
     if (!$env:SetFromProfile) { $CIPPAuth = Get-CIPPAuthentication; Write-Host 'Could not get Refreshtoken from environment variable. Reloading token.' }
     #If the $env:<$tenantid> is set, use that instead of the refreshtoken for all tenants.
     $refreshToken = $env:RefreshToken
+    if (!$tenantid) { $tenantid = $env:TenantID }
     $ClientType = Get-Tenants -IncludeErrors -TenantFilter $tenantid
     if ($clientType.delegatedPrivilegeStatus -eq 'directTenant') {
+        Write-Host "Using direct tenant refresh token for $($clientType.customerId)"
         $ClientRefreshToken = Get-Item -Path "env:\$($clientType.customerId)" -ErrorAction SilentlyContinue
         $refreshToken = $ClientRefreshToken.Value
     }
@@ -47,7 +49,6 @@ function Get-GraphToken($tenantid, $scope, $AsApp, $AppID, $AppSecret, $refreshT
         }
     }
 
-    if (!$tenantid) { $tenantid = $env:TenantID }
 
     $TokenKey = '{0}-{1}-{2}' -f $tenantid, $scope, $asApp