Merge pull request KelvinTegelaar#1755 from cipptesting/dev

Added overwrite toggle for transport rule standard

Author: KelvinTegelaar

.gitignore

@@ -10,6 +10,8 @@ ExcludedTenants
 SendNotifications/config.json
 .env
 Output/
+node_modules/.yarn-integrity
+yarn.lock
 
 # Cursor IDE
 .cursor/rules

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

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

node_modules/.yarn-integrity

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+