Changeset 898cf68 for server/authjs-handler.ts

Timestamp:

12/26/25 22:21:22 (7 months ago)

Author:

Tome <gjorgievtome@…>

Branches:

main

Children:

dd5067a

Parents:

e7f1bfa

Message:

Config authjs

File:

• server/authjs-handler.ts (modified) (7 diffs)

server/authjs-handler.ts

@@ -3 +3 @@
 import type { Session } from "@auth/core/types";
 import { enhance, type UniversalHandler, type UniversalMiddleware } from "@universal-middleware/core";
-import {eq} from "drizzle-orm";
+import {eq, or} from "drizzle-orm";
 import { db } from "../database/drizzle/db";
-import { usersTable } from "../database/drizzle/schema";
+import {adminsTable, usersTable} from "../database/drizzle/schema";
 import bcrypt from "bcrypt";
-// import { users, accounts, sessions, verificationTokens } from "../database/drizzle/schema/auth";
+import { AuthDrizzleAdapter } from "./drizzle/auth-adapter";
 
 const authjsConfig = {
@@ -13 +13 @@
   trustHost: true,
   secret: process.env.AUTH_SECRET,
+  adapter: AuthDrizzleAdapter(),
   session: {
     strategy: "jwt",
@@ -27 +28 @@
         const password = typeof credentials?.password === "string" ? credentials.password : null;
 
-        if(!username || !password) { return null; }
+        if(!username || !password || typeof username !== 'string' || typeof password !== 'string') { return null; }
 
         const user = await db.query.usersTable.findFirst({
-            where: eq(usersTable.username, username),
-        });
+            where: or(
+                eq(usersTable.username, username),
+                eq(usersTable.email, username)
+            ),
+          });
 
-        if(!user) { return null; }
+        if(!user) return null;
 
-        const isPasswordValid = await bcrypt.compare(password, user.passwordHash);
+        let isPasswordValid = false;
 
-        if(!isPasswordValid) { return null; }
+        if (user.passwordHash.startsWith('$2b$') || user.passwordHash.startsWith('$2a$')) {
+            isPasswordValid = await bcrypt.compare(password, user.passwordHash);
+        } else {
+            isPasswordValid = password === user.passwordHash;
+        }
+
+        if(!isPasswordValid) return null;
+
+          const admin = await db.query.adminsTable.findFirst({
+              where: eq(adminsTable.userId, user.id),
+          });
 
         return {
             id: String(user.id),
-            name: user.username,
+            username: user.username,
             email: user.email,
+            isAdmin: !!admin
         }
       },
@@ -50 +65 @@
   callbacks: {
       async jwt({ token, user }) {
-          if (user) token.sub = user.id;
+          if (user) {
+              token.sub = user.id;
+              token.username = user.name;
+
+              const customUser = user as any;
+              token.email = customUser.email;
+              token.isAdmin = customUser.isAdmin;
+          }
           return token;
       },
       async session({ session, token }) {
-          if (session.user && token.sub) session.user.id = token.sub;
+          if (session.user) {
+              session.user.id = token.sub!;
+              session.user.name = token.name as string;
+
+              const customToken = token as any;
+              session.user.email = customToken.email;
+              session.user.isAdmin = customToken.isAdmin;
+          }
           return session;
       },
@@ -60 +89 @@
 } satisfies Omit<AuthConfig, "raw">;
 
-/**
- * Retrieve Auth.js session from Request
- */
 export async function getSession(req: Request, config: Omit<AuthConfig, "raw">): Promise<Session | null> {
   setEnvDefaults(process.env, config);
@@ -79 +105 @@
 }
 
-/**
- * Add Auth.js session to context
- * @link {@see https://authjs.dev/getting-started/session-management/get-session}
- **/
 export const authjsSessionMiddleware: UniversalMiddleware = enhance(
   async (request, context) => {
@@ -104 +126 @@
 );
 
-/**
- * Auth.js route
- * @link {@see https://authjs.dev/getting-started/installation}
- **/
 export const authjsHandler = enhance(
   async (request) => {