Merge pull request #592 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 1ab4a65f1dfb · 2025-12-07T18:41:21.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/.github/workflows/dev_api.yml b/.github/workflows/dev_api.yml
@@ -26,6 +26,41 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup PowerShell module cache
+        id: cacher
+        uses: actions/cache@v3
+        with:
+          path: "~/.local/share/powershell/Modules"
+          key: ${{ runner.os }}-ModuleBuilder
+
+      - name: Install ModuleBuilder
+        if: steps.cacher.outputs.cache-hit != 'true'
+        shell: pwsh
+        run: |
+          Set-PSRepository PSGallery -InstallationPolicy Trusted
+          Install-Module ModuleBuilder -AllowClobber -Force
+
+      - name: Build CIPPCore Module
+        shell: pwsh
+        run: |
+          $ModulePath = Join-Path $env:GITHUB_WORKSPACE "Modules/CIPPCore"
+          $OutputPath = Join-Path $env:GITHUB_WORKSPACE "Output"
+
+          Write-Host "Building module from: $ModulePath"
+          Write-Host "Output directory: $OutputPath"
+
+          # Build the module using ModuleBuilder
+          Build-Module -SourcePath $ModulePath -OutputDirectory $OutputPath -Verbose
+
+          # Replace the source module with the built module
+          Remove-Item -Path $ModulePath -Recurse -Force
+          Copy-Item -Path (Join-Path $OutputPath "CIPPCore") -Destination $ModulePath -Recurse -Force
+
+          Write-Host "Module built and replaced successfully"
+
+          # Clean up output directory
+          Remove-Item -Path $OutputPath -Recurse -Force
+
       - name: Login to Azure
         uses: azure/login@v2
         with:
diff --git a/Modules/CIPPCore/CIPPCore.psm1 b/Modules/CIPPCore/CIPPCore.psm1
@@ -1,12 +1,16 @@
-$Public = @(Get-ChildItem -Path (Join-Path $PSScriptRoot "Public\*.ps1") -Recurse -ErrorAction SilentlyContinue)
-$Private = @(Get-ChildItem -Path (Join-Path $PSScriptRoot "Private\*.ps1") -Recurse -ErrorAction SilentlyContinue)
-$Functions = $Public + $Private
-foreach ($import in @($Functions)) {
-    try {
-        . $import.FullName
-    } catch {
-        Write-Error -Message "Failed to import function $($import.FullName): $_"
+# ModuleBuilder will concatenate all function files into this module
+# This block is only used when running from source (not built)
+if (Test-Path (Join-Path $PSScriptRoot 'Public')) {
+    $Public = @(Get-ChildItem -Path (Join-Path $PSScriptRoot 'Public\*.ps1') -Recurse -ErrorAction SilentlyContinue)
+    $Private = @(Get-ChildItem -Path (Join-Path $PSScriptRoot 'Private\*.ps1') -Recurse -ErrorAction SilentlyContinue)
+    $Functions = $Public + $Private
+    foreach ($import in @($Functions)) {
+        try {
+            . $import.FullName
+        } catch {
+            Write-Error -Message "Failed to import function $($import.FullName): $_"
+        }
     }
-}
 
-Export-ModuleMember -Function $Public.BaseName -Alias *
+    Export-ModuleMember -Function $Public.BaseName
+}
diff --git a/Modules/CIPPCore/CippCore.psd1 b/Modules/CIPPCore/CippCore.psd1
diff --git a/Modules/CIPPCore/Public/New-CIPPBackupTask.ps1 b/Modules/CIPPCore/Public/New-CIPPBackupTask.ps1
@@ -5,9 +5,13 @@ function New-CIPPBackupTask {
         $TenantFilter
     )
 
+    $FunctionStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+    Write-Host "CIPPBACKUP: Starting backup task: $Task for tenant: $TenantFilter"
+
     $BackupData = switch ($Task) {
         'CippCustomVariables' {
-            Write-Host "Backing up Custom Variables for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backing up Custom Variables for $TenantFilter"
             $ReplaceTable = Get-CIPPTable -tablename 'CippReplacemap'
 
             # Get tenant-specific variables
@@ -20,40 +24,56 @@ function New-CIPPBackupTask {
             if ($TenantFilter -eq 'AllTenants') {
                 $GlobalVariables = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq 'AllTenants'"
                 $AllVariables = @($TenantVariables) + @($GlobalVariables)
+                $TaskStopwatch.Stop()
+                Write-Host "CIPPBACKUP: CippCustomVariables backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
                 $AllVariables
             } else {
+                $TaskStopwatch.Stop()
+                Write-Host "CIPPBACKUP: CippCustomVariables backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
                 $TenantVariables
             }
         }
         'users' {
-            Write-Host "Backup users for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup users for $TenantFilter"
             $Users = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?$top=999' -tenantid $TenantFilter | Select-Object * -ExcludeProperty mail, provisionedPlans, onPrem*, *passwordProfile*, *serviceProvisioningErrors*, isLicenseReconciliationNeeded, isManagementRestricted, isResourceAccount, *date*, *external*, identities, deletedDateTime, isSipEnabled, assignedPlans, cloudRealtimeCommunicationInfo, deviceKeys, provisionedPlan, securityIdentifier
             #remove the property if the value is $null
-            $Users | ForEach-Object {
+            $users = $Users | ForEach-Object {
                 $_.psobject.properties | Where-Object { $null -eq $_.Value } | ForEach-Object {
                     $_.psobject.properties.Remove($_.Name)
                 }
             }
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Users backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
             $Users
+
         }
         'groups' {
-            Write-Host "Backup groups for $TenantFilter"
-            New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/groups?$top=999' -tenantid $TenantFilter
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup groups for $TenantFilter"
+            $Groups = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/groups?$top=999' -tenantid $TenantFilter
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Groups backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
+            $Groups
         }
         'ca' {
-            Write-Host "Backup Conditional Access Policies for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Conditional Access Policies for $TenantFilter"
             $Policies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/conditionalAccess/policies?$top=999' -tenantid $TenantFilter -AsApp $true
-            Write-Host 'Creating templates for found Conditional Access Policies'
+            Write-Host 'CIPPBACKUP: Creating templates for found Conditional Access Policies'
             foreach ($policy in $policies) {
                 try {
                     New-CIPPCATemplate -TenantFilter $TenantFilter -JSON $policy
                 } catch {
                     "Failed to create a template of the Conditional Access Policy with ID: $($policy.id). Error: $($_.Exception.Message)"
                 }
             }
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Conditional Access backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
         }
         'intuneconfig' {
-            Write-Host "Backup Intune Configuration Policies for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Intune Configuration Policies for $TenantFilter"
             $GraphURLS = @("https://graph.microsoft.com/beta/deviceManagement/deviceConfigurations?`$select=id,displayName,lastModifiedDateTime,roleScopeTagIds,microsoft.graph.unsupportedDeviceConfiguration/originalEntityTypeName&`$expand=assignments&top=1000"
                 'https://graph.microsoft.com/beta/deviceManagement/windowsDriverUpdateProfiles'
                 "https://graph.microsoft.com/beta/deviceManagement/groupPolicyConfigurations?`$expand=assignments&top=999"
@@ -77,28 +97,37 @@ function New-CIPPBackupTask {
                         }
                     }
                 } catch {
-                    Write-Host "Failed to backup $url"
+                    Write-Host "CIPPBACKUP: Failed to backup $url"
                 }
             }
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Intune Configuration backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
         }
         'intunecompliance' {
-            Write-Host "Backup Intune Configuration Policies for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Intune Configuration Policies for $TenantFilter"
 
             New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/deviceCompliancePolicies?$top=999' -tenantid $TenantFilter | ForEach-Object {
                 New-CIPPIntuneTemplate -TenantFilter $TenantFilter -URLName 'deviceCompliancePolicies' -ID $_.ID
             }
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Intune Compliance backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
         }
 
         'intuneprotection' {
-            Write-Host "Backup Intune Configuration Policies for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Intune Configuration Policies for $TenantFilter"
 
             New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceAppManagement/managedAppPolicies?$top=999' -tenantid $TenantFilter | ForEach-Object {
                 New-CIPPIntuneTemplate -TenantFilter $TenantFilter -URLName 'managedAppPolicies' -ID $_.ID
             }
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Intune Protection backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
         }
 
         'antispam' {
-            Write-Host "Backup Anti-Spam Policies for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Anti-Spam Policies for $TenantFilter"
 
             $Policies = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-HostedContentFilterPolicy' | Select-Object * -ExcludeProperty *odata*, *data.type*
             $Rules = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-HostedContentFilterRule' | Select-Object * -ExcludeProperty *odata*, *data.type*
@@ -116,11 +145,14 @@ function New-CIPPBackupTask {
             }
 
             $JSON = @{ policies = $Policies; rules = $Rules } | ConvertTo-Json -Depth 10
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Anti-Spam backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
             $JSON
         }
 
         'antiphishing' {
-            Write-Host "Backup Anti-Phishing Policies for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Anti-Phishing Policies for $TenantFilter"
 
             $Policies = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-AntiPhishPolicy' | Select-Object * -ExcludeProperty *odata*, *data.type*
             $Rules = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-AntiPhishRule' | Select-Object * -ExcludeProperty *odata*, *data.type*
@@ -138,20 +170,33 @@ function New-CIPPBackupTask {
             }
 
             $JSON = @{ policies = $Policies; rules = $Rules } | ConvertTo-Json -Depth 10
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Anti-Phishing backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
             $JSON
         }
 
         'CippWebhookAlerts' {
-            Write-Host "Backup Webhook Alerts for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Webhook Alerts for $TenantFilter"
             $WebhookTable = Get-CIPPTable -TableName 'WebhookRules'
-            Get-CIPPAzDataTableEntity @WebhookTable | Where-Object { $TenantFilter -in ($_.Tenants | ConvertFrom-Json).value }
+            $WebhookData = Get-CIPPAzDataTableEntity @WebhookTable | Where-Object { $TenantFilter -in ($_.Tenants | ConvertFrom-Json).value }
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Webhook Alerts backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
+            $WebhookData
         }
         'CippScriptedAlerts' {
-            Write-Host "Backup Scripted Alerts for $TenantFilter"
+            $TaskStopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            Write-Host "CIPPBACKUP: Backup Scripted Alerts for $TenantFilter"
             $ScheduledTasks = Get-CIPPTable -TableName 'ScheduledTasks'
-            Get-CIPPAzDataTableEntity @ScheduledTasks | Where-Object { $_.hidden -eq $true -and $_.command -like 'Get-CippAlert*' -and $TenantFilter -in $_.Tenant }
+            $ScriptedAlerts = Get-CIPPAzDataTableEntity @ScheduledTasks | Where-Object { $_.hidden -eq $true -and $_.command -like 'Get-CippAlert*' -and $TenantFilter -in $_.Tenant }
+            $TaskStopwatch.Stop()
+            Write-Host "CIPPBACKUP: Scripted Alerts backup completed in $($TaskStopwatch.Elapsed.TotalSeconds) seconds"
+            $ScriptedAlerts
         }
     }
+
+    $FunctionStopwatch.Stop()
+    Write-Host "CIPPBACKUP: Total backup task completed in $($FunctionStopwatch.Elapsed.TotalSeconds) seconds"
     return $BackupData
 }
 
diff --git a/Modules/CIPPCore/Public/New-CIPPCATemplate.ps1 b/Modules/CIPPCore/Public/New-CIPPCATemplate.ps1
@@ -11,7 +11,8 @@ function New-CIPPCATemplate {
         $NonEmptyProperties = $_.psobject.Properties | Where-Object { $null -ne $_.Value } | Select-Object -ExpandProperty Name
         $_ | Select-Object -Property $NonEmptyProperties
     }
-
+    $users = (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$top=999&`$select=displayName,id" -tenantid $TenantFilter)
+    $groups = (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups?`$top=999&`$select=displayName,id" -tenantid $TenantFilter)
     $includelocations = New-Object System.Collections.ArrayList
     $IncludeJSON = foreach ($Location in $JSON.conditions.locations.includeLocations) {
         $locationinfo = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/namedLocations' -tenantid $TenantFilter | Where-Object -Property id -EQ $location | Select-Object * -ExcludeProperty id, *time*
@@ -34,7 +35,7 @@ function New-CIPPCATemplate {
                 $originalID = $_
                 if ($_ -in 'All', 'None', 'GuestOrExternalUsers') { return $_ }
                 try {
-                (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/$($_)" -tenantid $TenantFilter).displayName
+                    ($users | Where-Object { $_.id -eq $_ }).displayName
                 } catch {
                     return $originalID
                 }
@@ -47,7 +48,7 @@ function New-CIPPCATemplate {
                 $originalID = $_
 
                 try {
-                (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/$($_)" -tenantid $TenantFilter).displayName
+                    ($users | Where-Object { $_.id -eq $_ }).displayName
                 } catch {
                     return $originalID
                 }
@@ -64,7 +65,7 @@ function New-CIPPCATemplate {
                 $originalID = $_
                 if ($_ -in 'All', 'None', 'GuestOrExternalUsers' -or -not (Test-IsGuid $_)) { return $_ }
                 try {
-                (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups/$($_)" -tenantid $TenantFilter).displayName
+                    ($groups | Where-Object { $_.id -eq $_ }).displayName
                 } catch {
                     return $originalID
                 }
@@ -76,7 +77,7 @@ function New-CIPPCATemplate {
 
                 if ($_ -in 'All', 'None', 'GuestOrExternalUsers' -or -not (Test-IsGuid $_)) { return $_ }
                 try {
-                (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups/$($_)" -tenantid $TenantFilter).displayName
+                    ($groups | Where-Object { $_.id -eq $_ }).displayName
                 } catch {
                     return $originalID
 
diff --git a/Modules/CIPPCore/build.psd1 b/Modules/CIPPCore/build.psd1
@@ -0,0 +1,9 @@
+@{
+    Path                     = 'CIPPCore.psd1'
+    OutputDirectory          = '../../Output'
+    VersionedOutputDirectory = $false
+    CopyPaths                = @()
+    Encoding                 = 'UTF8'
+    Prefix                   = $null
+    Suffix                   = $null
+}
