fix: wip

packages/api/v1/implementation.ts

@@ -1,4 +1,4 @@
-import { createNextRoute } from '@ts-rest/next';
+import { tsr } from '@ts-rest/serverless/fetch';
 import { match } from 'ts-pattern';
 
 import { getServerLimits } from '@documenso/ee/server-only/limits/server';
@@ -42,7 +42,6 @@ import {
   ZRadioFieldMeta,
   ZTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
-import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import {
@@ -62,7 +61,7 @@ import {
 import { ApiContractV1 } from './contract';
 import { authenticatedMiddleware } from './middleware/authenticated';
 
-export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
+export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
   getDocuments: authenticatedMiddleware(async (args, user, team) => {
     const page = Number(args.query.page) || 1;
     const perPage = Number(args.query.perPage) || 10;
@@ -849,7 +848,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     }
   }),
 
-  updateRecipient: authenticatedMiddleware(async (args, user, team) => {
+  updateRecipient: authenticatedMiddleware(async (args, user, team, { metadata }) => {
     const { id: documentId, recipientId } = args.params;
     const { name, email, role, authOptions, signingOrder } = args.body;
 
@@ -887,7 +886,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       role,
       signingOrder,
       actionAuth: authOptions?.actionAuth,
-      requestMetadata: extractNextApiRequestMetadata(args.req),
+      requestMetadata: metadata.requestMetadata,
     }).catch(() => null);
 
     if (!updatedRecipient) {
@@ -909,7 +908,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     };
   }),
 
-  deleteRecipient: authenticatedMiddleware(async (args, user, team) => {
+  deleteRecipient: authenticatedMiddleware(async (args, user, team, { metadata }) => {
     const { id: documentId, recipientId } = args.params;
 
     const document = await getDocumentById({
@@ -941,7 +940,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       recipientId: Number(recipientId),
       userId: user.id,
       teamId: team?.id,
-      requestMetadata: extractNextApiRequestMetadata(args.req),
+      requestMetadata: metadata.requestMetadata,
     }).catch(() => null);
 
     if (!deletedRecipient) {
@@ -963,7 +962,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     };
   }),
 
-  createField: authenticatedMiddleware(async (args, user, team) => {
+  createField: authenticatedMiddleware(async (args, user, team, { metadata }) => {
     const { id: documentId } = args.params;
     const fields = Array.isArray(args.body) ? args.body : [args.body];
 
@@ -1100,7 +1099,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
                   fieldRecipientId: recipientId,
                   fieldType: field.type,
                 },
-                requestMetadata: extractNextApiRequestMetadata(args.req),
+                requestMetadata: metadata.requestMetadata,
               }),
             });
 
@@ -1134,7 +1133,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     }
   }),
 
-  updateField: authenticatedMiddleware(async (args, user, team) => {
+  updateField: authenticatedMiddleware(async (args, user, team, { metadata }) => {
     const { id: documentId, fieldId } = args.params;
     const { recipientId, type, pageNumber, pageWidth, pageHeight, pageX, pageY, fieldMeta } =
       args.body;
@@ -1198,7 +1197,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       pageY,
       pageWidth,
       pageHeight,
-      requestMetadata: extractNextApiRequestMetadata(args.req),
+      requestMetadata: metadata.requestMetadata,
       fieldMeta: fieldMeta ? ZFieldMetaSchema.parse(fieldMeta) : undefined,
     });
 
@@ -1225,7 +1224,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     };
   }),
 
-  deleteField: authenticatedMiddleware(async (args, user, team) => {
+  deleteField: authenticatedMiddleware(async (args, user, team, { metadata }) => {
     const { id: documentId, fieldId } = args.params;
 
     const document = await getDocumentById({
@@ -1286,7 +1285,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       fieldId: Number(fieldId),
       userId: user.id,
       teamId: team?.id,
-      requestMetadata: extractNextApiRequestMetadata(args.req),
+      requestMetadata: metadata.requestMetadata,
     }).catch(() => null);
 
     if (!deletedField) {

packages/api/v1/middleware/authenticated.ts

@@ -1,14 +1,22 @@
-import type { NextApiRequest } from 'next';
+import type { TsRestRequest } from '@ts-rest/serverless';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getApiTokenByToken } from '@documenso/lib/server-only/public-api/get-api-token-by-token';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
+import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import type { Team, User } from '@documenso/prisma/client';
 
+type B = {
+  // appRoute: any;
+  request: TsRestRequest;
+  responseHeaders: Headers;
+};
+
 export const authenticatedMiddleware = <
   T extends {
-    req: NextApiRequest;
+    headers: {
+      authorization: string;
+    };
   },
   R extends {
     status: number;
@@ -16,15 +24,15 @@ export const authenticatedMiddleware = <
   },
 >(
   handler: (
-    args: T,
+    args: T & { req: TsRestRequest },
     user: User,
     team: Team | null | undefined,
     options: { metadata: ApiRequestMetadata },
   ) => Promise<R>,
 ) => {
-  return async (args: T) => {
+  return async (args: T, { request }: B) => {
     try {
-      const { authorization } = args.req.headers;
+      const { authorization } = args.headers;
 
       // Support for both "Authorization: Bearer api_xxx" and "Authorization: api_xxx"
       const [token] = (authorization || '').split('Bearer ').filter((s) => s.length > 0);
@@ -44,7 +52,7 @@ export const authenticatedMiddleware = <
       }
 
       const metadata: ApiRequestMetadata = {
-        requestMetadata: extractNextApiRequestMetadata(args.req),
+        requestMetadata: extractRequestMetadata(request), // Todo: Test
         source: 'apiV1',
         auth: 'api',
         auditUser: {
@@ -54,7 +62,15 @@ export const authenticatedMiddleware = <
         },
       };
 
-      return await handler(args, apiToken.user, apiToken.team, { metadata });
+      return await handler(
+        {
+          ...args,
+          req: request,
+        },
+        apiToken.user,
+        apiToken.team,
+        { metadata },
+      );
     } catch (err) {
       console.log({ err: err });