From f2e40dabf51c258f8da1f58089506374fd40cfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?= =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= Date: Sat, 30 Dec 2023 17:36:22 -0500 Subject: [PATCH] fix(build): remove oauth imports not yet! --- server/middleware/05.currentUser.ts | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/server/middleware/05.currentUser.ts b/server/middleware/05.currentUser.ts index ed7d9cf..91b9573 100644 --- a/server/middleware/05.currentUser.ts +++ b/server/middleware/05.currentUser.ts @@ -1,26 +1,19 @@ import jwt from "jsonwebtoken"; +import { log } from "@server/logger"; import { User } from "@models/user"; -import { messages } from "@server/constants"; -import { AccessToken } from "@models/oauth"; export default defineEventHandler(async (event) => { let ahead = (getHeaders(event).authorization || getCookie(event, "auth:token") || "")?.replace("Bearer ", ""); + // console.log("in here fucknuts", ahead); + // log.debug(`'${ahead}'`, { label: "idk" }); if (ahead) { - let toktok: jwt.JwtPayload; - try { - toktok = jwt.verify(ahead, useRuntimeConfig().jwt) as jwt.JwtPayload; - let user = await User.findById(toktok.id as number).exec(); - if (user && toktok) event.context.currentUser = user; - } catch (e) { - const t = await AccessToken.findOne({ token: ahead }); - if (!t) - throw createError({ - statusCode: 401, - message: messages[401], - }); - let user = await User.findById(t.userID); - if (user) event.context.currentUser = user; - // else throw createError({statusCode: 401, message: messages[401]}) - } + let toktok = jwt.verify( + ahead, + // ahead.replace("Bearer ", ""), + useRuntimeConfig().jwt, + ) as jwt.JwtPayload; + let user = await User.findById(toktok.id as number).exec(); + if (user && toktok) event.context.currentUser = user; + // setCookie(event, "auth:token", ahead) } });