broken newAuth

backend/lib/services/user.js

@@ -5,6 +5,36 @@ const Jwt = require('@hapi/jwt')
 const Schmervice = require('@hapipal/schmervice')
 const SecurePassword = require('secure-password')
 
+const hasher = async (pwd, steak) => {
+    const hash = await pwd.hash(steak)
+    const result = await pwd.verify(steak, hash)
+    let squirtle = null
+
+    switch (result) {
+        case SecurePassword.INVALID_UNRECOGNIZED_HASH:
+            return console.error(
+                'This hash was not made with secure-password. Attempt legacy algorithm',
+            )
+        case SecurePassword.INVALID:
+            return console.log('Invalid password')
+        case SecurePassword.VALID:
+            return result
+        case SecurePassword.VALID_NEEDS_REHASH:
+            console.log('Yay you made it, wait for us to improve your safety')
+            try {
+                squirtle = await pwd.hash(steak)
+                // console.log('improvedHash', squirtle)
+                // const saveHash = Auth.insert({user_email: matchingEmails}, ).into('token')
+                return squirtle
+            } catch (err) {
+                console.error(
+                    'You are authenticated, but we could not improve your safety this time around',
+                )
+            }
+            break
+    }
+}
+
 /** Class for methods used in the User plugin */
 module.exports = class UserService extends Schmervice.Service {
     /**
@@ -57,7 +87,7 @@ module.exports = class UserService extends Schmervice.Service {
      * @returns
      */
     async signup({ password, userInfo }, txn) {
-        const { User } = this.server.models()
+        const { User, Auth } = this.server.models()
         const matchingEmails = await User.query().where(
             'user_email',
             userInfo.user_email,
@@ -65,47 +95,25 @@ 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`
         }
-        
+
         // Library: Secure-Password
         const pepper = process.env.PEPPER
-        // add pepper to pw
-        const steak = password.trim() + pepper
-        console.log(steak)
 
-        const { Auth } = this.server.models()
+        // 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
-        pwd.hash(steak, function (err, hash) {
-            if (err) throw err
-
-            // Save hash somewhere
-            pwd.verify(steak, hash, function (err, result) {
-                if (err) throw err
-                
-                switch (result) {
-                case securePassword.INVALID_UNRECOGNIZED_HASH:
-                    return console.error('This hash was not made with secure-password. Attempt legacy algorithm')
-                case securePassword.INVALID:
-                    return console.log('Invalid password')
-                case securePassword.VALID:
-                    return console.log('Authenticated')
-                case securePassword.VALID_NEEDS_REHASH:
-                    console.log('Yay you made it, wait for us to improve your safety')
-
-                    pwd.hash(userPassword, function (err, improvedHash) {
-                    if (err) console.error('You are authenticated, but we could not improve your safety this time around')
-
-                    // Save improvedHash somewhere
-                    // insert hash and salt into authentication table (with user, see 73)
-                    const saveHash = Auth.insert({ user_email: matchingEmails})
-                        .into('token')
-         
-                    return saveHash
-                    })
-                    break
-                }
-            })
-            })
-        
+        const hashed = await hasher(this.pwd, steak)
+        console.log("hashed", hashed)
+
+        const newAuth = await Auth.query(txn).insert({
+            user_email: userInfo.user_email,
+            created_at: new Date.now(),
+            token: hashed,
+        })
+        console.log("newAuth", newAuth)
+        // return newAuth
+
         // const user = await User.query(txn).insert(userInfo)
         // user.user_id = user.id
         // delete user.id
@@ -210,11 +218,11 @@ module.exports = class UserService extends Schmervice.Service {
 
     async getPassword(email, txn) {
         const { Auth } = this.server.models()
-        
+
         const passwordRow = await Auth.query(txn)
             .where('user_email', email)
             .first()
-    
+
         return passwordRow ? passwordRow.token : null
     }
 }