Merge pull request #576 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecBackendURLs.ps1

@@ -7,7 +7,7 @@ function Invoke-ExecBackendURLs {
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
-    $Subscription = ($env:WEBSITE_OWNER_NAME).split('+') | Select-Object -First 1
+    $Subscription = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
     $SWAName = $env:WEBSITE_SITE_NAME -replace 'cipp', 'CIPP-SWA-'
 
     # Write to the Azure Functions log stream.

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

@@ -13,11 +13,10 @@ function Invoke-ListGroupTemplates {
     $Table = Get-CippTable -tablename 'templates'
     $Filter = "PartitionKey eq 'GroupTemplate'"
     $Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter) | ForEach-Object {
-        $data = $_.JSON | ConvertFrom-Json
-
+        $data = $_.JSON | ConvertFrom-Json -ErrorAction SilentlyContinue
         # Normalize groupType to camelCase for consistent frontend handling
         # Handle both stored normalized values and legacy values
-        $normalizedGroupType = switch -Wildcard ($data.groupType.ToLower()) {
+        $normalizedGroupType = switch -Wildcard ($data.groupType) {
             # Already normalized values (most common)
             'dynamicdistribution' { 'dynamicDistribution'; break }
             'azurerole' { 'azureRole'; break }