Merge pull request #235 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-ListTenants.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ListTenants {
+function Invoke-ListTenants {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -95,15 +95,15 @@ Function Invoke-ListTenants {
             }
             if ($Request.Query.Mode -eq 'TenantList') {
                 # add portal link properties
-                $Body = $Body | Select-Object *, @{Name = 'portal_m365'; Expression = { "https://admin.microsoft.com/Partner/BeginClientSession.aspx?CTID=$($_.customerId)&CSDEST=o365admincenter" } },
-                @{Name = 'portal_exchange'; Expression = { "https://admin.exchange.microsoft.com/?landingpage=homepage&form=mac_sidebar&delegatedOrg=$($_.defaultDomainName)" } },
+                $Body = $Body | Select-Object *, @{Name = 'portal_m365'; Expression = { "https://admin.cloud.microsoft/?delegatedOrg=$($_.initialDomainName)" } },
+                @{Name = 'portal_exchange'; Expression = { "https://admin.cloud.microsoft/exchange/?delegatedOrg=$($_.initialDomainName)" } },
                 @{Name = 'portal_entra'; Expression = { "https://entra.microsoft.com/$($_.defaultDomainName)" } },
-                @{Name = 'portal_teams'; Expression = { "https://admin.teams.microsoft.com/?delegatedOrg=$($_.defaultDomainName)" } },
+                @{Name = 'portal_teams'; Expression = { "https://admin.teams.microsoft.com/?delegatedOrg=$($_.initialDomainName)" } },
                 @{Name = 'portal_azure'; Expression = { "https://portal.azure.com/$($_.defaultDomainName)" } },
                 @{Name = 'portal_intune'; Expression = { "https://intune.microsoft.com/$($_.defaultDomainName)" } },
                 @{Name = 'portal_security'; Expression = { "https://security.microsoft.com/?tid=$($_.customerId)" } },
                 @{Name = 'portal_compliance'; Expression = { "https://purview.microsoft.com/?tid=$($_.customerId)" } },
-                @{Name = 'portal_sharepoint'; Expression = { "https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=$($_.customerId)&CSDEST=SharePoint" } }
+                @{Name = 'portal_sharepoint'; Expression = { "/api/ListSharePointAdminUrl?tenantFilter=$($_.defaultDomainName)" } }
             }
 
         } else {

Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1

@@ -20,16 +20,16 @@ function Get-CIPPStandards {
     $Table = Get-CippTable -tablename 'templates'
     $Filter = "PartitionKey eq 'StandardsTemplateV2'"
     $Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter | Sort-Object TimeStamp).JSON |
-        ForEach-Object {
-            try {
-                # Fix old "Action" => "action"
-                $JSON = $_ -replace '"Action":', '"action":' -replace '"permissionlevel":', '"permissionLevel":'
-                ConvertFrom-Json -InputObject $JSON -ErrorAction SilentlyContinue
-            } catch {}
-        } |
-        Where-Object {
-            $_.GUID -like $TemplateId -and $_.runManually -eq $runManually
-        }
+    ForEach-Object {
+        try {
+            # Fix old "Action" => "action"
+            $JSON = $_ -replace '"Action":', '"action":' -replace '"permissionlevel":', '"permissionLevel":'
+            ConvertFrom-Json -InputObject $JSON -ErrorAction SilentlyContinue
+        } catch {}
+    } |
+    Where-Object {
+        $_.GUID -like $TemplateId -and $_.runManually -eq $runManually
+    }
 
     # 2. Get tenant list, filter if needed
     $AllTenantsList = Get-Tenants
@@ -138,7 +138,15 @@ function Get-CIPPStandards {
 
                 if ($template.excludedTenants) {
                     if ($template.excludedTenants -is [System.Collections.IEnumerable] -and -not ($template.excludedTenants -is [string])) {
-                        $excludedTenantValues = $template.excludedTenants | ForEach-Object { $_.value }
+                        $excludedTenantValues = $template.excludedTenants | ForEach-Object {
+                            $FilterValue = $_.value
+                            if ($_.type -eq 'Group') {
+                        ($TenantGroups | Where-Object {
+                                    $_.Id -eq $FilterValue
+                                }).Members.defaultDomainName
+                            } else {
+                                $FilterValue
+                            } }
                     } else {
                         $excludedTenantValues = @($template.excludedTenants)
                     }

Modules/CippExtensions/Public/Hudu/Get-HuduFieldMapping.ps1

@@ -68,7 +68,7 @@ function Get-HuduFieldMapping {
         CIPPFields        = $CIPPFields
         CIPPFieldHeaders  = $CIPPFieldHeaders
         IntegrationFields = @($Unset) + @($AssetLayouts)
-        Mappings          = $Mappings
+        Mappings          = @($Mappings)
     }
 
     return $MappingObj

Modules/CippExtensions/Public/NinjaOne/Get-NinjaOneFieldMapping.ps1

@@ -109,7 +109,7 @@ function Get-NinjaOneFieldMapping {
         CIPPFields        = $CIPPFields
         CIPPFieldHeaders  = $CIPPFieldHeaders
         IntegrationFields = @($Unset) + @($NinjaCustomFieldsOrg) + @($NinjaCustomFieldsNode)
-        Mappings          = $Mappings
+        Mappings          = @($Mappings)
     }
 
     return $MappingObj