Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into…

… dev
inderly · Jul 17, 2023 · 00e8e1d · 00e8e1d
2 parents 0302e13 + 10d90ec
commit 00e8e1d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/ExecOffboardUser/run.ps1 b/ExecOffboardUser/run.ps1
@@ -23,7 +23,7 @@ try {
             Set-CIPPResetPassword -tenantFilter $tenantFilter -userid $username -ExecutingUser $request.headers.'x-ms-client-principal' -APIName "ExecOffboardUser"
         }
         { $_.RemoveGroups -eq 'true' } { 
-            Remove-CIPPGroups -userid $userid -tenantFilter $Tenantfilter -ExecutingUser $request.headers.'x-ms-client-principal' -APIName "ExecOffboardUser"
+            Remove-CIPPGroups -userid $userid -tenantFilter $Tenantfilter -ExecutingUser $request.headers.'x-ms-client-principal' -APIName "ExecOffboardUser" -Username "$Username"
         }
 
         { $_."HideFromGAL" -eq 'true' } {

diff --git a/Modules/CIPPCore/Public/Remove-CIPPGroups.ps1 b/Modules/CIPPCore/Public/Remove-CIPPGroups.ps1
@@ -4,7 +4,8 @@ function Remove-CIPPGroups {
         $userid,
         $tenantFilter,
         $APIName = "Remove From Groups",
-        $ExecutingUser
+        $ExecutingUser,
+        $Username
     )
 
     $AllGroups = (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups/?$select=DisplayName,mailEnabled" -tenantid $tenantFilter)
@@ -29,12 +30,12 @@ function Remove-CIPPGroups {
                 New-ExoRequest -tenantid $using:tenantFilter -cmdlet "Remove-DistributionGroupMember" -cmdParams $params  -UseSystemMailbox $true
             }
 
-            Write-LogMessage -user $using:ExecutingUser -API $($using:APIName) -message "Removed $($using:userid) from $groupname" -Sev "Info"  -tenant $using:TenantFilter
-            return "Successfully removed user from group $Groupname"
+            Write-LogMessage -user $using:ExecutingUser -API $($using:APIName) -message "Removed $($using:Username) from $groupname" -Sev "Info"  -tenant $using:TenantFilter
+            return "Successfully removed $($using:Username) from group $Groupname"
         }
         catch {
-            Write-LogMessage -user $using:ExecutingUser -API $($using:APIName) -message "Could not remove $($using:userid) from group $groupname" -Sev "Error" -tenant $using:TenantFilter
-            return "Could not remove user from group $($Groupname): $($_.Exception.Message). This is likely because its a Dynamic Group or synched with active directory"
+            Write-LogMessage -user $using:ExecutingUser -API $($using:APIName) -message "Could not remove $($using:Username) from group $groupname" -Sev "Error" -tenant $using:TenantFilter
+            return "Could not remove $($using:Username) from group $($Groupname): $($_.Exception.Message). This is likely because its a Dynamic Group or synched with active directory"
         }
     }
 }
diff --git a/Modules/CIPPCore/Public/Remove-CIPPRules.ps1 b/Modules/CIPPCore/Public/Remove-CIPPRules.ps1
@@ -11,19 +11,19 @@ function Remove-CIPPRules {
     try {
         $rules = New-ExoRequest -tenantid $TenantFilter -cmdlet "Get-InboxRule" -cmdParams @{mailbox = $userid } 
         if ($rules -eq $null) {
-            Write-LogMessage -user $ExecutingUser -API $APIName -message "No Rules for $($userid) to delete" -Sev "Info" -tenant $TenantFilter
-            return "No rules for $($userid) to delete"
+            Write-LogMessage -user $ExecutingUser -API $APIName -message "No Rules for $($username) to delete" -Sev "Info" -tenant $TenantFilter
+            return "No rules for $($username) to delete"
         }
         else {
             ForEach ($rule in $rules) {
                 New-ExoRequest -tenantid $TenantFilter -cmdlet "Remove-InboxRule" -Anchor $userid -cmdParams @{Identity = $rule.Identity }
             }
-            Write-LogMessage -user $ExecutingUser -API $APIName -message "Deleted Rules for $($userid)" -Sev "Info" -tenant $TenantFilter
-            return "Deleted Rules for $($userid)"
+            Write-LogMessage -user $ExecutingUser -API $APIName -message "Deleted Rules for $($username)" -Sev "Info" -tenant $TenantFilter
+            return "Deleted Rules for $($username)"
         }
     }
     catch {
-        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not delete rules for $($userid): $($_.Exception.Message)" -Sev "Error" -tenant $TenantFilter
-        return "Could not delete rules for $($userid). Error: $($_.Exception.Message)"
+        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not delete rules for $($username): $($_.Exception.Message)" -Sev "Error" -tenant $TenantFilter
+        return "Could not delete rules for $($username). Error: $($_.Exception.Message)"
     }
 }