fix: wip

apps/remix/server/trpc/hono-trpc-open-api.ts

@@ -3,17 +3,16 @@ import { createOpenApiFetchHandler } from 'trpc-to-openapi';
 
 import { API_V2_BETA_URL } from '@documenso/lib/constants/app';
 import { AppError, genericErrorCodeToTrpcErrorCodeMap } from '@documenso/lib/errors/app-error';
+import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 import { handleTrpcRouterError } from '@documenso/trpc/utils/trpc-error-handler';
 
-import { createHonoTrpcContext } from './trpc-context';
-
 export const openApiTrpcServerHandler = async (c: Context) => {
   return createOpenApiFetchHandler<typeof appRouter>({
     endpoint: API_V2_BETA_URL,
     router: appRouter,
     // Todo: Test this, since it's not using the createContext params.
-    createContext: async () => createHonoTrpcContext({ c, requestSource: 'apiV2' }),
+    createContext: async () => createTrpcContext({ c, requestSource: 'apiV2' }),
     req: c.req.raw,
     onError: (opts) => handleTrpcRouterError(opts, 'apiV2'),
     // Not sure why we need to do this since we handle it in errorFormatter which runs after this.

apps/remix/server/trpc/hono-trpc-remix.ts

@@ -1,10 +1,9 @@
 import { trpcServer } from '@hono/trpc-server';
 
+import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 import { handleTrpcRouterError } from '@documenso/trpc/utils/trpc-error-handler';
 
-import { createHonoTrpcContext } from './trpc-context';
-
 // Todo
 // export const config = {
 //   maxDuration: 120,
@@ -21,6 +20,6 @@ import { createHonoTrpcContext } from './trpc-context';
 export const reactRouterTrpcServer = trpcServer({
   router: appRouter,
   endpoint: '/api/trpc',
-  createContext: async (_, c) => createHonoTrpcContext({ c, requestSource: 'app' }),
+  createContext: async (_, c) => createTrpcContext({ c, requestSource: 'app' }),
   onError: (opts) => handleTrpcRouterError(opts, 'trpc'),
 });

apps/remix/server/trpc/trpc-context.ts

@@ -1,56 +0,0 @@
-import type { Context } from 'hono';
-import { z } from 'zod';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import type { TrpcContext } from '@documenso/trpc/server/context';
-
-type CreateTrpcContextOptions = {
-  c: Context;
-  requestSource: 'app' | 'apiV1' | 'apiV2';
-};
-
-/**
- * For trpc that uses @documenso/auth and Hono.
- */
-export const createHonoTrpcContext = async ({
-  c,
-  requestSource,
-}: CreateTrpcContextOptions): Promise<TrpcContext> => {
-  const { session, user } = await getSession(c);
-
-  const req = c.req.raw;
-
-  const metadata: ApiRequestMetadata = {
-    requestMetadata: extractRequestMetadata(req),
-    source: requestSource,
-    auth: null,
-  };
-
-  const rawTeamId = req.headers.get('x-team-id') || undefined;
-
-  const teamId = z.coerce
-    .number()
-    .optional()
-    .catch(() => undefined)
-    .parse(rawTeamId);
-
-  if (!session || !user) {
-    return {
-      session: null,
-      user: null,
-      teamId,
-      req,
-      metadata,
-    };
-  }
-
-  return {
-    session,
-    user,
-    teamId,
-    req,
-    metadata,
-  };
-};