Update data.json

Co-authored-by: hsluoyz <3787410+hsluoyz@users.noreply.github.com>

object/application.go

@@ -61,9 +61,10 @@ type SamlItem struct {
 }
 
 type JwtItem struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-	Type  string `json:"type"`
+	Name     string `json:"name"`
+	Category string `json:"category"`
+	Value    string `json:"value"`
+	Type     string `json:"type"`
 }
 
 type Application struct {

object/token_jwt.go

@@ -338,6 +338,50 @@ func getClaimsWithoutThirdIdp(claims Claims) ClaimsWithoutThirdIdp {
 	return res
 }
 
+// getUserFieldValue gets the value of a user field by name, handling special cases like Roles and Permissions
+func getUserFieldValue(user *User, fieldName string) (interface{}, bool) {
+	if user == nil {
+		return nil, false
+	}
+
+	// Handle special fields that need conversion
+	switch fieldName {
+	case "Roles":
+		return getUserRoleNames(user), true
+	case "Permissions":
+		return getUserPermissionNames(user), true
+	case "permissionNames":
+		permissionNames := []string{}
+		for _, val := range user.Permissions {
+			permissionNames = append(permissionNames, val.Name)
+		}
+		return permissionNames, true
+	}
+
+	// Handle Properties fields (e.g., Properties.my_field)
+	if strings.HasPrefix(fieldName, "Properties.") {
+		parts := strings.Split(fieldName, ".")
+		if len(parts) == 2 {
+			propName := parts[1]
+			if user.Properties != nil {
+				if value, exists := user.Properties[propName]; exists {
+					return value, true
+				}
+			}
+		}
+		return nil, false
+	}
+
+	// Use reflection to get the field value
+	userValue := reflect.ValueOf(user).Elem()
+	userField := userValue.FieldByName(fieldName)
+	if userField.IsValid() {
+		return userField.Interface(), true
+	}
+
+	return nil, false
+}
+
 func getClaimsCustom(claims Claims, tokenField []string, tokenAttributes []*JwtItem) jwt.MapClaims {
 	res := make(jwt.MapClaims)
 
@@ -414,16 +458,30 @@ func getClaimsCustom(claims Claims, tokenField []string, tokenAttributes []*JwtI
 	}
 
 	for _, item := range tokenAttributes {
-		valueList := replaceAttributeValue(claims.User, item.Value)
-		if len(valueList) == 0 {
-			continue
+		var value interface{}
+		
+		// If Category is "Existing Field", get the actual field value from the user
+		if item.Category == "Existing Field" {
+			fieldValue, found := getUserFieldValue(claims.User, item.Value)
+			if !found {
+				continue
+			}
+			value = fieldValue
+		} else {
+			// Default behavior: use replaceAttributeValue for "Static Value" or empty category
+			valueList := replaceAttributeValue(claims.User, item.Value)
+			if len(valueList) == 0 {
+				continue
+			}
+
+			if item.Type == "String" {
+				value = valueList[0]
+			} else {
+				value = valueList
+			}
 		}
 
-		if item.Type == "String" {
-			res[item.Name] = valueList[0]
-		} else {
-			res[item.Name] = valueList
-		}
+		res[item.Name] = value
 	}
 
 	return res

web/src/table/TokenAttributeTable.js

@@ -24,6 +24,8 @@ class TokenAttributeTable extends React.Component {
     this.state = {
       classes: props,
     };
+    // List of available user fields for "Existing Field" category
+    this.userFields = ["Owner", "Name", "Id", "DisplayName", "Email", "Phone", "Tag", "Roles", "Permissions", "permissionNames", "Groups"];
   }
 
   updateTable(table) {
@@ -36,7 +38,8 @@ class TokenAttributeTable extends React.Component {
   }
 
   addRow(table) {
-    const row = {Name: "", nameFormat: "", value: ""};
+    // Note: Field names use lowercase to match JSON serialization from backend (json:"name", json:"value", json:"type", json:"category")
+    const row = {name: "", value: "", type: "Array", category: "Static Value"};
     if (table === undefined || table === null) {
       table = [];
     }
@@ -74,24 +77,63 @@ class TokenAttributeTable extends React.Component {
           );
         },
       },
+      {
+        title: i18next.t("general:Category"),
+        dataIndex: "category",
+        key: "category",
+        width: "150px",
+        render: (text, record, index) => {
+          return (
+            <Select virtual={false} style={{width: "100%"}}
+              value={text ?? "Static Value"}
+              options={[
+                {value: "Static Value", label: i18next.t("application:Static Value")},
+                {value: "Existing Field", label: i18next.t("application:Existing Field")},
+              ].map((item) =>
+                Setting.getOption(item.label, item.value))
+              }
+              onChange={value => {
+                this.updateField(table, index, "category", value);
+              }} >
+            </Select>
+          );
+        },
+      },
       {
         title: i18next.t("webhook:Value"),
         dataIndex: "value",
         key: "value",
         width: "200px",
         render: (text, record, index) => {
-          return (
-            <Input value={text} onChange={e => {
-              this.updateField(table, index, "value", e.target.value);
-            }} />
-          );
+          const category = record.category ?? "Static Value";
+          if (category === "Existing Field") {
+            // Show dropdown for existing fields
+            return (
+              <Select virtual={false} style={{width: "100%"}}
+                value={text}
+                options={this.userFields.map((field) =>
+                  Setting.getOption(field, field))
+                }
+                onChange={value => {
+                  this.updateField(table, index, "value", value);
+                }} >
+              </Select>
+            );
+          } else {
+            // Show text input for static values
+            return (
+              <Input value={text} onChange={e => {
+                this.updateField(table, index, "value", e.target.value);
+              }} />
+            );
+          }
         },
       },
       {
         title: i18next.t("general:Type"),
         dataIndex: "type",
         key: "type",
-        width: "200px",
+        width: "150px",
         render: (text, record, index) => {
           return (
             <Select virtual={false} style={{width: "100%"}}