CA and groups

Author: KelvinTegelaar

Modules/CIPPCore/Public/New-CIPPTemplateRun.ps1

@@ -22,7 +22,13 @@ function New-CIPPTemplateRun {
     if ($TemplateSettings.templateRepo) {
         Write-Host 'Grabbing data from required community repo'
         $Files = (Get-GitHubFileTree -FullName $TemplateSettings.templateRepo.value -Branch $TemplateSettings.templateRepoBranch.value).tree | Where-Object { $_.path -match '.json$' -and $_.path -notmatch 'NativeImport' } | Select-Object *, @{n = 'html_url'; e = { "https://github.com/$($SplatParams.FullName)/tree/$($SplatParams.Branch)/$($_.path)" } }, @{n = 'name'; e = { ($_.path -split '/')[ -1 ] -replace '\.json$', '' } }
+        #if there is a migration table file, file the file. Store the file contents in $migrationtable
+        $MigrationTable = $Files | Where-Object { $_.name -eq 'MigrationTable' } | Select-Object -Last 1
+        if ($MigrationTable) {
+            $MigrationTable = (Get-GitHubFileContents -FullName $TemplateSettings.templateRepo.value -Branch $TemplateSettings.templateRepoBranch.value -Path $MigrationTable.path).content | ConvertFrom-Json
+        }
         foreach ($File in $Files) {
+            if ($File.name -eq 'MigrationTable') { continue }
             $ExistingTemplate = $ExistingTemplates | Where-Object { $_.displayName -eq $File.name } | Select-Object -First 1
             $Template = (Get-GitHubFileContents -FullName $TemplateSettings.templateRepo.value -Branch $TemplateSettings.templateRepoBranch.value -Path $File.path).content | ConvertFrom-Json
             if ($ExistingTemplate) {
@@ -32,11 +38,11 @@ function New-CIPPTemplateRun {
                 }
                 if ($UpdateNeeded) {
                     Write-Host "Template $($File.name) needs to be updated as the SHA is different"
-                    Import-CommunityTemplate -Template $Template -SHA $File.sha
+                    Import-CommunityTemplate -Template $Template -SHA $File.sha -MigrationTable $MigrationTable
                 }
             } else {
                 Write-Host "Template $($File.name) needs to be created"
-                Import-CommunityTemplate -Template $Template -SHA $File.sha
+                Import-CommunityTemplate -Template $Template -SHA $File.sha -MigrationTable $MigrationTable
 
             }
         }

Modules/CIPPCore/Public/Tools/Import-CommunityTemplate.ps1

@@ -7,6 +7,7 @@ function Import-CommunityTemplate {
         [Parameter(Mandatory = $true)]
         $Template,
         $SHA,
+        $MigrationTable,
         [switch]$Force
     )
 
@@ -15,12 +16,14 @@ function Import-CommunityTemplate {
 
     if ($Template.RowKey) {
         Write-Host "This is going to be a direct write to table, it's a CIPP template. We're writing $($Template.RowKey)"
+        $Template = $Template | Select-Object * -ExcludeProperty timestamp
         Add-CIPPAzDataTableEntity @Table -Entity $Template -Force
     } else {
-        if ($Template.groupTypes) { $Type = 'Group' }
+        if ($Template.mailNickname) { $Type = 'Group' }
         if ($Template.'@odata.type' -like '*conditionalAccessPolicy*') { $Type = 'ConditionalAccessPolicy' }
-
+        Write-Host "The type is $Type"
         switch -Wildcard ($Type) {
+
             '*Group*' {
                 $RawJsonObj = [PSCustomObject]@{
                     Displayname     = $Template.displayName
@@ -29,7 +32,7 @@ function Import-CommunityTemplate {
                     username        = $Template.mailNickname
                     GUID            = $Template.id
                     groupType       = 'generic'
-                } | ConvertTo-Json -Depth 100 -Compress
+                } | ConvertTo-Json -Depth 100
                 $entity = @{
                     JSON         = "$RawJsonObj"
                     PartitionKey = 'GroupTemplate'
@@ -38,8 +41,10 @@ function Import-CommunityTemplate {
                     RowKey       = $Template.id
                 }
                 Add-CIPPAzDataTableEntity @Table -Entity $entity -Force
+                break
             }
             '*conditionalAccessPolicy*' {
+                Write-Host $MigrationTable
                 $Template = ([pscustomobject]$Template) | ForEach-Object {
                     $NonEmptyProperties = $_.psobject.Properties | Where-Object { $null -ne $_.Value } | Select-Object -ExpandProperty Name
                     $_ | Select-Object -Property $NonEmptyProperties
@@ -48,6 +53,12 @@ function Import-CommunityTemplate {
                 $Template = $Template | Select-Object * -ExcludeProperty lastModifiedDateTime, 'assignments', '#microsoft*', '*@odata.navigationLink', '*@odata.associationLink', '*@odata.context', 'ScopeTagIds', 'supportsScopeTags', 'createdDateTime', '@odata.id', '@odata.editLink', '*odata.type', 'roleScopeTagIds@odata.type', createdDateTime, 'createdDateTime@odata.type'
                 Remove-ODataProperties -Object $Template
                 $RawJson = ConvertTo-Json -InputObject $Template -Depth 100 -Compress
+                #Replace the ids with the displayname by using the migration table, this is a simple find and replace each instance in the JSON.
+                $MigrationTable.objects | ForEach-Object {
+                    if ($RawJson -match $_.ID) {
+                        $RawJson = $RawJson.Replace($_.ID, $($_.DisplayName))
+                    }
+                }
                 $entity = @{
                     JSON         = "$RawJson"
                     PartitionKey = 'CATemplate'
@@ -56,6 +67,7 @@ function Import-CommunityTemplate {
                     RowKey       = $ID
                 }
                 Add-CIPPAzDataTableEntity @Table -Entity $entity -Force
+                break
             }
             default {
                 $URLName = switch -Wildcard ($Template.'@odata.id') {