wip: docker

apps/web/src/server/api/routers/client.ts

@@ -41,6 +41,7 @@ export const clientRouter = createTRPCRouter({
       z.object({
         id: z.string(),
         name: z.string(),
+        cors: z.string(),
       })
     )
     .mutation(({ input }) => {
@@ -50,6 +51,7 @@ export const clientRouter = createTRPCRouter({
         },
         data: {
           name: input.name,
+          cors: input.cors,
         },
       });
     }),

apps/web/src/server/api/routers/dashboard.ts

@@ -3,10 +3,11 @@ import { db } from '@/server/db';
 import { getDashboardBySlug } from '@/server/services/dashboard.service';
 import { getProjectBySlug } from '@/server/services/project.service';
 import { slug } from '@/utils/slug';
-import { Prisma } from '@prisma/client';
 import { PrismaError } from 'prisma-error-enum';
 import { z } from 'zod';
 
+import { Prisma } from '@mixan/db';
+
 export const dashboardRouter = createTRPCRouter({
   get: protectedProcedure
     .input(

apps/web/src/server/api/routers/report.ts

@@ -11,9 +11,10 @@ import type {
 } from '@/types';
 import { alphabetIds, timeRanges } from '@/utils/constants';
 import { zChartInput } from '@/utils/validation';
-import type { Report as DbReport } from '@prisma/client';
 import { z } from 'zod';
 
+import type { Report as DbReport } from '@mixan/db';
+
 function transformFilter(
   filter: Partial<IChartEventFilter>,
   index: number
@@ -48,7 +49,7 @@ function transformReport(report: DbReport): IChartInput & { id: string } {
     chartType: report.chart_type,
     interval: report.interval,
     name: report.name || 'Untitled',
-    range: report.range as IChartRange ?? timeRanges['1m'],
+    range: (report.range as IChartRange) ?? timeRanges['1m'],
   };
 }
 

apps/web/src/server/auth.ts

@@ -128,7 +128,16 @@ export async function validateSdkRequest(
       throw createError(401, 'Invalid client secret');
     }
   } else if (client.cors !== '*') {
-    res.setHeader('Access-Control-Allow-Origin', client.cors);
+    const ok = client.cors.split(',').find((origin) => {
+      if (origin === req.headers.origin) {
+        return true;
+      }
+    });
+    if (ok) {
+      res.setHeader('Access-Control-Allow-Origin', String(req.headers.origin));
+    } else {
+      throw createError(401, 'Invalid cors settings');
+    }
   }
 
   return client.project_id;

apps/web/src/server/db.ts

@@ -1,14 +1 @@
-import { env } from '@/env.mjs';
-import { PrismaClient } from '@prisma/client';
-
-const globalForPrisma = globalThis as unknown as {
-  prisma: PrismaClient | undefined;
-};
-
-export const db =
-  globalForPrisma.prisma ??
-  new PrismaClient({
-    log: ['error'],
-  });
-
-if (env.NODE_ENV !== 'production') globalForPrisma.prisma = db;
+export { db } from '@mixan/db';