only create tenant mapping if the TenantId is actually set

Author: JohnDuprey

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.' }