Skip to content

editing the show error to give the idea of suffix #36

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.

Sign up for GitHub

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

Open
lhitmi wants to merge 1 commit into
base: f24
Choose a base branch
from
Open

editing the show error to give the idea of suffix #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion public/src/client/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ define('forum/register', [
if (results.every(obj => obj.status === 'rejected')) {
showSuccess(usernameInput, username_notify, successIcon);
} else {
showError(usernameInput, username_notify, '[[error:username-taken]]');
showError(usernameInput, username_notify, `[[error:username-taken]] Maybe try ${usernameInput.val()}suffix`);
}

callback();
Expand Down
362 changes: 181 additions & 181 deletions src/user/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,184 +12,184 @@ const meta = require('../meta');
const analytics = require('../analytics');

module.exports = function (User) {
User.create = async function (data) {
data.username = data.username.trim();
data.userslug = slugify(data.username);
if (data.email !== undefined) {
data.email = String(data.email).trim();
}

await User.isDataValid(data);

await lock(data.username, '[[error:username-taken]]');
if (data.email && data.email !== data.username) {
await lock(data.email, '[[error:email-taken]]');
}

try {
return await create(data);
} finally {
await db.deleteObjectFields('locks', [data.username, data.email]);
}
};

async function lock(value, error) {
const count = await db.incrObjectField('locks', value);
if (count > 1) {
throw new Error(error);
}
}

async function create(data) {
const timestamp = data.timestamp || Date.now();

let userData = {
username: data.username,
userslug: data.userslug,
joindate: timestamp,
lastonline: timestamp,
status: 'online',
};
['picture', 'fullname', 'location', 'birthday'].forEach((field) => {
if (data[field]) {
userData[field] = data[field];
}
});
if (data.gdpr_consent === true) {
userData.gdpr_consent = 1;
}
if (data.acceptTos === true) {
userData.acceptTos = 1;
}

const renamedUsername = await User.uniqueUsername(userData);
const userNameChanged = !!renamedUsername;
if (userNameChanged) {
userData.username = renamedUsername;
userData.userslug = slugify(renamedUsername);
}

const results = await plugins.hooks.fire('filter:user.create', { user: userData, data: data });
userData = results.user;

const uid = await db.incrObjectField('global', 'nextUid');
const isFirstUser = uid === 1;
userData.uid = uid;

await db.setObject(`user:${uid}`, userData);

const bulkAdd = [
['username:uid', userData.uid, userData.username],
[`user:${userData.uid}:usernames`, timestamp, `${userData.username}:${timestamp}`],
['username:sorted', 0, `${userData.username.toLowerCase()}:${userData.uid}`],
['userslug:uid', userData.uid, userData.userslug],
['users:joindate', timestamp, userData.uid],
['users:online', timestamp, userData.uid],
['users:postcount', 0, userData.uid],
['users:reputation', 0, userData.uid],
];

if (userData.fullname) {
bulkAdd.push(['fullname:sorted', 0, `${userData.fullname.toLowerCase()}:${userData.uid}`]);
}

await Promise.all([
db.incrObjectField('global', 'userCount'),
analytics.increment('registrations'),
db.sortedSetAddBulk(bulkAdd),
groups.join(['registered-users', 'unverified-users'], userData.uid),
User.notifications.sendWelcomeNotification(userData.uid),
storePassword(userData.uid, data.password),
User.updateDigestSetting(userData.uid, meta.config.dailyDigestFreq),
]);

if (data.email && isFirstUser) {
await User.setUserField(uid, 'email', data.email);
await User.email.confirmByUid(userData.uid);
}

if (data.email && userData.uid > 1) {
await User.email.sendValidationEmail(userData.uid, {
email: data.email,
template: 'welcome',
subject: `[[email:welcome-to, ${meta.config.title || meta.config.browserTitle || 'NodeBB'}]]`,
}).catch(err => winston.error(`[user.create] Validation email failed to send\n[emailer.send] ${err.stack}`));
}
if (userNameChanged) {
await User.notifications.sendNameChangeNotification(userData.uid, userData.username);
}
plugins.hooks.fire('action:user.create', { user: userData, data: data });
return userData.uid;
}

async function storePassword(uid, password) {
if (!password) {
return;
}
const hash = await User.hashPassword(password);
await Promise.all([
User.setUserFields(uid, {
password: hash,
'password:shaWrapped': 1,
}),
User.reset.updateExpiry(uid),
]);
}

User.isDataValid = async function (userData) {
if (userData.email && !utils.isEmailValid(userData.email)) {
throw new Error('[[error:invalid-email]]');
}

if (!utils.isUserNameValid(userData.username) || !userData.userslug) {
throw new Error(`[[error:invalid-username, ${userData.username}]]`);
}

if (userData.password) {
User.isPasswordValid(userData.password);
}

if (userData.email) {
const available = await User.email.available(userData.email);
if (!available) {
throw new Error('[[error:email-taken]]');
}
}
};

User.isPasswordValid = function (password, minStrength) {
minStrength = (minStrength || minStrength === 0) ? minStrength : meta.config.minimumPasswordStrength;

// Sanity checks: Checks if defined and is string
if (!password || !utils.isPasswordValid(password)) {
throw new Error('[[error:invalid-password]]');
}

if (password.length < meta.config.minimumPasswordLength) {
throw new Error('[[reset_password:password-too-short]]');
}

if (password.length > 512) {
throw new Error('[[error:password-too-long]]');
}

const strength = zxcvbn(password);
if (strength.score < minStrength) {
throw new Error('[[user:weak-password]]');
}
};

User.uniqueUsername = async function (userData) {
let numTries = 0;
let { username } = userData;
while (true) {
/* eslint-disable no-await-in-loop */
const exists = await meta.userOrGroupExists(username);
if (!exists) {
return numTries ? username : null;
}
username = `${userData.username} ${numTries.toString(32)}`;
numTries += 1;
}
};
};
User.create = async function (data) {
data.username = data.username.trim();
data.userslug = slugify(data.username);
if (data.email !== undefined) {
data.email = String(data.email).trim();
}

await User.isDataValid(data);

await lock(data.username, '[[error:username-taken]] suffix');
if (data.email && data.email !== data.username) {
await lock(data.email, '[[error:email-taken]] suffix');
}

try {
return await create(data);
} finally {
await db.deleteObjectFields('locks', [data.username, data.email]);
}
};

async function lock(value, error) {
const count = await db.incrObjectField('locks', value);
if (count > 1) {
throw new Error(error);
}
}

async function create(data) {
const timestamp = data.timestamp || Date.now();

let userData = {
username: data.username,
userslug: data.userslug,
joindate: timestamp,
lastonline: timestamp,
status: 'online',
};
['picture', 'fullname', 'location', 'birthday'].forEach((field) => {
if (data[field]) {
userData[field] = data[field];
}
});
if (data.gdpr_consent === true) {
userData.gdpr_consent = 1;
}
if (data.acceptTos === true) {
userData.acceptTos = 1;
}

const renamedUsername = await User.uniqueUsername(userData);
const userNameChanged = !!renamedUsername;
if (userNameChanged) {
userData.username = renamedUsername;
userData.userslug = slugify(renamedUsername);
}

const results = await plugins.hooks.fire('filter:user.create', { user: userData, data: data });
userData = results.user;

const uid = await db.incrObjectField('global', 'nextUid');
const isFirstUser = uid === 1;
userData.uid = uid;

await db.setObject(`user:${uid}`, userData);

const bulkAdd = [
['username:uid', userData.uid, userData.username],
[`user:${userData.uid}:usernames`, timestamp, `${userData.username}:${timestamp}`],
['username:sorted', 0, `${userData.username.toLowerCase()}:${userData.uid}`],
['userslug:uid', userData.uid, userData.userslug],
['users:joindate', timestamp, userData.uid],
['users:online', timestamp, userData.uid],
['users:postcount', 0, userData.uid],
['users:reputation', 0, userData.uid],
];

if (userData.fullname) {
bulkAdd.push(['fullname:sorted', 0, `${userData.fullname.toLowerCase()}:${userData.uid}`]);
}

await Promise.all([
db.incrObjectField('global', 'userCount'),
analytics.increment('registrations'),
db.sortedSetAddBulk(bulkAdd),
groups.join(['registered-users', 'unverified-users'], userData.uid),
User.notifications.sendWelcomeNotification(userData.uid),
storePassword(userData.uid, data.password),
User.updateDigestSetting(userData.uid, meta.config.dailyDigestFreq),
]);

if (data.email && isFirstUser) {
await User.setUserField(uid, 'email', data.email);
await User.email.confirmByUid(userData.uid);
}

if (data.email && userData.uid > 1) {
await User.email.sendValidationEmail(userData.uid, {
email: data.email,
template: 'welcome',
subject: `[[email:welcome-to, ${meta.config.title || meta.config.browserTitle || 'NodeBB'}]]`,
}).catch(err => winston.error(`[user.create] Validation email failed to send\n[emailer.send] ${err.stack}`));
}
if (userNameChanged) {
await User.notifications.sendNameChangeNotification(userData.uid, userData.username);
}
plugins.hooks.fire('action:user.create', { user: userData, data: data });
return userData.uid;
}

async function storePassword(uid, password) {
if (!password) {
return;
}
const hash = await User.hashPassword(password);
await Promise.all([
User.setUserFields(uid, {
password: hash,
'password:shaWrapped': 1,
}),
User.reset.updateExpiry(uid),
]);
}

User.isDataValid = async function (userData) {
if (userData.email && !utils.isEmailValid(userData.email)) {
throw new Error('[[error:invalid-email]]');
}

if (!utils.isUserNameValid(userData.username) || !userData.userslug) {
throw new Error(`[[error:invalid-username, ${userData.username}]]`);
}

if (userData.password) {
User.isPasswordValid(userData.password);
}

if (userData.email) {
const available = await User.email.available(userData.email);
if (!available) {
throw new Error('[[error:email-taken]]');
}
}
};

User.isPasswordValid = function (password, minStrength) {
minStrength = (minStrength || minStrength === 0) ? minStrength : meta.config.minimumPasswordStrength;

// Sanity checks: Checks if defined and is string
if (!password || !utils.isPasswordValid(password)) {
throw new Error('[[error:invalid-password]]');
}

if (password.length < meta.config.minimumPasswordLength) {
throw new Error('[[reset_password:password-too-short]]');
}

if (password.length > 512) {
throw new Error('[[error:password-too-long]]');
}

const strength = zxcvbn(password);
if (strength.score < minStrength) {
throw new Error('[[user:weak-password]]');
}
};

User.uniqueUsername = async function (userData) {
let numTries = 0;
let { username } = userData;
while (true) {
/* eslint-disable no-await-in-loop */
const exists = await meta.userOrGroupExists(username);
if (!exists) {
return numTries ? username : null;
}
username = `${userData.username} ${numTries.toString(32)}`;
numTries += 1;
}
};
};