:recycle: alterations to unseed and test user creation

backend/db/data-generator/classes.js

@@ -5,6 +5,7 @@ class User {
         this.user_email = ''
         this.is_admin = false
         this.is_poster = false
+        this.is_verified = false
     }
 }
 class Profile {

backend/db/migrations/20210524105357_create_users_table.js

@@ -5,6 +5,7 @@ exports.up = function (knex) {
         table.string('user_email', 90).notNullable()
         table.boolean('is_admin').notNullable()
         table.boolean('is_poster').notNullable()
+        table.boolean('is_verified').notNullable()
     })
 }
 

backend/lib/models/user.js

@@ -7,9 +7,12 @@ module.exports = class User extends Schwifty.Model {
     }
     static get joiSchema() {
         return Joi.object({
-            user_id: Joi.number().required(),
+            user_id: Joi.number(),
             user_name: Joi.string(),
             user_email: Joi.string().required(),
+            is_poster: Joi.number().required(),
+            is_admin: Joi.number().required(),
+            is_verified: Joi.number().required(),
         })
     }
 }

backend/lib/plugins/user.js

@@ -10,6 +10,7 @@ const UserCurrentRoute = require('../routes/user/current')
 const UserProfileCreateRoute = require('../routes/user/create-profile')
 const UserProfilesListRoute = require('../routes/user/list-profiles')
 const UserLoginRoute = require('../routes/user/login')
+const UserSignupRoute = require('../routes/user/signup')
 
 const UserService = require('../services/user')
 const DisplayService = require('../services/display')
@@ -40,6 +41,7 @@ module.exports = {
 
         await server.route(UserCurrentRoute)
         await server.route(UserLoginRoute)
+        await server.route(UserSignupRoute)
         await server.route(UserProfileCreateRoute)
         await server.route(UserProfilesListRoute)
     },

backend/lib/routes/user/signup.js

@@ -0,0 +1,103 @@
+'use strict'
+
+const Joi = require('joi')
+const errorSchema = require('../../schemas/errors')
+const userSchema = require('../../schemas/user')
+
+const pluginConfig = {
+    handlerType: 'user',
+    docs: {
+        description: 'Create a user',
+        notes: 'Create a user and other things',
+    },
+}
+
+const validators = {
+    post: {
+        payload: Joi.object({
+            user: userSchema.userSignup,
+            error: errorSchema.single,
+        }).append().label('signup_payload')
+    }
+}
+
+const responseSchemas = {
+    response: Joi.object({
+        user_id: Joi.number(),
+        user_name: Joi.string(),
+        user_email: Joi.string(),
+        is_poster: Joi.number(),
+        is_admin: Joi.number(),
+        is_verified: Joi.number(),
+    }).label('created_user'),
+    error: errorSchema.single
+}
+
+module.exports = {
+    method: 'POST',
+    path: '/signup',
+    options: {
+        ...pluginConfig.docs,
+        tags: ['api'],
+        /** Protect this route with authentication? */
+        auth: false,
+
+        handler: async function (request, h) {
+            const { userService } = request.server.services()
+            const res = request.payload
+            const userName = res.user.user_name
+            const userEmail = res.user.user_email
+            const userType = res.user.user_type == 'poster' ? 1 : 0
+            const userPw = res.user.user_pass ? res.user.user_pass : 'changeme'
+            try {
+                const user = await userService.signup({
+                    password: userPw,
+                    userInfo: {
+                        user_name: userName,
+                        user_email: userEmail,
+                        is_poster: userType,
+                        is_admin: 0,
+                        is_verified: 0,
+                    }
+                })
+                return h
+                    .response({
+                        ok: true,
+                        handler: pluginConfig.handlerType,
+                        data: user,
+                    })
+                    .code(201)
+            } catch (err) {
+                return h
+                    .response({
+                        ok: false,
+                        handler: pluginConfig.handlerType,
+                        data: { error: `${err}` },
+                    })
+                    .code(409)
+            }
+        },
+
+        /** Validate based on validators object */
+        validate: {
+            ...validators.post,
+            failAction: 'log',
+        },
+
+        /** Validate the server response */
+        response: {
+            status: {
+                201: Joi.object({
+                    ok: Joi.bool(),
+                    handler: Joi.string(),
+                    data: responseSchemas.response,
+                }).label('created_user_res'),
+                409: Joi.object({
+                    ok: Joi.bool(),
+                    handler: Joi.string(),
+                    data: responseSchemas.error,
+                }).label('error_single_res'),
+            },
+        },
+    },
+}

backend/lib/schemas/user.js

@@ -11,6 +11,15 @@ const singleUser = Joi.object({
     token: Joi.string()
 }).label('user_single')
 
+const userSignup = Joi.object({
+    user_name: Joi.string(),
+    user_email: Joi.string(),
+    is_poster: Joi.number(),
+    is_admin: Joi.number(),
+    is_verified: Joi.number(),
+}).label('user_signup')
+
 module.exports = {
-    single: singleUser
+    single: singleUser,
+    userSignup
 }

backend/lib/services/user.js

@@ -56,11 +56,18 @@ module.exports = class UserService extends Schmervice.Service {
      * @param {*} txn
      * @returns
      */
-    async signup({ password, ...userInfo }, txn) {
+    async signup({ password, userInfo }, txn) {
         const { User } = this.server.models()
-        const { id } = await User.query(txn).insert(userInfo)
-        await this.changePassword(id, password, txn)
-        return id
+        const matchingEmails = await User.query().where('user_email', userInfo.user_email)
+
+        if(matchingEmails.length > 0) { 
+            throw `User ${userInfo.user_email} already exists: Cannot create a user without a unique email`
+        }
+        const user = await User.query(txn).insert(userInfo)
+        user.user_id = user.id
+        delete user.id
+        // await this.changePassword(id, password, txn)
+        return user
     }
 
     /**
@@ -146,13 +153,14 @@ module.exports = class UserService extends Schmervice.Service {
      */
     async changePassword(id, password, txn) {
         const { User } = this.server.models()
-
-        await User.query(txn)
-            .throwIfNotFound()
-            .where({ id })
-            .patch({
-                password: await this.pwd.hash(Buffer.from(password)),
-            })
-        return id
+        return 'done'
+
+        // await User.query(txn)
+        //     .throwIfNotFound()
+        //     .where({ id })
+        //     .patch({
+        //         password: await this.pwd.hash(Buffer.from(password)),
+        //     })
+        // return id
     }
 }

backend/package.json

@@ -8,6 +8,7 @@
         "connect": "USE_LOCAL_DB=false pscale connect $(grep '^PSCALE_DB_NAME' .env | cut -d '=' -f2) $(grep '^PSCALE_DB_BRANCH' .env | cut -d '=' -f2)",
         "migrate": "knex migrate:latest",
         "unmigrate": "knex migrate:down",
+        "unseed": "knex migrate:rollback --all && knex migrate:latest",
         "reseed": "knex migrate:rollback --all && knex migrate:latest && knex seed:run",
         "generate": "node ./db/data-generator/index.js",
         "seed": "knex seed:run",

frontend/src/views/SurveyView.vue

@@ -46,7 +46,6 @@ main.view--survey.f-col.start.w-full
                     p(@click="step = 0").p-1 start over
                     button(@click="$router.push({ name: 'HomeView' })") save
 
-    MainNav(@show-sidebar="$emit('show-sidebar')")
 </template>
 
 <script>