Merge pull request KelvinTegelaar#1564 from kris6673/fix-archive-and-blockedForSpam

Fix: Fix blocked for spam parameters and logic

Author: JohnDuprey

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

@@ -18,6 +18,10 @@ function Invoke-ListUserMailboxDetails {
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Query.tenantFilter
     $UserID = $Request.Query.UserID
+    $UserMail = $Request.Query.userMail
+    Write-Host "TenantFilter: $TenantFilter"
+    Write-Host "UserID: $UserID"
+    Write-Host "UserMail: $UserMail"
 
     try {
         $Requests = @(
@@ -53,7 +57,7 @@ function Invoke-ListUserMailboxDetails {
             @{
                 CmdletInput = @{
                     CmdletName = 'Get-BlockedSenderAddress'
-                    Parameters = @{ Identity = $UserID }
+                    Parameters = @{ SenderAddress = $UserMail }
                 }
             },
             @{
@@ -63,7 +67,6 @@ function Invoke-ListUserMailboxDetails {
                 }
             }
         )
-        Write-Host $UserID
         $usernames = New-GraphGetRequest -tenantid $TenantFilter -uri 'https://graph.microsoft.com/beta/users?$select=id,userPrincipalName,displayName,mailNickname&$top=999'
         $Results = New-ExoBulkRequest -TenantId $TenantFilter -CmdletArray $Requests -returnWithCommand $true -Anchor $username
         Write-Host "First line of usernames is $($usernames[0] | ConvertTo-Json)"
@@ -105,9 +108,9 @@ function Invoke-ListUserMailboxDetails {
 
         # Determine if the user is blocked for spam
         if ($BlockedSender -and $BlockedSender.Count -gt 0) {
-            $BlockedForSpam = $false
-        } else {
             $BlockedForSpam = $true
+        } else {
+            $BlockedForSpam = $false
         }
     } catch {
         Write-Error "Failed Fetching Data $($_.Exception.message): $($_.InvocationInfo.ScriptLineNumber)"

Modules/CIPPCore/Public/GraphHelper/New-ExoRequest.ps1

@@ -4,7 +4,7 @@ function New-ExoRequest {
     Internal
     #>
     [CmdletBinding(DefaultParameterSetName = 'ExoRequest')]
-    Param(
+    param(
         [Parameter(Mandatory = $true, ParameterSetName = 'ExoRequest')]
         [string]$cmdlet,
 
@@ -43,7 +43,7 @@ function New-ExoRequest {
         $token = Get-GraphToken -Tenantid $tenantid -scope "$Resource/.default" -AsApp:$AsApp.IsPresent
 
         if ($cmdParams) {
-            #if cmdparams is a pscustomobject, convert to hashtable, otherwise leave as is
+            #if cmdParams is a pscustomobject, convert to hashtable, otherwise leave as is
             $Params = $cmdParams
         } else {
             $Params = @{}
@@ -145,7 +145,7 @@ function New-ExoRequest {
                 } until ($null -eq $URL)
 
                 Write-Verbose ($ResponseHeaders | ConvertTo-Json)
-                if ($ReturnedData.'@adminapi.warnings' -and $ReturnedData.value -eq $null) {
+                if ($ReturnedData.'@adminapi.warnings' -and $null -eq $ReturnedData.value) {
                     $ReturnedData.value = $ReturnedData.'@adminapi.warnings'
                 }
             } catch {

cspell.json

@@ -4,6 +4,7 @@
   "dictionaryDefinitions": [],
   "dictionaries": [],
   "words": [
+    "adminapi",
     "ADMS",
     "AITM",
     "Autotask",
@@ -23,6 +24,7 @@
     "gdap",
     "GDAP",
     "IMAP",
+    "innererror",
     "Intune",
     "locationcipp",
     "MAPI",