Merge pull request #257 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

…val/Invoke-ExecAppDeploymentTemplate.ps1 …roval/Invoke-ExecAppApprovalTemplate.ps1Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ExecAppDeploymentTemplate.ps1 renamed to Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ExecAppApprovalTemplate.ps1 Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ExecAppDeploymentTemplate.ps1 renamed to Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ExecAppApprovalTemplate.ps1

@@ -1,4 +1,4 @@
-function Invoke-ExecAppDeploymentTemplate {
+function Invoke-ExecAppApprovalTemplate {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -39,12 +39,12 @@ function Invoke-ExecAppDeploymentTemplate {
                 # Convert to JSON, preserving the original structure
                 $templateJson = $templateObject | ConvertTo-Json -Depth 10 -Compress
 
-                # Add to templates table with AppDeploymentTemplate partition key
+                # Add to templates table with AppApprovalTemplate partition key
                 $Table.Force = $true
                 Add-CIPPAzDataTableEntity @Table -Entity @{
                     JSON         = [string]$templateJson
                     RowKey       = "$GUID"
-                    PartitionKey = 'AppDeploymentTemplate'
+                    PartitionKey = 'AppApprovalTemplate'
                 }
 
                 # Return a proper array with ONE element containing the TemplateId
@@ -71,7 +71,7 @@ function Invoke-ExecAppDeploymentTemplate {
                 $TemplateId = $Request.Body.TemplateId
 
                 # Get the template to delete
-                $Template = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'AppDeploymentTemplate' and RowKey eq '$TemplateId'"
+                $Template = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'AppApprovalTemplate' and RowKey eq '$TemplateId'"
 
                 if ($Template) {
                     $TemplateData = $Template.JSON | ConvertFrom-Json
@@ -98,10 +98,10 @@ function Invoke-ExecAppDeploymentTemplate {
         }
         'Get' {
             # Check if TemplateId is provided to filter results
-            $filter = "PartitionKey eq 'AppDeploymentTemplate'"
+            $filter = "PartitionKey eq 'AppApprovalTemplate'"
             if ($Request.Query.TemplateId) {
                 $templateId = $Request.Query.TemplateId
-                $filter = "PartitionKey eq 'AppDeploymentTemplate' and RowKey eq '$templateId'"
+                $filter = "PartitionKey eq 'AppApprovalTemplate' and RowKey eq '$templateId'"
                 Write-LogMessage -headers $Request.Headers -API $APIName -message "Retrieved specific template: $templateId" -Sev 'Info'
             }
 
@@ -125,7 +125,7 @@ function Invoke-ExecAppDeploymentTemplate {
         }
         default {
             # Default action - list all templates
-            $filter = "PartitionKey eq 'AppDeploymentTemplate'"
+            $filter = "PartitionKey eq 'AppApprovalTemplate'"
 
             $Templates = Get-CIPPAzDataTableEntity @Table -Filter $filter
 

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ExecAppPermissionTemplate.ps1

@@ -17,10 +17,11 @@ function Invoke-ExecAppPermissionTemplate {
     switch ($Action) {
         'Save' {
             try {
+                $RowKey = $Request.Body.TemplateId ?? [guid]::NewGuid().ToString()
                 $Permissions = $Request.Body.Permissions
                 $Entity = @{
                     'PartitionKey' = 'Templates'
-                    'RowKey'       = [string]($Request.Body.TemplateId ?? [guid]::NewGuid().ToString())
+                    'RowKey'       = [string]$RowKey
                     'TemplateName' = [string]$Request.Body.TemplateName
                     'Permissions'  = [string]($Permissions | ConvertTo-Json -Depth 10 -Compress)
                     'UpdatedBy'    = $User.UserDetails ?? 'CIPP-API'
@@ -30,11 +31,12 @@ function Invoke-ExecAppPermissionTemplate {
                     'Results'  = 'Template Saved'
                     'Metadata' = @{
                         'TemplateName' = $Entity.TemplateName
-                        'TemplateId'   = $Entity.RowKey
+                        'TemplateId'   = $RowKey
                     }
                 }
                 Write-LogMessage -headers $Request.Headers -API 'ExecAppPermissionTemplate' -message "Permissions Saved for template: $($Request.Body.TemplateName)" -Sev 'Info' -LogData $Permissions
             } catch {
+                Write-Information "Failed to save template: $($_.Exception.Message) - $($_.InvocationInfo.PositionMessage)"
                 $Body = @{
                     'Results' = $_.Exception.Message
                 }

…al/Invoke-ListAppDeploymentTemplates.ps1 …oval/Invoke-ListAppApprovalTemplates.ps1Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ListAppDeploymentTemplates.ps1 renamed to Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ListAppApprovalTemplates.ps1 Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ListAppDeploymentTemplates.ps1 renamed to Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Application Approval/Invoke-ListAppApprovalTemplates.ps1

@@ -1,4 +1,4 @@
-function Invoke-ListAppDeploymentTemplates {
+function Invoke-ListAppApprovalTemplates {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -15,8 +15,8 @@ function Invoke-ListAppDeploymentTemplates {
     $Table = Get-CIPPTable -TableName 'templates'
 
     try {
-        # Use the templates table with AppDeploymentTemplate partition key
-        $filter = "PartitionKey eq 'AppDeploymentTemplate'"
+        # Use the templates table with AppApprovalTemplate partition key
+        $filter = "PartitionKey eq 'AppApprovalTemplate'"
 
         $Templates = Get-CIPPAzDataTableEntity @Table -Filter $filter
 

Modules/CIPPCore/Public/Tools/Import-CommunityTemplate.ps1

@@ -43,6 +43,22 @@ function Import-CommunityTemplate {
                     $NewJSON.excludedTenants = $excludedTenants
                 }
             }
+
+            if ($Template.PartitionKey -eq 'AppApprovalTemplate') {
+                # Extract the Permission Set name,id,permissions from the JSON and add to the AppPermissions table
+                $AppPermissionsTable = Get-CIPPTable -TableName 'AppPermissions'
+                $Permissions = $NewJSON.Permissions
+                $Entity = @{
+                    'PartitionKey' = 'Templates'
+                    'RowKey'       = $NewJSON.PermissionSetId
+                    'TemplateName' = $NewJSON.PermissionSetName
+                    'Permissions'  = [string]($Permissions | ConvertTo-Json -Depth 10 -Compress)
+                    'UpdatedBy'    = $NewJSON.UpdatedBy ?? $NewJSON.CreatedBy ?? 'System'
+                }
+                $null = Add-CIPPAzDataTableEntity @AppPermissionsTable -Entity $Entity -Force
+                Write-Information 'Added App Permissions to AppPermissions table'
+            }
+
             # Re-compress JSON and save to table
             $NewJSON = [string]($NewJSON | ConvertTo-Json -Depth 100 -Compress)
             $Template.JSON = $NewJSON