Check for falsy existingUser variable. Fixes #1369

Use another return code for "User already exist"
This allows external scripts differentiating between "failure" and "everything is fine"

Co-Authored-By: Max Wu <jackymaxj@gmail.com>
Signed-off-by: Soeren Wegener <wegener92@gmail.com>
This commit is contained in:
Sören Wegener 2019-12-05 02:00:48 +01:00 committed by Soeren Wegener
parent f0c26b3a8c
commit 45d4daf0f3
No known key found for this signature in database
GPG Key ID: 1CA5723999CABD50
1 changed files with 4 additions and 4 deletions

View File

@ -37,9 +37,9 @@ function getPass (argv, action) {
async function createUser (argv) { async function createUser (argv) {
const existingUser = await models.User.findOne({ where: { email: argv['add'] } }) const existingUser = await models.User.findOne({ where: { email: argv['add'] } })
// Cannot create already-existing users // Cannot create already-existing users
if (existingUser !== undefined) { if (existingUser) {
console.log(`User with e-mail ${existingUser.email} already exists! Aborting ...`) console.log(`User with e-mail ${existingUser.email} already exists! Aborting ...`)
process.exit(1) process.exit(2)
} }
const pass = getPass(argv, 'add') const pass = getPass(argv, 'add')
@ -56,7 +56,7 @@ async function createUser (argv) {
async function deleteUser (argv) { async function deleteUser (argv) {
// Cannot delete non-existing users // Cannot delete non-existing users
const existingUser = await models.User.findOne({ where: { email: argv['del'] } }) const existingUser = await models.User.findOne({ where: { email: argv['del'] } })
if (existingUser === undefined) { if (!existingUser) {
console.log(`User with e-mail ${argv['del']} does not exist, cannot delete`) console.log(`User with e-mail ${argv['del']} does not exist, cannot delete`)
process.exit(1) process.exit(1)
} }
@ -71,7 +71,7 @@ async function deleteUser (argv) {
async function resetUser (argv) { async function resetUser (argv) {
const existingUser = await models.User.findOne({ where: { email: argv['reset'] } }) const existingUser = await models.User.findOne({ where: { email: argv['reset'] } })
// Cannot reset non-existing users // Cannot reset non-existing users
if (existingUser === undefined) { if (!existingUser) {
console.log(`User with e-mail ${argv['reset']} does not exist, cannot reset`) console.log(`User with e-mail ${argv['reset']} does not exist, cannot reset`)
process.exit(1) process.exit(1)
} }