@stanlemon/server-with-auth 0.1.8 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stanlemon/server-with-auth",
-  "version": "0.1.8",
+  "version": "0.1.11",
   "description": "A basic express web server setup with authentication baked in.",
   "author": "Stan Lemon <stanlemon@users.noreply.github.com>",
   "license": "MIT",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@stanlemon/eslint-config": "*",
     "@types/supertest": "^2.0.12",
-    "nodemon": "^2.0.16",
+    "nodemon": "^2.0.18",
     "supertest": "^6.2.3"
   }
 }

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,33 +21,29 @@ export default function authRoutes({
 }) {
   const router = Router();
 
-  router.get(
-    "/auth/session",
-    passport.authenticate("jwt", { session: false }),
-    async (req, res) => {
-      const userId = req.user;
-
-      if (!userId) {
-        res.status(401).json({
-          token: false,
-          user: false,
-        });
-        return;
-      }
+  router.get("/auth/session", checkAuth(), async (req, res) => {
+    const userId = req.user;
 
-      const user = await getUserById(userId);
+    if (!userId) {
+      res.status(401).json({
+        token: false,
+        user: false,
+      });
+      return;
+    }
 
-      if (!user) {
-        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"]) });
-      }
+    const user = await getUserById(userId);
+
+    if (!user) {
+      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"]) });
     }
-  );
+  });
 
   router.post("/auth/login", async (req, res) => {
     const user = await getUserByUsernameAndPassword(