Refactored codebase

Author: the-code-genin

controllers/auth.ts

@@ -13,7 +13,7 @@ export default class AuthController {
             user = await Users.getUserByEmail(req.body.email);
             if (user == null) {
                 throw new Error("Email and password combination do not match a user in our system.");
-            } else if (!await bcrypt.compare(req.body.password, String(user.password))) {
+            } else if (!await bcrypt.compare(req.body.password, user.password)) {
                 throw new Error("Email and password combination do not match a user in our system.");
             }
         } catch (e) {
@@ -28,12 +28,13 @@ export default class AuthController {
     }
 
     static async signup(req: Request, res: Response) {
-        let user: User = {};
+        let user: User | undefined;
 
         try {
-            user.email = req.body.email;
-            user.password = await bcrypt.hash(req.body.password, 10);
-            user = await Users.save(user);
+            user = await Users.save({
+                email: req.body.email,
+                password: await bcrypt.hash(req.body.password, 10)
+            });
         } catch (e) {
             return ServerError(res, (e as Error).message);
         }

index.ts

@@ -30,6 +30,7 @@ process.on('SIGINT', () => process.exit());
         }
     });
     global.db = db;
+    console.log("Connected to db");
 
     // Configure server.
     const app = express();

middleware/auth.ts

@@ -22,7 +22,7 @@ export default async function AuthMiddleware(req: Request, res: Response, next:
         user = await Users.getUserByID(id);
         if (user == null) {
             throw new Error('User is not Authenticated.');
-        } else if (await Users.checkUserHasAuthToken(Number(user.id), token)) {
+        } else if (await Users.checkUserHasAuthToken(user.id, token)) {
             throw new Error('Bad/Expired auth token.');
         }
     } catch (e) {

models/users.ts

@@ -1,9 +1,9 @@
 export interface User {
-    id?: number;
-    created_at?: Date;
-    updated_at?: Date;
-    email?: string;
-    password?: string;
+    id: number;
+    created_at: Date;
+    updated_at: Date;
+    email: string;
+    password: string;
 }
 
 export interface UserJSON extends Omit<User, "password"> {
@@ -62,17 +62,17 @@ export default class Users {
         return insertId.length == 1;
     }
 
-    static async save(user: User) {
+    static async save(user: Partial<User>) {
         const insertId = await Users
             .getQueryBuilder()
             .insert(user);
         if (insertId.length != 1) throw new Error("An error occured while creating the user");
-        return Users.getUserByID(insertId[0]) as User;
+        return await Users.getUserByID(insertId[0]) as User;
     }
 
-    static toJSON(user: User): UserJSON {
+    static toJSON(user: User) {
         const hiddenFields = ['password'];
         let data = Object.entries(user).filter(entry => !hiddenFields.includes(entry[0]));
-        return Object.fromEntries(data);
+        return Object.fromEntries(data) as UserJSON;
     }
 }