Merge pull request #505 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-AddGroupTemplate.ps1

@@ -14,35 +14,42 @@ function Invoke-AddGroupTemplate {
             throw 'You must enter a displayname'
         }
 
-        # Normalize group type to match New-CIPPGroup expectations (handle both camelCase and lowercase)
+        # Normalize group type to match New-CIPPGroup expectations
+        # Handle values from ListGroups calculatedGroupType and frontend form values
         $groupType = switch -wildcard ($Request.Body.groupType.ToLower()) {
-            '*dynamicdistribution*' { 'dynamicDistribution'; break }  # Check this first before *dynamic* and *distribution*
+            # Values from ListGroups calculatedGroupType
+            '*mail-enabled security*' { 'security'; break }
+            '*microsoft 365*' { 'm365'; break }
+            '*distribution list*' { 'distribution'; break }
+            # Dynamic groups don't have a specific calculatedGroupType - they're detected by membershipRule
+            # Frontend form values (camelCase and lowercase)
+            '*dynamicdistribution*' { 'dynamicDistribution'; break }
             '*dynamic*' { 'dynamic'; break }
             '*azurerole*' { 'azureRole'; break }
             '*unified*' { 'm365'; break }
-            '*microsoft*' { 'm365'; break }
             '*m365*' { 'm365'; break }
             '*generic*' { 'generic'; break }
-            '*security*' { 'security'; break }
+            '*security*' { 'generic'; break }
             '*distribution*' { 'distribution'; break }
             '*mail*' { 'distribution'; break }
             default { $Request.Body.groupType }
         }
 
         # Override to dynamic if membership rules are provided (for backward compatibility)
         # but only if it's not already a dynamicDistribution group
-        if ($Request.body.membershipRules -and $groupType -notin @('dynamicDistribution')) {
+        if ($Request.body.membershipRules -and ![string]::IsNullOrEmpty($Request.Body.membershipRules) -and $Request.Body.membershipRules -ne 'membershipRule' -and $groupType -notin @('dynamicDistribution')) {
             $groupType = 'dynamic'
         }
         # Normalize field names to handle different casing from various forms
         $displayName = $Request.Body.displayName ?? $Request.Body.Displayname ?? $Request.Body.displayname
         $description = $Request.Body.description ?? $Request.Body.Description
+        $MembershipRules = ([string]::IsNullOrEmpty($Request.Body.membershipRules) -or $Request.Body.membershipRules -eq 'membershipRule') ? $null : $Request.Body.membershipRules
 
         $object = [PSCustomObject]@{
             displayName     = $displayName
             description     = $description
             groupType       = $groupType
-            membershipRules = $Request.Body.membershipRules
+            membershipRules = $MembershipRules
             allowExternal   = $Request.Body.allowExternal
             username        = $Request.Body.username  # Can contain variables like @%tenantfilter%
             GUID            = $GUID

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-ListGroupTemplates.ps1

@@ -16,7 +16,12 @@ function Invoke-ListGroupTemplates {
         $data = $_.JSON | ConvertFrom-Json
 
         # Normalize groupType to camelCase for consistent frontend handling
+        # Handle both stored normalized values and legacy values
         $normalizedGroupType = switch -Wildcard ($data.groupType.ToLower()) {
+            # Already normalized values (most common)
+            'dynamicdistribution' { 'dynamicDistribution'; break }
+            'azurerole' { 'azureRole'; break }
+            # Legacy values that might exist in stored templates
             '*dynamicdistribution*' { 'dynamicDistribution'; break }
             '*dynamic*' { 'dynamic'; break }
             '*azurerole*' { 'azureRole'; break }