|
|
@ -6,7 +6,7 @@ import * as check from '../check';
|
|
|
|
import {
|
|
|
|
import {
|
|
|
|
BadRequestError, ForbiddenError, UserNotFoundError, ValidationError,
|
|
|
|
BadRequestError, ForbiddenError, UserNotFoundError, ValidationError,
|
|
|
|
} from '../error';
|
|
|
|
} from '../error';
|
|
|
|
import { isEmail, isPassword, isUname } from '../lib/validator';
|
|
|
|
import { isEmail, isPassword } from '../lib/validator';
|
|
|
|
import { Logger } from '../logger';
|
|
|
|
import { Logger } from '../logger';
|
|
|
|
import { PRIV, STATUS } from '../model/builtin';
|
|
|
|
import { PRIV, STATUS } from '../model/builtin';
|
|
|
|
import domain from '../model/domain';
|
|
|
|
import domain from '../model/domain';
|
|
|
@ -228,7 +228,7 @@ class SystemUserImportHandler extends SystemHandler {
|
|
|
|
if (!email || !username || !password) [email, username, password, displayName] = u.split('\t').map((t) => t.trim());
|
|
|
|
if (!email || !username || !password) [email, username, password, displayName] = u.split('\t').map((t) => t.trim());
|
|
|
|
if (email && username && password) {
|
|
|
|
if (email && username && password) {
|
|
|
|
if (!isEmail(email)) messages.push(`Line ${+i + 1}: Invalid email.`);
|
|
|
|
if (!isEmail(email)) messages.push(`Line ${+i + 1}: Invalid email.`);
|
|
|
|
else if (!isUname(username)) messages.push(`Line ${+i + 1}: Invalid username`);
|
|
|
|
else if (!Types.Username[1](username)) messages.push(`Line ${+i + 1}: Invalid username`);
|
|
|
|
else if (!isPassword(password)) messages.push(`Line ${+i + 1}: Invalid password`);
|
|
|
|
else if (!isPassword(password)) messages.push(`Line ${+i + 1}: Invalid password`);
|
|
|
|
// eslint-disable-next-line no-await-in-loop
|
|
|
|
// eslint-disable-next-line no-await-in-loop
|
|
|
|
else if (await user.getByEmail('system', email)) {
|
|
|
|
else if (await user.getByEmail('system', email)) {
|
|
|
|