Merge pull request KelvinTegelaar#1800 from KelvinTegelaar/dev

KelvinTegelaar · web-flow · commit a6b55ed6b645 · 2026-01-30T11:47:27.000+01:00
Dev
diff --git a/CIPPTimers.json b/CIPPTimers.json
diff --git a/CommunityRepos.json b/CommunityRepos.json
diff --git a/ConversionTable.csv b/ConversionTable.csv
diff --git a/Modules/CIPPCore/Public/Add-CIPPApplicationPermission.ps1 b/Modules/CIPPCore/Public/Add-CIPPApplicationPermission.ps1
@@ -11,6 +11,7 @@ function Add-CIPPApplicationPermission {
     }
     if ($RequiredResourceAccess -eq 'CIPPDefaults') {
 
+        Set-Location (Get-Item $PSScriptRoot).FullName
         $Permissions = Get-CippSamPermissions -NoDiff
         $RequiredResourceAccess = [System.Collections.Generic.List[object]]::new()
 
diff --git a/Modules/CIPPCore/Public/Add-CIPPDelegatedPermission.ps1 b/Modules/CIPPCore/Public/Add-CIPPDelegatedPermission.ps1
@@ -8,6 +8,7 @@ function Add-CIPPDelegatedPermission {
         $TenantFilter
     )
     Write-Host 'Adding Delegated Permissions'
+    Set-Location (Get-Item $PSScriptRoot).FullName
 
     if ($ApplicationId -eq $env:ApplicationID -and $TenantFilter -eq $env:TenantID) {
         #return @('Cannot modify delgated permissions for CIPP-SAM on partner tenant')
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1
@@ -8,6 +8,7 @@ function Invoke-PublicWebhooks {
     param($Request, $TriggerMetadata)
     $Headers = $Request.Headers
 
+    Set-Location (Get-Item $PSScriptRoot).Parent.FullName
     $WebhookTable = Get-CIPPTable -TableName webhookTable
     $WebhookIncoming = Get-CIPPTable -TableName WebhookIncoming
     $Webhooks = Get-CIPPAzDataTableEntity @WebhookTable
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tools/GitHub/Invoke-ListCommunityRepos.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tools/GitHub/Invoke-ListCommunityRepos.ps1
@@ -24,7 +24,7 @@ function Invoke-ListCommunityRepos {
 
     if (!$Request.Query.WriteAccess) {
         $CIPPRoot = (Get-Item (Get-Module -Name CIPPCore).ModuleBase).Parent.Parent.FullName
-        $CommunityRepos = Join-Path -Path $CIPPRoot -ChildPath 'Resources\CommunityRepos.json'
+        $CommunityRepos = Join-Path -Path $CIPPRoot -ChildPath 'CommunityRepos.json'
         $DefaultCommunityRepos = Get-Content -Path $CommunityRepos -Raw | ConvertFrom-Json
 
         $DefaultsMissing = $false
diff --git a/Modules/CIPPCore/Public/Get-CIPPTimerFunctions.ps1 b/Modules/CIPPCore/Public/Get-CIPPTimerFunctions.ps1
@@ -40,7 +40,7 @@ function Get-CIPPTimerFunctions {
     }
 
     $CIPPRoot = (Get-Item $CIPPCoreModuleRoot).Parent.Parent
-    $CippTimers = Get-Content -Path $CIPPRoot\Resources\CIPPTimers.json
+    $CippTimers = Get-Content -Path $CIPPRoot\CIPPTimers.json
 
     if ($ListAllTasks) {
         $Orchestrators = $CippTimers | ConvertFrom-Json | Sort-Object -Property Priority
diff --git a/Modules/CIPPCore/Public/GraphHelper/New-passwordString.ps1 b/Modules/CIPPCore/Public/GraphHelper/New-passwordString.ps1
@@ -10,7 +10,7 @@ function New-passwordString {
     $SettingsTable = Get-CippTable -tablename 'Settings'
     $PasswordType = (Get-CIPPAzDataTableEntity @SettingsTable).passwordType
     if ($PasswordType -eq 'Correct-Battery-Horse') {
-        $Words = Get-Content .\Resources\words.txt
+        $Words = Get-Content .\words.txt
         (Get-Random -InputObject $words -Count 4) -join '-'
     } else {
         # Generate a complex password with a maximum of 100 tries
diff --git a/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 b/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1
@@ -25,6 +25,7 @@ function Test-CIPPAccessPermissions {
     }
     $Success = $true
     try {
+        Set-Location (Get-Item $PSScriptRoot).FullName
         $null = Get-CIPPAuthentication
         $GraphToken = Get-GraphToken -returnRefresh $true -SkipCache $true
         if ($GraphToken) {
diff --git a/Modules/CippEntrypoints/CippEntrypoints.psm1 b/Modules/CippEntrypoints/CippEntrypoints.psm1
@@ -39,6 +39,7 @@ function Receive-CippHttpTrigger {
 
     # Convert the request to a PSCustomObject because the httpContext is case sensitive since 7.3
     $Request = $Request | ConvertTo-Json -Depth 100 | ConvertFrom-Json
+    Set-Location (Get-Item $PSScriptRoot).Parent.Parent.FullName
 
     if ($Request.Params.CIPPEndpoint -eq '$batch') {
         # Implement batch processing in the style of graph api $batch
diff --git a/Modules/CippExtensions/Public/Gradient/New-GradientServiceSyncRun.ps1 b/Modules/CippExtensions/Public/Gradient/New-GradientServiceSyncRun.ps1
@@ -27,8 +27,8 @@ function New-GradientServiceSyncRun {
     }
 
 
-    Set-Location (Get-Item $PSScriptRoot).Parent.Parent.Parent.Parent.FullName
-    $ConvertTable = Import-Csv Resources\ConversionTable.csv
+    Set-Location (Get-Item $PSScriptRoot).Parent.FullName
+    $ConvertTable = Import-Csv ConversionTable.csv
     $Table = Get-CIPPTable -TableName cachelicenses
     $LicenseTable = Get-CIPPTable -TableName ExcludedLicenses
     $ExcludedSkuList = Get-CIPPAzDataTableEntity @LicenseTable
diff --git a/Modules/CippExtensions/Public/Hudu/Invoke-HuduExtensionSync.ps1 b/Modules/CippExtensions/Public/Hudu/Invoke-HuduExtensionSync.ps1
@@ -34,7 +34,7 @@ function Invoke-HuduExtensionSync {
 
         # Import license mapping
         Set-Location (Get-Item $PSScriptRoot).Parent.Parent.Parent.Parent.FullName
-        $LicTable = Import-Csv Resources\ConversionTable.csv
+        $LicTable = Import-Csv ConversionTable.csv
 
         $CompanyResult.Logs.Add('Starting Hudu Extension Sync')
 
diff --git a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1
@@ -1846,6 +1846,9 @@ function Invoke-NinjaOneTenantSync {
 
             ### CIPP Applied Standards Cards
             Write-Information 'Applied Standards'
+            $ModuleBase = Get-Module CIPPExtensions | Select-Object -ExpandProperty ModuleBase
+            $CIPPRoot = (Get-Item $ModuleBase).Parent.Parent.FullName
+            Set-Location $CIPPRoot
 
             try {
                 $StandardsDefinitions = Invoke-RestMethod -Uri 'https://raw.githubusercontent.com/KelvinTegelaar/CIPP/refs/heads/main/src/data/standards.json'
diff --git a/intuneCollection.json b/intuneCollection.json
diff --git a/profile.ps1 b/profile.ps1
@@ -8,6 +8,7 @@ if ($env:APPLICATIONINSIGHTS_CONNECTION_STRING -or $env:APPINSIGHTS_INSTRUMENTAT
     $hasAppInsights = $true
 }
 if ($hasAppInsights) {
+    Set-Location -Path $PSScriptRoot
     $SwAppInsights = [System.Diagnostics.Stopwatch]::StartNew()
     try {
         $AppInsightsDllPath = Join-Path $PSScriptRoot 'Shared\AppInsights\Microsoft.ApplicationInsights.dll'
diff --git a/words.txt b/words.txt

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ function Add-CIPPApplicationPermission {`
`11`	`11`	`}`
`12`	`12`	`if ($RequiredResourceAccess -eq 'CIPPDefaults') {`
`13`	`13`
	`14`	`+ Set-Location (Get-Item $PSScriptRoot).FullName`
`14`	`15`	`$Permissions = Get-CippSamPermissions -NoDiff`
`15`	`16`	`$RequiredResourceAccess = [System.Collections.Generic.List[object]]::new()`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ function Add-CIPPDelegatedPermission {`
`8`	`8`	`$TenantFilter`
`9`	`9`	`)`
`10`	`10`	`Write-Host 'Adding Delegated Permissions'`
	`11`	`+ Set-Location (Get-Item $PSScriptRoot).FullName`
`11`	`12`
`12`	`13`	`if ($ApplicationId -eq $env:ApplicationID -and $TenantFilter -eq $env:TenantID) {`
`13`	`14`	`#return @('Cannot modify delgated permissions for CIPP-SAM on partner tenant')`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function Get-CIPPTimerFunctions {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`$CIPPRoot = (Get-Item $CIPPCoreModuleRoot).Parent.Parent`
`43`		`- $CippTimers = Get-Content -Path $CIPPRoot\Resources\CIPPTimers.json`
	`43`	`+ $CippTimers = Get-Content -Path $CIPPRoot\CIPPTimers.json`
`44`	`44`
`45`	`45`	`if ($ListAllTasks) {`
`46`	`46`	`$Orchestrators = $CippTimers \| ConvertFrom-Json \| Sort-Object -Property Priority`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ function Test-CIPPAccessPermissions {`
`25`	`25`	`}`
`26`	`26`	`$Success = $true`
`27`	`27`	`try {`
	`28`	`+ Set-Location (Get-Item $PSScriptRoot).FullName`
`28`	`29`	`$null = Get-CIPPAuthentication`
`29`	`30`	`$GraphToken = Get-GraphToken -returnRefresh $true -SkipCache $true`
`30`	`31`	`if ($GraphToken) {`