From 95c38a2b3d204ff4b7723049ca1d730b568a89fc Mon Sep 17 00:00:00 2001 From: MrR0b3rt Date: Mon, 23 Jun 2025 14:29:07 +0200 Subject: [PATCH 1/3] Add Trim() to sanitize the organization displayName property --- Extensions/MSGraph.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Extensions/MSGraph.psm1 b/Extensions/MSGraph.psm1 index 0b07e62..379f76f 100644 --- a/Extensions/MSGraph.psm1 +++ b/Extensions/MSGraph.psm1 @@ -2708,7 +2708,7 @@ function Get-GraphMigrationTableFile if($global:chkAddCompanyName.IsChecked) { - $path = Join-Path $path $global:organization.displayName + $path = Join-Path $path $global:organization.displayName.Trim() } $path } @@ -4263,7 +4263,7 @@ function Get-GraphObjectFolder $path = $rootFolder - if($addOrganization) { $path = Join-Path $path $global:organization.displayName } + if($addOrganization) { $path = Join-Path $path ($global:organization.displayName).Trim() } if($addObjectType -and $objectType.Id) { $path = Join-Path $path $objectType.Id } From 125d2e2b4440bedfbaf900e9ad2938e35674d717 Mon Sep 17 00:00:00 2001 From: MrR0b3rt Date: Mon, 23 Jun 2025 15:10:33 +0200 Subject: [PATCH 2/3] Forgot brackets before calling Trim() --- Extensions/MSGraph.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extensions/MSGraph.psm1 b/Extensions/MSGraph.psm1 index 379f76f..65815de 100644 --- a/Extensions/MSGraph.psm1 +++ b/Extensions/MSGraph.psm1 @@ -2708,7 +2708,7 @@ function Get-GraphMigrationTableFile if($global:chkAddCompanyName.IsChecked) { - $path = Join-Path $path $global:organization.displayName.Trim() + $path = Join-Path $path ($global:organization.displayName).Trim() } $path } From cfb0e5f6e4fc79571b2ba3c51da749cc31851b97 Mon Sep 17 00:00:00 2001 From: Robert Kooistra Date: Tue, 24 Jun 2025 10:07:17 +0200 Subject: [PATCH 3/3] Moved trim of org displayName to the moment it is loaded instead of where it's used --- Extensions/MSALAuthentication.psm1 | 1 + Extensions/MSGraph.psm1 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Extensions/MSALAuthentication.psm1 b/Extensions/MSALAuthentication.psm1 index 5eb049b..b040b85 100644 --- a/Extensions/MSALAuthentication.psm1 +++ b/Extensions/MSALAuthentication.psm1 @@ -259,6 +259,7 @@ function Get-MSALUserInfo if($global:Organization) { 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 } Set-EnvironmentInfo $global:Organization.displayName diff --git a/Extensions/MSGraph.psm1 b/Extensions/MSGraph.psm1 index 65815de..0b07e62 100644 --- a/Extensions/MSGraph.psm1 +++ b/Extensions/MSGraph.psm1 @@ -2708,7 +2708,7 @@ function Get-GraphMigrationTableFile if($global:chkAddCompanyName.IsChecked) { - $path = Join-Path $path ($global:organization.displayName).Trim() + $path = Join-Path $path $global:organization.displayName } $path } @@ -4263,7 +4263,7 @@ function Get-GraphObjectFolder $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 }