@stanlemon/server-with-auth 0.1.7 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stanlemon/server-with-auth",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "A basic express web server setup with authentication baked in.",
   "author": "Stan Lemon <stanlemon@users.noreply.github.com>",
   "license": "MIT",

package/src/data/simple-users-dao.js

@@ -1,22 +1,24 @@
-import { Low, JSONFile, Memory } from "lowdb";
+import { LowSync, JSONFileSync, MemorySync } from "lowdb";
 import { v4 as uuidv4 } from "uuid";
 import shortid from "shortid";
 import bcrypt from "bcryptjs";
 
 const DEFAULT_ADAPTER =
-  process.env.NODE_ENV === "test" ? new Memory() : new JSONFile("./db.json");
+  process.env.NODE_ENV === "test"
+    ? new MemorySync()
+    : new JSONFileSync("./db.json");
 
 export default class SimpleUsersDao {
   constructor(seeds = [], adapter = DEFAULT_ADAPTER) {
-    this.db = new Low(adapter);
+    this.db = new LowSync(adapter);
 
-    this.db.read().then(() => {
-      this.db.data ||= { users: [] };
+    this.db.read();
 
-      if (seeds.length > 0) {
-        seeds.forEach((user) => this.createUser(user));
-      }
-    });
+    this.db.data ||= { users: [] };
+
+    if (seeds.length > 0) {
+      seeds.forEach((user) => this.createUser(user));
+    }
   }
 
   getDb() {
@@ -70,7 +72,7 @@ export default class SimpleUsersDao {
       .shift();
   };
 
-  createUser = async (user) => {
+  createUser = (user) => {
     const existing = this.getUserByUsername(user.username);
 
     if (existing) {
@@ -87,11 +89,11 @@ export default class SimpleUsersDao {
       last_updated: now,
     };
     this.db.data.users.push(data);
-    await this.db.write();
+    this.db.write();
     return data;
   };
 
-  updateUser = async (userId, user) => {
+  updateUser = (userId, user) => {
     const now = new Date();
     this.db.data.users = this.db.data.users.map((u) => {
       if (u.id === userId) {
@@ -109,7 +111,7 @@ export default class SimpleUsersDao {
       }
       return u;
     });
-    await this.db.write();
+    this.db.write();
     return this.getUserById(userId);
   };
 }

package/src/data/simple-users-dao.test.js

@@ -1,7 +1,7 @@
 /**
  * @jest-environment node
  */
-import { Memory } from "lowdb";
+import { MemorySync } from "lowdb";
 import SimpleUsersDao from "./simple-users-dao.js";
 
 describe("simple-users-dao", () => {
@@ -15,7 +15,7 @@ describe("simple-users-dao", () => {
 
   beforeEach(() => {
     // Before each test reset our users database
-    users = new SimpleUsersDao([], new Memory());
+    users = new SimpleUsersDao([], new MemorySync());
   });
 
   it("creates a user", async () => {

package/src/routes/auth.js

@@ -1,12 +1,12 @@
 import { isEmpty } from "lodash-es";
 import { Router } from "express";
-import passport from "passport";
 import jwt from "jsonwebtoken";
 import {
   schemaHandler,
   formatOutput,
   BadRequestException,
 } from "@stanlemon/server";
+import checkAuth from "../checkAuth.js";
 
 /* eslint-disable max-lines-per-function */
 export default function authRoutes({
@@ -21,39 +21,28 @@ export default function authRoutes({
 }) {
   const router = Router();
 
-  router.get("/auth/session", (req, res, next) => {
-    /* look at the 2nd parameter to the below call */
-    passport.authenticate("jwt", { session: false }, (err, userId) => {
-      if (err) {
-        return next(err);
-      }
-      if (!userId) {
-        return res.status(401).json({
-          token: false,
-          user: false,
-        });
-      }
+  router.get("/auth/session", checkAuth(), async (req, res) => {
+    const userId = req.user;
+
+    if (!userId) {
+      res.status(401).json({
+        token: false,
+        user: false,
+      });
+      return;
+    }
+
+    const user = await getUserById(userId);
 
-      req.logIn(userId, async (err) => {
-        if (err) {
-          return next(err);
-        }
-
-        const user = await getUserById(userId);
-
-        if (!user) {
-          return res.status(401).json({
-            token: false,
-            user: false,
-          });
-        } else {
-          const token = jwt.sign(user.id, secret);
-          res
-            .status(200)
-            .json({ token, user: formatOutput(user, ["password"]) });
-        }
+    if (!user) {
+      res.status(401).json({
+        token: false,
+        user: false,
       });
-    })(req, res, next);
+    } else {
+      const token = jwt.sign(user.id, secret);
+      res.status(200).json({ token, user: formatOutput(user, ["password"]) });
+    }
   });
 
   router.post("/auth/login", async (req, res) => {

package/src/routes/auth.test.js

@@ -2,14 +2,14 @@
  * @jest-environment node
  */
 import request from "supertest";
-import { Memory } from "lowdb";
+import { MemorySync } from "lowdb";
 import createAppServer from "../createAppServer";
 import SimpleUsersDao from "../data/simple-users-dao.js";
 
 // This suppresses a warning we don't need in tests
 process.env.JWT_SECRET = "SECRET";
 
-let users = new SimpleUsersDao([], new Memory());
+let users = new SimpleUsersDao([], new MemorySync());
 
 // We want to explicitly test functionality we disable during testing
 process.env.NODE_ENV = "override";