A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix: Unified display name and username length checks
Luffyafdf6ce778c2
diff --git a/docs/docs.go b/docs/docs.goindex 4f5fe86e..82ab3c77 100644--- a/docs/docs.go+++ b/docs/docs.go@@ -8263,7 +8263,7 @@ const docTemplate = `{"display_name": {"type": "string","maxLength": 30,- "minLength": 4+ "minLength": 2},"email": {"type": "string",@@ -8274,7 +8274,8 @@ const docTemplate = `{},"username": {"type": "string",- "maxLength": 30+ "maxLength": 30,+ "minLength": 2}}},@@ -11084,7 +11085,8 @@ const docTemplate = `{},"display_name": {"type": "string",- "maxLength": 30+ "maxLength": 30,+ "minLength": 2},"location": {"type": "string",diff --git a/docs/swagger.json b/docs/swagger.jsonindex 5a48fd0d..689255a4 100644--- a/docs/swagger.json+++ b/docs/swagger.json@@ -8236,7 +8236,7 @@"display_name": {"type": "string","maxLength": 30,- "minLength": 4+ "minLength": 2},"email": {"type": "string",@@ -8247,7 +8247,8 @@},"username": {"type": "string",- "maxLength": 30+ "maxLength": 30,+ "minLength": 2}}},@@ -11057,7 +11058,8 @@},"display_name": {"type": "string",- "maxLength": 30+ "maxLength": 30,+ "minLength": 2},"location": {"type": "string",diff --git a/docs/swagger.yaml b/docs/swagger.yamlindex c06ce949..a399b3bf 100644--- a/docs/swagger.yaml+++ b/docs/swagger.yaml@@ -527,7 +527,7 @@ definitions:properties:display_name:maxLength: 30- minLength: 4+ minLength: 2type: stringemail:maxLength: 500@@ -536,6 +536,7 @@ definitions:type: stringusername:maxLength: 30+ minLength: 2type: stringrequired:- display_name@@ -2485,6 +2486,7 @@ definitions:type: stringdisplay_name:maxLength: 30+ minLength: 2type: stringlocation:maxLength: 100diff --git a/i18n/af_ZA.yaml b/i18n/af_ZA.yamlindex 0d1cf1cf..f421ba9a 100644--- a/i18n/af_ZA.yaml+++ b/i18n/af_ZA.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/ar_SA.yaml b/i18n/ar_SA.yamlindex 1f298b93..094a0552 100644--- a/i18n/ar_SA.yaml+++ b/i18n/ar_SA.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/ca_ES.yaml b/i18n/ca_ES.yamlindex 1f298b93..094a0552 100644--- a/i18n/ca_ES.yaml+++ b/i18n/ca_ES.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/cs_CZ.yaml b/i18n/cs_CZ.yamlindex e7561c9e..e7fda9af 100644--- a/i18n/cs_CZ.yaml+++ b/i18n/cs_CZ.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/cy_GB.yaml b/i18n/cy_GB.yamlindex 09987e25..ed65acbb 100644--- a/i18n/cy_GB.yaml+++ b/i18n/cy_GB.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/el_GR.yaml b/i18n/el_GR.yamlindex 1f298b93..094a0552 100644--- a/i18n/el_GR.yaml+++ b/i18n/el_GR.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/en_US.yaml b/i18n/en_US.yamlindex a22396cf..19158136 100644--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@ -1300,12 +1300,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1892,10 +1892,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/fa_IR.yaml b/i18n/fa_IR.yamlindex 5838f4cc..429aa856 100644--- a/i18n/fa_IR.yaml+++ b/i18n/fa_IR.yaml@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/fi_FI.yaml b/i18n/fi_FI.yamlindex 1f298b93..094a0552 100644--- a/i18n/fi_FI.yaml+++ b/i18n/fi_FI.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/he_IL.yaml b/i18n/he_IL.yamlindex 1f298b93..094a0552 100644--- a/i18n/he_IL.yaml+++ b/i18n/he_IL.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/hi_IN.yaml b/i18n/hi_IN.yamlindex c2d3781d..8dac7f47 100644--- a/i18n/hi_IN.yaml+++ b/i18n/hi_IN.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/hu_HU.yaml b/i18n/hu_HU.yamlindex 1f298b93..094a0552 100644--- a/i18n/hu_HU.yaml+++ b/i18n/hu_HU.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/id_ID.yaml b/i18n/id_ID.yamlindex ff969bfa..03a707c8 100644--- a/i18n/id_ID.yaml+++ b/i18n/id_ID.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/ko_KR.yaml b/i18n/ko_KR.yamlindex e1381004..543ef3b7 100644--- a/i18n/ko_KR.yaml+++ b/i18n/ko_KR.yaml@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: 이메일msg_invalid: Invalid Email Address.diff --git a/i18n/ml_IN.yaml b/i18n/ml_IN.yamlindex 9a3f7459..a1a6da69 100644--- a/i18n/ml_IN.yaml+++ b/i18n/ml_IN.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/nl_NL.yaml b/i18n/nl_NL.yamlindex 1f298b93..094a0552 100644--- a/i18n/nl_NL.yaml+++ b/i18n/nl_NL.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/no_NO.yaml b/i18n/no_NO.yamlindex 90b00b6c..a0cd0139 100644--- a/i18n/no_NO.yaml+++ b/i18n/no_NO.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/ro_RO.yaml b/i18n/ro_RO.yamlindex 80b0ebdb..e7ba8455 100644--- a/i18n/ro_RO.yaml+++ b/i18n/ro_RO.yaml@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/ru_RU.yaml b/i18n/ru_RU.yamlindex d2507f99..58e80e98 100644--- a/i18n/ru_RU.yaml+++ b/i18n/ru_RU.yaml@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/sk_SK.yaml b/i18n/sk_SK.yamlindex 414e6a9d..1de09bd7 100644--- a/i18n/sk_SK.yaml+++ b/i18n/sk_SK.yaml@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/sr_SP.yaml b/i18n/sr_SP.yamlindex 1f298b93..094a0552 100644--- a/i18n/sr_SP.yaml+++ b/i18n/sr_SP.yaml@@ -678,12 +678,12 @@ ui:display_name:label: Display Namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile Imagediff --git a/i18n/sv_SE.yaml b/i18n/sv_SE.yamlindex a2ecc2b1..910313f9 100644--- a/i18n/sv_SE.yaml+++ b/i18n/sv_SE.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Visningsnamnmsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Användarnamncaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profilbild@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Visningsnamn- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Användarnamn- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Ogiltig e-postadress.diff --git a/i18n/te_IN.yaml b/i18n/te_IN.yamlindex 425239fc..cc5ce338 100644--- a/i18n/te_IN.yaml+++ b/i18n/te_IN.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/tr_TR.yaml b/i18n/tr_TR.yamlindex f1bf034a..0b845a0e 100644--- a/i18n/tr_TR.yaml+++ b/i18n/tr_TR.yaml@@ -1275,12 +1275,12 @@ ui:display_name:label: Display namemsg: Display name cannot be empty.- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Usernamecaption: People can mention you as "@username".msg: Username cannot be empty.- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.character: 'Must use the character set "a-z", "0-9", " - . _"'avatar:label: Profile image@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/i18n/zh_TW.yaml b/i18n/zh_TW.yamlindex 72ab1779..4e02c70d 100644--- a/i18n/zh_TW.yaml+++ b/i18n/zh_TW.yaml@@ -1852,10 +1852,10 @@ ui:fields:display_name:label: Display name- msg_range: Display name up to 30 characters.+ msg_range: Display name must be 2-30 characters in length.username:label: Username- msg_range: Username up to 30 characters.+ msg_range: Username must be 2-30 characters in length.email:label: Emailmsg_invalid: Invalid Email Address.diff --git a/internal/schema/backyard_user_schema.go b/internal/schema/backyard_user_schema.goindex b6e29f65..923a20ed 100644--- a/internal/schema/backyard_user_schema.go+++ b/internal/schema/backyard_user_schema.go@@ -111,8 +111,8 @@ type UpdateUserRoleReq struct {// EditUserProfileReq edit user profile requesttype EditUserProfileReq struct {UserID string `validate:"required" json:"user_id"`- DisplayName string `validate:"required,gte=4,lte=30" json:"display_name"`- Username string `validate:"omitempty,gt=3,lte=30" json:"username"`+ DisplayName string `validate:"required,gte=2,lte=30" json:"display_name"`+ Username string `validate:"omitempty,gte=2,lte=30" json:"username"`Email string `validate:"required,email,gt=0,lte=500" json:"email"`LoginUserID string `json:"-"`IsAdmin bool `json:"-"`diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.goindex 3abbbdb3..7c0af1dc 100644--- a/internal/schema/user_schema.go+++ b/internal/schema/user_schema.go@@ -238,7 +238,7 @@ func (u *UserModifyPasswordReq) Check() (errFields []*validator.FormErrorField,}type UpdateInfoRequest struct {- DisplayName string `validate:"omitempty,gt=0,lte=30" json:"display_name"`+ DisplayName string `validate:"omitempty,gte=2,lte=30" json:"display_name"`Username string `validate:"omitempty,gte=2,lte=30" json:"username"`Avatar AvatarInfo `json:"avatar"`Bio string `validate:"omitempty,gt=0,lte=4096" json:"bio"`diff --git a/ui/src/hooks/useChangeProfileModal/index.tsx b/ui/src/hooks/useChangeProfileModal/index.tsxindex 6f85e25d..5fec7bab 100644--- a/ui/src/hooks/useChangeProfileModal/index.tsx+++ b/ui/src/hooks/useChangeProfileModal/index.tsx@@ -69,7 +69,7 @@ const useChangeProfileModal = (props: IProps = {}, userData) => {'ui:options': {inputType: 'text',validator: (value) => {- const MIN_LENGTH = 3;+ const MIN_LENGTH = 2;const MAX_LENGTH = 30;if (value.length < MIN_LENGTH || value.length > MAX_LENGTH) {return t('form.fields.display_name.msg_range');@@ -82,7 +82,7 @@ const useChangeProfileModal = (props: IProps = {}, userData) => {'ui:options': {inputType: 'text',validator: (value) => {- const MIN_LENGTH = 3;+ const MIN_LENGTH = 2;const MAX_LENGTH = 30;if (value.length < MIN_LENGTH || value.length > MAX_LENGTH) {return t('form.fields.username.msg_range');