From 968f51616f0517b1018ba2de480f77979860e33d Mon Sep 17 00:00:00 2001
From: Keepers <ryanfkeepers@gmail.com>
Date: Thu, 16 Mar 2023 23:07:01 -0600
Subject: [PATCH] add outputs to script (#2834)

Some quick QoL
---
 src/cmd/purge/scripts/foldersAndItems.ps1 |  8 ++++----
 src/cmd/purge/scripts/setRetention.ps1    | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/cmd/purge/scripts/foldersAndItems.ps1 b/src/cmd/purge/scripts/foldersAndItems.ps1
index c086a44d9..9d8926076 100644
--- a/src/cmd/purge/scripts/foldersAndItems.ps1
+++ b/src/cmd/purge/scripts/foldersAndItems.ps1
@@ -31,7 +31,7 @@ function Get-AccessToken {
     Param()
 
     if ([String]::IsNullOrEmpty($TenantId) -or [String]::IsNullOrEmpty($ClientId) -or [String]::IsNullOrEmpty($ClientSecret)) {
-        Write-Host "Need to specify TenantId, ClientId, and ClientSecret as parameters or ENVs"
+        Write-Host "`nNeed to specify TenantId, ClientId, and ClientSecret as parameters or ENVs"
     }
 
     $body=@{
@@ -130,7 +130,7 @@ function Remove-Folder {
 </FindFolder>
 "@
 
-    Write-Host "Looking for folders under well-known folder: $WellKnownRoot & matching folder: $FolderNamePurge$FolderNamePrefixPurge & for user: $User"
+    Write-Host "`nLooking for folders under well-known folder: $WellKnownRoot & matching folder: $FolderNamePurge$FolderNamePrefixPurge & for user: $User"
     $getFolderIdMsg = Initialize-SOAPMessage -User $User -Body $body
     $response = Invoke-SOAPRequest -Token $Token -Message $getFolderIdMsg
 
@@ -160,10 +160,10 @@ function Remove-Folder {
         }
 
         if (![String]::IsNullOrEmpty($FolderNamePurge)) {
-            Write-Host "Found desired folder to purge: $FolderNamePurge"
+            Write-Host "`nFound desired folder to purge: $FolderNamePurge"
         }
 
-        Write-Verbose "Folder Id and ChangeKey for ""$folderName"": $folderId, $changeKey"
+        Write-Verbose "`nFolder Id and ChangeKey for ""$folderName"": $folderId, $changeKey"
 
         # Empty and delete the folder if found
         if (![String]::IsNullOrEmpty($folderId) -and ![String]::IsNullOrEmpty($changeKey)) {
diff --git a/src/cmd/purge/scripts/setRetention.ps1 b/src/cmd/purge/scripts/setRetention.ps1
index d50d861ad..752652879 100644
--- a/src/cmd/purge/scripts/setRetention.ps1
+++ b/src/cmd/purge/scripts/setRetention.ps1
@@ -15,12 +15,21 @@ if (-not (Get-Module -ListAvailable -Name ExchangeOnlineManagement)) {
     Install-Module -Name ExchangeOnlineManagement -MinimumVersion 3.0.0 -Force
 }
 
-Write-Host "Connecting to Exchange..."
+Write-Host "`nConnecting to Exchange..."
 $password = convertto-securestring -String "$AdminPwd" -AsPlainText -Force
 $cred = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $AdminUser, $password
 Connect-ExchangeOnline -Credential $cred
 
-Write-Host "Resetting retention..."
+Write-Host "`nResetting retention..."
+
 # Set retention values for all mailboxes 
-Get-Mailbox | ForEach-Object { Set-Mailbox -Identity $_.Alias -RetentionHoldEnabled $false  -LitigationHoldEnabled $false -SingleItemRecoveryEnabled $false -RetainDeletedItemsFor 0 -AuditLogAgeLimit 0 -Force }
-Get-Mailbox | ForEach-Object { Start-ManagedFolderAssistant -Identity $_.Alias }
+Get-Mailbox | ForEach-Object {
+    Write-Host "...for" $_
+    Set-Mailbox -Identity $_.Alias `
+        -RetentionHoldEnabled $false `
+        -LitigationHoldEnabled $false `
+        -SingleItemRecoveryEnabled $false `
+        -RetainDeletedItemsFor 0 `
+        -AuditLogAgeLimit 0 `
+        -Force
+}