This commit is contained in:
wayanrivan
2026-05-28 14:39:46 +07:00
parent 9e0ff46801
commit bd04d8f472

View File

@ -484,7 +484,7 @@ export class UserController {
try {
const schema = Joi.object().keys({
email: Joi.string().email().max(64).required().label("Email"),
email: Joi.string().email().max(64).optional().label("Email"),
username: Joi.string().max(64).required().label("Username"),
password: Joi.string().pattern(new RegExp("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$")).min(8).required().label("Password"),
retype_password: Joi.ref("password"),
@ -502,13 +502,6 @@ export class UserController {
data.email = param.email;
data.status = param.status;
const email = await OrmHelper.DB.getRepository(User).findOne({
where: {
email: param.email,
deleted_at: IsNull()
}
});
const username = await OrmHelper.DB.getRepository(User).findOne({
where: {
username: param.username,
@ -516,8 +509,17 @@ export class UserController {
}
});
if (email) {
throw { message: "Email already exists" };
if (!param.email) {
const email = await OrmHelper.DB.getRepository(User).findOne({
where: {
email: param.email,
deleted_at: IsNull()
}
});
if (email) {
throw { message: "Email already exists" };
}
}
if (username) {