Merge pull request #463 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/BEC/Push-BECRun.ps1

@@ -144,7 +144,7 @@ function Push-BECRun {
         $GraphResults = New-GraphBulkRequest -Requests $Requests -tenantid $TenantFilter -asapp $true
 
         $PasswordChanges = (($GraphResults | Where-Object { $_.id -eq 'Users' }).body.value | Where-Object { $_.lastPasswordChangeDateTime -ge $startDate }) ?? @()
-        $NewUsers = ($GraphResults | Where-Object { $_.id -eq 'Users' }).body.value | Where-Object { $_.createdDateTime -ge $startDate } ?? @()
+        $NewUsers = (($GraphResults | Where-Object { $_.id -eq 'Users' }).body.value | Where-Object { $_.createdDateTime -ge $startDate }) ?? @()
         $MFADevices = ($GraphResults | Where-Object { $_.id -eq 'MFADevices' }).body.value ?? @()
         $NewSPs = ($GraphResults | Where-Object { $_.id -eq 'NewSPs' }).body.value ?? @()
 

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

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ListMailboxes {
+function Invoke-ListMailboxes {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -73,7 +73,7 @@ Function Invoke-ListMailboxes {
         LitigationHoldEnabled,
         LitigationHoldDate,
         LitigationHoldDuration,
-        @{ Name = 'LicensedForLitigationHold'; Expression = { ($_.PersistedCapabilities -contains 'BPOS_S_DlpAddOn' -or $_.PersistedCapabilities -contains 'BPOS_S_Enterprise') } },
+        @{ Name = 'LicensedForLitigationHold'; Expression = { ($_.PersistedCapabilities -contains 'EXCHANGE_S_ARCHIVE_ADDON' -or $_.PersistedCapabilities -contains 'EXCHANGE_S_ENTERPRISE') } },
         ComplianceTagHoldApplied,
         RetentionHoldEnabled,
         InPlaceHolds,

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-EditIntuneScript.ps1

@@ -73,9 +73,9 @@ function Invoke-EditIntuneScript {
         }
         'PATCH' {
             Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-                StatusCode = [HttpStatusCode]::BadRequest
-                Body       = "Method $($Request.Method) is not supported."
-            })
+                    StatusCode = [HttpStatusCode]::BadRequest
+                    Body       = "Method $($Request.Method) is not supported."
+                })
         }
         'POST' {
             # Parse the script data to determine type

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-RemoveIntuneScript.ps1

@@ -35,12 +35,12 @@ function Invoke-RemoveIntuneScript {
             'Linux' {
                 "https://graph.microsoft.com/beta/deviceManagement/ConfigurationPolicies('$($ID)')"
             }
-            Default { $null }
+            default { $null }
         }
 
         $null = New-GraphPOSTRequest -uri $URI -type DELETE -tenantid $TenantFilter
         $Result = "Deleted $($ScriptType) script $($DisplayName) with ID: $($ID)"
-        Write-LogMessage -headers $.Headers -API $APINAME -tenant $Tenant -message $Result -Sev 'Info'
+        Write-LogMessage -headers $Headers -API $APINAME -tenant $Tenant -message $Result -Sev 'Info'
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
@@ -49,11 +49,10 @@ function Invoke-RemoveIntuneScript {
         $StatusCode = [HttpStatusCode]::Forbidden
     }
 
-    $body = [pscustomobject]@{'Results' = "$Result" }
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = $StatusCode
-            Body       = $body
+            Body       = @{'Results' = "$Result" }
         })
 
 }

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

@@ -288,7 +288,7 @@ function Invoke-ListUserMailboxDetails {
             LitigationHoldEnabled,
             LitigationHoldDate,
             LitigationHoldDuration,
-            @{ Name = 'LicensedForLitigationHold'; Expression = { ($_.PersistedCapabilities -contains 'BPOS_S_DlpAddOn' -or $_.PersistedCapabilities -contains 'BPOS_S_Enterprise') } },
+            @{ Name = 'LicensedForLitigationHold'; Expression = { ($_.PersistedCapabilities -contains 'EXCHANGE_S_ARCHIVE_ADDON' -or $_.PersistedCapabilities -contains 'EXCHANGE_S_ENTERPRISE') } },
             ComplianceTagHoldApplied,
             RetentionHoldEnabled,
             InPlaceHolds)

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

@@ -11,11 +11,13 @@ function New-GraphPOSTRequest ($uri, $tenantid, $body, $type, $scope, $AsApp, $N
                 $headers.Add($header.Key, $header.Value)
             }
         }
-        Write-Verbose "Using $($uri) as url"
+
         if (!$type) {
             $type = 'POST'
         }
 
+        Write-Information "$($type.ToUpper()) [ $uri ] | tenant: $tenantid"
+
         if (!$contentType) {
             $contentType = 'application/json; charset=utf-8'
         }
@@ -28,6 +30,7 @@ function New-GraphPOSTRequest ($uri, $tenantid, $body, $type, $scope, $AsApp, $N
             } else {
                 $_.Exception.message
             }
+
             throw $Message
         }
         if ($returnHeaders) {

Modules/CIPPCore/Public/SAMManifest.json

@@ -91,6 +91,10 @@
           "id": "9255e99d-faf5-445e-bbf7-cb71482737c4",
           "type": "Role"
         },
+        {
+          "id": "8b9d79d0-ad75-4566-8619-f7500ecfcebe",
+          "type": "Scope"
+        },
         {
           "id": "06a5fe6d-c49d-46a7-b082-56b1b14103c7",
           "type": "Role"

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

@@ -39,9 +39,8 @@ function Invoke-CIPPStandardEnableLitigationHold {
 
     try {
         $MailboxesNoLitHold = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-Mailbox' -cmdParams @{ Filter = 'LitigationHoldEnabled -eq "False"' } -Select 'UserPrincipalName,PersistedCapabilities,LitigationHoldEnabled' |
-        Where-Object { $_.PersistedCapabilities -contains 'BPOS_S_DlpAddOn' -or $_.PersistedCapabilities -contains 'BPOS_S_Enterprise' }
-    }
-    catch {
+            Where-Object { $_.PersistedCapabilities -contains 'EXCHANGE_S_ARCHIVE_ADDON' -or $_.PersistedCapabilities -contains 'EXCHANGE_S_ENTERPRISE' }
+    } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
         Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the EnableLitigationHold state for $Tenant. Error: $ErrorMessage" -Sev Error
         return