cqrenet/macOS_IntuneManagement
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Moved trim of org displayName to the moment it is loaded instead of where it's used

Browse Source
This commit is contained in:
Robert Kooistra
2025-06-24 10:07:17 +02:00
parent 125d2e2b44
commit cfb0e5f6e4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Extensions/MSALAuthentication.psm1
View File

@@ -259,6 +259,7 @@ function Get-MSALUserInfo
if($global:Organization) if($global:Organization)
{ {
if($global:Organization -is [array]) { $global:Organization = $global:Organization[0]} if($global:Organization -is [array]) { $global:Organization = $global:Organization[0]}
$global:Organization.displayName = ($global:Organization.displayName).Trim()
Save-Setting $global:Organization.Id "_Name" $global:Organization.displayName Save-Setting $global:Organization.Id "_Name" $global:Organization.displayName
} }
Set-EnvironmentInfo $global:Organization.displayName Set-EnvironmentInfo $global:Organization.displayName

4
Extensions/MSGraph.psm1
View File

@@ -2708,7 +2708,7 @@ function Get-GraphMigrationTableFile
if($global:chkAddCompanyName.IsChecked) if($global:chkAddCompanyName.IsChecked)
{ {
$path = Join-Path $path ($global:organization.displayName).Trim() $path = Join-Path $path $global:organization.displayName
} }
$path $path
} }
@@ -4263,7 +4263,7 @@ function Get-GraphObjectFolder
$path = $rootFolder $path = $rootFolder
if($addOrganization) { $path = Join-Path $path ($global:organization.displayName).Trim() } if($addOrganization) { $path = Join-Path $path $global:organization.displayName }
if($addObjectType -and $objectType.Id) { $path = Join-Path $path $objectType.Id } if($addObjectType -and $objectType.Id) { $path = Join-Path $path $objectType.Id }