Changeset 66bf4fd

Timestamp:

12/16/25 01:31:19 (7 months ago)

Author:

Tome <gjorgievtome@…>

Branches:

main

Children:

c30935a

Parents:

fdd776b

Message:

setup config

Files:

• drizzle.config.ts (modified) (1 diff)
• package.json (modified) (1 diff)
• server/authjs-handler.ts (modified) (3 diffs)
• server/db-middleware.ts (modified) (3 diffs)
• server/telefunc-handler.ts (modified) (3 diffs)

drizzle.config.ts

@@ -7 +7 @@
 
 export default defineConfig({
-  dialect: "sqlite",
+  dialect: "postgresql",
   schema: "./database/drizzle/schema/*",
   out: "./database/migrations",

package.json

@@ -12 +12 @@
   },
   "dependencies": {
-    "vike": "^0.4.247",
     "@auth/core": "^0.41.1",
+    "@auth/drizzle-adapter": "^1.11.1",
+    "@photonjs/hono": "^0.1.10",
     "@universal-middleware/core": "^0.4.13",
-    "drizzle-kit": "^0.31.8",
-    "drizzle-orm": "^0.45.0",
+    "bcrypt": "^6.0.0",
+    "better-sqlite3": "^12.5.0",
     "dotenv": "^17.2.3",
-    "better-sqlite3": "^12.5.0",
-    "@photonjs/hono": "^0.1.10",
+    "drizzle-orm": "^0.45.1",
     "hono": "^4.10.7",
-    "vike-photon": "^0.1.22",
+    "pg": "^8.16.3",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
-    "vike-react": "^0.6.13",
-    "telefunc": "^0.2.17"
+    "telefunc": "^0.2.17",
+    "vike": "^0.4.247",
+    "vike-photon": "^0.1.22",
+    "vike-react": "^0.6.13"
   },
   "devDependencies": {
-    "typescript": "^5.9.3",
-    "vite": "^7.2.7",
     "@biomejs/biome": "2.3.8",
+    "@types/bcrypt": "^6.0.0",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^20.19.25",
+    "@types/pg": "^8.16.0",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.2",
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3"
+    "drizzle-kit": "^0.31.8",
+    "typescript": "^5.9.3",
+    "vite": "^7.2.7"
   },
   "type": "module"

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 { db } from "../database/drizzle/db";
+import { usersTable } from "../database/drizzle/schema";
+import bcrypt from "bcrypt";
+// import { users, accounts, sessions, verificationTokens } from "../database/drizzle/schema/auth";
 
 const authjsConfig = {
   basePath: "/api/auth",
   trustHost: true,
-  // TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
-  secret: "MY_SECRET",
+  secret: process.env.AUTH_SECRET,
+  session: {
+    strategy: "jwt",
+  },
   providers: [
-    // TODO: Choose and implement providers
     CredentialsProvider({
       name: "Credentials",
       credentials: {
-        username: { label: "Username", type: "text", placeholder: "jsmith" },
+        username: { label: "Username", type: "text" },
         password: { label: "Password", type: "password" },
       },
-      async authorize() {
-        // Add logic here to look up the user from the credentials supplied
-        const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
+      async authorize(credentials) {
+        const username = typeof credentials?.username === "string" ? credentials.username : null;
+        const password = typeof credentials?.password === "string" ? credentials.password : null;
 
-        // Any object returned will be saved in `user` property of the JWT
-        // If you return null then an error will be displayed advising the user to check their details.
-        // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
-        return user ?? null;
+        if(!username || !password) { return null; }
+
+        const user = await db.query.usersTable.findFirst({
+            where: eq(usersTable.username, username),
+        });
+
+        if(!user) { return null; }
+
+        const isPasswordValid = await bcrypt.compare(password, user.passwordHash);
+
+        if(!isPasswordValid) { return null; }
+
+        return {
+            id: String(user.id),
+            name: user.username,
+            email: user.email,
+        }
       },
     }),
   ],
+
+  callbacks: {
+      async jwt({ token, user }) {
+          if (user) token.sub = user.id;
+          return token;
+      },
+      async session({ session, token }) {
+          if (session.user && token.sub) session.user.id = token.sub;
+          return session;
+      },
+  },
 } satisfies Omit<AuthConfig, "raw">;
 
@@ -69 +99 @@
   },
   {
-    name: "my-app:authjs-middleware",
+    name: "pc-forge:authjs-middleware",
     immutable: false,
   },
@@ -83 +113 @@
   },
   {
-    name: "my-app:authjs-handler",
+    name: "pc-forge:authjs-handler",
     path: "/api/auth/**",
     method: ["GET", "POST"],

server/db-middleware.ts

@@ -1 @@
-import { dbSqlite } from "../database/drizzle/db";
+import { db } from "../database/drizzle/db";
+import type { Database } from "../database/drizzle/db";
 import { enhance, type UniversalMiddleware } from "@universal-middleware/core";
 
@@ -5 +6 @@
   namespace Universal {
     interface Context {
-      db: ReturnType<typeof dbSqlite>;
+      db: Database;
     }
   }
@@ -12 +13 @@
 // Add `db` to the Context
 export const dbMiddleware: UniversalMiddleware = enhance(
-  async (_request, context, _runtime) => {
-    const db = dbSqlite();
-
-    return {
-      ...context,
-      db: db,
-    };
-  },
+  async (_request, context) => ({
+    ...context,
+          db,
+  }),
   {
-    name: "my-app:db-middleware",
+    name: "pc-forge:db-middleware",
     immutable: false,
   },

server/telefunc-handler.ts

@@ -1 @@
-import type { dbSqlite } from "../database/drizzle/db";
+import type { Database } from "../database/drizzle/db";
 import { enhance, type UniversalHandler } from "@universal-middleware/core";
 import { telefunc } from "telefunc";
@@ -10 +10 @@
       body: await request.text(),
       context: {
-        ...(context as { db: ReturnType<typeof dbSqlite> }),
+        ...(context as { db: Database }),
         ...runtime,
       },
@@ -23 +23 @@
   },
   {
-    name: "my-app:telefunc-handler",
+    name: "pc-forge:telefunc-handler",
     path: `/_telefunc`,
     method: ["GET", "POST"],