@goscribe/server 1.0.7 → 1.0.8

package/dist/context.d.ts

@@ -4,6 +4,6 @@ export declare function createContext({ req, res }: CreateExpressContextOptions)
     session: any;
     req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     res: import("express").Response<any, Record<string, any>>;
-    cookies: any;
+    cookies: Record<string, string | undefined>;
 }>;
 export type Context = Awaited<ReturnType<typeof createContext>>;

package/dist/lib/auth.js

@@ -2,28 +2,32 @@
 import crypto from "node:crypto";
 // Custom HMAC cookie: auth_token = base64(userId).hex(hmacSHA256(base64(userId), secret))
 export function verifyCustomAuthCookie(cookieValue) {
-    if (!cookieValue)
+    if (!cookieValue) {
         return null;
-    const secret = process.env.CUSTOM_AUTH_SECRET;
-    if (!secret)
+    }
+    const secret = process.env.AUTH_SECRET;
+    if (!secret) {
         return null;
+    }
     const parts = cookieValue.split(".");
-    if (parts.length !== 2)
+    if (parts.length !== 2) {
         return null;
+    }
     const [base64UserId, signatureHex] = parts;
     let userId;
     try {
         const buf = Buffer.from(base64UserId, "base64url");
         userId = buf.toString("utf8");
     }
-    catch {
+    catch (error) {
         return null;
     }
     const hmac = crypto.createHmac("sha256", secret);
     hmac.update(base64UserId);
     const expected = hmac.digest("hex");
-    if (!timingSafeEqualHex(signatureHex, expected))
+    if (!timingSafeEqualHex(signatureHex, expected)) {
         return null;
+    }
     return { userId };
 }
 function timingSafeEqualHex(a, b) {

package/dist/routers/_app.d.ts

@@ -5,7 +5,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
         session: any;
         req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
         res: import("express").Response<any, Record<string, any>>;
-        cookies: any;
+        cookies: Record<string, string | undefined>;
     };
     meta: object;
     errorShape: import("@trpc/server").TRPCDefaultErrorShape;
@@ -17,7 +17,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             session: any;
             req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
             res: import("express").Response<any, Record<string, any>>;
-            cookies: any;
+            cookies: Record<string, string | undefined>;
         };
         meta: object;
         errorShape: import("@trpc/server").TRPCDefaultErrorShape;
@@ -42,22 +42,16 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
                 password: string;
             };
             output: {
-                id: any;
-                session: any;
-                user: {
-                    id: string;
-                    email: string | null;
-                    name: string | null;
-                    image: string | null;
-                };
+                id: string;
+                email: string | null;
+                name: string | null;
+                image: string | null;
             };
             meta: object;
         }>;
         getSession: import("@trpc/server").TRPCQueryProcedure<{
             input: void;
             output: {
-                id: any;
-                userId: any;
                 user: {
                     id: string;
                     email: string | null;
@@ -67,6 +61,13 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             };
             meta: object;
         }>;
+        logout: import("@trpc/server").TRPCMutationProcedure<{
+            input: void;
+            output: {
+                success: boolean;
+            };
+            meta: object;
+        }>;
     }>>;
     workspace: import("@trpc/server").TRPCBuiltRouter<{
         ctx: {
@@ -74,7 +75,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             session: any;
             req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
             res: import("express").Response<any, Record<string, any>>;
-            cookies: any;
+            cookies: Record<string, string | undefined>;
         };
         meta: object;
         errorShape: import("@trpc/server").TRPCDefaultErrorShape;
@@ -178,7 +179,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             session: any;
             req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
             res: import("express").Response<any, Record<string, any>>;
-            cookies: any;
+            cookies: Record<string, string | undefined>;
         };
         meta: object;
         errorShape: import("@trpc/server").TRPCDefaultErrorShape;
@@ -188,7 +189,17 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             input: {
                 workspaceId: string;
             };
-            output: {
+            output: ({
+                versions: {
+                    id: string;
+                    createdAt: Date;
+                    createdById: string | null;
+                    artifactId: string;
+                    content: string;
+                    data: import("@prisma/client/runtime/library").JsonValue | null;
+                    version: number;
+                }[];
+            } & {
                 id: string;
                 createdAt: Date;
                 updatedAt: Date;
@@ -197,55 +208,27 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
                 type: import("@prisma/client").$Enums.ArtifactType;
                 isArchived: boolean;
                 createdById: string | null;
-            }[];
+            })[];
             meta: object;
         }>;
-        createSet: import("@trpc/server").TRPCMutationProcedure<{
+        listCards: import("@trpc/server").TRPCQueryProcedure<{
             input: {
                 workspaceId: string;
-                title: string;
             };
             output: {
                 id: string;
                 createdAt: Date;
-                updatedAt: Date;
-                title: string;
-                workspaceId: string;
-                type: import("@prisma/client").$Enums.ArtifactType;
-                isArchived: boolean;
-                createdById: string | null;
-            };
-            meta: object;
-        }>;
-        getSet: import("@trpc/server").TRPCQueryProcedure<{
-            input: {
-                setId: string;
-            };
-            output: {
-                flashcards: {
-                    id: string;
-                    createdAt: Date;
-                    artifactId: string;
-                    front: string;
-                    back: string;
-                    tags: string[];
-                    order: number;
-                }[];
-            } & {
-                id: string;
-                createdAt: Date;
-                updatedAt: Date;
-                title: string;
-                workspaceId: string;
-                type: import("@prisma/client").$Enums.ArtifactType;
-                isArchived: boolean;
-                createdById: string | null;
-            };
+                artifactId: string;
+                front: string;
+                back: string;
+                tags: string[];
+                order: number;
+            }[];
             meta: object;
         }>;
         createCard: import("@trpc/server").TRPCMutationProcedure<{
             input: {
-                setId: string;
+                workspaceId: string;
                 front: string;
                 back: string;
                 tags?: string[] | undefined;
@@ -288,13 +271,6 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             output: boolean;
             meta: object;
         }>;
-        deleteSet: import("@trpc/server").TRPCMutationProcedure<{
-            input: {
-                setId: string;
-            };
-            output: boolean;
-            meta: object;
-        }>;
     }>>;
     worksheets: import("@trpc/server").TRPCBuiltRouter<{
         ctx: {
@@ -302,17 +278,37 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             session: any;
             req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
             res: import("express").Response<any, Record<string, any>>;
-            cookies: any;
+            cookies: Record<string, string | undefined>;
         };
         meta: object;
         errorShape: import("@trpc/server").TRPCDefaultErrorShape;
         transformer: true;
     }, import("@trpc/server").TRPCDecorateCreateRouterOptions<{
-        listSets: import("@trpc/server").TRPCQueryProcedure<{
+        list: import("@trpc/server").TRPCQueryProcedure<{
             input: {
                 workspaceId: string;
             };
-            output: {
+            output: ({
+                versions: {
+                    id: string;
+                    createdAt: Date;
+                    createdById: string | null;
+                    artifactId: string;
+                    content: string;
+                    data: import("@prisma/client/runtime/library").JsonValue | null;
+                    version: number;
+                }[];
+                questions: {
+                    meta: import("@prisma/client/runtime/library").JsonValue | null;
+                    id: string;
+                    createdAt: Date;
+                    artifactId: string;
+                    order: number;
+                    prompt: string;
+                    answer: string | null;
+                    difficulty: import("@prisma/client").$Enums.Difficulty;
+                }[];
+            } & {
                 id: string;
                 createdAt: Date;
                 updatedAt: Date;
@@ -321,10 +317,10 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
                 type: import("@prisma/client").$Enums.ArtifactType;
                 isArchived: boolean;
                 createdById: string | null;
-            }[];
+            })[];
             meta: object;
         }>;
-        createSet: import("@trpc/server").TRPCMutationProcedure<{
+        createWorksheet: import("@trpc/server").TRPCMutationProcedure<{
             input: {
                 workspaceId: string;
                 title: string;
@@ -341,9 +337,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             };
             meta: object;
         }>;
-        getSet: import("@trpc/server").TRPCQueryProcedure<{
+        get: import("@trpc/server").TRPCQueryProcedure<{
             input: {
-                setId: string;
+                worksheetId: string;
             };
             output: {
                 questions: {
@@ -368,9 +364,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             };
             meta: object;
         }>;
-        createQuestion: import("@trpc/server").TRPCMutationProcedure<{
+        createWorksheetQuestion: import("@trpc/server").TRPCMutationProcedure<{
             input: {
-                setId: string;
+                worksheetId: string;
                 prompt: string;
                 answer?: string | undefined;
                 difficulty?: "EASY" | "MEDIUM" | "HARD" | undefined;
@@ -389,9 +385,9 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             };
             meta: object;
         }>;
-        updateQuestion: import("@trpc/server").TRPCMutationProcedure<{
+        updateWorksheetQuestion: import("@trpc/server").TRPCMutationProcedure<{
             input: {
-                questionId: string;
+                worksheetQuestionId: string;
                 prompt?: string | undefined;
                 answer?: string | undefined;
                 difficulty?: "EASY" | "MEDIUM" | "HARD" | undefined;
@@ -410,16 +406,16 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             };
             meta: object;
         }>;
-        deleteQuestion: import("@trpc/server").TRPCMutationProcedure<{
+        deleteWorksheetQuestion: import("@trpc/server").TRPCMutationProcedure<{
             input: {
-                questionId: string;
+                worksheetQuestionId: string;
             };
             output: boolean;
             meta: object;
         }>;
-        deleteSet: import("@trpc/server").TRPCMutationProcedure<{
+        deleteWorksheet: import("@trpc/server").TRPCMutationProcedure<{
             input: {
-                setId: string;
+                worksheetId: string;
             };
             output: boolean;
             meta: object;

package/dist/routers/_app.js

@@ -1,8 +1,8 @@
 import { router } from '../trpc.js';
 import { auth } from './auth.js';
 import { workspace } from './workspace.js';
-import { flashcards } from './flashcards';
-import { worksheets } from './worksheets';
+import { flashcards } from './flashcards.js';
+import { worksheets } from './worksheets.js';
 export const appRouter = router({
     auth,
     workspace,

package/dist/routers/auth.d.ts

@@ -4,7 +4,7 @@ export declare const auth: import("@trpc/server").TRPCBuiltRouter<{
         session: any;
         req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
         res: import("express").Response<any, Record<string, any>>;
-        cookies: any;
+        cookies: Record<string, string | undefined>;
     };
     meta: object;
     errorShape: import("@trpc/server").TRPCDefaultErrorShape;
@@ -29,22 +29,16 @@ export declare const auth: import("@trpc/server").TRPCBuiltRouter<{
             password: string;
         };
         output: {
-            id: any;
-            session: any;
-            user: {
-                id: string;
-                email: string | null;
-                name: string | null;
-                image: string | null;
-            };
+            id: string;
+            email: string | null;
+            name: string | null;
+            image: string | null;
         };
         meta: object;
     }>;
     getSession: import("@trpc/server").TRPCQueryProcedure<{
         input: void;
         output: {
-            id: any;
-            userId: any;
             user: {
                 id: string;
                 email: string | null;
@@ -54,4 +48,11 @@ export declare const auth: import("@trpc/server").TRPCBuiltRouter<{
         };
         meta: object;
     }>;
+    logout: import("@trpc/server").TRPCMutationProcedure<{
+        input: void;
+        output: {
+            success: boolean;
+        };
+        meta: object;
+    }>;
 }>>;

package/dist/routers/auth.js

@@ -2,6 +2,19 @@ import { z } from 'zod';
 import { router, publicProcedure } from '../trpc.js';
 import bcrypt from 'bcryptjs';
 import { serialize } from 'cookie';
+import crypto from 'node:crypto';
+// Helper to create custom auth token
+function createCustomAuthToken(userId) {
+    const secret = process.env.AUTH_SECRET;
+    if (!secret) {
+        throw new Error("AUTH_SECRET is not set");
+    }
+    const base64UserId = Buffer.from(userId, 'utf8').toString('base64url');
+    const hmac = crypto.createHmac('sha256', secret);
+    hmac.update(base64UserId);
+    const signature = hmac.digest('hex');
+    return `${base64UserId}.${signature}`;
+}
 export const auth = router({
     signup: publicProcedure
         .input(z.object({
@@ -43,39 +56,53 @@ export const auth = router({
         if (!valid) {
             throw new Error("Invalid credentials");
         }
-        const session = await ctx.db.session.create({
-            data: {
-                userId: user.id,
-                expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30),
-            },
+        // Create custom auth token
+        const authToken = createCustomAuthToken(user.id);
+        // Set the cookie immediately after successful login
+        const cookieValue = serialize("auth_token", authToken, {
+            httpOnly: true,
+            secure: process.env.NODE_ENV === "production",
+            sameSite: "lax",
+            path: "/",
+            maxAge: 60 * 60 * 24 * 30, // 30 days
         });
-        return { id: session.id, session: session.id, user: { id: user.id, email: user.email, name: user.name, image: user.image } };
+        ctx.res.setHeader("Set-Cookie", cookieValue);
+        return {
+            id: user.id,
+            email: user.email,
+            name: user.name,
+            image: user.image
+        };
     }),
     getSession: publicProcedure.query(async ({ ctx }) => {
-        const session = await ctx.db.session.findUnique({
-            where: {
-                id: ctx.session?.id,
-            },
-        });
-        if (!session) {
-            throw new Error("Session not found");
-        }
-        if (session.expires < new Date()) {
-            throw new Error("Session expired");
+        // Just return the current session from context
+        if (!ctx.session) {
+            throw new Error("No session found");
         }
         const user = await ctx.db.user.findUnique({
-            where: { id: session.userId },
+            where: { id: ctx.session.user.id },
         });
         if (!user) {
             throw new Error("User not found");
         }
-        ctx.res.setHeader("Set-Cookie", serialize("auth_token", session.id, {
+        return {
+            user: {
+                id: user.id,
+                email: user.email,
+                name: user.name,
+                image: user.image
+            }
+        };
+    }),
+    logout: publicProcedure.mutation(async ({ ctx }) => {
+        // Clear the auth cookie
+        ctx.res.setHeader("Set-Cookie", serialize("auth_token", "", {
             httpOnly: true,
             secure: process.env.NODE_ENV === "production",
-            sameSite: "none", // cross-origin XHR needs None
+            sameSite: "lax",
             path: "/",
-            maxAge: 60 * 60 * 24 * 7,
+            maxAge: 0, // Expire immediately
         }));
-        return { id: session.id, userId: session.userId, user: { id: user.id, email: user.email, name: user.name, image: user.image } };
+        return { success: true };
     }),
 });

package/dist/routers/flashcards.d.ts

@@ -4,7 +4,7 @@ export declare const flashcards: import("@trpc/server").TRPCBuiltRouter<{
         session: any;
         req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
         res: import("express").Response<any, Record<string, any>>;
-        cookies: any;
+        cookies: Record<string, string | undefined>;
     };
     meta: object;
     errorShape: import("@trpc/server").TRPCDefaultErrorShape;
@@ -14,7 +14,17 @@ export declare const flashcards: import("@trpc/server").TRPCBuiltRouter<{
         input: {
             workspaceId: string;
         };
-        output: {
+        output: ({
+            versions: {
+                id: string;
+                createdAt: Date;
+                createdById: string | null;
+                artifactId: string;
+                content: string;
+                data: import("@prisma/client/runtime/library").JsonValue | null;
+                version: number;
+            }[];
+        } & {
             id: string;
             createdAt: Date;
             updatedAt: Date;
@@ -23,55 +33,27 @@ export declare const flashcards: import("@trpc/server").TRPCBuiltRouter<{
             type: import("@prisma/client").$Enums.ArtifactType;
             isArchived: boolean;
             createdById: string | null;
-        }[];
+        })[];
         meta: object;
     }>;
-    createSet: import("@trpc/server").TRPCMutationProcedure<{
+    listCards: import("@trpc/server").TRPCQueryProcedure<{
         input: {
             workspaceId: string;
-            title: string;
         };
         output: {
             id: string;
             createdAt: Date;
-            updatedAt: Date;
-            title: string;
-            workspaceId: string;
-            type: import("@prisma/client").$Enums.ArtifactType;
-            isArchived: boolean;
-            createdById: string | null;
-        };
-        meta: object;
-    }>;
-    getSet: import("@trpc/server").TRPCQueryProcedure<{
-        input: {
-            setId: string;
-        };
-        output: {
-            flashcards: {
-                id: string;
-                createdAt: Date;
-                artifactId: string;
-                front: string;
-                back: string;
-                tags: string[];
-                order: number;
-            }[];
-        } & {
-            id: string;
-            createdAt: Date;
-            updatedAt: Date;
-            title: string;
-            workspaceId: string;
-            type: import("@prisma/client").$Enums.ArtifactType;
-            isArchived: boolean;
-            createdById: string | null;
-        };
+            artifactId: string;
+            front: string;
+            back: string;
+            tags: string[];
+            order: number;
+        }[];
         meta: object;
     }>;
     createCard: import("@trpc/server").TRPCMutationProcedure<{
         input: {
-            setId: string;
+            workspaceId: string;
             front: string;
             back: string;
             tags?: string[] | undefined;
@@ -114,11 +96,4 @@ export declare const flashcards: import("@trpc/server").TRPCBuiltRouter<{
         output: boolean;
         meta: object;
     }>;
-    deleteSet: import("@trpc/server").TRPCMutationProcedure<{
-        input: {
-            setId: string;
-        };
-        output: boolean;
-        meta: object;
-    }>;
 }>>;