Changeset 6196d60

Timestamp:

12/24/25 00:34:57 (7 months ago)

Author:

Tome <gjorgievtome@…>

Branches:

main

Children:

40ac7a9

Parents:

ea09e98

Message:

Modify getAuthState()

Files:

• pages/+Layout.telefunc.ts (modified) (2 diffs)
• server/telefunc/ctx.ts (modified) (2 diffs)

pages/+Layout.telefunc.ts

@@ -1 +1 @@
 import * as drizzleQueries from "../database/drizzle/queries";
-import {ctx, getAuthState, requireUser} from "../server/telefunc/ctx";
+import {ctx, getAuthState, parseSessionUserId, requireUser} from "../server/telefunc/ctx";
 import {Abort} from "telefunc";
 import type {Database} from "../database/drizzle/db";
@@ -65 +65 @@
 export async function onGetBuildDetails({ buildId }
                                            : { buildId: number }) {
-    const context = getAuthState();
+    const context = ctx();
 
     if(!Number.isInteger(buildId) || buildId <= 0) throw Abort();
 
-    const buildDetails = await drizzleQueries.getBuildDetails(context.db, buildId, context.userId ?? undefined);
+    const userId = parseSessionUserId(context.session?.user?.id);
+    const buildDetails = await drizzleQueries.getBuildDetails(context.db, buildId, userId);
 
     if(!buildDetails) throw Abort();

server/telefunc/ctx.ts

@@ -6 +6 @@
 }
 
-export function parseSessionUserId(sessionUserId: unknown): number | null {
-    if (typeof sessionUserId !== "string" && typeof sessionUserId !== "number") return null;
+export function parseSessionUserId(sessionUserId: unknown): number | undefined {
+    if (typeof sessionUserId !== "string" && typeof sessionUserId !== "number") return undefined;
     const n = Number(sessionUserId);
-    return Number.isInteger(n) && n > 0 ? n : null;
+    return Number.isInteger(n) && n > 0 ? n : undefined;
 }
 
@@ -27 +27 @@
         username: c.session?.user?.name ?? null,
         session: c.session,
-        db: c.db,
     };
 }