Merge pull request #431 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 5d4ed1d957e8 · 2025-08-22T18:41:07.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/CippQueue/Invoke-ListCippQueue.ps1 b/Modules/CIPPCore/Public/CippQueue/Invoke-ListCippQueue.ps1
@@ -5,21 +5,24 @@ function Invoke-ListCippQueue {
     .ROLE
         CIPP.Core.Read
     #>
-    param($Request = $null, $TriggerMetadata = $null)
+    param($Request = $null, $TriggerMetadata = $null, $Reference = $null, $QueueId = $null)
 
     if ($Request) {
         $APIName = $Request.Params.CIPPEndpoint
         Write-LogMessage -headers $Request.Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
     }
 
-    $QueueId = $Request.Query.QueueId
+    $QueueId = $Request.Query.QueueId ?? $QueueId
+    $Reference = $Request.Query.Reference ?? $Reference
 
     $CippQueue = Get-CippTable -TableName 'CippQueue'
     $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
     $3HoursAgo = (Get-Date).ToUniversalTime().AddHours(-3).ToString('yyyy-MM-ddTHH:mm:ssZ')
 
     if ($QueueId) {
         $Filter = "PartitionKey eq 'CippQueue' and RowKey eq '$QueueId'"
+    } elseif ($Reference) {
+        $Filter = "PartitionKey eq 'CippQueue' and Reference eq '$Reference' and Timestamp ge datetime'$3HoursAgo'"
     } else {
         $Filter = "PartitionKey eq 'CippQueue' and Timestamp ge datetime'$3HoursAgo'"
     }
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ListMailboxRulesQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ListMailboxRulesQueue.ps1
@@ -12,14 +12,20 @@ function Push-ListMailboxRulesQueue {
 
     $Table = Get-CIPPTable -TableName cachembxrules
     try {
-        $Rules = New-ExoRequest -tenantid $domainName -cmdlet 'Get-Mailbox' -Select 'userPrincipalName,GUID' | ForEach-Object -Parallel {
-            Import-Module CIPPCore
-            $MbxRules = New-ExoRequest -Anchor $_.UserPrincipalName -tenantid $using:domainName -cmdlet 'Get-InboxRule' -cmdParams @{Mailbox = $_.GUID; IncludeHidden = $true } | Where-Object { $_.Name -ne 'Junk E-Mail Rule' -and $_.Name -notlike 'Microsoft.Exchange.OOF.*' }
-            foreach ($Rule in $MbxRules) {
-                $Rule | Add-Member -NotePropertyName 'UserPrincipalName' -NotePropertyValue $_.userPrincipalName
-                $Rule
+        $Mailboxes = New-ExoRequest -tenantid $domainName -cmdlet 'Get-Mailbox' -Select 'userPrincipalName,GUID'
+        $Request = $Mailboxes | ForEach-Object {
+            @{
+                OperationGuid = $_.UserPrincipalName
+                CmdletInput   = @{
+                    CmdletName = 'Get-InboxRule'
+                    Parameters = @{
+                        Mailbox = $_.UserPrincipalName
+                    }
+                }
             }
         }
+
+        $Rules = New-ExoBulkRequest -tenantid $domainName -cmdletArray @($Request) | Where-Object { $_.Identity }
         if (($Rules | Measure-Object).Count -gt 0) {
             $GraphRequest = foreach ($Rule in $Rules) {
                 [PSCustomObject]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-UpdateTenants.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-UpdateTenants.ps1
@@ -5,7 +5,7 @@ function Push-UpdateTenants {
     #>
     Param($Item)
     $QueueReference = 'UpdateTenants'
-    $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -ne 'Completed' -and $_.Status -ne 'Failed' }
+    $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -ne 'Completed' -and $_.Status -ne 'Failed' }
 
     $Queue = New-CippQueueEntry -Name 'Update Tenants' -Reference $QueueReference -TotalTasks 1
     try {
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ListMailboxRules.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ListMailboxRules.ps1
@@ -19,16 +19,21 @@ function Invoke-ListMailboxRules {
 
     $Table = Get-CIPPTable -TableName cachembxrules
     if ($TenantFilter -ne 'AllTenants') {
-        $Table.Filter = "Tenant eq '$TenantFilter'"
+        $Table.Filter = "PartitionKey eq 'MailboxRules' and Tenant eq '$TenantFilter'"
+    } else {
+        $Table.Filter = "PartitionKey eq 'MailboxRules'"
     }
+
+    Write-Information 'Getting cached mailbox rules'
     $Rows = Get-CIPPAzDataTableEntity @Table | Where-Object -Property Timestamp -GT (Get-Date).AddHours(-1)
     $PartitionKey = 'MailboxRules'
     $QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
-    $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
+    $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
 
     $Metadata = @{}
     # If a queue is running, we will not start a new one
     if ($RunningQueue -and !$Rows) {
+        Write-Information "Queue is already running for $TenantFilter"
         $Metadata = [PSCustomObject]@{
             QueueMessage = "Still loading data for $TenantFilter. Please check back in a few more minutes"
             QueueId      = $RunningQueue.RowKey
@@ -37,7 +42,7 @@ function Invoke-ListMailboxRules {
             Waiting = $true
         }
     } elseif ((!$Rows -and !$RunningQueue) -or ($TenantFilter -eq 'AllTenants' -and ($Rows | Measure-Object).Count -eq 1)) {
-
+        Write-Information "No cached mailbox rules found for $TenantFilter, starting new orchestration"
         if ($TenantFilter -eq 'AllTenants') {
             $Tenants = Get-Tenants -IncludeErrors | Select-Object defaultDomainName
             $Type = 'All Tenants'
@@ -65,10 +70,6 @@ function Invoke-ListMailboxRules {
         }
 
     } else {
-        if ($TenantFilter -ne 'AllTenants') {
-            $Rows = $Rows | Where-Object -Property Tenant -EQ $TenantFilter
-            $Rows = $Rows
-        }
         $Metadata = [PSCustomObject]@{
             QueueId = $RunningQueue.RowKey ?? $null
         }
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Transport/Invoke-ListTransportRules.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Transport/Invoke-ListTransportRules.ps1
@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ListTransportRules {
+function Invoke-ListTransportRules {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -28,19 +28,21 @@ Function Invoke-ListTransportRules {
             $Filter = "PartitionKey eq '$PartitionKey'"
             $Rows = Get-CIPPAzDataTableEntity @Table -filter $Filter | Where-Object -Property Timestamp -GT (Get-Date).AddMinutes(-60)
             $QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
-            $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
+            $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
 
             # If a queue is running, we will not start a new one
             if ($RunningQueue) {
                 $Metadata = [PSCustomObject]@{
                     QueueMessage = 'Still loading transport rules for all tenants. Please check back in a few more minutes'
+                    QueueId      = $RunningQueue.RowKey
                 }
             } elseif (!$Rows -and !$RunningQueue) {
                 # If no rows are found and no queue is running, we will start a new one
                 $TenantList = Get-Tenants -IncludeErrors
                 $Queue = New-CippQueueEntry -Name 'Transport Rules - All Tenants' -Link '/email/transport/list-rules?tenantFilter=AllTenants' -Reference $QueueReference -TotalTasks ($TenantList | Measure-Object).Count
                 $Metadata = [PSCustomObject]@{
                     QueueMessage = 'Loading transport rules for all tenants. Please check back in a few minutes'
+                    QueueId      = $Queue.RowKey
                 }
                 $InputObject = [PSCustomObject]@{
                     OrchestratorName = 'TransportRuleOrchestrator'
@@ -57,6 +59,9 @@ Function Invoke-ListTransportRules {
                 Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress) | Out-Null
             } else {
                 # Return cached data
+                $Metadata = [PSCustomObject]@{
+                    QueueId = $RunningQueue.RowKey ?? $null
+                }
                 $Rules = $Rows
                 foreach ($rule in $Rules) {
                     $RuleObj = $rule.TransportRule | ConvertFrom-Json
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecJITAdmin.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecJITAdmin.ps1
@@ -70,7 +70,7 @@ function Invoke-ExecJITAdmin {
 
             $QueueReference = '{0}-{1}' -f $Request.Query.TenantFilter, $PartitionKey # $TenantFilter is 'AllTenants'
             Write-Information "QueueReference: $QueueReference"
-            $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
+            $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
 
             if ($RunningQueue) {
                 $Metadata = [PSCustomObject]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListUserSettings.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListUserSettings.ps1
@@ -36,6 +36,15 @@ function Invoke-ListUserSettings {
                 }
             }
         }
+
+        try {
+            $UserSpecificSettings = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'UserSettings' and RowKey eq '$Username'"
+            $UserSpecificSettings = $UserSpecificSettings.JSON | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue
+        }
+        catch {
+            Write-Warning "Failed to convert UserSpecificSettings JSON: $($_.Exception.Message)"
+        }
+
         #Get branding settings
         if ($UserSettings) {
             $brandingTable = Get-CippTable -tablename 'Config'
@@ -44,6 +53,11 @@ function Invoke-ListUserSettings {
                 $UserSettings | Add-Member -MemberType NoteProperty -Name 'customBranding' -Value $BrandingSettings -Force | Out-Null
             }
         }
+
+        if ($UserSpecificSettings) {
+            $UserSettings | Add-Member -MemberType NoteProperty -Name 'UserSpecificSettings' -Value $UserSpecificSettings -Force | Out-Null
+        }
+
         $StatusCode = [HttpStatusCode]::OK
         $Results = $UserSettings
     } catch {
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecAlertsList.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecAlertsList.ps1
@@ -63,7 +63,7 @@ function Invoke-ExecAlertsList {
             $Filter = "PartitionKey eq '$PartitionKey'"
             $Rows = Get-CIPPAzDataTableEntity @Table -filter $Filter | Where-Object -Property Timestamp -GT (Get-Date).AddMinutes(-30)
             $QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
-            $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
+            $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
             # If a queue is running, we will not start a new one
             if ($RunningQueue) {
                 $Metadata = [PSCustomObject]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecIncidentsList.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecIncidentsList.ps1
@@ -47,7 +47,7 @@ function Invoke-ExecIncidentsList {
             $Filter = "PartitionKey eq '$PartitionKey'"
             $Rows = Get-CIPPAzDataTableEntity @Table -filter $Filter | Where-Object -Property Timestamp -GT (Get-Date).AddMinutes(-30)
             $QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
-            $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
+            $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
             # If a queue is running, we will not start a new one
             if ($RunningQueue) {
                 $Metadata = [PSCustomObject]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-EditTenantOffboardingDefaults.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-EditTenantOffboardingDefaults.ps1
@@ -0,0 +1,81 @@
+using namespace System.Net
+
+function Invoke-EditTenantOffboardingDefaults {
+    <#
+    .FUNCTIONALITY
+        Entrypoint,AnyTenant
+    .ROLE
+        Tenant.Config.ReadWrite
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $APIName = $Request.Params.CIPPEndpoint
+    $Headers = $Request.Headers
+    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
+    # Interact with query parameters or the body of the request.
+    $customerId = $Request.Body.customerId
+    $offboardingDefaults = $Request.Body.offboardingDefaults
+
+    if (!$customerId) {
+        $response = @{
+            state      = 'error'
+            resultText = 'Customer ID is required'
+        }
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::BadRequest
+                Body       = $response
+            })
+        return
+    }
+
+    $PropertiesTable = Get-CippTable -TableName 'TenantProperties'
+
+    try {
+        # Convert the offboarding defaults to JSON string and ensure it's treated as a string
+        $jsonValue = [string]($offboardingDefaults | ConvertTo-Json -Compress)
+
+        if ($jsonValue -and $jsonValue -ne '{}' -and $jsonValue -ne 'null' -and $jsonValue -ne '') {
+            # Save offboarding defaults
+            $offboardingEntity = @{
+                PartitionKey = [string]$customerId
+                RowKey       = [string]'OffboardingDefaults'
+                Value        = [string]$jsonValue
+            }
+            $null = Add-CIPPAzDataTableEntity @PropertiesTable -Entity $offboardingEntity -Force
+            Write-LogMessage -headers $Headers -tenant $customerId -API $APIName -message "Updated tenant offboarding defaults" -Sev 'Info'
+
+            $resultText = 'Tenant offboarding defaults updated successfully'
+        } else {
+            # Remove offboarding defaults if empty or null
+            $Existing = Get-CIPPAzDataTableEntity @PropertiesTable -Filter "PartitionKey eq '$customerId' and RowKey eq 'OffboardingDefaults'"
+            if ($Existing) {
+                Remove-AzDataTableEntity @PropertiesTable -Entity $Existing
+                Write-LogMessage -headers $Headers -tenant $customerId -API $APIName -message "Removed tenant offboarding defaults" -Sev 'Info'
+            }
+
+            $resultText = 'Tenant offboarding defaults cleared successfully'
+        }
+
+        $response = @{
+            state      = 'success'
+            resultText = $resultText
+        }
+
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = $response
+            })
+    } catch {
+        Write-LogMessage -headers $Headers -tenant $customerId -API $APINAME -message "Edit Tenant Offboarding Defaults failed. The error is: $($_.Exception.Message)" -Sev 'Error'
+        $response = @{
+            state      = 'error'
+            resultText = $_.Exception.Message
+        }
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::InternalServerError
+                Body       = $response
+            })
+    }
+}
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-ListTenants.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-ListTenants.ps1
@@ -24,6 +24,8 @@ function Invoke-ListTenants {
         $AllTenantSelector = $Request.Query.AllTenantSelector
     }
 
+    $IncludeOffboardingDefaults = $Request.Query.IncludeOffboardingDefaults
+
     # Clear Cache
     if ($Request.Body.ClearCache -eq $true) {
         $Results = Remove-CIPPCache -tenantsOnly $Request.Body.TenantsOnly
@@ -75,16 +77,46 @@ function Invoke-ListTenants {
             $Tenants = $Tenants | Where-Object -Property customerId -In $TenantAccess
         }
 
+        # If offboarding defaults are requested, fetch them
+        if ($IncludeOffboardingDefaults -eq 'true' -and $Tenants) {
+            $PropertiesTable = Get-CippTable -TableName 'TenantProperties'
+
+            # Get all offboarding defaults for all tenants in one query for performance
+            $AllOffboardingDefaults = Get-CIPPAzDataTableEntity @PropertiesTable -Filter "RowKey eq 'OffboardingDefaults'"
+
+            # Add offboarding defaults to each tenant
+            foreach ($Tenant in $Tenants) {
+                $TenantDefaults = $AllOffboardingDefaults | Where-Object { $_.PartitionKey -eq $Tenant.customerId }
+                if ($TenantDefaults) {
+                    try {
+                        $Tenant | Add-Member -MemberType NoteProperty -Name 'offboardingDefaults' -Value ($TenantDefaults.Value | ConvertFrom-Json) -Force
+                    } catch {
+                        Write-LogMessage -headers $Headers -API $APIName -message "Failed to parse offboarding defaults for tenant $($Tenant.customerId): $($_.Exception.Message)" -Sev 'Warning'
+                        $Tenant | Add-Member -MemberType NoteProperty -Name 'offboardingDefaults' -Value $null -Force
+                    }
+                } else {
+                    $Tenant | Add-Member -MemberType NoteProperty -Name 'offboardingDefaults' -Value $null -Force
+                }
+            }
+        }
+
         if ($null -eq $TenantFilter -or $TenantFilter -eq 'null') {
             $TenantList = [system.collections.generic.list[object]]::new()
             if ($AllTenantSelector -eq $true) {
-                $TenantList.Add(@{
-                        customerId        = 'AllTenants'
-                        defaultDomainName = 'AllTenants'
-                        displayName       = '*All Tenants'
-                        domains           = 'AllTenants'
-                        GraphErrorCount   = 0
-                    }) | Out-Null
+                $AllTenantsObject = @{
+                    customerId        = 'AllTenants'
+                    defaultDomainName = 'AllTenants'
+                    displayName       = '*All Tenants'
+                    domains           = 'AllTenants'
+                    GraphErrorCount   = 0
+                }
+
+                # Add offboarding defaults to AllTenants object if requested
+                if ($IncludeOffboardingDefaults -eq 'true') {
+                    $AllTenantsObject.offboardingDefaults = $null
+                }
+
+                $TenantList.Add($AllTenantsObject) | Out-Null
 
                 if (($Tenants).length -gt 1) {
                     $TenantList.AddRange($Tenants) | Out-Null
@@ -105,7 +137,9 @@ function Invoke-ListTenants {
                 @{Name = 'portal_intune'; Expression = { "https://intune.microsoft.com/$($_.defaultDomainName)" } },
                 @{Name = 'portal_security'; Expression = { "https://security.microsoft.com/?tid=$($_.customerId)" } },
                 @{Name = 'portal_compliance'; Expression = { "https://purview.microsoft.com/?tid=$($_.customerId)" } },
-                @{Name = 'portal_sharepoint'; Expression = { "/api/ListSharePointAdminUrl?tenantFilter=$($_.defaultDomainName)" } }
+                @{Name = 'portal_sharepoint'; Expression = { "/api/ListSharePointAdminUrl?tenantFilter=$($_.defaultDomainName)" } },
+                @{Name = 'portal_platform'; Expression = { "https://admin.powerplatform.microsoft.com/account/login/$($_.customerId)" } },
+                @{Name = 'portal_bi'; Expression = { "https://app.powerbi.com/admin-portal?ctid=$($_.customerId)" } }
             }
 
         } else {
diff --git a/Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1 b/Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1
@@ -36,7 +36,10 @@ function Get-CIPPTextReplacement {
         '%windir%',
         '%programfiles%',
         '%programfiles(x86)%',
-        '%programdata%'
+        '%programdata%',
+        '%cippuserschema%',
+        '%cippurl%',
+        '%defaultdomain%'
     )
 
     $Tenant = Get-Tenants -TenantFilter $TenantFilter
@@ -71,11 +74,25 @@ function Get-CIPPTextReplacement {
     #default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName
     $Text = $Text -replace '%tenantid%', $Tenant.customerId
     $Text = $Text -replace '%tenantfilter%', $Tenant.defaultDomainName
+    $Text = $Text -replace '%defaultdomain%', $Tenant.defaultDomainName
     $Text = $Text -replace '%initialdomain%', $Tenant.initialDomainName
     $Text = $Text -replace '%tenantname%', $Tenant.displayName
 
     # Partner specific replacements
     $Text = $Text -replace '%partnertenantid%', $env:TenantID
     $Text = $Text -replace '%samappid%', $env:ApplicationID
+
+    if ($Text -match '%cippuserschema%') {
+        $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' } | Select-Object -First 1
+        $Text = $Text -replace '%cippuserschema%', $Schema.id
+    }
+
+    if ($Text -match '%cippurl%') {
+        $ConfigTable = Get-CIPPTable -tablename 'Config'
+        $Config = Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'InstanceProperties' and RowKey eq 'CIPPURL'"
+        if ($Config) {
+            $Text = $Text -replace '%cippurl%', $Config.Value
+        }
+    }
     return $Text
 }
diff --git a/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1 b/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1
diff --git a/Modules/CippEntrypoints/CippEntrypoints.psm1 b/Modules/CippEntrypoints/CippEntrypoints.psm1
diff --git a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1
diff --git a/profile.ps1 b/profile.ps1

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,15 @@ function Invoke-ListUserSettings {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ try {`
	`41`	`+ $UserSpecificSettings = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'UserSettings' and RowKey eq '$Username'"`
	`42`	`+ $UserSpecificSettings = $UserSpecificSettings.JSON \| ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue`
	`43`	`+ }`
	`44`	`+ catch {`
	`45`	`+ Write-Warning "Failed to convert UserSpecificSettings JSON: $($_.Exception.Message)"`
	`46`	`+ }`
	`47`	`+`
`39`	`48`	`#Get branding settings`
`40`	`49`	`if ($UserSettings) {`
`41`	`50`	`$brandingTable = Get-CippTable -tablename 'Config'`
`@@ -44,6 +53,11 @@ function Invoke-ListUserSettings {`
`44`	`53`	`$UserSettings \| Add-Member -MemberType NoteProperty -Name 'customBranding' -Value $BrandingSettings -Force \| Out-Null`
`45`	`54`	`}`
`46`	`55`	`}`
	`56`	`+`
	`57`	`+ if ($UserSpecificSettings) {`
	`58`	`+ $UserSettings \| Add-Member -MemberType NoteProperty -Name 'UserSpecificSettings' -Value $UserSpecificSettings -Force \| Out-Null`
	`59`	`+ }`
	`60`	`+`
`47`	`61`	`$StatusCode = [HttpStatusCode]::OK`
`48`	`62`	`$Results = $UserSettings`
`49`	`63`	`} catch {`