Merge pull request #124 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ListCalendarPermissions.ps1

@@ -21,7 +21,9 @@ Function Invoke-ListCalendarPermissions {
         $GetCalParam = @{Identity = $UserID; FolderScope = 'Calendar' }
         $CalendarFolder = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-MailboxFolderStatistics' -anchor $UserID -cmdParams $GetCalParam | Select-Object -First 1 -ExcludeProperty *data.type*
         $CalParam = @{Identity = "$($UserID):\$($CalendarFolder.name)" }
-        $GraphRequest = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-MailboxFolderPermission' -anchor $UserID -cmdParams $CalParam -UseSystemMailbox $true | Select-Object Identity, User, AccessRights, FolderName
+        $Mailbox = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-Mailbox' -cmdParams @{Identity = $UserID }
+        $GraphRequest = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-MailboxFolderPermission' -anchor $UserID -cmdParams $CalParam -UseSystemMailbox $true | Select-Object Identity, User, AccessRights, FolderName, @{ Name = 'MailboxInfo'; Expression = { $Mailbox } }
+
         Write-LogMessage -API $APIName -tenant $TenantFilter -message "Calendar permissions listed for $($TenantFilter)" -sev Debug
         $StatusCode = [HttpStatusCode]::OK
     } catch {

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListUserMailboxDetails.ps1

@@ -64,9 +64,9 @@ Function Invoke-ListUserMailboxDetails {
             }
         )
         Write-Host $UserID
-        #$username = (New-GraphGetRequest -tenantid $TenantFilter -uri "https://graph.microsoft.com/beta/users/$UserID").userPrincipalName
+        $usernames = New-GraphGetRequest -tenantid $TenantFilter -uri 'https://graph.microsoft.com/beta/users?$select=id,userPrincipalName&$top=999'
         $Results = New-ExoBulkRequest -TenantId $TenantFilter -CmdletArray $Requests -returnWithCommand $true -Anchor $username
-
+        Write-Host "First line of usernames is $($usernames[0] | ConvertTo-Json)"
         # Assign variables from $Results
         $MailboxDetailedRequest = $Results.'Get-Mailbox'
         $PermsRequest = $Results.'Get-MailboxPermission'
@@ -113,18 +113,34 @@ Function Invoke-ListUserMailboxDetails {
 
     # Parse permissions
 
-    $ParsedPerms = foreach ($PermSet in @($PermsRequest, $PermsRequest2)) {
+    #Implemented as an arraylist that uses .add().
+    $ParsedPerms = [System.Collections.ArrayList]::new()
+    foreach ($PermSet in @($PermsRequest, $PermsRequest2)) {
         foreach ($Perm in $PermSet) {
             # Check if Trustee or User is not NT AUTHORITY\SELF
             $user = $Perm.Trustee ? $Perm.Trustee : $Perm.User
-            if ($user -ne 'NT AUTHORITY\SELF') {
-                [PSCustomObject]@{
-                    User         = $user
-                    AccessRights = ($Perm.AccessRights) -join ', '
-                }
+            if ($user -and $user -ne 'NT AUTHORITY\SELF') {
+                $null = $ParsedPerms.Add([PSCustomObject]@{
+                        User         = $user
+                        AccessRights = ($Perm.AccessRights) -join ', '
+                    })
             }
         }
     }
+    if ($MailboxDetailedRequest.GrantSendOnBehalfTo) {
+        $MailboxDetailedRequest.GrantSendOnBehalfTo | ForEach-Object {
+            $id = $_
+            $username = $usernames | Where-Object { $_.id -eq $id }
+
+            $null = $ParsedPerms.Add([PSCustomObject]@{
+                    User         = $username.UserPrincipalName ? $username.UserPrincipalName : $_
+                    AccessRights = 'SendOnBehalf'
+                })
+        }
+    }
+    if ($ParsedPerms.Count -eq 0) {
+        $ParsedPerms = @()
+    }
 
     # Get forwarding address
     $ForwardingAddress = if ($MailboxDetailedRequest.ForwardingAddress) {

Modules/CIPPCore/Public/New-CIPPDeviceAction.ps1

@@ -9,6 +9,11 @@ function New-CIPPDeviceAction {
         $APINAME
     )
     try {
+        if ($action -eq 'delete') {
+            $null = New-Graphpostrequest -uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices/$DeviceFilter" -type DELETE -tenantid $TenantFilter
+            Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantFilter -message "Queued $Action on $DeviceFilter" -Sev 'Info'
+            return "Queued $Action on $DeviceFilter"
+        }
         $null = New-Graphpostrequest -uri "https://graph.microsoft.com/beta/deviceManagement/managedDevices('$DeviceFilter')/$($Action)" -type POST -tenantid $TenantFilter -body $ActionBody
         Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantFilter -message "Queued $Action on $DeviceFilter" -Sev 'Info'
         return "Queued $Action on $DeviceFilter"

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableLitigationHold.ps1

@@ -39,14 +39,19 @@ function Invoke-CIPPStandardEnableLitigationHold {
         } else {
             try {
                 $Request = $MailboxesNoLitHold | ForEach-Object {
-                    @{
+                    $params = @{
                         CmdletInput = @{
                             CmdletName = 'Set-Mailbox'
                             Parameters = @{ Identity = $_.UserPrincipalName; LitigationHoldEnabled = $true }
                         }
                     }
+                    if ($Settings.days -ne $null) {
+                        $params.CmdletInput.Parameters['LitigationHoldDuration'] = $Settings.days
+                    }
+                    $params
                 }
 
+
                 $BatchResults = New-ExoBulkRequest -tenantid $tenant -cmdletArray @($Request)
                 $BatchResults | ForEach-Object {
                     if ($_.error) {