Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

Author: KelvinTegelaar

Modules/CIPPCore/Public/Authentication/Get-CIPPAzIdentityToken.ps1

@@ -0,0 +1,28 @@
+function Get-CIPPAzIdentityToken {
+    <#
+    .SYNOPSIS
+        Get the Azure Identity token for Managed Identity
+    .DESCRIPTION
+        This function retrieves the Azure Identity token using the Managed Identity endpoint
+    .EXAMPLE
+        Get-CIPPAzIdentityToken
+    #>
+    [CmdletBinding()]
+    param()
+
+    $Endpoint = $env:IDENTITY_ENDPOINT
+    $Secret = $env:IDENTITY_HEADER
+    $ResourceURI = 'https://management.azure.com/'
+
+    if (-not $Endpoint -or -not $Secret) {
+        throw 'Managed Identity environment variables (IDENTITY_ENDPOINT/IDENTITY_HEADER) not found. Is Managed Identity enabled on the Function App?'
+    }
+
+    $TokenUri = "$($Endpoint)?resource=$($ResourceURI)&api-version=2019-08-01"
+    $Headers = @{
+        'X-IDENTITY-HEADER' = $Secret
+    }
+
+    $TokenResponse = Invoke-RestMethod -Method Get -Headers $Headers -Uri $TokenUri
+    return $TokenResponse.access_token
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListNewUserDefaults.ps1

@@ -12,15 +12,13 @@ function Invoke-ListNewUserDefaults {
 
     # Get the TenantFilter from query parameters
     $TenantFilter = $Request.Query.TenantFilter
-    Write-Host "TenantFilter from request: $TenantFilter"
-    
+
     # Get the includeAllTenants flag from query or body parameters (defaults to true)
     $IncludeAllTenants = if ($Request.Query.includeAllTenants -eq 'false' -or $Request.Body.includeAllTenants -eq 'false') {
         $false
     } else {
         $true
     }
-    Write-Host "IncludeAllTenants: $IncludeAllTenants"
 
     # Get the templates table
     $Table = Get-CippTable -tablename 'templates'
@@ -33,15 +31,12 @@ function Invoke-ListNewUserDefaults {
             $data = $row.JSON | ConvertFrom-Json -Depth 100 -ErrorAction Stop
             $data | Add-Member -NotePropertyName 'GUID' -NotePropertyValue $row.GUID -Force
             $data | Add-Member -NotePropertyName 'RowKey' -NotePropertyValue $row.RowKey -Force
-            Write-Host "Template found: $($data.templateName), tenantFilter: $($data.tenantFilter)"
             $data
         } catch {
             Write-Warning "Failed to process User Default template: $($row.RowKey) - $($_.Exception.Message)"
         }
     }
 
-    Write-Host "Total templates before filtering: $($Templates.Count)"
-
     # Filter by tenant if TenantFilter is provided
     if ($TenantFilter) {
         if ($TenantFilter -eq 'AllTenants') {
@@ -57,7 +52,6 @@ function Invoke-ListNewUserDefaults {
                 $Templates = $Templates | Where-Object -Property tenantFilter -eq $TenantFilter
             }
         }
-        Write-Host "Templates after filtering: $($Templates.Count)"
     }
 
     # Sort by template name

profile.ps1

@@ -4,24 +4,21 @@ Write-Information '#### CIPP-API Start ####'
 Set-Location -Path $PSScriptRoot
 try {
     $AppInsightsDllPath = Join-Path $PSScriptRoot 'Shared\AppInsights\Microsoft.ApplicationInsights.dll'
-    if (Test-Path $AppInsightsDllPath) {
-        [Reflection.Assembly]::LoadFile($AppInsightsDllPath) | Out-Null
-        Write-Information 'Application Insights SDK loaded successfully'
-    } else {
-        Write-Warning "Application Insights DLL not found at: $AppInsightsDllPath"
-    }
+    $null = [Reflection.Assembly]::LoadFile($AppInsightsDllPath)
+    Write-Information 'Application Insights SDK loaded successfully'
 } catch {
     Write-Warning "Failed to load Application Insights SDK: $($_.Exception.Message)"
 }
 
 # Import modules
-@('CIPPCore', 'CippExtensions', 'Az.KeyVault', 'Az.Accounts', 'AzBobbyTables') | ForEach-Object {
+$ModulesPath = Join-Path $PSScriptRoot 'Modules'
+$Modules = @('CIPPCore', 'CippExtensions', 'Az.Accounts', 'Az.KeyVault', 'AzBobbyTables')
+foreach ($Module in $Modules) {
     try {
-        $Module = $_
-        Import-Module -Name $_ -ErrorAction Stop
+        Import-Module -Name (Join-Path $ModulesPath $Module) -ErrorAction Stop
     } catch {
         Write-LogMessage -message "Failed to import module - $Module" -LogData (Get-CippException -Exception $_) -Sev 'debug'
-        $_.Exception.Message
+        Write-Error $_.Exception.Message
     }
 }
 
@@ -61,7 +58,7 @@ if ($env:ExternalDurablePowerShellSDK -eq $true) {
 }
 
 try {
-    Disable-AzContextAutosave -Scope Process | Out-Null
+    $null = Disable-AzContextAutosave -Scope Process
 } catch {}
 
 try {
@@ -73,8 +70,7 @@ try {
     Write-LogMessage -message 'Could not retrieve keys from Keyvault' -LogData (Get-CippException -Exception $_) -Sev 'debug'
 }
 
-Set-Location -Path $PSScriptRoot
-$CurrentVersion = (Get-Content .\version_latest.txt).trim()
+$CurrentVersion = (Get-Content -Path (Join-Path $PSScriptRoot 'version_latest.txt') -Raw).Trim()
 $Table = Get-CippTable -tablename 'Version'
 Write-Information "Function App: $($env:WEBSITE_SITE_NAME) | API Version: $CurrentVersion | PS Version: $($PSVersionTable.PSVersion)"
 $global:CippVersion = $CurrentVersion
@@ -84,7 +80,7 @@ if (!$LastStartup -or $CurrentVersion -ne $LastStartup.Version) {
     Write-Information "Version has changed from $($LastStartup.Version ?? 'None') to $CurrentVersion"
     if ($LastStartup) {
         $LastStartup.Version = $CurrentVersion
-        $LastStartup | Add-Member -MemberType NoteProperty -Name 'PSVersion' -Value $PSVersionTable.PSVersion.ToString() -Force
+        Add-Member -InputObject $LastStartup -MemberType NoteProperty -Name 'PSVersion' -Value $PSVersionTable.PSVersion.ToString() -Force
     } else {
         $LastStartup = [PSCustomObject]@{
             PartitionKey = 'Version'

requirements.psd1

@@ -1,10 +1,6 @@
 # This file enables modules to be automatically managed by the Functions service.
 # See https://aka.ms/functionsmanageddependency for additional information.
 #
-@{
-    # For latest supported version, go to 'https://www.powershellgallery.com/packages/Az'. 
-    # To use the Az module in your function app, please uncomment the line below.
-    'Az.accounts'   = '2.*'
-    'Az.Keyvault'   = '3.*'
-    'AzBobbyTables' = '2.*'
-}
+# CIPP bundles all modules locally in the Modules folder and imports them explicitly.
+# managedDependency is disabled in host.json - this file is intentionally empty.
+@{}