fix: refactor trpc errors (#1511)

apps/web/src/app/(dashboard)/settings/profile/delete-account-dialog.tsx

@@ -7,7 +7,6 @@ import { useLingui } from '@lingui/react';
 import { signOut } from 'next-auth/react';
 
 import type { User } from '@documenso/prisma/client';
-import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
@@ -52,24 +51,14 @@ export const DeleteAccountDialog = ({ className, user }: DeleteAccountDialogProp
 
       return await signOut({ callbackUrl: '/' });
     } catch (err) {
-      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
-        toast({
-          title: _(msg`An error occurred`),
-          description: err.message,
-          variant: 'destructive',
-        });
-      } else {
       toast({
         title: _(msg`An unknown error occurred`),
         variant: 'destructive',
-          description:
+        description: _(
-            err.message ??
-            _(
           msg`We encountered an unknown error while attempting to delete your account. Please try again later.`,
         ),
       });
     }
-    }
   };
 
   return (

apps/web/src/app/(signing)/sign/[token]/complete/claim-account.tsx

@@ -9,7 +9,7 @@ import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
-import { TRPCClientError } from '@documenso/trpc/client';
+import { AppError } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
@@ -25,6 +25,8 @@ import { Input } from '@documenso/ui/primitives/input';
 import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { signupErrorMessages } from '~/components/forms/v2/signup';
+
 export type ClaimAccountProps = {
   defaultName: string;
   defaultEmail: string;
@@ -33,7 +35,10 @@ export type ClaimAccountProps = {
 
 export const ZClaimAccountFormSchema = z
   .object({
-    name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
+    name: z
+      .string()
+      .trim()
+      .min(1, { message: msg`Please enter a valid name.`.id }),
     email: z.string().email().min(1),
     password: ZPasswordSchema,
   })
@@ -43,7 +48,7 @@ export const ZClaimAccountFormSchema = z
       return !password.includes(name) && !password.includes(email.split('@')[0]);
     },
     {
-      message: 'Password should not be common or based on personal information',
+      message: msg`Password should not be common or based on personal information`.id,
       path: ['password'],
     },
   );
@@ -86,22 +91,16 @@ export const ClaimAccount = ({ defaultName, defaultEmail }: ClaimAccountProps) =
         email,
         timestamp: new Date().toISOString(),
       });
-    } catch (error) {
+    } catch (err) {
-      if (error instanceof TRPCClientError && error.data?.code === 'BAD_REQUEST') {
+      const error = AppError.parseError(err);
+
+      const errorMessage = signupErrorMessages[error.code] ?? signupErrorMessages.INVALID_REQUEST;
+
       toast({
         title: _(msg`An error occurred`),
-          description: error.message,
+        description: _(errorMessage),
         variant: 'destructive',
       });
-      } else {
-        toast({
-          title: _(msg`An unknown error occurred`),
-          description: _(
-            msg`We encountered an unknown error while attempting to sign you up. Please try again later.`,
-          ),
-          variant: 'destructive',
-        });
-      }
     }
   };
 

apps/web/src/components/forms/avatar-image.tsx

@@ -13,10 +13,10 @@ import { match } from 'ts-pattern';
 import { z } from 'zod';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { AppError } from '@documenso/lib/errors/app-error';
 import { base64 } from '@documenso/lib/universal/base64';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
 import type { Team, User } from '@documenso/prisma/client';
-import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
@@ -111,21 +111,18 @@ export const AvatarImageForm = ({ className, user, team }: AvatarImageFormProps)
 
       router.refresh();
     } catch (err) {
-      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+      const error = AppError.parseError(err);
+
+      const errorMessage = match(error.code).otherwise(
+        () =>
+          msg`We encountered an unknown error while attempting to update your password. Please try again later.`,
+      );
+
       toast({
         title: _(msg`An error occurred`),
-          description: err.message,
+        description: _(errorMessage),
         variant: 'destructive',
       });
-      } else {
-        toast({
-          title: _(msg`An unknown error occurred`),
-          description: _(
-            msg`We encountered an unknown error while attempting to update the avatar. Please try again later.`,
-          ),
-          variant: 'destructive',
-        });
-      }
     }
   };
 

apps/web/src/components/forms/password.tsx

@@ -4,10 +4,11 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { useForm } from 'react-hook-form';
+import { match } from 'ts-pattern';
 import { z } from 'zod';
 
+import { AppError } from '@documenso/lib/errors/app-error';
 import type { User } from '@documenso/prisma/client';
-import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { ZCurrentPasswordSchema, ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
@@ -73,21 +74,25 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
         duration: 5000,
       });
     } catch (err) {
-      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+      const error = AppError.parseError(err);
+
+      const errorMessage = match(error.code)
+        .with('NO_PASSWORD', () => msg`User has no password.`)
+        .with('INCORRECT_PASSWORD', () => msg`Current password is incorrect.`)
+        .with(
+          'SAME_PASSWORD',
+          () => msg`Your new password cannot be the same as your old password.`,
+        )
+        .otherwise(
+          () =>
+            msg`We encountered an unknown error while attempting to update your password. Please try again later.`,
+        );
+
       toast({
         title: _(msg`An error occurred`),
-          description: err.message,
+        description: _(errorMessage),
         variant: 'destructive',
       });
-      } else {
-        toast({
-          title: _(msg`An unknown error occurred`),
-          description: _(
-            msg`We encountered an unknown error while attempting to update your password. Please try again later.`,
-          ),
-          variant: 'destructive',
-        });
-      }
     }
   };
 

apps/web/src/components/forms/reset-password.tsx

@@ -6,9 +6,10 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { useForm } from 'react-hook-form';
+import { match } from 'ts-pattern';
 import { z } from 'zod';
 
-import { TRPCClientError } from '@documenso/trpc/client';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
@@ -76,21 +77,25 @@ export const ResetPasswordForm = ({ className, token }: ResetPasswordFormProps)
 
       router.push('/signin');
     } catch (err) {
-      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+      const error = AppError.parseError(err);
+
+      const errorMessage = match(error.code)
+        .with(AppErrorCode.EXPIRED_CODE, () => msg`Token has expired. Please try again.`)
+        .with('INVALID_TOKEN', () => msg`Invalid token provided. Please try again.`)
+        .with(
+          'SAME_PASSWORD',
+          () => msg`Your new password cannot be the same as your old password.`,
+        )
+        .otherwise(
+          () =>
+            msg`We encountered an unknown error while attempting to reset your password. Please try again later.`,
+        );
+
       toast({
         title: _(msg`An error occurred`),
-          description: err.message,
+        description: _(errorMessage),
         variant: 'destructive',
       });
-      } else {
-        toast({
-          title: _(msg`An unknown error occurred`),
-          description: _(
-            msg`We encountered an unknown error while attempting to reset your password. Please try again later.`,
-          ),
-          variant: 'destructive',
-        });
-      }
     }
   };
 

apps/web/src/components/forms/signup.tsx

@@ -11,7 +11,7 @@ import { FcGoogle } from 'react-icons/fc';
 import { z } from 'zod';
 
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
-import { TRPCClientError } from '@documenso/trpc/client';
+import { AppError } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
@@ -29,6 +29,8 @@ import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { signupErrorMessages } from './v2/signup';
+
 const SIGN_UP_REDIRECT_PATH = '/documents';
 
 export const ZSignUpFormSchema = z
@@ -102,21 +104,15 @@ export const SignUpForm = ({
         timestamp: new Date().toISOString(),
       });
     } catch (err) {
-      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+      const error = AppError.parseError(err);
+
+      const errorMessage = signupErrorMessages[error.code] ?? signupErrorMessages.INVALID_REQUEST;
+
       toast({
         title: _(msg`An error occurred`),
-          description: err.message,
+        description: _(errorMessage),
         variant: 'destructive',
       });
-      } else {
-        toast({
-          title: _(msg`An unknown error occurred`),
-          description: _(
-            msg`We encountered an unknown error while attempting to sign you up. Please try again later.`,
-          ),
-          variant: 'destructive',
-        });
-      }
     }
   };
 

apps/web/src/components/forms/v2/signup.tsx

@@ -7,6 +7,7 @@ import Link from 'next/link';
 import { useRouter, useSearchParams } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
+import type { MessageDescriptor } from '@lingui/core';
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { AnimatePresence, motion } from 'framer-motion';
@@ -20,7 +21,6 @@ import communityCardsImage from '@documenso/assets/images/community-cards.png';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
@@ -47,17 +47,20 @@ type SignUpStep = 'BASIC_DETAILS' | 'CLAIM_USERNAME';
 
 export const ZSignUpFormV2Schema = z
   .object({
-    name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
+    name: z
+      .string()
+      .trim()
+      .min(1, { message: msg`Please enter a valid name.`.id }),
     email: z.string().email().min(1),
     password: ZPasswordSchema,
-    signature: z.string().min(1, { message: 'We need your signature to sign documents' }),
+    signature: z.string().min(1, { message: msg`We need your signature to sign documents`.id }),
     url: z
       .string()
       .trim()
       .toLowerCase()
-      .min(1, { message: 'We need a username to create your profile' })
+      .min(1, { message: msg`We need a username to create your profile`.id })
       .regex(/^[a-z0-9-]+$/, {
-        message: 'Username can only container alphanumeric characters and dashes.',
+        message: msg`Username can only container alphanumeric characters and dashes.`.id,
       }),
   })
   .refine(
@@ -66,10 +69,18 @@ export const ZSignUpFormV2Schema = z
       return !password.includes(name) && !password.includes(email.split('@')[0]);
     },
     {
-      message: 'Password should not be common or based on personal information',
+      message: msg`Password should not be common or based on personal information`.id,
     },
   );
 
+export const signupErrorMessages: Record<string, MessageDescriptor> = {
+  SIGNUP_DISABLED: msg`Signups are disabled.`,
+  [AppErrorCode.ALREADY_EXISTS]: msg`User with this email already exists. Please use a different email address.`,
+  [AppErrorCode.INVALID_REQUEST]: msg`We were unable to create your account. Please review the information you provided and try again.`,
+  [AppErrorCode.PROFILE_URL_TAKEN]: msg`This username has already been taken`,
+  [AppErrorCode.PREMIUM_PROFILE_URL]: msg`Only subscribers can have a username shorter than 6 characters`,
+};
+
 export type TSignUpFormV2Schema = z.infer<typeof ZSignUpFormV2Schema>;
 
 export type SignUpFormV2Props = {
@@ -139,28 +150,20 @@ export const SignUpFormV2 = ({
     } catch (err) {
       const error = AppError.parseError(err);
 
-      if (error.code === AppErrorCode.PROFILE_URL_TAKEN) {
+      const errorMessage = signupErrorMessages[error.code] ?? signupErrorMessages.INVALID_REQUEST;
+
+      if (
+        error.code === AppErrorCode.PROFILE_URL_TAKEN ||
+        error.code === AppErrorCode.PREMIUM_PROFILE_URL
+      ) {
         form.setError('url', {
           type: 'manual',
-          message: _(msg`This username has already been taken`),
+          message: _(errorMessage),
-        });
-      } else if (error.code === AppErrorCode.PREMIUM_PROFILE_URL) {
-        form.setError('url', {
-          type: 'manual',
-          message: error.message,
-        });
-      } else if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
-        toast({
-          title: _(msg`An error occurred`),
-          description: err.message,
-          variant: 'destructive',
         });
       } else {
         toast({
-          title: _(msg`An unknown error occurred`),
+          title: _(msg`An error occurred`),
-          description: _(
+          description: _(errorMessage),
-            msg`We encountered an unknown error while attempting to sign you up. Please try again later.`,
-          ),
           variant: 'destructive',
         });
       }

apps/web/src/pages/api/trpc/[trpc].ts

@@ -21,8 +21,7 @@ export default trpcNext.createNextApiHandler({
   onError(opts) {
     const { error, path } = opts;
 
-    // Currently trialing changes with template and team router only.
+    if (!path) {
-    if (!path || (!path.startsWith('template') && !path.startsWith('team'))) {
       return;
     }
 

packages/lib/server-only/crypto/encrypt.ts

@@ -2,7 +2,6 @@ import { z } from 'zod';
 
 import { DOCUMENSO_ENCRYPTION_SECONDARY_KEY } from '@documenso/lib/constants/crypto';
 import { symmetricEncrypt } from '@documenso/lib/universal/crypto';
-import type { TEncryptSecondaryDataMutationSchema } from '@documenso/trpc/server/crypto/schema';
 
 export const ZEncryptedDataSchema = z.object({
   data: z.string(),
@@ -25,7 +24,7 @@ export type EncryptDataOptions = {
  *
  * @returns The encrypted data.
  */
-export const encryptSecondaryData = ({ data, expiresAt }: TEncryptSecondaryDataMutationSchema) => {
+export const encryptSecondaryData = ({ data, expiresAt }: EncryptDataOptions) => {
   if (!DOCUMENSO_ENCRYPTION_SECONDARY_KEY) {
     throw new Error('Missing encryption key');
   }

packages/lib/server-only/profile/set-avatar-image.ts

@@ -2,6 +2,7 @@ import sharp from 'sharp';
 
 import { prisma } from '@documenso/prisma';
 
+import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 
 export type SetAvatarImageOptions = {
@@ -29,7 +30,9 @@ export const setAvatarImage = async ({
   });
 
   if (!user) {
-    throw new Error('User not found');
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'User not found',
+    });
   }
 
   oldAvatarImageId = user.avatarImageId;
@@ -47,7 +50,9 @@ export const setAvatarImage = async ({
     });
 
     if (!team) {
-      throw new Error('Team not found');
+      throw new AppError('TEAM_NOT_FOUND', {
+        statusCode: 404,
+      });
     }
 
     oldAvatarImageId = team.avatarImageId;

packages/lib/server-only/user/create-user.ts

@@ -8,6 +8,7 @@ import { IdentityProvider, TeamMemberInviteStatus } from '@documenso/prisma/clie
 import { IS_BILLING_ENABLED } from '../../constants/app';
 import { SALT_ROUNDS } from '../../constants/auth';
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildLogger } from '../../utils/logger';
 
 export interface CreateUserOptions {
   name: string;
@@ -27,7 +28,7 @@ export const createUser = async ({ name, email, password, signature, url }: Crea
   });
 
   if (userExists) {
-    throw new Error('User already exists');
+    throw new AppError(AppErrorCode.ALREADY_EXISTS);
   }
 
   if (url) {
@@ -134,6 +135,18 @@ export const createUser = async ({ name, email, password, signature, url }: Crea
       return await getStripeCustomerByUser(user).then((session) => session.user);
     } catch (err) {
       console.error(err);
+
+      const error = AppError.parseError(err);
+
+      const logger = buildLogger();
+
+      logger.error(error, {
+        method: 'createUser',
+        context: {
+          appError: AppError.toJSON(error),
+          userId: user.id,
+        },
+      });
     }
   }
 

packages/lib/server-only/user/reset-password.ts

@@ -4,6 +4,7 @@ import { prisma } from '@documenso/prisma';
 import { UserSecurityAuditLogType } from '@documenso/prisma/client';
 
 import { SALT_ROUNDS } from '../../constants/auth';
+import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { sendResetPassword } from '../auth/send-reset-password';
 
@@ -15,7 +16,7 @@ export type ResetPasswordOptions = {
 
 export const resetPassword = async ({ token, password, requestMetadata }: ResetPasswordOptions) => {
   if (!token) {
-    throw new Error('Invalid token provided. Please try again.');
+    throw new AppError('INVALID_TOKEN');
   }
 
   const foundToken = await prisma.passwordResetToken.findFirst({
@@ -28,19 +29,19 @@ export const resetPassword = async ({ token, password, requestMetadata }: ResetP
   });
 
   if (!foundToken) {
-    throw new Error('Invalid token provided. Please try again.');
+    throw new AppError('INVALID_TOKEN');
   }
 
   const now = new Date();
 
   if (now > foundToken.expiry) {
-    throw new Error('Token has expired. Please try again.');
+    throw new AppError(AppErrorCode.EXPIRED_CODE);
   }
 
   const isSamePassword = await compare(password, foundToken.User.password || '');
 
   if (isSamePassword) {
-    throw new Error('Your new password cannot be the same as your old password.');
+    throw new AppError('SAME_PASSWORD');
   }
 
   const hashedPassword = await hash(password, SALT_ROUNDS);

packages/lib/server-only/user/update-password.ts

@@ -5,6 +5,8 @@ import type { RequestMetadata } from '@documenso/lib/universal/extract-request-m
 import { prisma } from '@documenso/prisma';
 import { UserSecurityAuditLogType } from '@documenso/prisma/client';
 
+import { AppError } from '../../errors/app-error';
+
 export type UpdatePasswordOptions = {
   userId: number;
   password: string;
@@ -26,18 +28,18 @@ export const updatePassword = async ({
   });
 
   if (!user.password) {
-    throw new Error('User has no password');
+    throw new AppError('NO_PASSWORD');
   }
 
   const isCurrentPasswordValid = await compare(currentPassword, user.password);
   if (!isCurrentPasswordValid) {
-    throw new Error('Current password is incorrect.');
+    throw new AppError('INCORRECT_PASSWORD');
   }
 
   // Compare the new password with the old password
   const isSamePassword = await compare(password, user.password);
   if (isSamePassword) {
-    throw new Error('Your new password cannot be the same as your old password.');
+    throw new AppError('SAME_PASSWORD');
   }
 
   const hashedNewPassword = await hash(password, SALT_ROUNDS);

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

@@ -1,5 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
 import { findDocuments } from '@documenso/lib/server-only/admin/get-all-documents';
 import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-document';
 import { updateRecipient } from '@documenso/lib/server-only/admin/update-recipient';
@@ -28,16 +26,7 @@ export const adminRouter = router({
   findDocuments: adminProcedure.input(ZAdminFindDocumentsQuerySchema).query(async ({ input }) => {
     const { term, page, perPage } = input;
 
-    try {
     return await findDocuments({ term, page, perPage });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to retrieve the documents. Please try again.',
-      });
-    }
   }),
 
   updateUser: adminProcedure
@@ -45,16 +34,7 @@ export const adminRouter = router({
     .mutation(async ({ input }) => {
       const { id, name, email, roles } = input;
 
-      try {
       return await updateUser({ id, name, email, roles });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to retrieve the specified account. Please try again.',
-        });
-      }
     }),
 
   updateRecipient: adminProcedure
@@ -62,22 +42,12 @@ export const adminRouter = router({
     .mutation(async ({ input }) => {
       const { id, name, email } = input;
 
-      try {
       return await updateRecipient({ id, name, email });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to update the recipient provided.',
-        });
-      }
     }),
 
   updateSiteSetting: adminProcedure
     .input(ZAdminUpdateSiteSettingMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       const { id, enabled, data } = input;
 
       return await upsertSiteSetting({
@@ -86,14 +56,6 @@ export const adminRouter = router({
         data,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to update the site setting provided.',
-        });
-      }
     }),
 
   resealDocument: adminProcedure
@@ -101,26 +63,16 @@ export const adminRouter = router({
     .mutation(async ({ input }) => {
       const { id } = input;
 
-      try {
       const document = await getEntireDocument({ id });
 
       const isResealing = document.status === DocumentStatus.COMPLETED;
 
       return await sealDocument({ documentId: id, isResealing });
-      } catch (err) {
-        console.error('resealDocument error', err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to reseal the document provided.',
-        });
-      }
     }),
 
   deleteUser: adminProcedure.input(ZAdminDeleteUserMutationSchema).mutation(async ({ input }) => {
     const { id, email } = input;
 
-    try {
     const user = await getUserById({ id });
 
     if (user.email !== email) {
@@ -128,34 +80,17 @@ export const adminRouter = router({
     }
 
     return await deleteUser({ id });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to delete the specified account. Please try again.',
-      });
-    }
   }),
 
   deleteDocument: adminProcedure
     .input(ZAdminDeleteDocumentMutationSchema)
     .mutation(async ({ ctx, input }) => {
       const { id, reason } = input;
-      try {
       await sendDeleteEmail({ documentId: id, reason });
 
       return await superDeleteDocument({
         id,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to delete the specified document. Please try again.',
-        });
-      }
     }),
 });

packages/trpc/server/api-token-router/router.ts

@@ -1,5 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
 import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
 import { deleteTokenById } from '@documenso/lib/server-only/public-api/delete-api-token-by-id';
 import { getUserTokens } from '@documenso/lib/server-only/public-api/get-all-user-tokens';
@@ -14,42 +12,23 @@ import {
 
 export const apiTokenRouter = router({
   getTokens: authenticatedProcedure.query(async ({ ctx }) => {
-    try {
     return await getUserTokens({ userId: ctx.user.id });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to find your API tokens. Please try again.',
-      });
-    }
   }),
 
   getTokenById: authenticatedProcedure
     .input(ZGetApiTokenByIdQuerySchema)
     .query(async ({ input, ctx }) => {
-      try {
       const { id } = input;
 
       return await getApiTokenById({
         id,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to find this API token. Please try again.',
-        });
-      }
     }),
 
   createToken: authenticatedProcedure
     .input(ZCreateTokenMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { tokenName, teamId, expirationDate } = input;
 
       return await createApiToken({
@@ -58,20 +37,11 @@ export const apiTokenRouter = router({
         tokenName,
         expiresIn: expirationDate,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to create an API token. Please try again.',
-        });
-      }
     }),
 
   deleteTokenById: authenticatedProcedure
     .input(ZDeleteTokenByIdMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { id, teamId } = input;
 
       return await deleteTokenById({
@@ -79,13 +49,5 @@ export const apiTokenRouter = router({
         teamId,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to delete this API Token. Please try again.',
-        });
-      }
     }),
 });

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

@@ -33,10 +33,8 @@ const NEXT_PUBLIC_DISABLE_SIGNUP = () => env('NEXT_PUBLIC_DISABLE_SIGNUP');
 
 export const authRouter = router({
   signup: procedure.input(ZSignUpMutationSchema).mutation(async ({ input }) => {
-    try {
     if (NEXT_PUBLIC_DISABLE_SIGNUP() === 'true') {
-        throw new TRPCError({
+      throw new AppError('SIGNUP_DISABLED', {
-          code: 'BAD_REQUEST',
         message: 'Signups are disabled.',
       });
     }
@@ -59,27 +57,6 @@ export const authRouter = router({
     });
 
     return user;
-    } catch (err) {
-      console.error(err);
-
-      const error = AppError.parseError(err);
-
-      if (error.code !== AppErrorCode.UNKNOWN_ERROR) {
-        throw error;
-      }
-
-      let message =
-        'We were unable to create your account. Please review the information you provided and try again.';
-
-      if (err instanceof Error && err.message === 'User already exists') {
-        message = 'User with this email already exists. Please use a different email address.';
-      }
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message,
-      });
-    }
   }),
 
   verifyPassword: authenticatedProcedure
@@ -104,7 +81,6 @@ export const authRouter = router({
   createPasskey: authenticatedProcedure
     .input(ZCreatePasskeyMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       const verificationResponse = input.verificationResponse as RegistrationResponseJSON;
 
@@ -114,46 +90,21 @@ export const authRouter = router({
         passkeyName: input.passkeyName,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw err;
-      }
     }),
 
   createPasskeyAuthenticationOptions: authenticatedProcedure
     .input(ZCreatePasskeyAuthenticationOptionsMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       return await createPasskeyAuthenticationOptions({
         userId: ctx.user.id,
         preferredPasskeyId: input?.preferredPasskeyId,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to create the authentication options for the passkey. Please try again later.',
-        });
-      }
     }),
 
   createPasskeyRegistrationOptions: authenticatedProcedure.mutation(async ({ ctx }) => {
-    try {
     return await createPasskeyRegistrationOptions({
       userId: ctx.user.id,
     });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message:
-          'We were unable to create the registration options for the passkey. Please try again later.',
-      });
-    }
   }),
 
   createPasskeySigninOptions: procedure.mutation(async ({ ctx }) => {
@@ -168,22 +119,12 @@ export const authRouter = router({
 
     const [sessionId] = decodeURI(sessionIdToken).split('|');
 
-    try {
     return await createPasskeySigninOptions({ sessionId });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to create the options for passkey signin. Please try again later.',
-      });
-    }
   }),
 
   deletePasskey: authenticatedProcedure
     .input(ZDeletePasskeyMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       const { passkeyId } = input;
 
       await deletePasskey({
@@ -191,20 +132,11 @@ export const authRouter = router({
         passkeyId,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to delete this passkey. Please try again later.',
-        });
-      }
     }),
 
   findPasskeys: authenticatedProcedure
     .input(ZFindPasskeysQuerySchema)
     .query(async ({ input, ctx }) => {
-      try {
       const { page, perPage, orderBy } = input;
 
       return await findPasskeys({
@@ -213,20 +145,11 @@ export const authRouter = router({
         orderBy,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to find passkeys. Please try again later.',
-        });
-      }
     }),
 
   updatePasskey: authenticatedProcedure
     .input(ZUpdatePasskeyMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       const { passkeyId, name } = input;
 
       await updatePasskey({
@@ -235,13 +158,5 @@ export const authRouter = router({
         name,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to update this passkey. Please try again later.',
-        });
-      }
     }),
 });

packages/trpc/server/crypto/router.ts

@@ -1,8 +0,0 @@
-import { procedure, router } from '../trpc';
-import { ZEncryptSecondaryDataMutationSchema } from './schema';
-
-export const cryptoRouter = router({
-  encryptSecondaryData: procedure.input(ZEncryptSecondaryDataMutationSchema).mutation(() => {
-    throw new Error('Public usage of encryptSecondaryData is no longer permitted');
-  }),
-});

packages/trpc/server/crypto/schema.ts

@@ -1,15 +0,0 @@
-import { z } from 'zod';
-
-export const ZEncryptSecondaryDataMutationSchema = z.object({
-  data: z.string(),
-  expiresAt: z.number().optional(),
-});
-
-export const ZDecryptDataMutationSchema = z.object({
-  data: z.string(),
-});
-
-export type TEncryptSecondaryDataMutationSchema = z.infer<
-  typeof ZEncryptSecondaryDataMutationSchema
->;
-export type TDecryptDataMutationSchema = z.infer<typeof ZDecryptDataMutationSchema>;

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

@@ -51,63 +51,35 @@ export const documentRouter = router({
   getDocumentById: authenticatedProcedure
     .input(ZGetDocumentByIdQuerySchema)
     .query(async ({ input, ctx }) => {
-      try {
       return await getDocumentById({
         ...input,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to find this document. Please try again later.',
-        });
-      }
     }),
 
   getDocumentByToken: procedure
     .input(ZGetDocumentByTokenQuerySchema)
     .query(async ({ input, ctx }) => {
-      try {
       const { token } = input;
 
       return await getDocumentAndSenderByToken({
         token,
         userId: ctx.user?.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to find this document. Please try again later.',
-        });
-      }
     }),
 
   getDocumentWithDetailsById: authenticatedProcedure
     .input(ZGetDocumentWithDetailsByIdQuerySchema)
     .query(async ({ input, ctx }) => {
-      try {
       return await getDocumentWithDetailsById({
         ...input,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to find this document. Please try again later.',
-        });
-      }
     }),
 
   createDocument: authenticatedProcedure
     .input(ZCreateDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { title, documentDataId, teamId } = input;
 
       const { remaining } = await getServerLimits({ email: ctx.user.email, teamId });
@@ -115,8 +87,7 @@ export const documentRouter = router({
       if (remaining.documents <= 0) {
         throw new TRPCError({
           code: 'BAD_REQUEST',
-            message:
+          message: 'You have reached your document limit for this month. Please upgrade your plan.',
-              'You have reached your document limit for this month. Please upgrade your plan.',
         });
       }
 
@@ -127,24 +98,11 @@ export const documentRouter = router({
         documentDataId,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        if (err instanceof TRPCError) {
-          throw err;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to create this document. Please try again later.',
-        });
-      }
     }),
 
   deleteDocument: authenticatedProcedure
     .input(ZDeleteDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { id, teamId } = input;
 
       const userId = ctx.user.id;
@@ -155,20 +113,11 @@ export const documentRouter = router({
         teamId,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to delete this document. Please try again later.',
-        });
-      }
     }),
 
   moveDocumentToTeam: authenticatedProcedure
     .input(ZMoveDocumentsToTeamSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, teamId } = input;
       const userId = ctx.user.id;
 
@@ -178,18 +127,6 @@ export const documentRouter = router({
         userId,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        if (err instanceof TRPCError) {
-          throw err;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to move this document. Please try again later.',
-        });
-      }
     }),
 
   findDocuments: authenticatedProcedure
@@ -199,7 +136,6 @@ export const documentRouter = router({
 
       const { search, teamId, templateId, page, perPage, orderBy, source, status } = input;
 
-      try {
       const documents = await findDocuments({
         userId: user.id,
         teamId,
@@ -213,20 +149,11 @@ export const documentRouter = router({
       });
 
       return documents;
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We are unable to search for documents. Please try again later.',
-        });
-      }
     }),
 
   findDocumentAuditLogs: authenticatedProcedure
     .input(ZFindDocumentAuditLogsQuerySchema)
     .query(async ({ input, ctx }) => {
-      try {
       const { page, perPage, documentId, cursor, filterForRecentActivity, orderBy } = input;
 
       return await findDocumentAuditLogs({
@@ -238,21 +165,12 @@ export const documentRouter = router({
         orderBy,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to find audit logs for this document. Please try again later.',
-        });
-      }
     }),
 
   // Todo: Add API
   setSettingsForDocument: authenticatedProcedure
     .input(ZSetSettingsForDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, teamId, data, meta } = input;
 
       const userId = ctx.user.id;
@@ -278,15 +196,6 @@ export const documentRouter = router({
         data,
         requestMetadata,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to update the settings for this document. Please try again later.',
-        });
-      }
     }),
 
   setTitleForDocument: authenticatedProcedure
@@ -296,7 +205,6 @@ export const documentRouter = router({
 
       const userId = ctx.user.id;
 
-      try {
       return await updateTitle({
         title,
         userId,
@@ -304,17 +212,11 @@ export const documentRouter = router({
         documentId,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw err;
-      }
     }),
 
   setPasswordForDocument: authenticatedProcedure
     .input(ZSetPasswordForDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, password } = input;
 
       const key = DOCUMENSO_ENCRYPTION_KEY;
@@ -334,20 +236,11 @@ export const documentRouter = router({
         userId: ctx.user.id,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to set the password for this document. Please try again later.',
-        });
-      }
     }),
 
   setSigningOrderForDocument: authenticatedProcedure
     .input(ZSetSigningOrderForDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, signingOrder } = input;
 
       return await upsertDocumentMeta({
@@ -356,21 +249,11 @@ export const documentRouter = router({
         userId: ctx.user.id,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to update the settings for this document. Please try again later.',
-        });
-      }
     }),
 
   updateTypedSignatureSettings: authenticatedProcedure
     .input(ZUpdateTypedSignatureSettingsMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, teamId, typedSignatureEnabled } = input;
 
       const document = await getDocumentById({
@@ -392,25 +275,11 @@ export const documentRouter = router({
         userId: ctx.user.id,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        if (err instanceof TRPCError) {
-          throw err;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to update the settings for this document. Please try again later.',
-        });
-      }
     }),
 
   sendDocument: authenticatedProcedure
     .input(ZSendDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, teamId, meta } = input;
 
       if (
@@ -442,51 +311,25 @@ export const documentRouter = router({
         teamId,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to send this document. Please try again later.',
-        });
-      }
     }),
 
   resendDocument: authenticatedProcedure
     .input(ZResendDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       return await resendDocument({
         userId: ctx.user.id,
         ...input,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to resend this document. Please try again later.',
-        });
-      }
     }),
 
   duplicateDocument: authenticatedProcedure
     .input(ZGetDocumentByIdQuerySchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       return await duplicateDocumentById({
         userId: ctx.user.id,
         ...input,
       });
-      } catch (err) {
-        console.log(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We are unable to duplicate this document. Please try again later.',
-        });
-      }
     }),
 
   searchDocuments: authenticatedProcedure
@@ -494,27 +337,17 @@ export const documentRouter = router({
     .query(async ({ input, ctx }) => {
       const { query } = input;
 
-      try {
       const documents = await searchDocumentsWithKeyword({
         query,
         userId: ctx.user.id,
       });
 
       return documents;
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We are unable to search for documents. Please try again later.',
-        });
-      }
     }),
 
   downloadAuditLogs: authenticatedProcedure
     .input(ZDownloadAuditLogsMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, teamId } = input;
 
       const document = await getDocumentById({
@@ -538,21 +371,11 @@ export const documentRouter = router({
       return {
         url: `${NEXT_PUBLIC_WEBAPP_URL()}/__htmltopdf/audit-log?d=${encrypted}`,
       };
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to download the audit logs for this document. Please try again later.',
-        });
-      }
     }),
 
   downloadCertificate: authenticatedProcedure
     .input(ZDownloadCertificateMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, teamId } = input;
 
       const document = await getDocumentById({
@@ -573,14 +396,5 @@ export const documentRouter = router({
       return {
         url: `${NEXT_PUBLIC_WEBAPP_URL()}/__htmltopdf/certificate?d=${encrypted}`,
       };
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to download the audit logs for this document. Please try again later.',
-        });
-      }
     }),
 });

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

@@ -1,5 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
 import { getFieldById } from '@documenso/lib/server-only/field/get-field-by-id';
 import { removeSignedFieldWithToken } from '@documenso/lib/server-only/field/remove-signed-field-with-token';
 import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document';
@@ -20,7 +18,6 @@ export const fieldRouter = router({
   addFields: authenticatedProcedure
     .input(ZAddFieldsMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, fields } = input;
 
       return await setFieldsForDocument({
@@ -39,14 +36,6 @@ export const fieldRouter = router({
         })),
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to set this field. Please try again later.',
-        });
-      }
     }),
 
   addTemplateFields: authenticatedProcedure
@@ -54,7 +43,6 @@ export const fieldRouter = router({
     .mutation(async ({ input, ctx }) => {
       const { templateId, fields } = input;
 
-      try {
       return await setFieldsForTemplate({
         userId: ctx.user.id,
         templateId,
@@ -70,17 +58,11 @@ export const fieldRouter = router({
           fieldMeta: field.fieldMeta,
         })),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw err;
-      }
     }),
 
   signFieldWithToken: procedure
     .input(ZSignFieldWithTokenMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { token, fieldId, value, isBase64, authOptions } = input;
 
       return await signFieldWithToken({
@@ -92,17 +74,11 @@ export const fieldRouter = router({
         authOptions,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw err;
-      }
     }),
 
   removeSignedFieldWithToken: procedure
     .input(ZRemovedSignedFieldWithTokenMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { token, fieldId } = input;
 
       return await removeSignedFieldWithToken({
@@ -110,18 +86,9 @@ export const fieldRouter = router({
         fieldId,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to remove the signature for this field. Please try again later.',
-        });
-      }
     }),
 
   getField: authenticatedProcedure.input(ZGetFieldQuerySchema).query(async ({ input, ctx }) => {
-    try {
     const { fieldId, teamId } = input;
 
     return await getFieldById({
@@ -129,14 +96,6 @@ export const fieldRouter = router({
       teamId,
       fieldId,
     });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to find this field. Please try again.',
-      });
-    }
   }),
 
   // This doesn't appear to be used anywhere, and it doesn't seem to support updating template fields

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

@@ -1,5 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
 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';
@@ -33,40 +31,21 @@ export const profileRouter = router({
   findUserSecurityAuditLogs: authenticatedProcedure
     .input(ZFindUserSecurityAuditLogsSchema)
     .query(async ({ input, ctx }) => {
-      try {
       return await findUserSecurityAuditLogs({
         userId: ctx.user.id,
         ...input,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to find user security audit logs. Please try again.',
-        });
-      }
     }),
 
   getUser: adminProcedure.input(ZRetrieveUserByIdQuerySchema).query(async ({ input }) => {
-    try {
     const { id } = input;
 
     return await getUserById({ id });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to retrieve the specified account. Please try again.',
-      });
-    }
   }),
 
   updateProfile: authenticatedProcedure
     .input(ZUpdateProfileMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { name, signature } = input;
 
       return await updateProfile({
@@ -75,21 +54,11 @@ export const profileRouter = router({
         signature,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to update your profile. Please review the information you provided and try again.',
-        });
-      }
     }),
 
   updatePublicProfile: authenticatedProcedure
     .input(ZUpdatePublicProfileMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { url, bio, enabled } = input;
 
       if (IS_BILLING_ENABLED() && url !== undefined && url.length < 6) {
@@ -116,27 +85,11 @@ export const profileRouter = router({
       });
 
       return { success: true, url: user.url };
-      } catch (err) {
-        console.error(err);
-
-        const error = AppError.parseError(err);
-
-        if (error.code !== AppErrorCode.UNKNOWN_ERROR) {
-          throw error;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to update your public profile. Please review the information you provided and try again.',
-        });
-      }
     }),
 
   updatePassword: authenticatedProcedure
     .input(ZUpdatePasswordMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { password, currentPassword } = input;
 
       return await updatePassword({
@@ -145,37 +98,17 @@ export const profileRouter = router({
         currentPassword,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        let message =
-          'We were unable to update your profile. Please review the information you provided and try again.';
-
-        if (err instanceof Error) {
-          message = err.message;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message,
-        });
-      }
     }),
 
   forgotPassword: procedure.input(ZForgotPasswordFormSchema).mutation(async ({ input }) => {
-    try {
     const { email } = input;
 
     return await forgotPassword({
       email,
     });
-    } catch (err) {
-      console.error(err);
-    }
   }),
 
   resetPassword: procedure.input(ZResetPasswordFormSchema).mutation(async ({ input, ctx }) => {
-    try {
     const { password, token } = input;
 
     return await resetPassword({
@@ -183,26 +116,11 @@ export const profileRouter = router({
       password,
       requestMetadata: extractNextApiRequestMetadata(ctx.req),
     });
-    } catch (err) {
-      console.error(err);
-
-      let message = 'We were unable to reset your password. Please try again.';
-
-      if (err instanceof Error) {
-        message = err.message;
-      }
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message,
-      });
-    }
   }),
 
   sendConfirmationEmail: procedure
     .input(ZConfirmEmailMutationSchema)
     .mutation(async ({ input }) => {
-      try {
       const { email } = input;
 
       await jobsClient.triggerJob({
@@ -211,47 +129,17 @@ export const profileRouter = router({
           email,
         },
       });
-      } catch (err) {
-        console.error(err);
-
-        let message = 'We were unable to send a confirmation email. Please try again.';
-
-        if (err instanceof Error) {
-          message = err.message;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message,
-        });
-      }
     }),
 
   deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => {
-    try {
     return await deleteUser({
       id: ctx.user.id,
     });
-    } catch (err) {
-      console.error(err);
-
-      let message = 'We were unable to delete your account. Please try again.';
-
-      if (err instanceof Error) {
-        message = err.message;
-      }
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message,
-      });
-    }
   }),
 
   setProfileImage: authenticatedProcedure
     .input(ZSetProfileImageMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { bytes, teamId } = input;
 
       return await setAvatarImage({
@@ -260,19 +148,5 @@ export const profileRouter = router({
         bytes,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        let message = 'We were unable to update your profile image. Please try again.';
-
-        if (err instanceof Error) {
-          message = err.message;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message,
-        });
-      }
     }),
 });

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

@@ -1,5 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
 import { completeDocumentWithToken } from '@documenso/lib/server-only/document/complete-document-with-token';
 import { rejectDocumentWithToken } from '@documenso/lib/server-only/document/reject-document-with-token';
 import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document';
@@ -18,7 +16,6 @@ export const recipientRouter = router({
   addSigners: authenticatedProcedure
     .input(ZAddSignersMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { documentId, teamId, signers } = input;
 
       return await setRecipientsForDocument({
@@ -35,20 +32,11 @@ export const recipientRouter = router({
         })),
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to set this field. Please try again later.',
-        });
-      }
     }),
 
   addTemplateSigners: authenticatedProcedure
     .input(ZAddTemplateSignersMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { templateId, signers, teamId } = input;
 
       return await setRecipientsForTemplate({
@@ -64,20 +52,11 @@ export const recipientRouter = router({
           actionAuth: signer.actionAuth,
         })),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to set this field. Please try again later.',
-        });
-      }
     }),
 
   completeDocumentWithToken: procedure
     .input(ZCompleteDocumentWithTokenMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { token, documentId, authOptions } = input;
 
       return await completeDocumentWithToken({
@@ -87,20 +66,11 @@ export const recipientRouter = router({
         userId: ctx.user?.id,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to sign this field. Please try again later.',
-        });
-      }
     }),
 
   rejectDocumentWithToken: procedure
     .input(ZRejectDocumentWithTokenMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { token, documentId, reason } = input;
 
       return await rejectDocumentWithToken({
@@ -109,13 +79,5 @@ export const recipientRouter = router({
         reason,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to handle this request. Please try again later.',
-        });
-      }
     }),
 });

packages/trpc/server/router.ts

@@ -1,7 +1,6 @@
 import { adminRouter } from './admin-router/router';
 import { apiTokenRouter } from './api-token-router/router';
 import { authRouter } from './auth-router/router';
-import { cryptoRouter } from './crypto/router';
 import { documentRouter } from './document-router/router';
 import { fieldRouter } from './field-router/router';
 import { profileRouter } from './profile-router/router';
@@ -16,7 +15,6 @@ import { webhookRouter } from './webhook-router/router';
 
 export const appRouter = router({
   auth: authRouter,
-  crypto: cryptoRouter,
   profile: profileRouter,
   document: documentRouter,
   field: fieldRouter,

packages/trpc/server/share-link-router/router.ts

@@ -1,5 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
 import { createOrGetShareLink } from '@documenso/lib/server-only/share/create-or-get-share-link';
 
 import { procedure, router } from '../trpc';
@@ -9,7 +7,6 @@ export const shareLinkRouter = router({
   createOrGetShareLink: procedure
     .input(ZCreateOrGetShareLinkMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       const { documentId, token } = input;
 
       if (token) {
@@ -23,13 +20,5 @@ export const shareLinkRouter = router({
       }
 
       return await createOrGetShareLink({ documentId, userId: ctx.user.id });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to create a sharing link.',
-        });
-      }
     }),
 });

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

@@ -30,7 +30,6 @@ export const singleplayerRouter = router({
   createSinglePlayerDocument: procedure
     .input(ZCreateSinglePlayerDocumentMutationSchema)
     .mutation(async ({ input }) => {
-      try {
       const { signer, fields, documentData, documentName, fieldMeta } = input;
 
       const document = await getFile({
@@ -179,10 +178,5 @@ export const singleplayerRouter = router({
       });
 
       return token;
-      } catch (err) {
-        console.error(err);
-
-        throw err;
-      }
     }),
 });

packages/trpc/server/two-factor-authentication-router/router.ts

@@ -1,6 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
-import { AppError } from '@documenso/lib/errors/app-error';
 import { disableTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/disable-2fa';
 import { enableTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/enable-2fa';
 import { setupTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/setup-2fa';
@@ -16,24 +13,14 @@ import {
 
 export const twoFactorAuthenticationRouter = router({
   setup: authenticatedProcedure.mutation(async ({ ctx }) => {
-    try {
     return await setupTwoFactorAuthentication({
       user: ctx.user,
     });
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to setup two-factor authentication. Please try again later.',
-      });
-    }
   }),
 
   enable: authenticatedProcedure
     .input(ZEnableTwoFactorAuthenticationMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       const user = ctx.user;
 
       const { code } = input;
@@ -43,24 +30,11 @@ export const twoFactorAuthenticationRouter = router({
         code,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        const error = AppError.parseError(err);
-
-        if (error.code !== 'INCORRECT_TWO_FACTOR_CODE') {
-          console.error(err);
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to enable two-factor authentication. Please try again later.',
-        });
-      }
     }),
 
   disable: authenticatedProcedure
     .input(ZDisableTwoFactorAuthenticationMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       const user = ctx.user;
 
       return await disableTwoFactorAuthentication({
@@ -69,36 +43,14 @@ export const twoFactorAuthenticationRouter = router({
         backupCode: input.backupCode,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
-      } catch (err) {
-        const error = AppError.parseError(err);
-
-        if (error.code !== 'INCORRECT_TWO_FACTOR_CODE') {
-          console.error(err);
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to disable two-factor authentication. Please try again later.',
-        });
-      }
     }),
 
   viewRecoveryCodes: authenticatedProcedure
     .input(ZViewRecoveryCodesMutationSchema)
     .mutation(async ({ ctx, input }) => {
-      try {
       return await viewBackupCodes({
         user: ctx.user,
         token: input.token,
       });
-      } catch (err) {
-        const error = AppError.parseError(err);
-
-        if (error.code !== 'INCORRECT_TWO_FACTOR_CODE') {
-          console.error(err);
-        }
-
-        throw error;
-      }
     }),
 });

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

@@ -1,5 +1,3 @@
-import { TRPCError } from '@trpc/server';
-
 import { createWebhook } from '@documenso/lib/server-only/webhooks/create-webhook';
 import { deleteWebhookById } from '@documenso/lib/server-only/webhooks/delete-webhook-by-id';
 import { editWebhook } from '@documenso/lib/server-only/webhooks/edit-webhook';
@@ -18,16 +16,7 @@ import {
 
 export const webhookRouter = router({
   getWebhooks: authenticatedProcedure.query(async ({ ctx }) => {
-    try {
     return await getWebhooksByUserId(ctx.user.id);
-    } catch (err) {
-      console.error(err);
-
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        message: 'We were unable to fetch your webhooks. Please try again later.',
-      });
-    }
   }),
 
   getTeamWebhooks: authenticatedProcedure
@@ -35,22 +24,12 @@ export const webhookRouter = router({
     .query(async ({ ctx, input }) => {
       const { teamId } = input;
 
-      try {
       return await getWebhooksByTeamId(teamId, ctx.user.id);
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to fetch your webhooks. Please try again later.',
-        });
-      }
     }),
 
   getWebhookById: authenticatedProcedure
     .input(ZGetWebhookByIdQuerySchema)
     .query(async ({ input, ctx }) => {
-      try {
       const { id, teamId } = input;
 
       return await getWebhookById({
@@ -58,14 +37,6 @@ export const webhookRouter = router({
         userId: ctx.user.id,
         teamId,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to fetch your webhook. Please try again later.',
-        });
-      }
     }),
 
   createWebhook: authenticatedProcedure
@@ -73,7 +44,6 @@ export const webhookRouter = router({
     .mutation(async ({ input, ctx }) => {
       const { enabled, eventTriggers, secret, webhookUrl, teamId } = input;
 
-      try {
       return await createWebhook({
         enabled,
         secret,
@@ -82,20 +52,11 @@ export const webhookRouter = router({
         teamId,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to create this webhook. Please try again later.',
-        });
-      }
     }),
 
   deleteWebhook: authenticatedProcedure
     .input(ZDeleteWebhookMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { id, teamId } = input;
 
       return await deleteWebhookById({
@@ -103,20 +64,11 @@ export const webhookRouter = router({
         teamId,
         userId: ctx.user.id,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to create this webhook. Please try again later.',
-        });
-      }
     }),
 
   editWebhook: authenticatedProcedure
     .input(ZEditWebhookMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      try {
       const { id, teamId, ...data } = input;
 
       return await editWebhook({
@@ -125,13 +77,5 @@ export const webhookRouter = router({
         userId: ctx.user.id,
         teamId,
       });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to create this webhook. Please try again later.',
-        });
-      }
     }),
 });