starred/pocket-id-pocket-id-2
1
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2025-12-11 07:32:57 +03:00
Code Issues 116 Packages Projects Releases 10 Wiki Activity

fix: remove restrictive validation for group names

Browse Source
This commit is contained in:
Elias Schneider
2025-01-13 12:38:02 +01:00
parent 888557171d
commit be6e25a167
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/internal/dto/user_group_dto.go
View File

@@ -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 {

14
backend/internal/dto/validations.go
View File

@@ -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)

5
frontend/src/routes/settings/admin/user-groups/user-group-form.svelte
View File

@@ -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;