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

fix(invites): bogus validation errors

Browse Source
This commit is contained in:
Sabe Jones
2018-11-07 15:58:17 -06:00
parent 1ac4dd8171
commit b1dd79f75c
5 changed files with 9 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/server/models/group.js
View File

@@ -350,7 +350,7 @@ schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, use
return toJSON;
};
function getIniviteError (uuids, emails, usernames) {
function getInviteError (uuids, emails, usernames) {
const uuidsIsArray = Array.isArray(uuids);
const emailsIsArray = Array.isArray(emails);
const usernamesIsArray = Array.isArray(usernames);
@@ -366,16 +366,12 @@ function getIniviteError (uuids, emails, usernames) {
errorString = 'uuidsMustBeAnArray';
} else if (emails && !emailsIsArray) {
errorString = 'emailsMustBeAnArray';
} else if (!emails && emptyUuids) {
errorString = 'inviteMissingUuid';
} else if (!uuids && emptyEmails) {
errorString = 'inviteMissingEmail';
} else if (emptyEmails && emptyUuids) {
} else if (usernames && !usernamesIsArray) {
errorString = 'usernamesMustBeAnArray';
} else if (emptyEmails && emptyUuids && emptyUsernames) {
errorString = 'inviteMustNotBeEmpty';
}
if (usernames && emptyUsernames) errorString = 'usernamesMustNotBeEmpty';
return errorString;
}
@@ -407,8 +403,7 @@ schema.statics.validateInvitations = async function getInvitationError (invites,
emails,
usernames,
} = invites;
const errorString = getIniviteError(uuids, emails, usernames);
const errorString = getInviteError(uuids, emails, usernames);
if (errorString) throw new BadRequest(res.t(errorString));
const totalInvites = getInviteCount(uuids, emails);