Merge pull request #2189 from microsoft/bilong-removeinvalid

Remove invalid permissions via pipe
microsoft · Sep 12, 2024 · bd69c9c · bd69c9c
2 parents 3801c4c + 125cbbd
commit bd69c9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/PublicFolders/SourceSideValidations/SourceSideValidations.ps1 b/PublicFolders/SourceSideValidations/SourceSideValidations.ps1
@@ -44,6 +44,7 @@ param (
 . $PSScriptRoot\JobQueue.ps1
 . $PSScriptRoot\..\..\Shared\ScriptUpdateFunctions\Test-ScriptVersion.ps1
 . $PSScriptRoot\..\..\Shared\Out-Columns.ps1
+. $PSScriptRoot\..\..\Shared\Confirm-ExchangeShell.ps1
 
 # For HashSet support
 Add-Type -AssemblyName System.Core -ErrorAction Stop
@@ -92,6 +93,15 @@ try {
     }
 
     if ($RemoveInvalidPermissions) {
+        $shell = Confirm-ExchangeShell
+
+        if (-not $shell.EMS) {
+            Write-Host "The -RemoveInvalidPermissions switch must be used from Exchange Management Shell. If you are using EMS,"
+            Write-Host "then there may be an issue with the Auth Certificate or some other issue preventing PowerShell serialization."
+            Write-Host "Cannot continue."
+            return
+        }
+
         if (-not (Test-Path $ResultsFile)) {
             Write-Error "File not found: $ResultsFile. Please specify -ResultsFile or run without -RemoveInvalidPermissions to generate a results file."
         } else {

diff --git a/PublicFolders/SourceSideValidations/Tests/Permission/Remove-InvalidPermission.ps1 b/PublicFolders/SourceSideValidations/Tests/Permission/Remove-InvalidPermission.ps1
@@ -48,7 +48,7 @@ function Remove-InvalidPermission {
                     ) {
                         if ($PSCmdlet.ShouldProcess("$($result.FolderIdentity)", "Remove $($perm.User.DisplayName)")) {
                             Write-Host "Removing $($perm.User.DisplayName) from folder $($result.FolderIdentity)"
-                            Remove-PublicFolderClientPermission $result.FolderEntryId -User $perm.User.DisplayName -Confirm:$false
+                            $perm | Remove-PublicFolderClientPermission -Confirm:$false
                         }
                     }
                 }