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

Verify username as valid if user is re-checking their current name (#10737)

Browse Source 
* Verify username as valid if user is re-checking their current name

* Fix lint error and existingUser check.
This commit is contained in:
Phillip Thelen
2018-10-05 21:51:21 +02:00
committed by Sabe Jones
parent 8682cf1cf7
commit 52fbb8f899
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,8 @@ api.verifyUsername = {
method: 'POST', method: 'POST',
url: '/user/auth/verify-username', url: '/user/auth/verify-username',
async handler (req, res) { async handler (req, res) {
const user = res.locals.user;
req.checkBody({ req.checkBody({
username: { username: {
notEmpty: {errorMessage: res.t('missingUsername')}, notEmpty: {errorMessage: res.t('missingUsername')},
@@ -84,8 +86,10 @@ api.verifyUsername = {
const issues = verifyUsername(req.body.username, res); const issues = verifyUsername(req.body.username, res);
const count = await User.count({ 'auth.local.lowerCaseUsername': req.body.username.toLowerCase() }); const existingUser = await User.findOne({ 'auth.local.lowerCaseUsername': req.body.username.toLowerCase() }, {auth: 1}).exec();
if (count > 0) issues.push(res.t('usernameTaken')); if (existingUser && existingUser._id !== user._id) {
issues.push(res.t('usernameTaken'));
}
if (issues.length > 0) { if (issues.length > 0) {
res.respond(200, { isUsable: false, issues }); res.respond(200, { isUsable: false, issues });