Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: create user should add limitation for username and password #787

Merged
merged 1 commit into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions client/src/i18n/cn/warning.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
const warningTrans = {
required: '{{name}} 是必需的',
requiredOnly: '必需的',
positive: '{{name}} 应为正数',
integer: '{{name}} 应为整数',
number: '{{name}} 应为数字',
bool: '{{name}} 应为布尔值`true`或`false`',
range: '范围是 {{min}} ~ {{max}}',
required: '{{name}} 是必填的。',
requiredOnly: '必填的。',
positive: '{{name}} 应为正数',
integer: '{{name}} 应为整数',
number: '{{name}} 应为数字',
bool: '{{name}} 应为布尔值`true`或`false`',
range: '范围是 {{min}} ~ {{max}}',
specValueOrRange:
'{{name}} 应为 {{specValue}},或在范围 {{min}} ~ {{max}} 内',
noSupportIndexType:
'Attu 还不支持 {{type}}。请更换其他字段',
'{{name}} 应为 {{specValue}},或在范围 {{min}} ~ {{max}} 内。',
noSupportIndexType: 'Attu 还不支持 {{type}}。请更换其他字段。',
valueLength: '{{name}} 长度应在 {{min}} ~ {{max}} 之间。',
username: ' 用户名不能为空,长度不能超过32个字符。必须以字母开头,只能包含下划线、字母或数字。',
};

export default warningTrans;
export default warningTrans;
20 changes: 11 additions & 9 deletions client/src/i18n/en/warning.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
const warningTrans = {
required: '{{name}} is required',
requiredOnly: 'Required',
positive: '{{name}} should be positive',
integer: '{{name}} should be integers',
number: '{{name}} should be numbers',
bool: '{{name}} should be boolean value `true` or `false`',
range: 'Range is {{min}} ~ {{max}}',
required: '{{name}} is required.',
requiredOnly: 'Required.',
positive: '{{name}} should be positive.',
integer: '{{name}} should be integers.',
number: '{{name}} should be numbers.',
bool: '{{name}} should be boolean value `true` or `false`.',
range: 'Range is {{min}} ~ {{max}}.',
specValueOrRange:
'{{name}} should be {{specValue}}, or in range {{min}} ~ {{max}}',
'{{name}} should be {{specValue}}, or in range {{min}} ~ {{max}}.',
noSupportIndexType:
'Attu has not supported {{type}} yet. Please change another field',
'Attu has not supported {{type}} yet. Please change another field.',
valueLength: '{{name}} length should be in {{min}} ~ {{max}}.',
username: ' Username must not be empty, and must not exceed 32 characters in length. It must start with a letter, and only contains underscores, letters, or numbers.',
};

export default warningTrans;
9 changes: 6 additions & 3 deletions client/src/pages/user/User.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useEffect, useState } from 'react';
import { useContext, useEffect, useState } from 'react';
import { Theme } from '@mui/material';
import { useTranslation } from 'react-i18next';
import { UserService } from '@/http';
Expand All @@ -7,7 +7,6 @@ import { ColDefinitionsType, ToolBarConfig } from '@/components/grid/Types';
import {
CreateUserParams,
DeleteUserParams,
UpdateUserParams,
UpdateUserRoleParams,
} from './Types';
import DeleteTemplate from '@/components/customDialog/DeleteDialogTemplate';
Expand Down Expand Up @@ -72,7 +71,11 @@ const Users = () => {
} = usePaginationHook(users || []);

const handleCreate = async (data: CreateUserParams) => {
await UserService.createUser(data);
const s: any = await UserService.createUser(data);
if (s.error_code !== 'Success') {
openSnackBar(s.reason, 'error');
return;
}
// assign user role if
await UserService.updateUserRole({
username: data.username,
Expand Down
16 changes: 16 additions & 0 deletions client/src/pages/user/dialogs/CreateUserDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ const CreateUser: FC<CreateUserProps> = ({
name: attuTrans.username,
}),
},
{
rule: 'username',
errorText: warningTrans('username'),
},
],
defaultValue: form.username,
},
Expand All @@ -93,6 +97,18 @@ const CreateUser: FC<CreateUserProps> = ({
name: attuTrans.password,
}),
},
{
rule: 'valueLength',
errorText: warningTrans('valueLength', {
name: attuTrans.password,
min: 6,
max: 256,
}),
extraParam: {
min: 6,
max: 256,
},
},
],
defaultValue: form.username,
},
Expand Down
14 changes: 14 additions & 0 deletions client/src/utils/Validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export type ValidType =
| 'firstCharacter'
| 'specValueOrRange'
| 'duplicate'
| 'valueLength'
| 'username'
| 'custom';
export interface ICheckMapParam {
value: string;
Expand Down Expand Up @@ -222,6 +224,16 @@ export const checkNumber = (value: string): boolean => {
return !isNaN(Number(value));
};

export const checkValueLength = (value: string, min: number, max: number) => {
return value.length >= min && value.length <= max;
};

// Username must not be empty, and must not exceed 32 characters in length. It must start with a letter, and only contains underscores, letters, or numbers.
export const checkUserName = (value: string): boolean => {
const re = /^[a-zA-Z][a-zA-Z0-9_]{0,31}$/;
return re.test(value);
};

export const getCheckResult = (param: ICheckMapParam): boolean => {
const { value, extraParam = {}, rule } = param;
const numberValue = Number(value);
Expand Down Expand Up @@ -265,6 +277,8 @@ export const getCheckResult = (param: ICheckMapParam): boolean => {
compareValue: Number(extraParam.compareValue) || 0,
}),
duplicate: checkDuplicate({ value, compare: extraParam.compareValue! }),
valueLength: checkValueLength(value, extraParam.min!, extraParam.max!),
username: checkUserName(value),
custom:
extraParam && typeof extraParam.compare === 'function'
? extraParam.compare(value)
Expand Down
Loading