Merge pull request KelvinTegelaar#1653 from Zacgoose/migrate-tenant-groups

Fix: Migrate tenant group key from domain to GUID

Author: JohnDuprey

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

@@ -67,6 +67,24 @@ function Invoke-EditTenant {
                 Remove-AzDataTableEntity @GroupMembersTable -Entity $Group
             }
         }
+        $DomainBasedEntries = Get-CIPPAzDataTableEntity @GroupMembersTable -Filter "customerId eq '$($Tenant.defaultDomainName)'"
+            if ($DomainBasedEntries) {
+                foreach ($Entry in $DomainBasedEntries) {
+                    try {
+                        # Add corrected GUID-based entry using the actual GUID
+                        $NewEntry = @{
+                            PartitionKey = 'Member'
+                            RowKey       = '{0}-{1}' -f $Entry.GroupId, $Tenant.customerId
+                            GroupId      = $Entry.GroupId
+                            customerId   = $Tenant.customerId
+                        }
+                        Add-CIPPAzDataTableEntity @GroupMembersTable -Entity $NewEntry -Force
+                        Remove-AzDataTableEntity @GroupMembersTable -Entity $Entry
+                    } catch {
+                        Write-Host "Error migrating entry: $($_.Exception.Message)"
+                    }
+                }
+            }
 
         $response = @{
             state      = 'success'