krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(usernames): various

Browse Source 
Better modal positioning
Correct text colors for input field
Don't show "already taken" if username has other errors
This commit is contained in:
Sabe Jones
2018-10-15 11:27:49 -05:00
parent 0897ab5dc9
commit cfd19ac694
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/server/controllers/api-v4/auth.js
View File

@@ -90,12 +90,14 @@ api.verifyUsername = {
const issues = verifyUsername(chosenUsername, res);
const existingUser = await User.findOne({
'auth.local.lowerCaseUsername': chosenUsername.toLowerCase(),
}, {auth: 1}).exec();
if (issues.length < 1) {
const existingUser = await User.findOne({
'auth.local.lowerCaseUsername': chosenUsername.toLowerCase(),
}, {auth: 1}).exec();
if (existingUser) {
if (!user || existingUser._id !== user._id) issues.push(res.t('usernameTaken'));
if (existingUser) {
if (!user || existingUser._id !== user._id) issues.push(res.t('usernameTaken'));
}
}
if (issues.length > 0) {