diff --git a/backend/internal/dto/user_group_dto.go b/backend/internal/dto/user_group_dto.go index 44b51a9..90d3fb1 100644 --- a/backend/internal/dto/user_group_dto.go +++ b/backend/internal/dto/user_group_dto.go @@ -23,8 +23,8 @@ type UserGroupDtoWithUserCount struct { } type UserGroupCreateDto struct { - FriendlyName string `json:"friendlyName" binding:"required,min=3,max=30"` - Name string `json:"name" binding:"required,min=3,max=30,userGroupName"` + FriendlyName string `json:"friendlyName" binding:"required,min=2,max=50"` + Name string `json:"name" binding:"required,min=2,max=255"` } type UserGroupUpdateUsersDto struct { diff --git a/backend/internal/dto/validations.go b/backend/internal/dto/validations.go index 5199c6c..bec57db 100644 --- a/backend/internal/dto/validations.go +++ b/backend/internal/dto/validations.go @@ -28,13 +28,6 @@ var validateUsername validator.Func = func(fl validator.FieldLevel) bool { return matched } -var validateUserGroupName validator.Func = func(fl validator.FieldLevel) bool { - // The string can only contain lowercase letters, numbers, and underscores - regex := "^[a-z0-9_]*$" - matched, _ := regexp.MatchString(regex, fl.Field().String()) - return matched -} - var validateClaimKey validator.Func = func(fl validator.FieldLevel) bool { // The string can only contain letters and numbers regex := "^[A-Za-z0-9]*$" @@ -53,13 +46,6 @@ func init() { log.Fatalf("Failed to register custom validation: %v", err) } } - - if v, ok := binding.Validator.Engine().(*validator.Validate); ok { - if err := v.RegisterValidation("userGroupName", validateUserGroupName); err != nil { - log.Fatalf("Failed to register custom validation: %v", err) - } - } - if v, ok := binding.Validator.Engine().(*validator.Validate); ok { if err := v.RegisterValidation("claimKey", validateClaimKey); err != nil { log.Fatalf("Failed to register custom validation: %v", err) diff --git a/frontend/src/routes/settings/admin/user-groups/user-group-form.svelte b/frontend/src/routes/settings/admin/user-groups/user-group-form.svelte index 763ce35..478173d 100644 --- a/frontend/src/routes/settings/admin/user-groups/user-group-form.svelte +++ b/frontend/src/routes/settings/admin/user-groups/user-group-form.svelte @@ -22,12 +22,11 @@ }; const formSchema = z.object({ - friendlyName: z.string().min(2).max(30), + friendlyName: z.string().min(2).max(50), name: z .string() .min(2) - .max(30) - .regex(/^[a-z0-9_]+$/, 'Name can only contain lowercase letters, numbers, and underscores') + .max(255) }); type FormSchema = typeof formSchema;