From 8f221659514644fd571108e0ec1233dbecb6e52a Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Tue, 28 Oct 2025 07:41:34 -0500 Subject: [PATCH] refactor(v1 middle ware): removed the need for this and just let it all pass --- .../auth/middleware/authMiddleware.ts | 18 +++++----- .../services/auth/middleware/roleCheck.ts | 36 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lstV2/server/services/auth/middleware/authMiddleware.ts b/lstV2/server/services/auth/middleware/authMiddleware.ts index 1553408..c810c37 100644 --- a/lstV2/server/services/auth/middleware/authMiddleware.ts +++ b/lstV2/server/services/auth/middleware/authMiddleware.ts @@ -5,18 +5,18 @@ import jwt from "jsonwebtoken"; const { sign, verify } = jwt; export const authMiddleware: MiddlewareHandler = async (c, next) => { - console.log("middleware checked"); - const cookieHeader = c.req.header("Cookie"); - if (!cookieHeader) return c.json({ error: "Unauthorized" }, 401); + // console.log("middleware checked"); + // const cookieHeader = c.req.header("Cookie"); + // if (!cookieHeader) return c.json({ error: "Unauthorized" }, 401); - const res = await axios.get(`${process.env.LST_BASE_URL}/api/user/me`, { - headers: { Cookie: cookieHeader }, - }); + // const res = await axios.get(`${process.env.LST_BASE_URL}/api/user/me`, { + // headers: { Cookie: cookieHeader }, + // }); - if (res.status === 401) return c.json({ error: "Unauthorized" }, 401); + // if (res.status === 401) return c.json({ error: "Unauthorized" }, 401); - //const user = await resp.json(); - c.set("user", res.data.user); + // //const user = await resp.json(); + // c.set("user", res.data.user); return next(); }; diff --git a/lstV2/server/services/auth/middleware/roleCheck.ts b/lstV2/server/services/auth/middleware/roleCheck.ts index 0a076ff..170e657 100644 --- a/lstV2/server/services/auth/middleware/roleCheck.ts +++ b/lstV2/server/services/auth/middleware/roleCheck.ts @@ -84,26 +84,26 @@ interface UserRole { const hasCorrectRole = (requiredRole: string[], module: string) => createMiddleware(async (c, next) => { - const cookieHeader = c.req.header("Cookie"); - if (!cookieHeader) return c.json({ error: "Unauthorized" }, 401); + // const cookieHeader = c.req.header("Cookie"); + // if (!cookieHeader) return c.json({ error: "Unauthorized" }, 401); - const res = await axios.get(`${process.env.LST_BASE_URL}/api/user/roles`, { - headers: { Cookie: cookieHeader }, - }); + // const res = await axios.get(`${process.env.LST_BASE_URL}/api/user/roles`, { + // headers: { Cookie: cookieHeader }, + // }); - const currentRoles: UserRole[] = res.data.data; - const canAccess = currentRoles.some( - (r) => r.module === module && requiredRole.includes(r.role), - ); - if (!canAccess) { - return c.json( - { - error: "Unauthorized", - message: `You do not have access to ${module}`, - }, - 400, - ); - } + // const currentRoles: UserRole[] = res.data.data; + // const canAccess = currentRoles.some( + // (r) => r.module === module && requiredRole.includes(r.role), + // ); + // if (!canAccess) { + // return c.json( + // { + // error: "Unauthorized", + // message: `You do not have access to ${module}`, + // }, + // 400, + // ); + // } return next(); });