Merge branch 'interface-rewrite' of https://github.com/KelvinTegelaar/CIPP-API into interface-rewrite

Author: KelvinTegelaar

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

@@ -15,10 +15,11 @@ Function Invoke-ExecEmailForward {
     $ForwardingAddress = $request.body.ForwardInternal.value
     $ForwardingSMTPAddress = $request.body.ForwardExternal
     $DisableForwarding = $request.body.disableForwarding
+    $ForwardOption = $request.body.forwardOption
     $APIName = $TriggerMetadata.FunctionName
     [bool]$KeepCopy = if ($request.body.keepCopy -eq 'true') { $true } else { $false }
 
-    if ($ForwardingAddress) {
+    if ($ForwardOption -eq 'internalAddress') {
         try {
             Set-CIPPForwarding -userid $username -tenantFilter $TenantFilter -APIName $APINAME -ExecutingUser $request.headers.'x-ms-client-principal' -Forward $ForwardingAddress -keepCopy $KeepCopy
             if (-not $request.body.KeepCopy) {
@@ -33,7 +34,7 @@ Function Invoke-ExecEmailForward {
         }
     }
 
-    if ($ForwardingSMTPAddress) {
+    if ($ForwardOption -eq 'ExternalAddress') {
         try {
             Set-CIPPForwarding -userid $username -tenantFilter $TenantFilter -APIName $APINAME -ExecutingUser $request.headers.'x-ms-client-principal' -forwardingSMTPAddress $ForwardingSMTPAddress -keepCopy $KeepCopy
             if (-not $request.body.KeepCopy) {
@@ -49,7 +50,7 @@ Function Invoke-ExecEmailForward {
 
     }
 
-    if ($DisableForwarding -eq 'True') {
+    if ($ForwardOption -eq 'disabled') {
         try {
             Set-CIPPForwarding -userid $username -username $username -tenantFilter $Tenantfilter -ExecutingUser $ExecutingUser -APIName $APIName -Disable $true
             $results = "Disabled Email Forwarding for $($username)"

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

@@ -45,8 +45,8 @@ function Invoke-ExecMailboxRestore {
             default {
                 $TenantFilter = $Request.Body.TenantFilter
                 $RequestName = $Request.Body.RequestName
-                $SourceMailbox = $Request.Body.SourceMailbox
-                $TargetMailbox = if (!$Request.Body.input) {$Request.Body.TargetMailbox} else {$Request.Body.input}
+                $SourceMailbox = $Request.Body.SourceMailbox.value ?? $Request.Body.SourceMailbox
+                $TargetMailbox = $Request.Body.TargetMailbox.value ?? $Request.Body.TargetMailbox
 
                 $ExoRequest = @{
                     tenantid  = $TenantFilter
@@ -58,16 +58,50 @@ function Invoke-ExecMailboxRestore {
                         AllowLegacyDNMismatch = $true
                     }
                 }
-                if ([bool]$Request.Body.AcceptLargeDataLoss -eq $true) {
-                    $ExoRequest.cmdParams.AcceptLargeDataLoss = $true
+                if ($Request.Body.AssociatedMessagesCopyOption) {
+                    $ExoRequest.cmdParams.AssociatedMessagesCopyOption = $Request.Body.AssociatedMessagesCopyOption.value
+                }
+                if ($Request.Body.ExcludeFolders) {
+                    $ExoRequest.cmdParams.ExcludeFolders = $Request.Body.ExcludeFolders.value
+                }
+                if ($Request.Body.IncludeFolders) {
+                    $ExoRequest.cmdParams.IncludeFolders = $Request.Body.IncludeFolders.value
+                }
+                if ($Request.Body.BatchName) {
+                    $ExoRequest.cmdParams.BatchName = $Request.Body.BatchName
+                }
+                if ($Request.Body.CompletedRequestAgeLimit) {
+                    $ExoRequest.cmdParams.CompletedRequestAgeLimit = $Request.Body.CompletedRequestAgeLimit
+                }
+                if ($Request.Body.ConflictResolutionOption) {
+                    $ExoRequest.cmdParams.ConflictResolutionOption = $Request.Body.ConflictResolutionOption.value
+                }
+                if ($Request.Body.SourceRootFolder) {
+                    $ExoRequest.cmdParams.SourceRootFolder = $Request.Body.SourceRootFolder
+                }
+                if ($Request.Body.TargetRootFolder) {
+                    $ExoRequest.cmdParams.TargetRootFolder = $Request.Body.TargetRootFolder
+                }
+                if ($Request.Body.TargetType) {
+                    $ExoRequest.cmdParams.TargetType = $Request.Body.TargetType.value
                 }
                 if ([int]$Request.Body.BadItemLimit -gt 0) {
                     $ExoRequest.cmdParams.BadItemLimit = $Request.Body.BadItemLimit
                 }
                 if ([int]$Request.Body.LargeItemLimit -gt 0) {
                     $ExoRequest.cmdParams.LargeItemLimit = $Request.Body.LargeItemLimit
                 }
+                if ($Request.Body.ExcludeDumpster) {
+                    $ExoRequest.cmdParams.ExcludeDumpster = $Request.Body.ExcludeDumpster
+                }
+                if ($Request.Body.SourceIsArchive) {
+                    $ExoRequest.cmdParams.SourceIsArchive = $Request.Body.SourceIsArchive
+                }
+                if ($Request.Body.TargetIsArchive) {
+                    $ExoRequest.cmdParams.TargetIsArchive = $Request.Body.TargetIsArchive
+                }
 
+                Write-Information ($ExoRequest | ConvertTo-Json)
                 $SuccessMessage = 'Mailbox restore request created successfully'
             }
         }
@@ -93,4 +127,4 @@ function Invoke-ExecMailboxRestore {
             StatusCode = $StatusCode
             Body       = $Body
         })
-}
+}

Modules/CIPPCore/Public/Entrypoints/Invoke-ListMailboxes.ps1

@@ -58,7 +58,6 @@ Function Invoke-ListMailboxes {
             }
         }
 
-        Write-Host ($ExoRequest | ConvertTo-Json)
         $GraphRequest = (New-ExoRequest @ExoRequest) | Select-Object id, ExchangeGuid, ArchiveGuid, WhenSoftDeleted, @{ Name = 'UPN'; Expression = { $_.'UserPrincipalName' } },
 
         @{ Name = 'displayName'; Expression = { $_.'DisplayName' } },