Fix: JIT Admin template support for groups and fix selected user

Author: Zacgoose

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-AddJITAdminTemplate.ps1

@@ -78,6 +78,9 @@ function Invoke-AddJITAdminTemplate {
             templateName                = $TemplateName
             defaultForTenant            = $DefaultForTenant
             defaultRoles                = $Request.Body.defaultRoles
+            defaultGroups               = $Request.Body.defaultGroups
+            defaultUseRoles             = [bool]$Request.Body.defaultUseRoles
+            defaultUseGroups            = [bool]$Request.Body.defaultUseGroups
             defaultDuration             = $Request.Body.defaultDuration
             defaultExpireAction         = $Request.Body.defaultExpireAction
             defaultNotificationActions  = $Request.Body.defaultNotificationActions
@@ -92,6 +95,11 @@ function Invoke-AddJITAdminTemplate {
             $TemplateObject.defaultUserAction = $DefaultUserAction
         }
 
+        # Add existing user selection when "select" action is specified
+        if ($DefaultUserAction -eq 'select' -and $Request.Body.defaultExistingUser) {
+            $TemplateObject.defaultExistingUser = $Request.Body.defaultExistingUser
+        }
+
         # Add user detail fields when "create" action is specified
         if ($DefaultUserAction -eq 'create') {
             # These fields can be saved for both AllTenants and specific tenant templates

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditJITAdminTemplate.ps1

@@ -94,6 +94,9 @@ function Invoke-EditJITAdminTemplate {
             templateName                = $TemplateName
             defaultForTenant            = $DefaultForTenant
             defaultRoles                = $Request.Body.defaultRoles
+            defaultGroups               = $Request.Body.defaultGroups
+            defaultUseRoles             = [bool]$Request.Body.defaultUseRoles
+            defaultUseGroups            = [bool]$Request.Body.defaultUseGroups
             defaultDuration             = $Request.Body.defaultDuration
             defaultExpireAction         = $Request.Body.defaultExpireAction
             defaultNotificationActions  = $Request.Body.defaultNotificationActions
@@ -110,6 +113,11 @@ function Invoke-EditJITAdminTemplate {
             $TemplateObject.defaultUserAction = $DefaultUserAction
         }
 
+        # Add existing user selection when "select" action is specified
+        if ($DefaultUserAction -eq 'select' -and $Request.Body.defaultExistingUser) {
+            $TemplateObject.defaultExistingUser = $Request.Body.defaultExistingUser
+        }
+
         # Add user detail fields when "create" action is specified
         if ($DefaultUserAction -eq 'create') {
             # These fields can be saved for both AllTenants and specific tenant templates