From 5c24281f720578df8ab26c4113c6057ee61835a8 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 13 Feb 2025 02:45:33 -0600 Subject: [PATCH] refactor: return correct information --- apps/dokploy/server/api/routers/auth.ts | 1 - packages/server/src/lib/auth.ts | 7 +++++++ packages/server/src/services/auth.ts | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/dokploy/server/api/routers/auth.ts b/apps/dokploy/server/api/routers/auth.ts index b6b915f6..c1c2e0a7 100644 --- a/apps/dokploy/server/api/routers/auth.ts +++ b/apps/dokploy/server/api/routers/auth.ts @@ -169,7 +169,6 @@ export const authRouter = createTRPCRouter({ }), get: protectedProcedure.query(async ({ ctx }) => { - console.log(ctx.user); const auth = await findAuthById(ctx.user.id); return auth; }), diff --git a/packages/server/src/lib/auth.ts b/packages/server/src/lib/auth.ts index 2844d1d1..878313ae 100644 --- a/packages/server/src/lib/auth.ts +++ b/packages/server/src/lib/auth.ts @@ -40,6 +40,11 @@ export const auth = betterAuth({ }, user: { modelName: "users_temp", + additionalFields: { + role: { + type: "string", + }, + }, }, plugins: [organization()], }); @@ -51,6 +56,8 @@ export const validateRequest = async (request: IncomingMessage) => { }), }); + console.log(session); + if (!session?.session || !session.user) { return { session: null, diff --git a/packages/server/src/services/auth.ts b/packages/server/src/services/auth.ts index 787ceedb..8781f4f1 100644 --- a/packages/server/src/services/auth.ts +++ b/packages/server/src/services/auth.ts @@ -100,8 +100,8 @@ export const findAuthByEmail = async (email: string) => { }; export const findAuthById = async (authId: string) => { - const result = await db.query.user.findFirst({ - where: eq(user.id, authId), + const result = await db.query.users_temp.findFirst({ + where: eq(users_temp.id, authId), columns: { createdAt: false, updatedAt: false,