Merge pull request #386 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecUpdateDriftDeviation.ps1

@@ -0,0 +1,66 @@
+using namespace System.Net
+
+function Invoke-ExecUpdateDriftDeviation {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        Tenant.Standards.ReadWrite
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $APIName = $TriggerMetadata.FunctionName
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+
+    try {
+        $TenantFilter = $Request.Body.TenantFilter
+
+        if ($Request.Body.RemoveDriftCustomization) {
+            $Table = Get-CippTable -tablename 'tenantDrift'
+            $Filter = "PartitionKey eq '$TenantFilter'"
+            $ExistingDeviations = Get-CIPPAzDataTableEntity @Table -Filter $Filter
+            foreach ($Deviation in $ExistingDeviations) {
+                Remove-AzDataTableEntity @Table -Entity $Deviation
+            }
+            $Results = @([PSCustomObject]@{
+                    success = $true
+                    result  = "All drift customizations removed for tenant $TenantFilter"
+                })
+            Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Removed all drift customizations for tenant $TenantFilter" -Sev 'Info'
+        } else {
+            $Deviations = $Request.Body.deviations
+            $Results = foreach ($Deviation in $Deviations) {
+                try {
+                    $Result = Set-CIPPDriftDeviation -TenantFilter $TenantFilter -StandardName $Deviation.standardName -Status $Deviation.status
+                    [PSCustomObject]@{
+                        success = $true
+                        result  = $Result
+                    }
+                    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Updated drift deviation status for $($Deviation.standardName) to $($Deviation.status)" -Sev 'Info'
+                } catch {
+                    [PSCustomObject]@{
+                        standardName = $Deviation.standardName
+                        success      = $false
+                        error        = $_.Exception.Message
+                    }
+                    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Failed to update drift deviation for $($Deviation.standardName): $($_.Exception.Message)" -Sev 'Error'
+                }
+            }
+        }
+
+        $Body = @{ Results = @($Results) }
+
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = $Body
+            })
+
+    } catch {
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Failed to update drift deviation: $($_.Exception.Message)" -Sev 'Error'
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::BadRequest
+                Body       = @{error = $_.Exception.Message }
+            })
+    }
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListTenantAlignment.ps1

@@ -22,6 +22,7 @@ function Invoke-ListTenantAlignment {
             [PSCustomObject]@{
                 tenantFilter             = $_.TenantFilter
                 standardName             = $_.StandardName
+                standardType             = $_.StandardType ? $_.StandardType : 'Classic Standard'
                 standardId               = $_.StandardId
                 alignmentScore           = $_.AlignmentScore
                 LicenseMissingPercentage = $_.LicenseMissingPercentage

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListTenantDrift.ps1

@@ -0,0 +1,36 @@
+using namespace System.Net
+
+function Invoke-ListTenantDrift {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        Tenant.Standards.Read
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $APIName = $Request.Params.CIPPEndpoint
+
+    try {
+        # Use the new Get-CIPPTenantAlignment function to get alignment data
+        if ($Request.Query.TenantFilter) {
+            $TenantFilter = $Request.Query.TenantFilter
+            $Results = Get-CIPPDrift -TenantFilter $TenantFilter
+        } else {
+            $Tenants = Get-Tenants
+            $Results = $Tenants | ForEach-Object { Get-CIPPDrift -AllTenants -TenantFilter $_.defaultDomainName }
+        }
+
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = @($Results)
+            })
+    } catch {
+        Write-LogMessage -API $APIName -message "Failed to get tenant alignment data: $($_.Exception.Message)" -sev Error
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::InternalServerError
+                Body       = @{ error = "Failed to get tenant alignment data: $($_.Exception.Message)" }
+            })
+    }
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-listStandardTemplates.ps1

@@ -15,7 +15,6 @@ function Invoke-listStandardTemplates {
     Write-LogMessage -Headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
     # Interact with query parameters or the body of the request.
     $ID = $Request.Query.id
-
     $Table = Get-CippTable -tablename 'templates'
     $Filter = "PartitionKey eq 'StandardsTemplateV2'"
     $Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter) | ForEach-Object {

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Tools/Invoke-ExecGraphExplorerPreset.ps1

@@ -41,31 +41,31 @@ function Invoke-ExecGraphExplorerPreset {
         $params.'$select' = ($params.'$select').value -join ','
     }
 
-    if (!$Request.Body.preset.name) {
+    if (!$Request.Body.preset.name -and $Action -ne 'Delete') {
         $Message = 'Error: Preset name is required'
         $StatusCode = [HttpStatusCode]::BadRequest
         Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
                 StatusCode = $StatusCode
                 Body       = @{
-                    Results = @{
+                    Results = @(@{
                         resultText = $Message
                         state      = 'error'
-                    }
+                    })
                 }
             })
         return
     }
 
-    if (!$Request.Body.preset.endpoint) {
+    if (!$Request.Body.preset.endpoint -and $Action -ne 'Delete') {
         $Message = 'Error: Preset endpoint is required'
         $StatusCode = [HttpStatusCode]::BadRequest
         Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
                 StatusCode = $StatusCode
                 Body       = @{
-                    Results = @{
+                    Results = @(@{
                         resultText = $Message
                         state      = 'error'
-                    }
+                    })
                 }
             })
         return
@@ -114,10 +114,10 @@ function Invoke-ExecGraphExplorerPreset {
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = @{
-                Results = @{
+                Results = @(@{
                     resultText = $Message
                     state      = if ($Success) { 'success' } else { 'error' }
-                }
+                })
             }
         })
 }

Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1

@@ -236,6 +236,8 @@ function Get-CIPPTenantAlignment {
                     TenantFilter             = $TenantName
                     StandardName             = $Template.templateName
                     StandardId               = $Template.GUID
+                    standardType             = $Template.type
+                    standardSettings         = $Template.Standards
                     AlignmentScore           = $AlignmentPercentage
                     LicenseMissingPercentage = $LicenseMissingPercentage
                     CombinedScore            = $AlignmentPercentage + $LicenseMissingPercentage