wip

packages/trpc/server/admin-router/router.ts

@@ -1,3 +1,5 @@
+import { DocumentStatus } from '@prisma/client';
+
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { findDocuments } from '@documenso/lib/server-only/admin/get-all-documents';
 import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-document';
@@ -11,8 +13,6 @@ import { deleteUser } from '@documenso/lib/server-only/user/delete-user';
 import { disableUser } from '@documenso/lib/server-only/user/disable-user';
 import { enableUser } from '@documenso/lib/server-only/user/enable-user';
 import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id';
-import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { DocumentStatus } from '@documenso/prisma/client';
 
 import { adminProcedure, router } from '../trpc';
 import {
@@ -117,7 +117,7 @@ export const adminRouter = router({
 
       return await superDeleteDocument({
         id,
-        requestMetadata: extractNextApiRequestMetadata(ctx.req),
+        requestMetadata: ctx.metadata.requestMetadata,
       });
     }),
 });

packages/trpc/server/auth-router/router.ts

@@ -1,22 +1,18 @@
 import type { RegistrationResponseJSON } from '@simplewebauthn/types';
-import { TRPCError } from '@trpc/server';
-import { parse } from 'cookie-es';
 import { env } from 'next-runtime-env';
 
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { formatSecureCookieName } from '@documenso/lib/constants/auth';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { jobsClient } from '@documenso/lib/jobs/client';
-import { ErrorCode } from '@documenso/lib/next-auth/error-codes';
 import { createPasskey } from '@documenso/lib/server-only/auth/create-passkey';
 import { createPasskeyAuthenticationOptions } from '@documenso/lib/server-only/auth/create-passkey-authentication-options';
 import { createPasskeyRegistrationOptions } from '@documenso/lib/server-only/auth/create-passkey-registration-options';
 import { createPasskeySigninOptions } from '@documenso/lib/server-only/auth/create-passkey-signin-options';
 import { deletePasskey } from '@documenso/lib/server-only/auth/delete-passkey';
 import { findPasskeys } from '@documenso/lib/server-only/auth/find-passkeys';
-import { compareSync } from '@documenso/lib/server-only/auth/hash';
 import { updatePasskey } from '@documenso/lib/server-only/auth/update-passkey';
 import { createUser } from '@documenso/lib/server-only/user/create-user';
+import { nanoid } from '@documenso/lib/universal/id';
 
 import { authenticatedProcedure, procedure, router } from '../trpc';
 import {
@@ -26,7 +22,6 @@ import {
   ZFindPasskeysQuerySchema,
   ZSignUpMutationSchema,
   ZUpdatePasskeyMutationSchema,
-  ZVerifyPasswordMutationSchema,
 } from './schema';
 
 const NEXT_PUBLIC_DISABLE_SIGNUP = () => env('NEXT_PUBLIC_DISABLE_SIGNUP');
@@ -59,25 +54,6 @@ export const authRouter = router({
     return user;
   }),
 
-  verifyPassword: authenticatedProcedure
-    .input(ZVerifyPasswordMutationSchema)
-    .mutation(({ ctx, input }) => {
-      const user = ctx.user;
-
-      const { password } = input;
-
-      if (!user.password) {
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: ErrorCode.INCORRECT_PASSWORD,
-        });
-      }
-
-      const valid = compareSync(password, user.password);
-
-      return valid;
-    }),
-
   createPasskey: authenticatedProcedure
     .input(ZCreatePasskeyMutationSchema)
     .mutation(async ({ ctx, input }) => {
@@ -107,20 +83,17 @@ export const authRouter = router({
     });
   }),
 
-  createPasskeySigninOptions: procedure.mutation(async ({ ctx }) => {
-    const cookies = parse(ctx.req.headers.cookie ?? '');
-
-    const sessionIdToken =
-      cookies[formatSecureCookieName('__Host-next-auth.csrf-token')] ||
-      cookies[formatSecureCookieName('next-auth.csrf-token')];
-
-    if (!sessionIdToken) {
-      throw new Error('Missing CSRF token');
-    }
+  createPasskeySigninOptions: procedure.mutation(async () => {
+    const sessionIdToken = nanoid(16);
 
     const [sessionId] = decodeURI(sessionIdToken).split('|');
 
-    return await createPasskeySigninOptions({ sessionId });
+    const options = await createPasskeySigninOptions({ sessionId });
+
+    return {
+      options,
+      sessionId,
+    };
   }),
 
   deletePasskey: authenticatedProcedure

packages/trpc/server/auth-router/schema.ts

@@ -71,5 +71,3 @@ export const ZFindPasskeysQuerySchema = ZFindSearchParamsSchema.extend({
 });
 
 export type TSignUpMutationSchema = z.infer<typeof ZSignUpMutationSchema>;
-
-export const ZVerifyPasswordMutationSchema = ZSignUpMutationSchema.pick({ password: true });

packages/trpc/server/context.ts

@@ -1,20 +1,24 @@
+import type { User } from '@prisma/client';
 import { z } from 'zod';
 
 import { getServerSession } from '@documenso/lib/next-auth/get-server-session';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 
-import type { CreateNextContextOptions } from './adapters/next';
+import type { CreateNextContextOptions, NextApiRequest } from './adapters/next';
 
 type CreateTrpcContext = CreateNextContextOptions & {
   requestSource: 'apiV1' | 'apiV2' | 'app';
 };
 
+/**
+ * Todo: Delete
+ */
 export const createTrpcContext = async ({
   req,
   res,
   requestSource,
-}: Omit<CreateTrpcContext, 'info'>) => {
+}: Omit<CreateTrpcContext, 'info'>): Promise<TrpcContext> => {
   const { session, user } = await getServerSession({ req, res });
 
   const metadata: ApiRequestMetadata = {
@@ -58,4 +62,17 @@ export const createTrpcContext = async ({
   };
 };
 
-export type TrpcContext = Awaited<ReturnType<typeof createTrpcContext>>;
+export type TrpcContext = (
+  | {
+      session: null;
+      user: null;
+    }
+  | {
+      session: unknown;
+      user: User;
+    }
+) & {
+  teamId: number | undefined;
+  req: Request | NextApiRequest;
+  metadata: ApiRequestMetadata;
+};

packages/trpc/server/document-router/router.ts

@@ -1,3 +1,4 @@
+import { DocumentDataType, DocumentStatus } from '@prisma/client';
 import { TRPCError } from '@trpc/server';
 import { DateTime } from 'luxon';
 
@@ -24,7 +25,6 @@ import { sendDocument } from '@documenso/lib/server-only/document/send-document'
 import { updateDocument } from '@documenso/lib/server-only/document/update-document';
 import { symmetricEncrypt } from '@documenso/lib/universal/crypto';
 import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions';
-import { DocumentDataType, DocumentStatus } from '@documenso/prisma/client';
 
 import { authenticatedProcedure, procedure, router } from '../trpc';
 import {

packages/trpc/server/document-router/schema.ts

@@ -1,3 +1,11 @@
+import {
+  DocumentDistributionMethod,
+  DocumentSigningOrder,
+  DocumentSource,
+  DocumentStatus,
+  DocumentVisibility,
+  FieldType,
+} from '@prisma/client';
 import { z } from 'zod';
 
 import { VALID_DATE_FORMAT_VALUES } from '@documenso/lib/constants/date-formats';
@@ -23,14 +31,6 @@ import {
 import { ZFieldAndMetaSchema } from '@documenso/lib/types/field-meta';
 import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { isValidRedirectUrl } from '@documenso/lib/utils/is-valid-redirect-url';
-import {
-  DocumentDistributionMethod,
-  DocumentSigningOrder,
-  DocumentSource,
-  DocumentStatus,
-  DocumentVisibility,
-  FieldType,
-} from '@documenso/prisma/client';
 
 import { ZCreateRecipientSchema } from '../recipient-router/schema';
 

packages/trpc/server/field-router/router.ts

@@ -9,7 +9,6 @@ import { setFieldsForTemplate } from '@documenso/lib/server-only/field/set-field
 import { signFieldWithToken } from '@documenso/lib/server-only/field/sign-field-with-token';
 import { updateDocumentFields } from '@documenso/lib/server-only/field/update-document-fields';
 import { updateTemplateFields } from '@documenso/lib/server-only/field/update-template-fields';
-import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 
 import { ZGenericSuccessResponse, ZSuccessResponseSchema } from '../document-router/schema';
 import { authenticatedProcedure, procedure, router } from '../trpc';
@@ -456,7 +455,7 @@ export const fieldRouter = router({
         isBase64,
         userId: ctx.user?.id,
         authOptions,
-        requestMetadata: extractNextApiRequestMetadata(ctx.req),
+        requestMetadata: ctx.metadata.requestMetadata,
       });
     }),
 
@@ -471,7 +470,7 @@ export const fieldRouter = router({
       return await removeSignedFieldWithToken({
         token,
         fieldId,
-        requestMetadata: extractNextApiRequestMetadata(ctx.req),
+        requestMetadata: ctx.metadata.requestMetadata,
       });
     }),
 });

packages/trpc/server/field-router/schema.ts

@@ -1,3 +1,4 @@
+import { FieldType } from '@prisma/client';
 import { z } from 'zod';
 
 import { ZRecipientActionAuthSchema } from '@documenso/lib/types/document-auth';
@@ -10,7 +11,6 @@ import {
   ZFieldWidthSchema,
 } from '@documenso/lib/types/field';
 import { ZFieldAndMetaSchema, ZFieldMetaSchema } from '@documenso/lib/types/field-meta';
-import { FieldType } from '@documenso/prisma/client';
 
 const ZCreateFieldSchema = ZFieldAndMetaSchema.and(
   z.object({

packages/trpc/server/profile-router/router.ts

@@ -1,3 +1,5 @@
+import { SubscriptionStatus } from '@prisma/client';
+
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { jobsClient } from '@documenso/lib/jobs/client';
@@ -11,8 +13,6 @@ import { resetPassword } from '@documenso/lib/server-only/user/reset-password';
 import { updatePassword } from '@documenso/lib/server-only/user/update-password';
 import { updateProfile } from '@documenso/lib/server-only/user/update-profile';
 import { updatePublicProfile } from '@documenso/lib/server-only/user/update-public-profile';
-import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { SubscriptionStatus } from '@documenso/prisma/client';
 
 import { adminProcedure, authenticatedProcedure, procedure, router } from '../trpc';
 import {
@@ -114,7 +114,7 @@ export const profileRouter = router({
     return await resetPassword({
       token,
       password,
-      requestMetadata: extractNextApiRequestMetadata(ctx.req),
+      requestMetadata: ctx.metadata.requestMetadata,
     });
   }),
 

packages/trpc/server/recipient-router/router.ts

@@ -9,7 +9,6 @@ import { setDocumentRecipients } from '@documenso/lib/server-only/recipient/set-
 import { setTemplateRecipients } from '@documenso/lib/server-only/recipient/set-template-recipients';
 import { updateDocumentRecipients } from '@documenso/lib/server-only/recipient/update-document-recipients';
 import { updateTemplateRecipients } from '@documenso/lib/server-only/recipient/update-template-recipients';
-import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 
 import { ZGenericSuccessResponse, ZSuccessResponseSchema } from '../document-router/schema';
 import { authenticatedProcedure, procedure, router } from '../trpc';
@@ -444,7 +443,7 @@ export const recipientRouter = router({
         documentId,
         authOptions,
         userId: ctx.user?.id,
-        requestMetadata: extractNextApiRequestMetadata(ctx.req),
+        requestMetadata: ctx.metadata.requestMetadata,
       });
     }),
 
@@ -460,7 +459,7 @@ export const recipientRouter = router({
         token,
         documentId,
         reason,
-        requestMetadata: extractNextApiRequestMetadata(ctx.req),
+        requestMetadata: ctx.metadata.requestMetadata,
       });
     }),
 });

packages/trpc/server/recipient-router/schema.ts

@@ -1,3 +1,4 @@
+import { RecipientRole } from '@prisma/client';
 import { z } from 'zod';
 
 import {
@@ -6,7 +7,6 @@ import {
   ZRecipientActionAuthTypesSchema,
 } from '@documenso/lib/types/document-auth';
 import { ZRecipientLiteSchema, ZRecipientSchema } from '@documenso/lib/types/recipient';
-import { RecipientRole } from '@documenso/prisma/client';
 
 export const ZGetRecipientRequestSchema = z.object({
   recipientId: z.number(),

packages/trpc/server/team-router/schema.ts

@@ -1,9 +1,9 @@
+import { DocumentVisibility, TeamMemberRole } from '@prisma/client';
 import { z } from 'zod';
 
 import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
 import { PROTECTED_TEAM_URLS } from '@documenso/lib/constants/teams';
 import { ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
-import { DocumentVisibility, TeamMemberRole } from '@documenso/prisma/client';
 
 import { ZUpdatePublicProfileMutationSchema } from '../profile-router/schema';
 

packages/trpc/server/template-router/router.ts

@@ -1,3 +1,5 @@
+import type { Document } from '@prisma/client';
+
 import { getServerLimits } from '@documenso/ee/server-only/limits/server';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
@@ -20,7 +22,6 @@ import { getTemplateById } from '@documenso/lib/server-only/template/get-templat
 import { moveTemplateToTeam } from '@documenso/lib/server-only/template/move-template-to-team';
 import { toggleTemplateDirectLink } from '@documenso/lib/server-only/template/toggle-template-direct-link';
 import { updateTemplate } from '@documenso/lib/server-only/template/update-template';
-import type { Document } from '@documenso/prisma/client';
 
 import { ZGenericSuccessResponse, ZSuccessResponseSchema } from '../document-router/schema';
 import { authenticatedProcedure, maybeAuthenticatedProcedure, router } from '../trpc';

packages/trpc/server/template-router/schema.ts

@@ -1,3 +1,4 @@
+import { DocumentSigningOrder, DocumentVisibility, TemplateType } from '@prisma/client';
 import { z } from 'zod';
 
 import { ZDocumentSchema } from '@documenso/lib/types/document';
@@ -12,7 +13,6 @@ import {
   ZTemplateManySchema,
   ZTemplateSchema,
 } from '@documenso/lib/types/template';
-import { DocumentSigningOrder, DocumentVisibility, TemplateType } from '@documenso/prisma/client';
 import { TemplateDirectLinkSchema } from '@documenso/prisma/generated/zod';
 
 import {

packages/trpc/server/trpc.ts

@@ -6,7 +6,6 @@ import { AppError, genericErrorCodeToTrpcErrorCodeMap } from '@documenso/lib/err
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
 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 type { TrpcContext } from './context';
 
@@ -131,8 +130,6 @@ export const authenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
 });
 
 export const maybeAuthenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
-  const requestMetadata = extractNextApiRequestMetadata(ctx.req);
-
   return await next({
     ctx: {
       ...ctx,
@@ -147,7 +144,6 @@ export const maybeAuthenticatedMiddleware = t.middleware(async ({ ctx, next }) =
               email: ctx.user.email,
             }
           : undefined,
-        requestMetadata,
         auth: ctx.session ? 'session' : null,
       } satisfies ApiRequestMetadata,
     },

packages/trpc/server/webhook-router/schema.ts

@@ -1,7 +1,6 @@
+import { WebhookTriggerEvents } from '@prisma/client';
 import { z } from 'zod';
 
-import { WebhookTriggerEvents } from '@documenso/prisma/client';
-
 export const ZGetTeamWebhooksQuerySchema = z.object({
   teamId: z.number(),
 });