Merge pull request #652 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 5006b66e0b6a · 2025-12-30T12:41:36.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@ ExcludedTenants
 SendNotifications/config.json
 .env
 Output/
+node_modules/.yarn-integrity
+yarn.lock
 
 # Cursor IDE
 .cursor/rules
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1
@@ -210,6 +210,16 @@ function Push-CIPPDBCacheData {
         try { Set-CIPPDBCacheExoAcceptedDomains -TenantFilter $TenantFilter } catch {
             Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "ExoAcceptedDomains collection failed: $($_.Exception.Message)" -sev Error
         }
+
+        Write-Host 'Getting cache for License Overview'
+        try { Set-CIPPDBCacheLicenseOverview -TenantFilter $TenantFilter } catch {
+            Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "License Overview collection failed: $($_.Exception.Message)" -sev Error
+        }
+
+        Write-Host 'Getting cache for MFA State'
+        try { Set-CIPPDBCacheMFAState -TenantFilter $TenantFilter } catch {
+            Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "MFA State collection failed: $($_.Exception.Message)" -sev Error
+        }
         #endregion All Licenses
 
         #region Conditional Access Licensed - Azure AD Premium features
diff --git a/Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1 b/Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1
@@ -173,13 +173,26 @@ function New-CIPPCAPolicy {
             if (!$location.displayName) { continue }
             $CheckExisting = New-GraphGETRequest -uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/namedLocations' -tenantid $TenantFilter -asApp $true
             if ($Location.displayName -in $CheckExisting.displayName) {
+                $ExistingLocation = $CheckExisting | Where-Object -Property displayName -EQ $Location.displayName
+                if ($Overwrite) {
+                    $LocationUpdate = $location | Select-Object * -ExcludeProperty id
+                    Remove-ODataProperties -Object $LocationUpdate
+                    $Body = ConvertTo-Json -InputObject $LocationUpdate -Depth 10     
+                    try {
+                        $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/namedLocations/$($ExistingLocation.id)" -body $body -Type PATCH -tenantid $tenantfilter -asApp $true
+                        Write-LogMessage -Tenant $TenantFilter -Headers $User -API $APINAME -message "Updated existing Named Location: $($location.displayName)" -Sev 'Info'
+                    } catch {
+                        Write-Warning "Failed to update location $($location.displayName): $_"
+                        Write-LogMessage -Tenant $TenantFilter -Headers $User -API $APINAME -message "Failed to update existing Named Location: $($location.displayName). Error: $_" -Sev 'Error'
+                    }
+                } else {
+                    Write-LogMessage -Tenant $TenantFilter -Headers $User -API $APINAME -message "Matched a CA policy with the existing Named Location: $($location.displayName)" -Sev 'Info'
+                }
                 [pscustomobject]@{
-                    id         = ($CheckExisting | Where-Object -Property displayName -EQ $Location.displayName).id
-                    name       = ($CheckExisting | Where-Object -Property displayName -EQ $Location.displayName).displayName
-                    templateId = $location.id
+                    id          = $ExistingLocation.id
+                    name        = $ExistingLocation.displayName
+                    templateId  = $location.id
                 }
-                Write-LogMessage -Tenant $TenantFilter -Headers $User -API $APINAME -message "Matched a CA policy with the existing Named Location: $($location.displayName)" -Sev 'Info'
-
             } else {
                 if ($location.countriesAndRegions) { $location.countriesAndRegions = @($location.countriesAndRegions) }
                 $location | Select-Object * -ExcludeProperty id
diff --git a/Modules/CIPPCore/Public/Set-CIPPDBCacheLicenseOverview.ps1 b/Modules/CIPPCore/Public/Set-CIPPDBCacheLicenseOverview.ps1
@@ -0,0 +1,27 @@
+function Set-CIPPDBCacheLicenseOverview {
+    <#
+    .SYNOPSIS
+        Caches license overview for a tenant
+
+    .PARAMETER TenantFilter
+        The tenant to cache license overview for
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$TenantFilter
+    )
+
+    try {
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching license overview' -sev Info
+
+        $LicenseOverview = Get-CIPPLicenseOverview -TenantFilter $TenantFilter
+        Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'LicenseOverview' -Data @($LicenseOverview)
+        $LicenseOverview = $null
+
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached license overview successfully' -sev Info
+
+    } catch {
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Failed to cache license overview: $($_.Exception.Message)" -sev Error
+    }
+}
diff --git a/Modules/CIPPCore/Public/Set-CIPPDBCacheMFAState.ps1 b/Modules/CIPPCore/Public/Set-CIPPDBCacheMFAState.ps1
@@ -0,0 +1,27 @@
+function Set-CIPPDBCacheMFAState {
+    <#
+    .SYNOPSIS
+        Caches MFA state for a tenant
+
+    .PARAMETER TenantFilter
+        The tenant to cache MFA state for
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$TenantFilter
+    )
+
+    try {
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching MFA state' -sev Info
+
+        $MFAState = Get-CIPPMFAState -TenantFilter $TenantFilter
+        Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'MFAState' -Data @($MFAState)
+        $MFAState = $null
+
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached MFA state successfully' -sev Info
+
+    } catch {
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Failed to cache MFA state: $($_.Exception.Message)" -sev Error
+    }
+}
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTransportRuleTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTransportRuleTemplate.ps1
@@ -49,9 +49,13 @@ function Invoke-CIPPStandardTransportRuleTemplate {
             try {
                 if ($Existing) {
                     Write-Host 'Found existing'
-                    $RequestParams | Add-Member -NotePropertyValue $RequestParams.name -NotePropertyName Identity
-                    $GraphRequest = New-ExoRequest -tenantid $Tenant -cmdlet 'Set-TransportRule' -cmdParams ($RequestParams | Select-Object -Property * -ExcludeProperty GUID, Comments, HasSenderOverride, ExceptIfHasSenderOverride, ExceptIfMessageContainsDataClassifications, MessageContainsDataClassifications, UseLegacyRegex) -useSystemMailbox $true
-                    Write-LogMessage -API 'Standards' -tenant $tenant -message "Successfully set transport rule for $tenant" -sev 'Info'
+                    if ($Settings.overwrite) {
+                        $RequestParams | Add-Member -NotePropertyValue $RequestParams.name -NotePropertyName Identity
+                        $GraphRequest = New-ExoRequest -tenantid $Tenant -cmdlet 'Set-TransportRule' -cmdParams ($RequestParams | Select-Object -Property * -ExcludeProperty GUID, Comments, HasSenderOverride, ExceptIfHasSenderOverride, ExceptIfMessageContainsDataClassifications, MessageContainsDataClassifications, UseLegacyRegex) -useSystemMailbox $true
+                        Write-LogMessage -API 'Standards' -tenant $tenant -message "Successfully set transport rule for $tenant" -sev 'Info'
+                    } else {
+                        Write-LogMessage -API 'Standards' -tenant $tenant -message "Skipping transport rule for $tenant as it already exists" -sev 'Info'
+                    }
                 } else {
                     Write-Host 'Creating new'
                     $GraphRequest = New-ExoRequest -tenantid $Tenant -cmdlet 'New-TransportRule' -cmdParams ($RequestParams | Select-Object -Property * -ExcludeProperty GUID, Comments, HasSenderOverride, ExceptIfHasSenderOverride, ExceptIfMessageContainsDataClassifications, MessageContainsDataClassifications, UseLegacyRegex) -useSystemMailbox $true
diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
diff --git a/yarn.lock b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 +# yarn lockfile v1
++
++