Merge pull request #190 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-GetCippAlerts.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-GetCippAlerts {
+function Invoke-GetCippAlerts {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -60,7 +60,7 @@ Function Invoke-GetCippAlerts {
                 type  = 'error'
             })
     }
-    if ($env:WEBSITE_RUN_FROM_PACKAGE -ne '1' -and $env:AzureWebJobsStorage -ne 'UseDevelopmentStorage=true') {
+    if ((!$env:WEBSITE_RUN_FROM_PACKAGE -or [string]::IsNullOrEmpty($env:WEBSITE_RUN_FROM_PACKAGE)) -and $env:AzureWebJobsStorage -ne 'UseDevelopmentStorage=true') {
         $Alerts.Add(
             @{
                 title = 'Function App in Write Mode'

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecAlertsList.ps1

@@ -43,6 +43,10 @@ Function Invoke-ExecAlertsList {
             }
 
             $DisplayableAlerts = New-FlatArray $AlertsObj | Where-Object { $null -ne $_.Id } | Sort-Object -Property EventDateTime -Descending
+            if (!$DisplayableAlerts) {
+                $DisplayableAlerts = @()
+            }
+            $Metadata = [PSCustomObject]@{}
 
             [PSCustomObject]@{
                 NewAlertsCount             = $DisplayableAlerts | Where-Object { $_.Status -eq 'newAlert' } | Measure-Object | Select-Object -ExpandProperty Count
@@ -51,7 +55,7 @@ Function Invoke-ExecAlertsList {
                 SeverityMediumAlertsCount  = $DisplayableAlerts | Where-Object { ($_.Status -eq 'inProgress') -or ($_.Status -eq 'newAlert') } | Where-Object { $_.Severity -eq 'medium' } | Measure-Object | Select-Object -ExpandProperty Count
                 SeverityLowAlertsCount     = $DisplayableAlerts | Where-Object { ($_.Status -eq 'inProgress') -or ($_.Status -eq 'newAlert') } | Where-Object { $_.Severity -eq 'low' } | Measure-Object | Select-Object -ExpandProperty Count
                 SeverityInformationalCount = $DisplayableAlerts | Where-Object { ($_.Status -eq 'inProgress') -or ($_.Status -eq 'newAlert') } | Where-Object { $_.Severity -eq 'informational' } | Measure-Object | Select-Object -ExpandProperty Count
-                MSResults                  = $DisplayableAlerts
+                MSResults                  = @($DisplayableAlerts)
             }
         } else {
             $Table = Get-CIPPTable -TableName cachealertsandincidents

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Teams-Sharepoint/Invoke-ListTeamsVoice.ps1

@@ -28,7 +28,11 @@ Function Invoke-ListTeamsVoice {
             $data = (New-TeamsAPIGetRequest -uri "https://api.interfaces.records.teams.microsoft.com/Skype.TelephoneNumberMgmt/Tenants/$($Tenantid)/telephone-numbers?skip=$($skip)&locale=en-US&top=999" -tenantid $TenantFilter).TelephoneNumbers | ForEach-Object {
                 Write-Host 'Reached the loop'
                 $CompleteRequest = $_ | Select-Object *, @{Name = 'AssignedTo'; Expression = { $users | Where-Object -Property id -EQ $_.AssignedTo.id } }
-                $CompleteRequest.AcquisitionDate ? ($CompleteRequest.AcquisitionDate = $CompleteRequest.AcquisitionDate -split 'T' | Select-Object -First 1) : ($CompleteRequest | Add-Member -NotePropertyName 'AcquisitionDate' -NotePropertyValue 'Unknown' -Force)
+                if ($CompleteRequest.AcquisitionDate) {
+                    $CompleteRequest.AcquisitionDate = $_.AcquisitionDate -split 'T' | Select-Object -First 1
+                } else {
+                    $CompleteRequest | Add-Member -NotePropertyName 'AcquisitionDate' -NotePropertyValue 'Unknown' -Force
+                }
                 $CompleteRequest.AssignedTo ? $null : ($CompleteRequest | Add-Member -NotePropertyName 'AssignedTo' -NotePropertyValue 'Unassigned' -Force)
                 $CompleteRequest
             }

Modules/CippExtensions/Public/Halo/Set-HaloMapping.ps1

@@ -9,15 +9,16 @@ function Set-HaloMapping {
         Remove-AzDataTableEntity -Force @CIPPMapping -Entity $_
     }
     foreach ($Mapping in $Request.Body) {
-        $AddObject = @{
-            PartitionKey    = 'HaloMapping'
-            RowKey          = "$($mapping.TenantId)"
-            IntegrationId   = "$($mapping.IntegrationId)"
-            IntegrationName = "$($mapping.IntegrationName)"
+        if ($Mapping.TenantId) {
+            $AddObject = @{
+                PartitionKey    = 'HaloMapping'
+                RowKey          = "$($mapping.TenantId)"
+                IntegrationId   = "$($mapping.IntegrationId)"
+                IntegrationName = "$($mapping.IntegrationName)"
+            }
         }
 
         Add-CIPPAzDataTableEntity @CIPPMapping -Entity $AddObject -Force
-
         Write-LogMessage -API $APINAME -headers $Request.Headers -message "Added mapping for $($mapping.name)." -Sev 'Info'
     }
     $Result = [pscustomobject]@{'Results' = 'Successfully edited mapping table.' }

Modules/CippExtensions/Public/NinjaOne/Set-NinjaOneOrgMapping.ps1

@@ -10,15 +10,15 @@ function Set-NinjaOneOrgMapping {
         Remove-AzDataTableEntity -Force @CIPPMapping -Entity $_
     }
     foreach ($Mapping in $Request.Body) {
-        $AddObject = @{
-            PartitionKey    = 'NinjaOneMapping'
-            RowKey          = "$($mapping.TenantId)"
-            IntegrationId   = "$($mapping.IntegrationId)"
-            IntegrationName = "$($mapping.IntegrationName)"
+        if ($Mapping.TenantId) {
+            $AddObject = @{
+                PartitionKey    = 'NinjaOneMapping'
+                RowKey          = "$($mapping.TenantId)"
+                IntegrationId   = "$($mapping.IntegrationId)"
+                IntegrationName = "$($mapping.IntegrationName)"
+            }
         }
-
         Add-CIPPAzDataTableEntity @CIPPMapping -Entity $AddObject -Force
-
         Write-LogMessage -API $APINAME -headers $Request.Headers -message "Added mapping for $($mapping.name)." -Sev 'Info'
     }
     $Result = [pscustomobject]@{'Results' = 'Successfully edited mapping table.' }