@goscribe/server 1.0.2 → 1.0.4

package/src/routers/auth.ts

@@ -1,9 +1,9 @@
 import { z } from 'zod';
-import { router, publicProcedure, authedProcedure } from '../trpc';
+import { router, publicProcedure, authedProcedure } from '../trpc.js';
 import bcrypt from 'bcryptjs';
 
 export const auth = router({
-signup: publicProcedure
+  signup: publicProcedure
     .input(z.object({
       name: z.string().min(1),
       email: z.string().email(),
@@ -30,5 +30,50 @@ signup: publicProcedure
 
       return { id: user.id, email: user.email, name: user.name };
     }),
+  login: publicProcedure
+    .input(z.object({
+      email: z.string().email(),
+      password: z.string().min(6),
+    }))
+    .mutation(async ({ ctx, input }) => {
+      const user = await ctx.db.user.findUnique({
+        where: { email: input.email },
+      });
+      if (!user) {
+        throw new Error("Invalid credentials");
+      }
+
+      const valid = await bcrypt.compare(input.password, user.passwordHash!);
+      if (!valid) {
+        throw new Error("Invalid credentials");
+      }
+
+      return { id: user.id, email: user.email, name: user.name };
+    }),
+  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");
+    }
+
+    const user = await ctx.db.user.findUnique({
+      where: { id: session.userId },
+    });
+
+    if (!user) {
+      throw new Error("User not found");
+    }
+
+    return { id: session.id, userId: session.userId, user: { id: user.id, email: user.email, name: user.name, image: user.image } };
+  }),
 });
 

package/src/routers/workspace.ts

@@ -1,10 +1,11 @@
 import { z } from 'zod';
-import { router, publicProcedure, authedProcedure } from '../trpc';
-import { bucket } from 'src/lib/storage';
+import { router, publicProcedure, authedProcedure } from '../trpc.js';
+import { bucket } from '../lib/storage.js';
+import { FileAsset } from '@prisma/client';
 
 export const workspace = router({
   // Mutation with Zod input
-  list: publicProcedure
+  list: authedProcedure
     .query(async ({ ctx, input }) => {
       const workspaces = await ctx.db.workspace.findMany({
         where: {
@@ -14,7 +15,7 @@ export const workspace = router({
       return workspaces;
     }),
     
-  create: publicProcedure
+  create: authedProcedure
     .input(z.object({
         name: z.string().min(1).max(100),
         description: z.string().max(500).optional(),
@@ -28,7 +29,7 @@ export const workspace = router({
         },
       });
     }),
-  get: publicProcedure
+  get: authedProcedure
     .input(z.object({
         id: z.string().uuid(),
      }))
@@ -39,7 +40,7 @@ export const workspace = router({
         },
       });
     }),
-  update: publicProcedure
+  update: authedProcedure
     .input(z.object({
         id: z.string().uuid(),
         name: z.string().min(1).max(100).optional(),
@@ -56,7 +57,7 @@ export const workspace = router({
         },
       }); 
     }), 
-    delete: publicProcedure
+    delete: authedProcedure
     .input(z.object({
         id: z.string().uuid(),
      }))
@@ -68,7 +69,7 @@ export const workspace = router({
       });
       return true;
     }),
-    uploadFiles: publicProcedure
+    uploadFiles: authedProcedure
     .input(z.object({
         id: z.string().uuid(),
         files: z.array(
@@ -121,7 +122,7 @@ export const workspace = router({
       return results;
 
     }),
-    deleteFiles: publicProcedure
+    deleteFiles: authedProcedure
     .input(z.object({
         fileId: z.array(z.string().uuid()),
         id: z.string().uuid(),
@@ -135,13 +136,13 @@ export const workspace = router({
       });
 
       // Delete from GCS
-      files.then((fileRecords) => {
-        fileRecords.forEach((file) => {
+      files.then((fileRecords: FileAsset[]) => {
+        fileRecords.forEach((file: FileAsset) => {
           if (file.bucket && file.objectKey) {
-            const gcsFile = bucket.file(file.objectKey);
-            gcsFile.delete({ ignoreNotFound: true }).catch((err: unknown) => {
-              console.error(`Error deleting file ${file.objectKey} from bucket ${file.bucket}:`, err);
-            });
+        const gcsFile: import('@google-cloud/storage').File = bucket.file(file.objectKey);
+        gcsFile.delete({ ignoreNotFound: true }).catch((err: unknown) => {
+          console.error(`Error deleting file ${file.objectKey} from bucket ${file.bucket}:`, err);
+        });
           }
         });
       });

package/src/server.ts

@@ -4,10 +4,9 @@ import helmet from 'helmet';
 import morgan from 'morgan';
 import compression from 'compression';
 import * as trpcExpress from '@trpc/server/adapters/express';
-import { authRouter } from './lib/auth';
 
-import { appRouter } from './routers/_app';
-import { createContext } from './context';
+import { appRouter } from './routers/_app.js';
+import { createContext } from './context.js';
 
 const PORT = process.env.PORT ? Number(process.env.PORT) : 3001;
 
@@ -25,8 +24,6 @@ async function main() {
   app.use(compression());
   app.use(express.json());
   
-  app.use("/auth", authRouter);         // Auth routes live under /auth/*
-
 
   // Health (plain Express)
   app.get('/', (_req, res) => {

package/src/trpc.ts

@@ -1,6 +1,6 @@
 import { initTRPC, TRPCError } from "@trpc/server";
 import superjson from "superjson";
-import type { Context } from "./context";
+import type { Context } from "./context.js";
 
 const t = initTRPC.context<Context>().create({
   transformer: superjson,
@@ -15,20 +15,14 @@ export const publicProcedure = t.procedure;
 
 /** Middleware that enforces authentication */
 const isAuthed = middleware(({ ctx, next }) => {
-  if (!ctx.session?.user?.id) {
+  const hasUser = Boolean((ctx.session as any)?.user?.id);
+  if (!ctx.session || !hasUser) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
+
   return next({
     ctx: {
-      ...ctx,
-      // refine ctx: session is guaranteed, user.id is string
-      session: {
-        ...ctx.session,
-        user: {
-          ...ctx.session.user,
-          id: ctx.session.user.id, // typed non-null
-        },
-      },
+      session: ctx.session,
     },
   });
 });

package/tsconfig.json

@@ -1,17 +1,24 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "ES2020",             // <-- this ensures ESM output
+    "moduleResolution": "bundler",
+    "plugins": [
+      { "transform": "typescript-transform-paths" },
+      { "transform": "typescript-transform-paths", "afterDeclarations": true }
+
+    ],
+    "baseUrl": "./",
+    "declaration": true,
+    "declarationDir": "dist",       // optional, but keeps .d.ts in dist
+    "emitDeclarationOnly": false,   // unless you only want .d.ts
+    "noEmit": false,            // must not be true
+
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "outDir": "dist",
-    "baseUrl": ".", 
-    "declaration": true,
-    "declarationMap": true
+    "outDir": "dist"
   },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
-} 
+  "include": ["src"],
+  "exclude": ["node_modules", "dist" ]
+}

package/dist/context.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAGjF,wBAAsB,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,2BAA2B;;;;;GAI5E;AAED,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC"}

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/lib/auth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,UAAU,0HA0BnB,CAAA"}

package/dist/lib/prisma.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../src/lib/prisma.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD,eAAO,MAAM,MAAM,2IAIf,CAAC"}

package/dist/routers/_app.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_app.d.ts","sourceRoot":"","sources":["../../src/routers/_app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAKrE,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAGpB,CAAC;AAGH,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC;AACzC,MAAM,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACxD,MAAM,MAAM,aAAa,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC"}

package/dist/routers/auth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/routers/auth.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;GA4Bf,CAAC"}

package/dist/routers/sample.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sampleRouter = void 0;
-const zod_1 = require("zod");
-const trpc_1 = require("../trpc");
-exports.sampleRouter = (0, trpc_1.router)({
-    // GET-like: query without input
-    hello: trpc_1.publicProcedure.query(() => {
-        return { message: 'Hello from tRPC + Express 👋' };
-    }),
-    // Mutation with Zod input
-    echo: trpc_1.publicProcedure
-        .input(zod_1.z.object({ text: zod_1.z.string().min(1) }))
-        .mutation(({ input }) => {
-        return { echoed: input.text };
-    }),
-    // Authed query
-    me: trpc_1.authedProcedure.query(({ ctx }) => {
-        return { userId: ctx.user.id, role: ctx.user.role };
-    }),
-});

package/dist/routers/workspace.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/routers/workspace.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CpB,CAAC"}

package/dist/server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":""}

package/dist/trpc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"trpc.d.ts","sourceRoot":"","sources":["../src/trpc.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,MAAM;;;;;;;;;;EAAW,CAAC;AAC/B,eAAO,MAAM,UAAU;;;;;;;;;;sCAAe,CAAC;AACvC,eAAO,MAAM,eAAe;;;;;yLAAc,CAAC;AAsB3C,gCAAgC;AAChC,eAAO,MAAM,eAAe;;;;;;;;;;yKAAgC,CAAC"}