reworking wip

backend/db/migrations/20220901171733_user_authentication.js

@@ -1,8 +1,9 @@
 exports.up = function (knex) {
     return knex.schema.createTable('authentication', function (table) {
-        table.string('user_email', 90).primary()
-        table.string('created_at').notNullable()
-        table.string('token').notNullable()
+        table.string('user_email', 90).primary().unique()
+        table.date('created_at').notNullable()
+        // table.char('token').notNullable()
+        table.binary('token').notNullable()
     })
 }
 

backend/lib/models/authentication.js

@@ -9,7 +9,7 @@ module.exports = class Auth extends Schwifty.Model {
         return Joi.object({
             user_email: Joi.string().required(),
             created_at: Joi.date().required(),
-            token: Joi.string().required()
+            token: Joi.binary().required()
         })
     }
 }

backend/lib/routes/user/signup.js

@@ -26,6 +26,7 @@ const responseSchemas = {
         is_poster: Joi.number(),
         is_admin: Joi.number(),
         is_verified: Joi.number(),
+        user_pass: Joi.string()
     }).label('created_user'),
     error: errorSchema.single,
 }

backend/lib/schemas/authentication.js

@@ -5,7 +5,7 @@ const Joi = require('joi')
 const userAuth = Joi.object({
     user_email: Joi.string(),
     created_at: Joi.date(),
-    token: Joi.string()
+    token: Joi.binary()
 }).label('user_auth')
 
 module.exports = {

backend/lib/schemas/user.js

@@ -17,6 +17,7 @@ const userSignup = Joi.object({
     is_poster: Joi.number(),
     is_admin: Joi.number(),
     is_verified: Joi.number(),
+    user_pass: Joi.string()
 }).label('user_signup')
 
 module.exports = {

backend/lib/services/user.js

@@ -95,23 +95,35 @@ module.exports = class UserService extends Schmervice.Service {
         if (matchingEmails.length > 0) {
             throw `User ${userInfo.user_email} already exists: Cannot create a user without a unique email`
         }
+        // const todayTest = new Date.now()
+        console.log("password passed to .signup()", password)
+        const steak = process.env.PEPPER+password
+        console.log("steak", steak)
+        console.log("user_email", userInfo.user_email)
 
-        // Library: Secure-Password
-        const pepper = process.env.PEPPER
-
-        // add pepper to pw and convert to buffer to prep for hash bytes
-        const steak = Buffer.from(password + pepper, 'utf-8')
-
-        // send peppered pw to (argon algorithm) library for salted hash
-        const hashed = await hasher(this.pwd, steak)
-        console.log("hashed", hashed)
-
-        const newAuth = await Auth.query(txn).insert({
+        const { email } = await Auth.query(txn).insert({
             user_email: userInfo.user_email,
             created_at: new Date.now(),
-            token: hashed,
         })
-        console.log("newAuth", newAuth)
+        await this.changePassword(email, steak, txn)
+        return userInfo.user_email
+        console.log("signup return finished")
+        // Library: Secure-Password
+        // console.log('data type of create_at', )
+        // add pepper to pw and convert to buffer to prep for hash bytes
+        // const steak = Buffer.from(password + pepper, 'utf-8')
+        // console.log("steak", steak)
+        // send peppered pw to (argon algorithm) library for salted hash
+        // hashed is actually for logging in
+        // const hashed = await hasher(this.pwd, steak)
+        // console.log("hashed", hashed)
+        // console.log ("user_email", userInfo.user_email)
+        // const newAuth = await Auth.query(txn).insert({
+        //     user_email: userInfo.user_email,
+        //     created_at: new Date.now(),
+        //     token: steak,
+        // })
+        // console.log("newAuth", newAuth)
         // return newAuth
 
         // const user = await User.query(txn).insert(userInfo)
@@ -202,10 +214,19 @@ module.exports = class UserService extends Schmervice.Service {
      * @param {*} txn
      * @returns {number}
      */
-    async changePassword(id, password, txn) {
-        const { User } = this.server.models()
-        return 'done'
-        // rework with Auth model
+    async changePassword(email, password, txn) {
+        const { User, Auth } = this.server.models()
+
+        await Auth.query(txn)
+            .throwIfNotFound()
+            .where({ email })
+            .patch({
+                // user_email: email,
+                token: await this.pwd.hash(Buffer.from(password)),
+            })
+        console.log("changed pw return", email)
+        console.log("token created in changePassword", this.pwd.hash(Buffer.from(password)))
+        return email
 
         // await User.query(txn)
         //     .throwIfNotFound()