Signup working with new db

server/auth.js

@@ -30,7 +30,7 @@ export default class AuthHandler {
 
     async login(req, res) {
         const { email, password } = req.body;
-        let foundUser = global.db.get.userByEmail(email)
+        let foundUser = global.db.members.getByEmail(email)
         if(!foundUser) {
             res.status(400).json({ error: 'Incorrect email.' });
             return;

server/db/db.js

@@ -49,11 +49,7 @@ export default class Database {
         }
     }
 
-    generateUserID() {
-        let id = this.labels["User"].length + 1;
-        while (this.get.user(`user-${id}`)) {
-            id++;
-        }
-        return `user-${id}`; // O(1) most of the time
+    saveData() {
+        
     }
 }

server/db/model/Members.js

@@ -1,11 +1,33 @@
 import OrderedObject from "./OrderedObject.js"
+const argon2 = require("argon2")
+const { z } = require("zod")
 
 export default class Members extends OrderedObject {
+    addressSchema = z.object({
+        address1: z.string(),
+        address2: z.string().optional(),
+        zip: z.string().regex(/^\d{5}(-\d{4})?$/),
+        state: z.string(),
+        city: z.string()
+    })
+    schema = z.object({
+        email: z.string().email(),
+        firstName: z.string(),
+        lastName: z.number().int().min(0),
+        password: z.string(),
+        address: this.addressSchema
+    })
 
-    add(newMember) {
+    isHashed = (s) => {return s.startsWith("$argon2")}
+
+    async add(newMember) {
         console.log("adding ", newMember)
         let id = `MEMBER-${newMember.email}`
-        if(this.validate(id, newMember)) {
+        if(this.schema.safeParse(newMember)) {
+            if(!this.isHashed(newMember.password)) {
+                const hash = await argon2.hash(newMember.password);
+                newMember.password = hash
+            } 
             try {
                 super.add(id, newMember)
             } catch(e) {
@@ -17,48 +39,7 @@ export default class Members extends OrderedObject {
         }
     }
 
-    validate(id, node) {
-        let idTraits = {
-            firstWord: "MEMBER"
-        }
-
-        let fields = [
-            "firstName",
-            "lastName",
-            "email",
-            "password"
-        ]
-
-        let checkID = () => {
-            let split = id.split("-")
-            return (
-                split[0] === idTraits.firstWord
-                && split[1].includes("@")
-                && split[1].includes(".")
-            )
-        }
-        let idres = checkID()
-        if(!idres) {
-            console.log("id failed: ", id)
-            return false
-        }
-
-        let checkFields = () => {
-            for(let i = 0; i < fields.length; i++) {
-                if(!node[fields[i]]) {
-                    throw new Error(`Member ${node.email} is missing trait ${fields[i]}`)
-                    return false
-                } else {
-                    return true
-                }
-            }
-        }
-        let fieldres = checkFields()
-        if(!fieldres) {
-            console.log("fields failed")
-            return false
-        }
-
-        return true
+    getByEmail(email) {
+        return super.get(`MEMBER-${email}`)
     }
 }

server/index.js

@@ -43,11 +43,11 @@ class Server {
         next()
     }
 
-    newUserSubmission = (req, res) => {
+    newUserSubmission = async (req, res) => {
         const { token } = req.query;
         try {
-            db.members.add(req.body)
-            return res.redirect(`/signin/?new=true`);
+            await db.members.add(req.body)
+            return res.status(200).json({});
         } catch(e) {
             return res.status(e.status).json({ error: 'Error adding new member' });
         }