Skip to content

Commit bc86d72

Browse files
committed
fix: update admin name validation
1 parent 4b9fd39 commit bc86d72

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

i18n/en_US.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@ ui:
16821682
admin_name:
16831683
label: Name
16841684
msg: Name cannot be empty.
1685-
character: 'Must use the character set "a-z", "0-9", " - . _"'
1685+
character: 'Must use the character set "a-z", "A-Z", "0-9", " - . _"'
16861686
msg_max_length: Name must be at maximum 30 characters in length.
16871687
admin_password:
16881688
label: Password

i18n/zh_CN.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,7 @@ ui:
16451645
admin_name:
16461646
label: 名字
16471647
msg: 名字不能为空。
1648-
character: '只能由 "a-z", "0-9", " - . _" 组成'
1648+
character: '只能由 "a-z"、"A-Z"、"0-9"" - . _" 组成'
16491649
msg_max_length: 名字长度不能超过 30 个字符。
16501650
admin_password:
16511651
label: 密码

ui/src/pages/Install/components/FourthStep/index.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
4545
password,
4646
email,
4747
} = data;
48+
const nameRegex = /^[\w.-\s]{2,30}$/;
4849

4950
if (!site_name.value) {
5051
bol = false;
@@ -115,19 +116,19 @@ const Index: FC<Props> = ({ visible, data, changeCallback, nextCallback }) => {
115116
isInvalid: true,
116117
errorMsg: t('admin_name.msg'),
117118
};
118-
} else if (/[^a-z0-9\-._]/.test(name.value)) {
119+
} else if (name.value.length < 2 || name.value.length > 30) {
119120
bol = false;
120121
data.name = {
121122
value: name.value,
122123
isInvalid: true,
123-
errorMsg: t('admin_name.character'),
124+
errorMsg: t('admin_name.msg_max_length'),
124125
};
125-
} else if (data.name.value.length > 30) {
126+
} else if (!nameRegex.test(name.value)) {
126127
bol = false;
127128
data.name = {
128-
value: data.name.value,
129+
value: name.value,
129130
isInvalid: true,
130-
errorMsg: t('admin_name.msg_max_length'),
131+
errorMsg: t('admin_name.character'),
131132
};
132133
}
133134

0 commit comments

Comments
 (0)