Merge pull request #950 from JohnDuprey/dev

Fix hudu CIPP url
KelvinTegelaar · Jul 8, 2024 · 689c5b7 · 689c5b7
2 parents c325129 + 3bb72cf
commit 689c5b7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/.../CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExtensionsConfig.ps1 b/.../CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExtensionsConfig.ps1
@@ -68,6 +68,17 @@ Function Invoke-ExecExtensionsConfig {
         }
 
         Add-CIPPAzDataTableEntity @Table -Entity $Config -Force | Out-Null
+
+        $CippUri = [System.Uri]$TriggerMetadata.Headers.'x-ms-original-url'
+        $AddObject = @{
+            PartitionKey = 'InstanceProperties'
+            RowKey       = 'CIPPURL'
+            Value        = '{0}://{1}' -f $CippUri.Scheme, $CippUri.Authority
+        }
+        $ConfigTable = Get-CIPPTable -tablename 'Config'
+        Add-AzDataTableEntity @ConfigTable -Entity $AddObject -Force
+
+        Register-CIPPExtensionScheduledTasks
         "Successfully set the configuration. $AddedText"
     } catch {
         "Failed to set configuration: $($_.Exception.message) Linenumber: $($_.InvocationInfo.ScriptLineNumber)"

diff --git a/Modules/CippExtensions/Public/Extension Functions/Register-CippExtensionScheduledTasks.ps1 b/Modules/CippExtensions/Public/Extension Functions/Register-CippExtensionScheduledTasks.ps1
@@ -107,14 +107,14 @@ function Register-CIPPExtensionScheduledTasks {
     }
 
     foreach ($Task in $ScheduledTasks) {
-        if ($Task.TenantFilter -notin $Tenants.defaultDomainName) {
+        if ($Task.Tenant -notin $Tenants.defaultDomainName) {
             Write-Information "Tenant Removed: Cleaning up scheduled task $($Task.Name) for tenant $($Task.TenantFilter)"
             $Entity = $Task | Select-Object -Property PartitionKey, RowKey
             Remove-AzDataTableEntity @ScheduledTasksTable -Entity $Entity
         }
     }
     foreach ($Task in $PushTasks) {
-        if ($Task.TenantFilter -notin $Tenants.defaultDomainName) {
+        if ($Task.Tenant -notin $Tenants.defaultDomainName) {
             Write-Information "Tenant Removed: Cleaning up scheduled task $($Task.Name) for tenant $($Task.TenantFilter)"
             $Entity = $Task | Select-Object -Property PartitionKey, RowKey
             Remove-AzDataTableEntity @ScheduledTasksTable -Entity $Entity

diff --git a/Modules/CippExtensions/Public/Hudu/Invoke-HuduExtensionSync.ps1 b/Modules/CippExtensions/Public/Hudu/Invoke-HuduExtensionSync.ps1
@@ -44,11 +44,14 @@ function Invoke-HuduExtensionSync {
     Set-Location (Get-Item $PSScriptRoot).Parent.Parent.Parent.Parent.FullName
     $LicTable = Import-Csv Conversiontable.csv
 
-
     #$AssignedMap = Get-AssignedMap
     #$AssignedNameMap = Get-AssignedNameMap
+
     $EnableCIPP = $true
-    #$CIPPURL = $env:CIPPURL
+
+    $ConfigTable = Get-Cipptable -tablename 'Config'
+    $Config = Get-CippAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'InstanceProperties' and RowKey -eq 'CIPPURL'"
+    $CIPPURL = $Config.Value
 
     $ExtensionCache = Get-ExtensionCacheData -TenantFilter $Tenant.defaultDomainName
 
@@ -593,9 +596,9 @@ function Invoke-HuduExtensionSync {
 
                     [System.Collections.Generic.List[PSCustomObject]]$CIPPLinksFormatted = @()
                     if ($EnableCIPP) {
-                        $CIPPLinksFormatted.add((Get-HuduLinkBlock -URL "$($CIPPURL).auth/login/aad?post_login_redirect_uri=$($CIPPURL)identity/administration/users/view?userId=$($User.id)%26tenantDomain%3D$($Tenant.defaultDomainName)" -Icon 'far fa-eye' -Title 'CIPP - View User'))
-                        $CIPPLinksFormatted.add((Get-HuduLinkBlock -URL "$($CIPPURL).auth/login/aad?post_login_redirect_uri=$($CIPPURL)identity/administration/users/edit?userId=$($User.id)%26tenantDomain%3D$($Tenant.defaultDomainName)" -Icon 'fas fa-user-cog' -Title 'CIPP - Edit User'))
-                        $CIPPLinksFormatted.add((Get-HuduLinkBlock -URL "$($CIPPURL).auth/login/aad?post_login_redirect_uri=$($CIPPURL)identity/administration/ViewBec?userId=$($User.id)%26tenantDomain%3D$($Tenant.defaultDomainName)" -Icon 'fas fa-user-secret' -Title 'CIPP - Research Compromise'))
+                        $CIPPLinksFormatted.add((Get-HuduLinkBlock -URL "$($CIPPURL)/.auth/login/aad?post_login_redirect_uri=$($CIPPURL)/identity/administration/users/view?userId=$($User.id)%26tenantDomain%3D$($Tenant.defaultDomainName)" -Icon 'far fa-eye' -Title 'CIPP - View User'))
+                        $CIPPLinksFormatted.add((Get-HuduLinkBlock -URL "$($CIPPURL)/.auth/login/aad?post_login_redirect_uri=$($CIPPURL)/identity/administration/users/edit?userId=$($User.id)%26tenantDomain%3D$($Tenant.defaultDomainName)" -Icon 'fas fa-user-cog' -Title 'CIPP - Edit User'))
+                        $CIPPLinksFormatted.add((Get-HuduLinkBlock -URL "$($CIPPURL)/.auth/login/aad?post_login_redirect_uri=$($CIPPURL)/identity/administration/ViewBec?userId=$($User.id)%26tenantDomain%3D$($Tenant.defaultDomainName)" -Icon 'fas fa-user-secret' -Title 'CIPP - Research Compromise'))
                     }
 
                     [System.Collections.Generic.List[PSCustomObject]]$UserLinksFormatted = @()