From 741cf724ae6cff9b023016b9a6f42a8a9f23647c Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Tue, 26 Feb 2019 00:18:03 +0000 Subject: [webapp/setup] StartPageSetup now uses the new UserCreateForm component & small fixes --- server/api/authentication.js | 4 +- server/lib/authentication.js | 2 +- webapp/package-lock.json | 28 ++++++++--- webapp/src/components/StartPageSetup.vue | 85 ++++++-------------------------- webapp/src/components/UserCreateForm.vue | 6 ++- 5 files changed, 45 insertions(+), 80 deletions(-) diff --git a/server/api/authentication.js b/server/api/authentication.js index 050031c..18158ce 100644 --- a/server/api/authentication.js +++ b/server/api/authentication.js @@ -20,8 +20,8 @@ noAuthRouter.post('/logout', (req, res) => { // Setup method for creating the initial root account. noAuthRouter.post('/setup', (req, res) => { db.user.findAll().then(users => { - if (users.length > 0) res.send({ status: 'USERTABLE_NOT_EMPTY', error_message: 'The user table is not empty, unauthorized creation is forbidden.' }) - else if (req.body.username) authentication.signup(req, res) + if (users.length > 0) res.status(500).send({ status: 'USERTABLE_NOT_EMPTY', error_message: 'The user table is not empty, unauthorized creation is forbidden.' }) + else if (req.body.username) return authentication.signup(req, res) else res.send({ status: 'SUCCESS' }) }) }) diff --git a/server/lib/authentication.js b/server/lib/authentication.js index 9c1062c..b9c87d1 100644 --- a/server/lib/authentication.js +++ b/server/lib/authentication.js @@ -38,7 +38,7 @@ async function signup (req, res) { // TODO: Implement some security stuff. Not every user who call this request should be able to sign up. var params = req.body if (!params.username) return res.status(400).send({ auth: false, status: 'USER_MISSING', error_message: 'This service requires an username.' }) - if (validateUsername(params.username)) return res.status(400).send({ auth: false, status: 'INVALID_USERNAME', error_message: 'Username does not fullfill the requirements. (No whitespaces)' }) + if (!validateUsername(params.username)) return res.status(400).send({ auth: false, status: 'INVALID_USERNAME', error_message: 'Username does not fullfill the requirements. (No whitespaces)' }) if (!params.password) return res.status(400).send({ auth: false, status: 'PASSWORD_MISSING', error_message: 'This services requires a password.' }) // if (!params.email) return res.status(500).send({ auth: false, status: 'EMAIL_MISSING', error_message: 'This services requires an email.' }) diff --git a/webapp/package-lock.json b/webapp/package-lock.json index b03144b..f8a2299 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -4295,12 +4295,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4315,17 +4317,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4442,7 +4447,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4454,6 +4460,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4468,6 +4475,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4475,12 +4483,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4499,6 +4509,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4579,7 +4590,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4591,6 +4603,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4712,6 +4725,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/webapp/src/components/StartPageSetup.vue b/webapp/src/components/StartPageSetup.vue index 32dd1a3..8d41f81 100644 --- a/webapp/src/components/StartPageSetup.vue +++ b/webapp/src/components/StartPageSetup.vue @@ -34,87 +34,38 @@