Merge branch 'main' into release

Release 0.9.2

.env.example

@@ -2,11 +2,6 @@
 NEXTAUTH_URL="http://localhost:3000"
 NEXTAUTH_SECRET="secret"
 
-# [[CRYPTO]]
-# Application Key for symmetric encryption and decryption
-# This should be a random string of at least 32 characters
-NEXT_PRIVATE_ENCRYPTION_KEY="CAFEBABE"
-
 # [[AUTH OPTIONAL]]
 NEXT_PRIVATE_GOOGLE_CLIENT_ID=""
 NEXT_PRIVATE_GOOGLE_CLIENT_SECRET=""

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ env:
   HUSKY: 0
 
 jobs:
-  build_app:
-    name: Build App
+  build:
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -37,16 +37,3 @@ jobs:
 
       - name: Build
         run: npm run build
-
-  build_docker:
-    name: Build Docker Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-
-      - name: Build Docker Image
-        run: ./docker/build.sh
-

README.md

@@ -193,12 +193,6 @@ git clone https://github.com/documenso/documenso
 
 We support DevContainers for VSCode. [Click here to get started.](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/documenso/documenso)
 
-### Video walkthrough
-
-If you're a visual learner and prefer to watch a video walkthrough of setting up Documenso locally, check out this video:
-
-[![Watch the video](https://img.youtube.com/vi/Y0ppIQrEnZs/hqdefault.jpg)](https://youtu.be/Y0ppIQrEnZs)
-
 ## Docker
 
 🚧 Docker containers and images are current in progress. We are actively working on bringing a simple Docker build and publish pipeline for Documenso.
@@ -240,7 +234,7 @@ Now you can install the dependencies and build it:
 
 ```
 npm i
-npm run build:web
+npm run:build:web
 npm run prisma:migrate-deploy
 ```
 

apps/marketing/next.config.js

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const fs = require('fs');
 const path = require('path');
 const { withContentlayer } = require('next-contentlayer');
 
@@ -11,31 +10,16 @@ ENV_FILES.forEach((file) => {
   });
 });
 
-// !: This is a temp hack to get caveat working without placing it back in the public directory.
-// !: By inlining this at build time we should be able to sign faster.
-const FONT_CAVEAT_BYTES = fs.readFileSync(
-  path.join(__dirname, '../../packages/assets/fonts/caveat.ttf'),
-);
-
 /** @type {import('next').NextConfig} */
 const config = {
   experimental: {
+    serverActionsBodySizeLimit: '10mb',
     outputFileTracingRoot: path.join(__dirname, '../../'),
-    serverActions: {
-      bodySizeLimit: '50mb',
-    },
   },
   reactStrictMode: true,
-  transpilePackages: [
-    '@documenso/assets',
-    '@documenso/lib',
-    '@documenso/tailwind-config',
-    '@documenso/trpc',
-    '@documenso/ui',
-  ],
+  transpilePackages: ['@documenso/lib', '@documenso/prisma', '@documenso/trpc', '@documenso/ui'],
   env: {
     NEXT_PUBLIC_PROJECT: 'marketing',
-    FONT_CAVEAT_URI: `data:font/ttf;base64,${FONT_CAVEAT_BYTES.toString('base64')}`,
   },
   modularizeImports: {
     'lucide-react': {

apps/marketing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/marketing",
-  "version": "1.2.1",
+  "version": "0.1.0",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
@@ -13,7 +13,6 @@
     "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
   "dependencies": {
-    "@documenso/assets": "*",
     "@documenso/lib": "*",
     "@documenso/tailwind-config": "*",
     "@documenso/trpc": "*",
@@ -24,8 +23,8 @@
     "lucide-react": "^0.279.0",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "14.0.3",
-    "next-auth": "4.24.5",
+    "next": "14.0.0",
+    "next-auth": "4.24.3",
     "next-contentlayer": "^0.3.4",
     "next-plausible": "^3.10.1",
     "perfect-freehand": "^1.2.0",
@@ -44,13 +43,5 @@
     "@types/node": "20.1.0",
     "@types/react": "18.2.18",
     "@types/react-dom": "18.2.7"
-  },
-  "overrides": {
-    "next-auth": {
-      "next": "$next"
-    },
-    "next-contentlayer": {
-      "next": "$next"
-    }
   }
 }

apps/marketing/src/app/(marketing)/pricing/page.tsx

@@ -1,5 +1,3 @@
-'use client';
-
 import Link from 'next/link';
 
 import {

apps/marketing/src/app/(marketing)/singleplayer/client.tsx

@@ -8,23 +8,23 @@ import { useRouter } from 'next/navigation';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { base64 } from '@documenso/lib/universal/base64';
 import { putFile } from '@documenso/lib/universal/upload/put-file';
-import type { Field, Recipient } from '@documenso/prisma/client';
-import { DocumentDataType, Prisma } from '@documenso/prisma/client';
-import { trpc } from '@documenso/trpc/react';
+import { DocumentDataType, Field, Prisma, Recipient } from '@documenso/prisma/client';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';
 import { AddFieldsFormPartial } from '@documenso/ui/primitives/document-flow/add-fields';
-import type { TAddFieldsFormSchema } from '@documenso/ui/primitives/document-flow/add-fields.types';
+import { TAddFieldsFormSchema } from '@documenso/ui/primitives/document-flow/add-fields.types';
 import { AddSignatureFormPartial } from '@documenso/ui/primitives/document-flow/add-signature';
-import type { TAddSignatureFormSchema } from '@documenso/ui/primitives/document-flow/add-signature.types';
+import { TAddSignatureFormSchema } from '@documenso/ui/primitives/document-flow/add-signature.types';
 import {
   DocumentFlowFormContainer,
   DocumentFlowFormContainerHeader,
 } from '@documenso/ui/primitives/document-flow/document-flow-root';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
+import { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { createSinglePlayerDocument } from '~/components/(marketing)/single-player-mode/create-single-player-document.action';
+
 type SinglePlayerModeStep = 'fields' | 'sign';
 
 // !: This entire file is a hack to get around failed prerendering of
@@ -41,9 +41,6 @@ export const SinglePlayerClient = () => {
   const [step, setStep] = useState<SinglePlayerModeStep>('fields');
   const [fields, setFields] = useState<Field[]>([]);
 
-  const { mutateAsync: createSinglePlayerDocument } =
-    trpc.singleplayer.createSinglePlayerDocument.useMutation();
-
   const documentFlow: Record<SinglePlayerModeStep, DocumentFlowStep> = {
     fields: {
       title: 'Add document',

apps/marketing/src/components/(marketing)/footer.tsx

@@ -5,13 +5,14 @@ import type { HTMLAttributes } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
 
+import { Moon, Sun } from 'lucide-react';
+import { useTheme } from 'next-themes';
 import { FaXTwitter } from 'react-icons/fa6';
 import { LiaDiscord } from 'react-icons/lia';
 import { LuGithub } from 'react-icons/lu';
 
 import LogoImage from '@documenso/assets/logo.png';
 import { cn } from '@documenso/ui/lib/utils';
-import { ThemeSwitcher } from '@documenso/ui/primitives/theme-switcher';
 
 export type FooterProps = HTMLAttributes<HTMLDivElement>;
 
@@ -35,6 +36,8 @@ const FOOTER_LINKS = [
 ];
 
 export const Footer = ({ className, ...props }: FooterProps) => {
+  const { setTheme } = useTheme();
+
   return (
     <div className={cn('border-t py-12', className)} {...props}>
       <div className="mx-auto flex w-full max-w-screen-xl flex-wrap items-start justify-between gap-8 px-8">
@@ -76,13 +79,21 @@ export const Footer = ({ className, ...props }: FooterProps) => {
           ))}
         </div>
       </div>
-      <div className="mx-auto mt-4 flex w-full max-w-screen-xl flex-wrap items-center justify-between gap-4 px-8 md:mt-12 lg:mt-24">
+      <div className="mx-auto mt-4 flex w-full max-w-screen-xl flex-wrap justify-between gap-4 px-8 md:mt-12 lg:mt-24">
         <p className="text-muted-foreground text-sm">
           © {new Date().getFullYear()} Documenso, Inc. All rights reserved.
         </p>
 
-        <div className="flex flex-wrap">
-          <ThemeSwitcher />
+        <div className="flex flex-wrap items-center gap-x-4 gap-y-2.5">
+          <button type="button" className="text-muted-foreground" onClick={() => setTheme('light')}>
+            <Sun className="h-5 w-5" />
+            <span className="sr-only">Light</span>
+          </button>
+
+          <button type="button" className="text-muted-foreground" onClick={() => setTheme('dark')}>
+            <Moon className="h-5 w-5" />
+            <span className="sr-only">Dark</span>
+          </button>
         </div>
       </div>
     </div>

apps/marketing/src/components/(marketing)/single-player-mode/create-single-player-document.action.ts

@@ -0,0 +1,233 @@
+'use server';
+
+import { createElement } from 'react';
+
+import { DateTime } from 'luxon';
+import { PDFDocument } from 'pdf-lib';
+import { match } from 'ts-pattern';
+import { z } from 'zod';
+
+import { mailer } from '@documenso/email/mailer';
+import { render } from '@documenso/email/render';
+import { DocumentSelfSignedEmailTemplate } from '@documenso/email/templates/document-self-signed';
+import { FROM_ADDRESS, FROM_NAME, SERVICE_USER_EMAIL } from '@documenso/lib/constants/email';
+import { insertFieldInPDF } from '@documenso/lib/server-only/pdf/insert-field-in-pdf';
+import { alphaid } from '@documenso/lib/universal/id';
+import { getFile } from '@documenso/lib/universal/upload/get-file';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
+import { prisma } from '@documenso/prisma';
+import {
+  DocumentDataType,
+  DocumentStatus,
+  FieldType,
+  Prisma,
+  ReadStatus,
+  SendStatus,
+  SigningStatus,
+} from '@documenso/prisma/client';
+import { signPdf } from '@documenso/signing';
+
+const ZCreateSinglePlayerDocumentSchema = z.object({
+  documentData: z.object({
+    data: z.string(),
+    type: z.nativeEnum(DocumentDataType),
+  }),
+  documentName: z.string(),
+  signer: z.object({
+    email: z.string().email().min(1),
+    name: z.string(),
+    signature: z.string(),
+  }),
+  fields: z.array(
+    z.object({
+      page: z.number(),
+      type: z.nativeEnum(FieldType),
+      positionX: z.number(),
+      positionY: z.number(),
+      width: z.number(),
+      height: z.number(),
+    }),
+  ),
+});
+
+export type TCreateSinglePlayerDocumentSchema = z.infer<typeof ZCreateSinglePlayerDocumentSchema>;
+
+/**
+ * Create and self signs a document.
+ *
+ * Returns the document token.
+ */
+export const createSinglePlayerDocument = async (
+  value: TCreateSinglePlayerDocumentSchema,
+): Promise<string> => {
+  const { signer, fields, documentData, documentName } =
+    ZCreateSinglePlayerDocumentSchema.parse(value);
+
+  const document = await getFile({
+    data: documentData.data,
+    type: documentData.type,
+  });
+
+  const doc = await PDFDocument.load(document);
+  const createdAt = new Date();
+
+  const isBase64 = signer.signature.startsWith('data:image/png;base64,');
+  const signatureImageAsBase64 = isBase64 ? signer.signature : null;
+  const typedSignature = !isBase64 ? signer.signature : null;
+
+  // Update the document with the fields inserted.
+  for (const field of fields) {
+    const isSignatureField = field.type === FieldType.SIGNATURE;
+
+    await insertFieldInPDF(doc, {
+      ...mapField(field, signer),
+      Signature: isSignatureField
+        ? {
+            created: createdAt,
+            signatureImageAsBase64,
+            typedSignature,
+            // Dummy data.
+            id: -1,
+            recipientId: -1,
+            fieldId: -1,
+          }
+        : null,
+      // Dummy data.
+      id: -1,
+      documentId: -1,
+      recipientId: -1,
+    });
+  }
+
+  const unsignedPdfBytes = await doc.save();
+
+  const signedPdfBuffer = await signPdf({ pdf: Buffer.from(unsignedPdfBytes) });
+
+  const { token } = await prisma.$transaction(
+    async (tx) => {
+      const token = alphaid();
+
+      // Fetch service user who will be the owner of the document.
+      const serviceUser = await tx.user.findFirstOrThrow({
+        where: {
+          email: SERVICE_USER_EMAIL,
+        },
+      });
+
+      const { id: documentDataId } = await putFile({
+        name: `${documentName}.pdf`,
+        type: 'application/pdf',
+        arrayBuffer: async () => Promise.resolve(signedPdfBuffer),
+      });
+
+      // Create document.
+      const document = await tx.document.create({
+        data: {
+          title: documentName,
+          status: DocumentStatus.COMPLETED,
+          documentDataId,
+          userId: serviceUser.id,
+          createdAt,
+        },
+      });
+
+      // Create recipient.
+      const recipient = await tx.recipient.create({
+        data: {
+          documentId: document.id,
+          name: signer.name,
+          email: signer.email,
+          token,
+          signedAt: createdAt,
+          readStatus: ReadStatus.OPENED,
+          signingStatus: SigningStatus.SIGNED,
+          sendStatus: SendStatus.SENT,
+        },
+      });
+
+      // Create fields and signatures.
+      await Promise.all(
+        fields.map(async (field) => {
+          const insertedField = await tx.field.create({
+            data: {
+              documentId: document.id,
+              recipientId: recipient.id,
+              ...mapField(field, signer),
+            },
+          });
+
+          if (field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE) {
+            await tx.signature.create({
+              data: {
+                fieldId: insertedField.id,
+                signatureImageAsBase64,
+                typedSignature,
+                recipientId: recipient.id,
+              },
+            });
+          }
+        }),
+      );
+
+      return { document, token };
+    },
+    {
+      maxWait: 5000,
+      timeout: 30000,
+    },
+  );
+
+  const template = createElement(DocumentSelfSignedEmailTemplate, {
+    documentName: documentName,
+    assetBaseUrl: process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000',
+  });
+
+  // Send email to signer.
+  await mailer.sendMail({
+    to: {
+      address: signer.email,
+      name: signer.name,
+    },
+    from: {
+      name: FROM_NAME,
+      address: FROM_ADDRESS,
+    },
+    subject: 'Document signed',
+    html: render(template),
+    text: render(template, { plainText: true }),
+    attachments: [{ content: signedPdfBuffer, filename: documentName }],
+  });
+
+  return token;
+};
+
+/**
+ * Map the fields provided by the user to fields compatible with Prisma.
+ *
+ * Signature fields are handled separately.
+ *
+ * @param field The field passed in by the user.
+ * @param signer The details of the person who is signing this document.
+ * @returns A field compatible with Prisma.
+ */
+const mapField = (
+  field: TCreateSinglePlayerDocumentSchema['fields'][number],
+  signer: TCreateSinglePlayerDocumentSchema['signer'],
+) => {
+  const customText = match(field.type)
+    .with(FieldType.DATE, () => DateTime.now().toFormat('yyyy-MM-dd hh:mm a'))
+    .with(FieldType.EMAIL, () => signer.email)
+    .with(FieldType.NAME, () => signer.name)
+    .otherwise(() => '');
+
+  return {
+    type: field.type,
+    page: field.page,
+    positionX: new Prisma.Decimal(field.positionX),
+    positionY: new Prisma.Decimal(field.positionY),
+    width: new Prisma.Decimal(field.width),
+    height: new Prisma.Decimal(field.height),
+    customText,
+    inserted: true,
+  };
+};

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

@@ -2,10 +2,6 @@ import * as trpcNext from '@documenso/trpc/server/adapters/next';
 import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 
-export const config = {
-  maxDuration: 60,
-};
-
 export default trpcNext.createNextApiHandler({
   router: appRouter,
   createContext: async ({ req, res }) => createTrpcContext({ req, res }),

apps/web/next.config.js

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const fs = require('fs');
 const path = require('path');
 const { version } = require('./package.json');
 
@@ -11,35 +10,24 @@ ENV_FILES.forEach((file) => {
   });
 });
 
-// !: This is a temp hack to get caveat working without placing it back in the public directory.
-// !: By inlining this at build time we should be able to sign faster.
-const FONT_CAVEAT_BYTES = fs.readFileSync(
-  path.join(__dirname, '../../packages/assets/fonts/caveat.ttf'),
-);
-
 /** @type {import('next').NextConfig} */
 const config = {
   output: process.env.DOCKER_OUTPUT ? 'standalone' : undefined,
   experimental: {
     outputFileTracingRoot: path.join(__dirname, '../../'),
-    serverActions: {
-      bodySizeLimit: '50mb',
-    },
+    serverActionsBodySizeLimit: '50mb',
   },
   reactStrictMode: true,
   transpilePackages: [
-    '@documenso/assets',
-    '@documenso/ee',
     '@documenso/lib',
     '@documenso/prisma',
-    '@documenso/tailwind-config',
     '@documenso/trpc',
     '@documenso/ui',
+    '@documenso/email',
   ],
   env: {
     APP_VERSION: version,
     NEXT_PUBLIC_PROJECT: 'web',
-    FONT_CAVEAT_URI: `data:font/ttf;base64,${FONT_CAVEAT_BYTES.toString('base64')}`,
   },
   modularizeImports: {
     'lucide-react': {

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.2.1",
+  "version": "0.1.0",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
@@ -13,7 +13,6 @@
     "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
   "dependencies": {
-    "@documenso/assets": "*",
     "@documenso/ee": "*",
     "@documenso/lib": "*",
     "@documenso/prisma": "*",
@@ -27,8 +26,8 @@
     "lucide-react": "^0.279.0",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "14.0.3",
-    "next-auth": "4.24.5",
+    "next": "14.0.0",
+    "next-auth": "4.24.3",
     "next-plausible": "^3.10.1",
     "next-themes": "^0.2.1",
     "perfect-freehand": "^1.2.0",
@@ -44,7 +43,6 @@
     "sharp": "0.32.5",
     "ts-pattern": "^5.0.5",
     "typescript": "5.2.2",
-    "uqr": "^0.1.2",
     "zod": "^3.22.4"
   },
   "devDependencies": {
@@ -53,13 +51,5 @@
     "@types/node": "20.1.0",
     "@types/react": "18.2.18",
     "@types/react-dom": "18.2.7"
-  },
-  "overrides": {
-    "next-auth": {
-      "next": "$next"
-    },
-    "next-contentlayer": {
-      "next": "$next"
-    }
   }
 }

apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx

@@ -4,28 +4,28 @@ import { useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import type { DocumentData, Field, Recipient, User } from '@documenso/prisma/client';
-import { DocumentStatus } from '@documenso/prisma/client';
-import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
-import { trpc } from '@documenso/trpc/react';
+import { DocumentData, Field, Recipient, User } from '@documenso/prisma/client';
+import { DocumentWithData } from '@documenso/prisma/types/document-with-data';
 import { cn } from '@documenso/ui/lib/utils';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { AddFieldsFormPartial } from '@documenso/ui/primitives/document-flow/add-fields';
-import type { TAddFieldsFormSchema } from '@documenso/ui/primitives/document-flow/add-fields.types';
+import { TAddFieldsFormSchema } from '@documenso/ui/primitives/document-flow/add-fields.types';
 import { AddSignersFormPartial } from '@documenso/ui/primitives/document-flow/add-signers';
-import type { TAddSignersFormSchema } from '@documenso/ui/primitives/document-flow/add-signers.types';
+import { TAddSignersFormSchema } from '@documenso/ui/primitives/document-flow/add-signers.types';
 import { AddSubjectFormPartial } from '@documenso/ui/primitives/document-flow/add-subject';
-import type { TAddSubjectFormSchema } from '@documenso/ui/primitives/document-flow/add-subject.types';
-import { AddTitleFormPartial } from '@documenso/ui/primitives/document-flow/add-title';
-import type { TAddTitleFormSchema } from '@documenso/ui/primitives/document-flow/add-title.types';
+import { TAddSubjectFormSchema } from '@documenso/ui/primitives/document-flow/add-subject.types';
 import {
   DocumentFlowFormContainer,
   DocumentFlowFormContainerHeader,
 } from '@documenso/ui/primitives/document-flow/document-flow-root';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
+import { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { addFields } from '~/components/forms/edit-document/add-fields.action';
+import { addSigners } from '~/components/forms/edit-document/add-signers.action';
+import { completeDocument } from '~/components/forms/edit-document/add-subject.action';
+
 export type EditDocumentFormProps = {
   className?: string;
   user: User;
@@ -35,7 +35,7 @@ export type EditDocumentFormProps = {
   documentData: DocumentData;
 };
 
-type EditDocumentStep = 'title' | 'signers' | 'fields' | 'subject';
+type EditDocumentStep = 'signers' | 'fields' | 'subject';
 
 export const EditDocumentForm = ({
   className,
@@ -48,65 +48,30 @@ export const EditDocumentForm = ({
   const { toast } = useToast();
   const router = useRouter();
 
-  const [step, setStep] = useState<EditDocumentStep>(
-    document.status === DocumentStatus.DRAFT ? 'title' : 'signers',
-  );
-
-  const { mutateAsync: addTitle } = trpc.document.setTitleForDocument.useMutation();
-  const { mutateAsync: addFields } = trpc.field.addFields.useMutation();
-  const { mutateAsync: addSigners } = trpc.recipient.addSigners.useMutation();
-  const { mutateAsync: sendDocument } = trpc.document.sendDocument.useMutation();
+  const [step, setStep] = useState<EditDocumentStep>('signers');
 
   const documentFlow: Record<EditDocumentStep, DocumentFlowStep> = {
-    title: {
-      title: 'Add Title',
-      description: 'Add the title to the document.',
-      stepIndex: 1,
-    },
     signers: {
       title: 'Add Signers',
       description: 'Add the people who will sign the document.',
-      stepIndex: 2,
-      onBackStep: () => document.status === DocumentStatus.DRAFT && setStep('title'),
+      stepIndex: 1,
     },
     fields: {
       title: 'Add Fields',
       description: 'Add all relevant fields for each recipient.',
-      stepIndex: 3,
+      stepIndex: 2,
       onBackStep: () => setStep('signers'),
     },
     subject: {
       title: 'Add Subject',
       description: 'Add the subject and message you wish to send to signers.',
-      stepIndex: 4,
+      stepIndex: 3,
       onBackStep: () => setStep('fields'),
     },
   };
 
   const currentDocumentFlow = documentFlow[step];
 
-  const onAddTitleFormSubmit = async (data: TAddTitleFormSchema) => {
-    try {
-      // Custom invocation server action
-      await addTitle({
-        documentId: document.id,
-        title: data.title,
-      });
-
-      router.refresh();
-
-      setStep('signers');
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: 'Error',
-        description: 'An error occurred while updating title.',
-        variant: 'destructive',
-      });
-    }
-  };
-
   const onAddSignersFormSubmit = async (data: TAddSignersFormSchema) => {
     try {
       // Custom invocation server action
@@ -155,7 +120,7 @@ export const EditDocumentForm = ({
     const { subject, message } = data.email;
 
     try {
-      await sendDocument({
+      await completeDocument({
         documentId: document.id,
         email: {
           subject,
@@ -193,32 +158,16 @@ export const EditDocumentForm = ({
       </Card>
 
       <div className="col-span-12 lg:col-span-6 xl:col-span-5">
-        <DocumentFlowFormContainer
-          className="lg:h-[calc(100vh-6rem)]"
-          onSubmit={(e) => e.preventDefault()}
-        >
+        <DocumentFlowFormContainer onSubmit={(e) => e.preventDefault()}>
           <DocumentFlowFormContainerHeader
             title={currentDocumentFlow.title}
             description={currentDocumentFlow.description}
           />
 
-          {step === 'title' && (
-            <AddTitleFormPartial
-              key={recipients.length}
-              documentFlow={documentFlow.title}
-              recipients={recipients}
-              fields={fields}
-              document={document}
-              numberOfSteps={Object.keys(documentFlow).length}
-              onSubmit={onAddTitleFormSubmit}
-            />
-          )}
-
           {step === 'signers' && (
             <AddSignersFormPartial
               key={recipients.length}
               documentFlow={documentFlow.signers}
-              document={document}
               recipients={recipients}
               fields={fields}
               numberOfSteps={Object.keys(documentFlow).length}

apps/web/src/app/(dashboard)/documents/[id]/page.tsx

@@ -43,11 +43,11 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
   const { documentData } = document;
 
   const [recipients, fields] = await Promise.all([
-    getRecipientsForDocument({
+    await getRecipientsForDocument({
       documentId,
       userId: user.id,
     }),
-    getFieldsForDocument({
+    await getFieldsForDocument({
       documentId,
       userId: user.id,
     }),

apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx

@@ -4,7 +4,6 @@ import { useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { History } from 'lucide-react';
-import { useSession } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 import * as z from 'zod';
 
@@ -55,14 +54,11 @@ export const ResendDocumentActionItem = ({
   document,
   recipients,
 }: ResendDocumentActionItemProps) => {
-  const { data: session } = useSession();
   const { toast } = useToast();
 
   const [isOpen, setIsOpen] = useState(false);
-  const isOwner = document.userId === session?.user?.id;
 
   const isDisabled =
-    !isOwner ||
     document.status !== 'PENDING' ||
     !recipients.some((r) => r.signingStatus === SigningStatus.NOT_SIGNED);
 

apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx

@@ -62,10 +62,9 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
     });
 
     const link = window.document.createElement('a');
-    const baseTitle = row.title.includes('.pdf') ? row.title.split('.pdf')[0] : row.title;
 
     link.href = window.URL.createObjectURL(blob);
-    link.download = baseTitle ? `${baseTitle}_signed.pdf` : 'document.pdf';
+    link.download = row.title || 'document.pdf';
 
     link.click();
 

apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx

@@ -88,10 +88,9 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
     });
 
     const link = window.document.createElement('a');
-    const baseTitle = row.title.includes('.pdf') ? row.title.split('.pdf')[0] : row.title;
 
     link.href = window.URL.createObjectURL(blob);
-    link.download = baseTitle ? `${baseTitle}_signed.pdf` : 'document.pdf';
+    link.download = row.title || 'document.pdf';
 
     link.click();
 

apps/web/src/app/(dashboard)/documents/data-table.tsx

@@ -6,8 +6,8 @@ import { Loader } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import type { FindResultSet } from '@documenso/lib/types/find-result-set';
-import type { Document, Recipient, User } from '@documenso/prisma/client';
+import { FindResultSet } from '@documenso/lib/types/find-result-set';
+import { Document, Recipient, User } from '@documenso/prisma/client';
 import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
 

apps/web/src/app/(dashboard)/documents/upload-document.tsx

@@ -6,7 +6,6 @@ import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
-import { useSession } from 'next-auth/react';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
@@ -23,7 +22,6 @@ export type UploadDocumentProps = {
 
 export const UploadDocument = ({ className }: UploadDocumentProps) => {
   const router = useRouter();
-  const { data: session } = useSession();
 
   const { toast } = useToast();
 
@@ -81,7 +79,7 @@ export const UploadDocument = ({ className }: UploadDocumentProps) => {
     <div className={cn('relative', className)}>
       <DocumentDropzone
         className="min-h-[40vh]"
-        disabled={remaining.documents === 0 || !session?.user.emailVerified}
+        disabled={remaining.documents === 0}
         onDrop={onFileDrop}
       />
 

apps/web/src/app/(dashboard)/layout.tsx

@@ -9,7 +9,6 @@ import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 
 import { Header } from '~/components/(dashboard)/layout/header';
-import { VerifyEmailBanner } from '~/components/(dashboard)/layout/verify-email-banner';
 import { RefreshOnFocus } from '~/components/(dashboard)/refresh-on-focus/refresh-on-focus';
 import { NextAuthProvider } from '~/providers/next-auth';
 
@@ -31,7 +30,6 @@ export default async function AuthenticatedDashboardLayout({
   return (
     <NextAuthProvider session={session}>
       <LimitsProvider>
-        {!user.emailVerified && <VerifyEmailBanner email={user.email} />}
         <Header user={user} />
 
         <main className="mt-8 pb-8 md:mt-12 md:pb-12">{children}</main>

apps/web/src/app/(dashboard)/settings/billing/page.tsx

@@ -41,7 +41,7 @@ export default async function BillingSettingsPage() {
 
   return (
     <div>
-      <h3 className="text-2xl font-semibold">Billing</h3>
+      <h3 className="text-lg font-medium">Billing</h3>
 
       <div className="text-muted-foreground mt-2 text-sm">
         {isMissingOrInactiveOrFreePlan && (

apps/web/src/app/(dashboard)/settings/password/page.tsx

@@ -1,5 +1,19 @@
-import { redirect } from 'next/navigation';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 
-export default function PasswordSettingsPage() {
-  redirect('/settings/security');
+import { PasswordForm } from '~/components/forms/password';
+
+export default async function PasswordSettingsPage() {
+  const { user } = await getRequiredServerComponentSession();
+
+  return (
+    <div>
+      <h3 className="text-lg font-medium">Password</h3>
+
+      <p className="text-muted-foreground mt-2 text-sm">Here you can update your password.</p>
+
+      <hr className="my-4" />
+
+      <PasswordForm user={user} className="max-w-xl" />
+    </div>
+  );
 }

apps/web/src/app/(dashboard)/settings/profile/page.tsx

@@ -7,7 +7,7 @@ export default async function ProfileSettingsPage() {
 
   return (
     <div>
-      <h3 className="text-2xl font-semibold">Profile</h3>
+      <h3 className="text-lg font-medium">Profile</h3>
 
       <p className="text-muted-foreground mt-2 text-sm">Here you can edit your personal details.</p>
 

apps/web/src/app/(dashboard)/settings/security/page.tsx

@@ -1,46 +0,0 @@
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-
-import { AuthenticatorApp } from '~/components/forms/2fa/authenticator-app';
-import { RecoveryCodes } from '~/components/forms/2fa/recovery-codes';
-import { PasswordForm } from '~/components/forms/password';
-
-export default async function SecuritySettingsPage() {
-  const { user } = await getRequiredServerComponentSession();
-
-  return (
-    <div>
-      <h3 className="text-2xl font-semibold">Security</h3>
-
-      <p className="text-muted-foreground mt-2 text-sm">
-        Here you can manage your password and security settings.
-      </p>
-
-      <hr className="my-4" />
-
-      <PasswordForm user={user} className="max-w-xl" />
-
-      <hr className="mb-4 mt-8" />
-
-      <h4 className="text-lg font-medium">Two Factor Authentication</h4>
-
-      <p className="text-muted-foreground mt-2 text-sm">
-        Add and manage your two factor security settings to add an extra layer of security to your
-        account!
-      </p>
-
-      <div className="mt-4 max-w-xl">
-        <h5 className="font-medium">Two-factor methods</h5>
-
-        <AuthenticatorApp isTwoFactorEnabled={user.twoFactorEnabled} />
-      </div>
-
-      {user.twoFactorEnabled && (
-        <div className="mt-4 max-w-xl">
-          <h5 className="font-medium">Recovery methods</h5>
-
-          <RecoveryCodes isTwoFactorEnabled={user.twoFactorEnabled} />
-        </div>
-      )}
-    </div>
-  );
-}

apps/web/src/app/(signing)/sign/[token]/complete/page.tsx

@@ -2,7 +2,6 @@ import Link from 'next/link';
 import { notFound } from 'next/navigation';
 
 import { CheckCircle2, Clock8 } from 'lucide-react';
-import { getServerSession } from 'next-auth';
 import { match } from 'ts-pattern';
 
 import signingCelebration from '@documenso/assets/images/signing-celebration.png';
@@ -54,9 +53,6 @@ export default async function CompletedSigningPage({
     fields.find((field) => field.type === FieldType.NAME)?.customText ||
     recipient.email;
 
-  const sessionData = await getServerSession();
-  const isLoggedIn = !!sessionData?.user;
-
   return (
     <div className="-mx-4 flex max-w-[100vw] flex-col items-center overflow-x-hidden px-4 pt-24 md:-mx-8 md:px-8 lg:pt-36 xl:pt-44">
       {/* Card with recipient */}
@@ -109,21 +105,15 @@ export default async function CompletedSigningPage({
           />
         </div>
 
-        {isLoggedIn ? (
-          <Link href="/documents" className="text-documenso-700 hover:text-documenso-600 mt-36">
-            Go Back Home
+        <p className="text-muted-foreground/60 mt-36 text-sm">
+          Want to send slick signing links like this one?{' '}
+          <Link
+            href="https://documenso.com"
+            className="text-documenso-700 hover:text-documenso-600"
+          >
+            Check out Documenso.
           </Link>
-        ) : (
-          <p className="text-muted-foreground/60 mt-36 text-sm">
-            Want to send slick signing links like this one?{' '}
-            <Link
-              href="https://documenso.com"
-              className="text-documenso-700 hover:text-documenso-600"
-            >
-              Check out Documenso.
-            </Link>
-          </p>
-        )}
+        </p>
       </div>
     </div>
   );

apps/web/src/app/(signing)/sign/[token]/form.tsx

@@ -7,9 +7,9 @@ import { useRouter } from 'next/navigation';
 import { useSession } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 
+import { completeDocumentWithToken } from '@documenso/lib/server-only/document/complete-document-with-token';
 import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
-import type { Document, Field, Recipient } from '@documenso/prisma/client';
-import { trpc } from '@documenso/trpc/react';
+import { Document, Field, Recipient } from '@documenso/prisma/client';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -34,9 +34,6 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =
   const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();
   const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
 
-  const { mutateAsync: completeDocumentWithToken } =
-    trpc.recipient.completeDocumentWithToken.useMutation();
-
   const {
     handleSubmit,
     formState: { isSubmitting },

apps/web/src/app/(signing)/sign/[token]/signature-field.tsx

@@ -6,8 +6,8 @@ import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
 
-import type { Recipient } from '@documenso/prisma/client';
-import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
+import { Recipient } from '@documenso/prisma/client';
+import { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
@@ -76,16 +76,10 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
         return;
       }
 
-      const value = source === 'local' && localSignature ? localSignature : providedSignature ?? '';
-
-      if (!value) {
-        return;
-      }
-
       await signFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
-        value,
+        value: source === 'local' && localSignature ? localSignature : providedSignature ?? '',
         isBase64: true,
       });
 

apps/web/src/app/(unauthenticated)/verify-email/[token]/page.tsx

@@ -1,97 +0,0 @@
-import Link from 'next/link';
-
-import { AlertTriangle, CheckCircle2, XCircle, XOctagon } from 'lucide-react';
-
-import { verifyEmail } from '@documenso/lib/server-only/user/verify-email';
-import { Button } from '@documenso/ui/primitives/button';
-
-export type PageProps = {
-  params: {
-    token: string;
-  };
-};
-
-export default async function VerifyEmailPage({ params: { token } }: PageProps) {
-  if (!token) {
-    return (
-      <div className="w-full">
-        <div className="mb-4 text-red-300">
-          <XOctagon />
-        </div>
-
-        <h2 className="text-4xl font-semibold">No token provided</h2>
-        <p className="text-muted-foreground mt-2 text-base">
-          It seems that there is no token provided. Please check your email and try again.
-        </p>
-      </div>
-    );
-  }
-
-  const verified = await verifyEmail({ token });
-
-  if (verified === null) {
-    return (
-      <div className="flex w-full items-start">
-        <div className="mr-4 mt-1 hidden md:block">
-          <AlertTriangle className="h-10 w-10 text-yellow-500" strokeWidth={2} />
-        </div>
-
-        <div>
-          <h2 className="text-2xl font-bold md:text-4xl">Something went wrong</h2>
-
-          <p className="text-muted-foreground mt-4">
-            We were unable to verify your email. If your email is not verified already, please try
-            again.
-          </p>
-
-          <Button className="mt-4" asChild>
-            <Link href="/">Go back home</Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (!verified) {
-    return (
-      <div className="flex w-full items-start">
-        <div className="mr-4 mt-1 hidden md:block">
-          <XCircle className="text-destructive h-10 w-10" strokeWidth={2} />
-        </div>
-
-        <div>
-          <h2 className="text-2xl font-bold md:text-4xl">Your token has expired!</h2>
-
-          <p className="text-muted-foreground mt-4">
-            It seems that the provided token has expired. We've just sent you another token, please
-            check your email and try again.
-          </p>
-
-          <Button className="mt-4" asChild>
-            <Link href="/">Go back home</Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex w-full items-start">
-      <div className="mr-4 mt-1 hidden md:block">
-        <CheckCircle2 className="h-10 w-10 text-green-500" strokeWidth={2} />
-      </div>
-
-      <div>
-        <h2 className="text-2xl font-bold md:text-4xl">Email Confirmed!</h2>
-
-        <p className="text-muted-foreground mt-4">
-          Your email has been successfully confirmed! You can now use all features of Documenso.
-        </p>
-
-        <Button className="mt-4" asChild>
-          <Link href="/">Go back home</Link>
-        </Button>
-      </div>
-    </div>
-  );
-}

apps/web/src/app/(unauthenticated)/verify-email/page.tsx

@@ -1,28 +0,0 @@
-import Link from 'next/link';
-
-import { XCircle } from 'lucide-react';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-export default function EmailVerificationWithoutTokenPage() {
-  return (
-    <div className="flex w-full items-start">
-      <div className="mr-4 mt-1 hidden md:block">
-        <XCircle className="text-destructive h-10 w-10" strokeWidth={2} />
-      </div>
-
-      <div>
-        <h2 className="text-2xl font-bold md:text-4xl">Uh oh! Looks like you're missing a token</h2>
-
-        <p className="text-muted-foreground mt-4">
-          It seems that there is no token provided, if you are trying to verify your email please
-          follow the link in your email.
-        </p>
-
-        <Button className="mt-4" asChild>
-          <Link href="/">Go back home</Link>
-        </Button>
-      </div>
-    </div>
-  );
-}

apps/web/src/app/layout.tsx

@@ -12,6 +12,7 @@ import { Toaster } from '@documenso/ui/primitives/toaster';
 import { TooltipProvider } from '@documenso/ui/primitives/tooltip';
 
 import { ThemeProvider } from '~/providers/next-theme';
+import { PlausibleProvider } from '~/providers/plausible';
 import { PostHogPageview } from '~/providers/posthog';
 
 import './globals.css';
@@ -68,11 +69,13 @@ export default async function RootLayout({ children }: { children: React.ReactNo
       <body>
         <LocaleProvider locale={locale}>
           <FeatureFlagProvider initialFlags={flags}>
-            <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-              <TooltipProvider>
-                <TrpcProvider>{children}</TrpcProvider>
-              </TooltipProvider>
-            </ThemeProvider>
+            <PlausibleProvider>
+              <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
+                <TooltipProvider>
+                  <TrpcProvider>{children}</TrpcProvider>
+                </TooltipProvider>
+              </ThemeProvider>
+            </PlausibleProvider>
 
             <Toaster />
           </FeatureFlagProvider>

apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx

@@ -1,46 +0,0 @@
-'use client';
-
-import React from 'react';
-
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
-import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
-import type { Recipient } from '@documenso/prisma/client';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { StackAvatar } from './stack-avatar';
-
-export type AvatarWithRecipientProps = {
-  recipient: Recipient;
-};
-
-export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) {
-  const [, copy] = useCopyToClipboard();
-  const { toast } = useToast();
-
-  const onRecipientClick = () => {
-    void copy(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`).then(() => {
-      toast({
-        title: 'Copied to clipboard',
-        description: 'The signing link has been copied to your clipboard.',
-      });
-    });
-  };
-
-  return (
-    <div className="my-1 flex cursor-pointer items-center gap-2" onClick={onRecipientClick}>
-      <StackAvatar
-        first={true}
-        key={recipient.id}
-        type={getRecipientType(recipient)}
-        fallbackText={recipientAbbreviation(recipient)}
-      />
-      <span
-        className="text-muted-foreground text-sm hover:underline"
-        title="Click to copy signing link for sending to recipient"
-      >
-        {recipient.email}
-      </span>
-    </div>
-  );
-}

apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx

@@ -1,6 +1,6 @@
 import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
 import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
-import type { Recipient } from '@documenso/prisma/client';
+import { Recipient } from '@documenso/prisma/client';
 import {
   Tooltip,
   TooltipContent,
@@ -8,7 +8,6 @@ import {
   TooltipTrigger,
 } from '@documenso/ui/primitives/tooltip';
 
-import { AvatarWithRecipient } from './avatar-with-recipient';
 import { StackAvatar } from './stack-avatar';
 import { StackAvatars } from './stack-avatars';
 
@@ -69,7 +68,15 @@ export const StackAvatarsWithTooltip = ({
               <div>
                 <h1 className="text-base font-medium">Waiting</h1>
                 {waitingRecipients.map((recipient: Recipient) => (
-                  <AvatarWithRecipient key={recipient.id} recipient={recipient} />
+                  <div key={recipient.id} className="my-1 flex items-center gap-2">
+                    <StackAvatar
+                      first={true}
+                      key={recipient.id}
+                      type={getRecipientType(recipient)}
+                      fallbackText={recipientAbbreviation(recipient)}
+                    />
+                    <span className="text-muted-foreground text-sm">{recipient.email}</span>
+                  </div>
                 ))}
               </div>
             )}
@@ -78,7 +85,15 @@ export const StackAvatarsWithTooltip = ({
               <div>
                 <h1 className="text-base font-medium">Opened</h1>
                 {openedRecipients.map((recipient: Recipient) => (
-                  <AvatarWithRecipient key={recipient.id} recipient={recipient} />
+                  <div key={recipient.id} className="my-1 flex items-center gap-2">
+                    <StackAvatar
+                      first={true}
+                      key={recipient.id}
+                      type={getRecipientType(recipient)}
+                      fallbackText={recipientAbbreviation(recipient)}
+                    />
+                    <span className="text-muted-foreground text-sm">{recipient.email}</span>
+                  </div>
                 ))}
               </div>
             )}
@@ -87,7 +102,15 @@ export const StackAvatarsWithTooltip = ({
               <div>
                 <h1 className="text-base font-medium">Uncompleted</h1>
                 {uncompletedRecipients.map((recipient: Recipient) => (
-                  <AvatarWithRecipient key={recipient.id} recipient={recipient} />
+                  <div key={recipient.id} className="my-1 flex items-center gap-2">
+                    <StackAvatar
+                      first={true}
+                      key={recipient.id}
+                      type={getRecipientType(recipient)}
+                      fallbackText={recipientAbbreviation(recipient)}
+                    />
+                    <span className="text-muted-foreground text-sm">{recipient.email}</span>
+                  </div>
                 ))}
               </div>
             )}

apps/web/src/components/(dashboard)/layout/desktop-nav.tsx

@@ -1,7 +1,6 @@
 'use client';
 
-import type { HTMLAttributes } from 'react';
-import { useEffect, useState } from 'react';
+import { HTMLAttributes, useState } from 'react';
 
 import { Search } from 'lucide-react';
 
@@ -15,14 +14,6 @@ export type DesktopNavProps = HTMLAttributes<HTMLDivElement>;
 export const DesktopNav = ({ className, ...props }: DesktopNavProps) => {
   // const pathname = usePathname();
   const [open, setOpen] = useState(false);
-  const [modifierKey, setModifierKey] = useState(() => 'Ctrl');
-
-  useEffect(() => {
-    const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : 'unknown';
-    const isMacOS = /Macintosh|Mac\s+OS\s+X/i.test(userAgent);
-
-    setModifierKey(isMacOS ? '⌘' : 'Ctrl');
-  }, []);
 
   return (
     <div
@@ -42,8 +33,8 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => {
         </div>
 
         <div>
-          <div className="text-muted-foreground bg-muted flex items-center rounded-md px-1.5 py-0.5  text-xs tracking-wider">
-            {modifierKey}+K
+          <div className="text-muted-foreground bg-muted rounded-md px-1.5 py-0.5 font-mono text-xs">
+            Ctrl+K
           </div>
         </div>
       </Button>

apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx

@@ -4,7 +4,7 @@ import Link from 'next/link';
 
 import {
   CreditCard,
-  Lock,
+  Key,
   LogOut,
   User as LucideUser,
   Monitor,
@@ -87,9 +87,9 @@ export const ProfileDropdown = ({ user }: ProfileDropdownProps) => {
         </DropdownMenuItem>
 
         <DropdownMenuItem asChild>
-          <Link href="/settings/security" className="cursor-pointer">
-            <Lock className="mr-2 h-4 w-4" />
-            Security
+          <Link href="/settings/password" className="cursor-pointer">
+            <Key className="mr-2 h-4 w-4" />
+            Password
           </Link>
         </DropdownMenuItem>
 

apps/web/src/components/(dashboard)/layout/verify-email-banner.tsx

@@ -1,123 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-
-import { AlertTriangle } from 'lucide-react';
-
-import { ONE_SECOND } from '@documenso/lib/constants/time';
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type VerifyEmailBannerProps = {
-  email: string;
-};
-
-const RESEND_CONFIRMATION_EMAIL_TIMEOUT = 20 * ONE_SECOND;
-
-export const VerifyEmailBanner = ({ email }: VerifyEmailBannerProps) => {
-  const { toast } = useToast();
-  const [isOpen, setIsOpen] = useState(false);
-
-  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
-
-  const { mutateAsync: sendConfirmationEmail, isLoading } =
-    trpc.profile.sendConfirmationEmail.useMutation();
-
-  const onResendConfirmationEmail = async () => {
-    try {
-      setIsButtonDisabled(true);
-
-      await sendConfirmationEmail({ email: email });
-
-      toast({
-        title: 'Success',
-        description: 'Verification email sent successfully.',
-      });
-
-      setIsOpen(false);
-      setTimeout(() => setIsButtonDisabled(false), RESEND_CONFIRMATION_EMAIL_TIMEOUT);
-    } catch (err) {
-      setIsButtonDisabled(false);
-
-      toast({
-        title: 'Error',
-        description: 'Something went wrong while sending the confirmation email.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  useEffect(() => {
-    // Check localStorage to see if we've recently automatically displayed the dialog
-    // if it was within the past 24 hours, don't show it again
-    // otherwise, show it again and update the localStorage timestamp
-    const emailVerificationDialogLastShown = localStorage.getItem(
-      'emailVerificationDialogLastShown',
-    );
-
-    if (emailVerificationDialogLastShown) {
-      const lastShownTimestamp = parseInt(emailVerificationDialogLastShown);
-
-      if (Date.now() - lastShownTimestamp < 24 * 60 * 60 * 1000) {
-        return;
-      }
-    }
-
-    setIsOpen(true);
-
-    localStorage.setItem('emailVerificationDialogLastShown', Date.now().toString());
-  }, []);
-
-  return (
-    <>
-      <div className="bg-yellow-200 dark:bg-yellow-400">
-        <div className="mx-auto flex max-w-screen-xl items-center justify-center gap-x-4 px-4 py-2 text-sm font-medium text-yellow-900">
-          <div className="flex items-center">
-            <AlertTriangle className="mr-2.5 h-5 w-5" />
-            Verify your email address to unlock all features.
-          </div>
-
-          <div>
-            <Button
-              variant="ghost"
-              className="h-auto px-2.5 py-1.5 text-yellow-900 hover:bg-yellow-100 hover:text-yellow-900 dark:hover:bg-yellow-500"
-              disabled={isButtonDisabled}
-              onClick={() => setIsOpen(true)}
-              size="sm"
-            >
-              {isButtonDisabled ? 'Verification Email Sent' : 'Verify Now'}
-            </Button>
-          </div>
-        </div>
-      </div>
-
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
-        <DialogContent>
-          <DialogTitle>Verify your email address</DialogTitle>
-
-          <DialogDescription>
-            We've sent a confirmation email to <strong>{email}</strong>. Please check your inbox and
-            click the link in the email to verify your account.
-          </DialogDescription>
-
-          <div>
-            <Button
-              disabled={isButtonDisabled}
-              loading={isLoading}
-              onClick={onResendConfirmationEmail}
-            >
-              {isLoading ? 'Sending...' : 'Resend Confirmation Email'}
-            </Button>
-          </div>
-        </DialogContent>
-      </Dialog>
-    </>
-  );
-};

apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx

@@ -5,7 +5,7 @@ import { HTMLAttributes } from 'react';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 
-import { CreditCard, Lock, User } from 'lucide-react';
+import { CreditCard, Key, User } from 'lucide-react';
 
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
 import { cn } from '@documenso/ui/lib/utils';
@@ -35,16 +35,16 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => {
         </Button>
       </Link>
 
-      <Link href="/settings/security">
+      <Link href="/settings/password">
         <Button
           variant="ghost"
           className={cn(
             'w-full justify-start',
-            pathname?.startsWith('/settings/security') && 'bg-secondary',
+            pathname?.startsWith('/settings/password') && 'bg-secondary',
           )}
         >
-          <Lock className="mr-2 h-5 w-5" />
-          Security
+          <Key className="mr-2 h-5 w-5" />
+          Password
         </Button>
       </Link>
 

apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx

@@ -5,7 +5,7 @@ import { HTMLAttributes } from 'react';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 
-import { CreditCard, Lock, User } from 'lucide-react';
+import { CreditCard, Key, User } from 'lucide-react';
 
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
 import { cn } from '@documenso/ui/lib/utils';
@@ -38,16 +38,16 @@ export const MobileNav = ({ className, ...props }: MobileNavProps) => {
         </Button>
       </Link>
 
-      <Link href="/settings/security">
+      <Link href="/settings/password">
         <Button
           variant="ghost"
           className={cn(
             'w-full justify-start',
-            pathname?.startsWith('/settings/security') && 'bg-secondary',
+            pathname?.startsWith('/settings/password') && 'bg-secondary',
           )}
         >
-          <Lock className="mr-2 h-5 w-5" />
-          Security
+          <Key className="mr-2 h-5 w-5" />
+          Password
         </Button>
       </Link>
 

apps/web/src/components/forms/2fa/authenticator-app.tsx

@@ -1,58 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-import { DisableAuthenticatorAppDialog } from './disable-authenticator-app-dialog';
-import { EnableAuthenticatorAppDialog } from './enable-authenticator-app-dialog';
-
-type AuthenticatorAppProps = {
-  isTwoFactorEnabled: boolean;
-};
-
-export const AuthenticatorApp = ({ isTwoFactorEnabled }: AuthenticatorAppProps) => {
-  const [modalState, setModalState] = useState<'enable' | 'disable' | null>(null);
-
-  const isEnableDialogOpen = modalState === 'enable';
-  const isDisableDialogOpen = modalState === 'disable';
-
-  return (
-    <>
-      <div className="mt-4 flex flex-col justify-between gap-4 rounded-lg border p-4 md:flex-row md:items-center md:gap-8">
-        <div className="flex-1">
-          <p>Authenticator app</p>
-
-          <p className="text-muted-foreground mt-2 max-w-[50ch] text-sm">
-            Create one-time passwords that serve as a secondary authentication method for confirming
-            your identity when requested during the sign-in process.
-          </p>
-        </div>
-
-        <div>
-          {isTwoFactorEnabled ? (
-            <Button variant="destructive" onClick={() => setModalState('disable')} size="sm">
-              Disable 2FA
-            </Button>
-          ) : (
-            <Button onClick={() => setModalState('enable')} size="sm">
-              Enable 2FA
-            </Button>
-          )}
-        </div>
-      </div>
-
-      <EnableAuthenticatorAppDialog
-        key={isEnableDialogOpen ? 'open' : 'closed'}
-        open={isEnableDialogOpen}
-        onOpenChange={(open) => !open && setModalState(null)}
-      />
-
-      <DisableAuthenticatorAppDialog
-        key={isDisableDialogOpen ? 'open' : 'closed'}
-        open={isDisableDialogOpen}
-        onOpenChange={(open) => !open && setModalState(null)}
-      />
-    </>
-  );
-};

apps/web/src/components/forms/2fa/disable-authenticator-app-dialog.tsx

@@ -1,161 +0,0 @@
-import { useRouter } from 'next/navigation';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { flushSync } from 'react-dom';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export const ZDisableTwoFactorAuthenticationForm = z.object({
-  password: z.string().min(6).max(72),
-  backupCode: z.string(),
-});
-
-export type TDisableTwoFactorAuthenticationForm = z.infer<
-  typeof ZDisableTwoFactorAuthenticationForm
->;
-
-export type DisableAuthenticatorAppDialogProps = {
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-};
-
-export const DisableAuthenticatorAppDialog = ({
-  open,
-  onOpenChange,
-}: DisableAuthenticatorAppDialogProps) => {
-  const router = useRouter();
-  const { toast } = useToast();
-
-  const { mutateAsync: disableTwoFactorAuthentication } =
-    trpc.twoFactorAuthentication.disable.useMutation();
-
-  const disableTwoFactorAuthenticationForm = useForm<TDisableTwoFactorAuthenticationForm>({
-    defaultValues: {
-      password: '',
-      backupCode: '',
-    },
-    resolver: zodResolver(ZDisableTwoFactorAuthenticationForm),
-  });
-
-  const { isSubmitting: isDisableTwoFactorAuthenticationSubmitting } =
-    disableTwoFactorAuthenticationForm.formState;
-
-  const onDisableTwoFactorAuthenticationFormSubmit = async ({
-    password,
-    backupCode,
-  }: TDisableTwoFactorAuthenticationForm) => {
-    try {
-      await disableTwoFactorAuthentication({ password, backupCode });
-
-      toast({
-        title: 'Two-factor authentication disabled',
-        description:
-          'Two-factor authentication has been disabled for your account. You will no longer be required to enter a code from your authenticator app when signing in.',
-      });
-
-      flushSync(() => {
-        onOpenChange(false);
-      });
-
-      router.refresh();
-    } catch (_err) {
-      toast({
-        title: 'Unable to disable two-factor authentication',
-        description:
-          'We were unable to disable two-factor authentication for your account. Please ensure that you have entered your password and backup code correctly and try again.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-full max-w-xl md:max-w-xl lg:max-w-xl">
-        <DialogHeader>
-          <DialogTitle>Disable Authenticator App</DialogTitle>
-
-          <DialogDescription>
-            To disable the Authenticator App for your account, please enter your password and a
-            backup code. If you do not have a backup code available, please contact support.
-          </DialogDescription>
-        </DialogHeader>
-
-        <Form {...disableTwoFactorAuthenticationForm}>
-          <form
-            onSubmit={disableTwoFactorAuthenticationForm.handleSubmit(
-              onDisableTwoFactorAuthenticationFormSubmit,
-            )}
-            className="flex flex-col gap-y-4"
-          >
-            <FormField
-              name="password"
-              control={disableTwoFactorAuthenticationForm.control}
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel className="text-muted-foreground">Password</FormLabel>
-                  <FormControl>
-                    <Input
-                      {...field}
-                      type="password"
-                      autoComplete="current-password"
-                      value={field.value ?? ''}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              name="backupCode"
-              control={disableTwoFactorAuthenticationForm.control}
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel className="text-muted-foreground">Backup Code</FormLabel>
-                  <FormControl>
-                    <Input {...field} type="text" value={field.value ?? ''} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <div className="flex w-full items-center justify-between">
-              <Button type="button" variant="ghost" onClick={() => onOpenChange(false)}>
-                Cancel
-              </Button>
-
-              <Button
-                type="submit"
-                variant="destructive"
-                loading={isDisableTwoFactorAuthenticationSubmitting}
-              >
-                Disable 2FA
-              </Button>
-            </div>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx

@@ -1,283 +0,0 @@
-import { useMemo } from 'react';
-
-import { useRouter } from 'next/navigation';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { flushSync } from 'react-dom';
-import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
-import { renderSVG } from 'uqr';
-import { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { RecoveryCodeList } from './recovery-code-list';
-
-export const ZSetupTwoFactorAuthenticationForm = z.object({
-  password: z.string().min(6).max(72),
-});
-
-export type TSetupTwoFactorAuthenticationForm = z.infer<typeof ZSetupTwoFactorAuthenticationForm>;
-
-export const ZEnableTwoFactorAuthenticationForm = z.object({
-  token: z.string(),
-});
-
-export type TEnableTwoFactorAuthenticationForm = z.infer<typeof ZEnableTwoFactorAuthenticationForm>;
-
-export type EnableAuthenticatorAppDialogProps = {
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-};
-
-export const EnableAuthenticatorAppDialog = ({
-  open,
-  onOpenChange,
-}: EnableAuthenticatorAppDialogProps) => {
-  const router = useRouter();
-  const { toast } = useToast();
-
-  const { mutateAsync: setupTwoFactorAuthentication, data: setupTwoFactorAuthenticationData } =
-    trpc.twoFactorAuthentication.setup.useMutation();
-
-  const { mutateAsync: enableTwoFactorAuthentication, data: enableTwoFactorAuthenticationData } =
-    trpc.twoFactorAuthentication.enable.useMutation();
-
-  const setupTwoFactorAuthenticationForm = useForm<TSetupTwoFactorAuthenticationForm>({
-    defaultValues: {
-      password: '',
-    },
-    resolver: zodResolver(ZSetupTwoFactorAuthenticationForm),
-  });
-
-  const { isSubmitting: isSetupTwoFactorAuthenticationSubmitting } =
-    setupTwoFactorAuthenticationForm.formState;
-
-  const enableTwoFactorAuthenticationForm = useForm<TEnableTwoFactorAuthenticationForm>({
-    defaultValues: {
-      token: '',
-    },
-    resolver: zodResolver(ZEnableTwoFactorAuthenticationForm),
-  });
-
-  const { isSubmitting: isEnableTwoFactorAuthenticationSubmitting } =
-    enableTwoFactorAuthenticationForm.formState;
-
-  const step = useMemo(() => {
-    if (!setupTwoFactorAuthenticationData || isSetupTwoFactorAuthenticationSubmitting) {
-      return 'setup';
-    }
-
-    if (!enableTwoFactorAuthenticationData || isEnableTwoFactorAuthenticationSubmitting) {
-      return 'enable';
-    }
-
-    return 'view';
-  }, [
-    setupTwoFactorAuthenticationData,
-    isSetupTwoFactorAuthenticationSubmitting,
-    enableTwoFactorAuthenticationData,
-    isEnableTwoFactorAuthenticationSubmitting,
-  ]);
-
-  const onSetupTwoFactorAuthenticationFormSubmit = async ({
-    password,
-  }: TSetupTwoFactorAuthenticationForm) => {
-    try {
-      await setupTwoFactorAuthentication({ password });
-    } catch (_err) {
-      toast({
-        title: 'Unable to setup two-factor authentication',
-        description:
-          'We were unable to setup two-factor authentication for your account. Please ensure that you have entered your password correctly and try again.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const onEnableTwoFactorAuthenticationFormSubmit = async ({
-    token,
-  }: TEnableTwoFactorAuthenticationForm) => {
-    try {
-      await enableTwoFactorAuthentication({ code: token });
-
-      toast({
-        title: 'Two-factor authentication enabled',
-        description:
-          'Two-factor authentication has been enabled for your account. You will now be required to enter a code from your authenticator app when signing in.',
-      });
-    } catch (_err) {
-      toast({
-        title: 'Unable to setup two-factor authentication',
-        description:
-          'We were unable to setup two-factor authentication for your account. Please ensure that you have entered your password correctly and try again.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const onCompleteClick = () => {
-    flushSync(() => {
-      onOpenChange(false);
-    });
-
-    router.refresh();
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-full max-w-xl md:max-w-xl lg:max-w-xl">
-        <DialogHeader>
-          <DialogTitle>Enable Authenticator App</DialogTitle>
-
-          {step === 'setup' && (
-            <DialogDescription>
-              To enable two-factor authentication, please enter your password below.
-            </DialogDescription>
-          )}
-
-          {step === 'view' && (
-            <DialogDescription>
-              Your recovery codes are listed below. Please store them in a safe place.
-            </DialogDescription>
-          )}
-        </DialogHeader>
-
-        {match(step)
-          .with('setup', () => {
-            return (
-              <Form {...setupTwoFactorAuthenticationForm}>
-                <form
-                  onSubmit={setupTwoFactorAuthenticationForm.handleSubmit(
-                    onSetupTwoFactorAuthenticationFormSubmit,
-                  )}
-                  className="flex flex-col gap-y-4"
-                >
-                  <FormField
-                    name="password"
-                    control={setupTwoFactorAuthenticationForm.control}
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel className="text-muted-foreground">Password</FormLabel>
-                        <FormControl>
-                          <Input
-                            {...field}
-                            type="password"
-                            autoComplete="current-password"
-                            value={field.value ?? ''}
-                          />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-
-                  <div className="flex w-full items-center justify-between">
-                    <Button type="button" variant="ghost" onClick={() => onOpenChange(false)}>
-                      Cancel
-                    </Button>
-
-                    <Button type="submit" loading={isSetupTwoFactorAuthenticationSubmitting}>
-                      Continue
-                    </Button>
-                  </div>
-                </form>
-              </Form>
-            );
-          })
-          .with('enable', () => (
-            <Form {...enableTwoFactorAuthenticationForm}>
-              <form
-                onSubmit={enableTwoFactorAuthenticationForm.handleSubmit(
-                  onEnableTwoFactorAuthenticationFormSubmit,
-                )}
-                className="flex flex-col gap-y-4"
-              >
-                <p className="text-muted-foreground text-sm">
-                  To enable two-factor authentication, scan the following QR code using your
-                  authenticator app.
-                </p>
-
-                <div
-                  className="flex h-36 justify-center"
-                  dangerouslySetInnerHTML={{
-                    __html: renderSVG(setupTwoFactorAuthenticationData?.uri ?? ''),
-                  }}
-                />
-
-                <p className="text-muted-foreground text-sm">
-                  If your authenticator app does not support QR codes, you can use the following
-                  code instead:
-                </p>
-
-                <p className="bg-muted/60 text-muted-foreground rounded-lg p-2 text-center font-mono tracking-widest">
-                  {setupTwoFactorAuthenticationData?.secret}
-                </p>
-
-                <p className="text-muted-foreground text-sm">
-                  Once you have scanned the QR code or entered the code manually, enter the code
-                  provided by your authenticator app below.
-                </p>
-
-                <FormField
-                  name="token"
-                  control={enableTwoFactorAuthenticationForm.control}
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel className="text-muted-foreground">Token</FormLabel>
-                      <FormControl>
-                        <Input {...field} type="text" value={field.value ?? ''} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <div className="flex w-full items-center justify-between">
-                  <Button type="button" variant="ghost" onClick={() => onOpenChange(false)}>
-                    Cancel
-                  </Button>
-
-                  <Button type="submit" loading={isEnableTwoFactorAuthenticationSubmitting}>
-                    Enable 2FA
-                  </Button>
-                </div>
-              </form>
-            </Form>
-          ))
-          .with('view', () => (
-            <div>
-              {enableTwoFactorAuthenticationData?.recoveryCodes && (
-                <RecoveryCodeList recoveryCodes={enableTwoFactorAuthenticationData.recoveryCodes} />
-              )}
-
-              <div className="mt-4 flex w-full flex-row-reverse items-center justify-between">
-                <Button type="button" onClick={() => onCompleteClick()}>
-                  Complete
-                </Button>
-              </div>
-            </div>
-          ))
-          .exhaustive()}
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/web/src/components/forms/2fa/recovery-code-list.tsx

@@ -1,57 +0,0 @@
-import { Copy } from 'lucide-react';
-
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type RecoveryCodeListProps = {
-  recoveryCodes: string[];
-};
-
-export const RecoveryCodeList = ({ recoveryCodes }: RecoveryCodeListProps) => {
-  const { toast } = useToast();
-  const [, copyToClipboard] = useCopyToClipboard();
-
-  const onCopyRecoveryCodeClick = async (code: string) => {
-    try {
-      const result = await copyToClipboard(code);
-
-      if (!result) {
-        throw new Error('Unable to copy recovery code');
-      }
-
-      toast({
-        title: 'Recovery code copied',
-        description: 'Your recovery code has been copied to your clipboard.',
-      });
-    } catch (_err) {
-      toast({
-        title: 'Unable to copy recovery code',
-        description:
-          'We were unable to copy your recovery code to your clipboard. Please try again.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  return (
-    <div className="grid grid-cols-2 gap-4">
-      {recoveryCodes.map((code) => (
-        <div
-          key={code}
-          className="bg-muted text-muted-foreground relative rounded-lg p-4 font-mono md:text-center"
-        >
-          <span>{code}</span>
-
-          <div className="absolute inset-y-0 right-4 flex items-center justify-center">
-            <button
-              className="opacity-60 hover:opacity-80"
-              onClick={() => void onCopyRecoveryCodeClick(code)}
-            >
-              <Copy className="h-5 w-5" />
-            </button>
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-};

apps/web/src/components/forms/2fa/recovery-codes.tsx

@@ -1,43 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-import { ViewRecoveryCodesDialog } from './view-recovery-codes-dialog';
-
-type RecoveryCodesProps = {
-  // backupCodes: string[] | null;
-  isTwoFactorEnabled: boolean;
-};
-
-export const RecoveryCodes = ({ isTwoFactorEnabled }: RecoveryCodesProps) => {
-  const [isOpen, setIsOpen] = useState(false);
-
-  return (
-    <>
-      <div className="mt-4 flex flex-col justify-between gap-4 rounded-lg border p-4 md:flex-row md:items-center md:gap-8">
-        <div className="flex-1">
-          <p>Recovery Codes</p>
-
-          <p className="text-muted-foreground mt-2 max-w-[50ch] text-sm">
-            Recovery codes are used to access your account in the event that you lose access to your
-            authenticator app.
-          </p>
-        </div>
-
-        <div>
-          <Button onClick={() => setIsOpen(true)} disabled={!isTwoFactorEnabled} size="sm">
-            View Codes
-          </Button>
-        </div>
-      </div>
-
-      <ViewRecoveryCodesDialog
-        key={isOpen ? 'open' : 'closed'}
-        open={isOpen}
-        onOpenChange={setIsOpen}
-      />
-    </>
-  );
-};

apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx

@@ -1,151 +0,0 @@
-import { useMemo } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
-import { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { RecoveryCodeList } from './recovery-code-list';
-
-export const ZViewRecoveryCodesForm = z.object({
-  password: z.string().min(6).max(72),
-});
-
-export type TViewRecoveryCodesForm = z.infer<typeof ZViewRecoveryCodesForm>;
-
-export type ViewRecoveryCodesDialogProps = {
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-};
-
-export const ViewRecoveryCodesDialog = ({ open, onOpenChange }: ViewRecoveryCodesDialogProps) => {
-  const { toast } = useToast();
-
-  const { mutateAsync: viewRecoveryCodes, data: viewRecoveryCodesData } =
-    trpc.twoFactorAuthentication.viewRecoveryCodes.useMutation();
-
-  const viewRecoveryCodesForm = useForm<TViewRecoveryCodesForm>({
-    defaultValues: {
-      password: '',
-    },
-    resolver: zodResolver(ZViewRecoveryCodesForm),
-  });
-
-  const { isSubmitting: isViewRecoveryCodesSubmitting } = viewRecoveryCodesForm.formState;
-
-  const step = useMemo(() => {
-    if (!viewRecoveryCodesData || isViewRecoveryCodesSubmitting) {
-      return 'authenticate';
-    }
-
-    return 'view';
-  }, [viewRecoveryCodesData, isViewRecoveryCodesSubmitting]);
-
-  const onViewRecoveryCodesFormSubmit = async ({ password }: TViewRecoveryCodesForm) => {
-    try {
-      await viewRecoveryCodes({ password });
-    } catch (_err) {
-      toast({
-        title: 'Unable to view recovery codes',
-        description:
-          'We were unable to view your recovery codes. Please ensure that you have entered your password correctly and try again.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-full max-w-xl md:max-w-xl lg:max-w-xl">
-        <DialogHeader>
-          <DialogTitle>View Recovery Codes</DialogTitle>
-
-          {step === 'authenticate' && (
-            <DialogDescription>
-              To view your recovery codes, please enter your password below.
-            </DialogDescription>
-          )}
-
-          {step === 'view' && (
-            <DialogDescription>
-              Your recovery codes are listed below. Please store them in a safe place.
-            </DialogDescription>
-          )}
-        </DialogHeader>
-
-        {match(step)
-          .with('authenticate', () => {
-            return (
-              <Form {...viewRecoveryCodesForm}>
-                <form
-                  onSubmit={viewRecoveryCodesForm.handleSubmit(onViewRecoveryCodesFormSubmit)}
-                  className="flex flex-col gap-y-4"
-                >
-                  <FormField
-                    name="password"
-                    control={viewRecoveryCodesForm.control}
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel className="text-muted-foreground">Password</FormLabel>
-                        <FormControl>
-                          <Input
-                            {...field}
-                            type="password"
-                            autoComplete="current-password"
-                            value={field.value ?? ''}
-                          />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-
-                  <div className="flex w-full items-center justify-between">
-                    <Button type="button" variant="ghost" onClick={() => onOpenChange(false)}>
-                      Cancel
-                    </Button>
-
-                    <Button type="submit" loading={isViewRecoveryCodesSubmitting}>
-                      Continue
-                    </Button>
-                  </div>
-                </form>
-              </Form>
-            );
-          })
-          .with('view', () => (
-            <div>
-              {viewRecoveryCodesData?.recoveryCodes && (
-                <RecoveryCodeList recoveryCodes={viewRecoveryCodesData.recoveryCodes} />
-              )}
-
-              <div className="mt-4 flex flex-row-reverse items-center justify-between">
-                <Button onClick={() => onOpenChange(false)}>Complete</Button>
-              </div>
-            </div>
-          ))
-          .exhaustive()}
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/web/src/components/forms/edit-document/add-fields.action.ts

@@ -0,0 +1,30 @@
+'use server';
+
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document';
+import type { TAddFieldsFormSchema } from '@documenso/ui/primitives/document-flow/add-fields.types';
+
+export type AddFieldsActionInput = TAddFieldsFormSchema & {
+  documentId: number;
+};
+
+export const addFields = async ({ documentId, fields }: AddFieldsActionInput) => {
+  'use server';
+
+  const { user } = await getRequiredServerComponentSession();
+
+  await setFieldsForDocument({
+    userId: user.id,
+    documentId,
+    fields: fields.map((field) => ({
+      id: field.nativeId,
+      signerEmail: field.signerEmail,
+      type: field.type,
+      pageNumber: field.pageNumber,
+      pageX: field.pageX,
+      pageY: field.pageY,
+      pageWidth: field.pageWidth,
+      pageHeight: field.pageHeight,
+    })),
+  });
+};

apps/web/src/components/forms/edit-document/add-signers.action.ts

@@ -0,0 +1,25 @@
+'use server';
+
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document';
+import type { TAddSignersFormSchema } from '@documenso/ui/primitives/document-flow/add-signers.types';
+
+export type AddSignersActionInput = TAddSignersFormSchema & {
+  documentId: number;
+};
+
+export const addSigners = async ({ documentId, signers }: AddSignersActionInput) => {
+  'use server';
+
+  const { user } = await getRequiredServerComponentSession();
+
+  await setRecipientsForDocument({
+    userId: user.id,
+    documentId,
+    recipients: signers.map((signer) => ({
+      id: signer.nativeId,
+      email: signer.email,
+      name: signer.name,
+    })),
+  });
+};

apps/web/src/components/forms/edit-document/add-subject.action.ts

@@ -0,0 +1,29 @@
+'use server';
+
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta';
+import { sendDocument } from '@documenso/lib/server-only/document/send-document';
+import type { TAddSubjectFormSchema } from '@documenso/ui/primitives/document-flow/add-subject.types';
+
+export type CompleteDocumentActionInput = TAddSubjectFormSchema & {
+  documentId: number;
+};
+
+export const completeDocument = async ({ documentId, email }: CompleteDocumentActionInput) => {
+  'use server';
+
+  const { user } = await getRequiredServerComponentSession();
+
+  if (email.message || email.subject) {
+    await upsertDocumentMeta({
+      documentId,
+      subject: email.subject,
+      message: email.message,
+    });
+  }
+
+  return await sendDocument({
+    userId: user.id,
+    documentId,
+  });
+};

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

@@ -20,18 +20,9 @@ import { FormErrorMessage } from '../form/form-error-message';
 
 export const ZPasswordFormSchema = z
   .object({
-    currentPassword: z
-      .string()
-      .min(6, { message: 'Password should contain at least 6 characters' })
-      .max(72, { message: 'Password should not contain more than 72 characters' }),
-    password: z
-      .string()
-      .min(6, { message: 'Password should contain at least 6 characters' })
-      .max(72, { message: 'Password should not contain more than 72 characters' }),
-    repeatedPassword: z
-      .string()
-      .min(6, { message: 'Password should contain at least 6 characters' })
-      .max(72, { message: 'Password should not contain more than 72 characters' }),
+    currentPassword: z.string().min(6).max(72),
+    password: z.string().min(6).max(72),
+    repeatedPassword: z.string().min(6).max(72),
   })
   .refine((data) => data.password === data.repeatedPassword, {
     message: 'Passwords do not match',

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

@@ -3,6 +3,7 @@
 import { useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
+import { Eye, EyeOff } from 'lucide-react';
 import { signIn } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 import { FcGoogle } from 'react-icons/fc';
@@ -11,30 +12,23 @@ import { z } from 'zod';
 import { ErrorCode, isErrorCode } from '@documenso/lib/next-auth/error-codes';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@documenso/ui/primitives/dialog';
 import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
-import { Input, PasswordInput } from '@documenso/ui/primitives/input';
+import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-const ERROR_MESSAGES: Partial<Record<keyof typeof ErrorCode, string>> = {
+const ERROR_MESSAGES = {
   [ErrorCode.CREDENTIALS_NOT_FOUND]: 'The email or password provided is incorrect',
   [ErrorCode.INCORRECT_EMAIL_PASSWORD]: 'The email or password provided is incorrect',
   [ErrorCode.USER_MISSING_PASSWORD]:
     'This account appears to be using a social login method, please sign in using that method',
-  [ErrorCode.INCORRECT_TWO_FACTOR_CODE]: 'The two-factor authentication code provided is incorrect',
-  [ErrorCode.INCORRECT_TWO_FACTOR_BACKUP_CODE]: 'The backup code provided is incorrect',
 };
 
-const TwoFactorEnabledErrorCode = ErrorCode.TWO_FACTOR_MISSING_CREDENTIALS;
-
 const LOGIN_REDIRECT_PATH = '/documents';
 
 export const ZSignInFormSchema = z.object({
   email: z.string().email().min(1),
   password: z.string().min(6).max(72),
-  totpCode: z.string().trim().optional(),
-  backupCode: z.string().trim().optional(),
 });
 
 export type TSignInFormSchema = z.infer<typeof ZSignInFormSchema>;
@@ -45,84 +39,33 @@ export type SignInFormProps = {
 
 export const SignInForm = ({ className }: SignInFormProps) => {
   const { toast } = useToast();
-  const [isTwoFactorAuthenticationDialogOpen, setIsTwoFactorAuthenticationDialogOpen] =
-    useState(false);
-
-  const [twoFactorAuthenticationMethod, setTwoFactorAuthenticationMethod] = useState<
-    'totp' | 'backup'
-  >('totp');
+  const [showPassword, setShowPassword] = useState(false);
 
   const {
     register,
     handleSubmit,
-    setValue,
     formState: { errors, isSubmitting },
   } = useForm<TSignInFormSchema>({
     values: {
       email: '',
       password: '',
-      totpCode: '',
-      backupCode: '',
     },
     resolver: zodResolver(ZSignInFormSchema),
   });
 
-  const onCloseTwoFactorAuthenticationDialog = () => {
-    setValue('totpCode', '');
-    setValue('backupCode', '');
-
-    setIsTwoFactorAuthenticationDialogOpen(false);
-  };
-
-  const onToggleTwoFactorAuthenticationMethodClick = () => {
-    const method = twoFactorAuthenticationMethod === 'totp' ? 'backup' : 'totp';
-
-    if (method === 'totp') {
-      setValue('backupCode', '');
-    }
-
-    if (method === 'backup') {
-      setValue('totpCode', '');
-    }
-
-    setTwoFactorAuthenticationMethod(method);
-  };
-
-  const onFormSubmit = async ({ email, password, totpCode, backupCode }: TSignInFormSchema) => {
+  const onFormSubmit = async ({ email, password }: TSignInFormSchema) => {
     try {
-      const credentials: Record<string, string> = {
+      const result = await signIn('credentials', {
         email,
         password,
-      };
-
-      if (totpCode) {
-        credentials.totpCode = totpCode;
-      }
-
-      if (backupCode) {
-        credentials.backupCode = backupCode;
-      }
-
-      const result = await signIn('credentials', {
-        ...credentials,
-
         callbackUrl: LOGIN_REDIRECT_PATH,
         redirect: false,
       });
 
       if (result?.error && isErrorCode(result.error)) {
-        if (result.error === TwoFactorEnabledErrorCode) {
-          setIsTwoFactorAuthenticationDialogOpen(true);
-
-          return;
-        }
-
-        const errorMessage = ERROR_MESSAGES[result.error];
-
         toast({
           variant: 'destructive',
-          title: 'Unable to sign in',
-          description: errorMessage ?? 'An unknown error occurred',
+          description: ERROR_MESSAGES[result.error],
         });
 
         return;
@@ -175,14 +118,31 @@ export const SignInForm = ({ className }: SignInFormProps) => {
           <span>Password</span>
         </Label>
 
-        <PasswordInput
-          id="password"
-          minLength={6}
-          maxLength={72}
-          className="bg-background mt-2"
-          autoComplete="current-password"
-          {...register('password')}
-        />
+        <div className="relative">
+          <Input
+            id="password"
+            type={showPassword ? 'text' : 'password'}
+            minLength={6}
+            maxLength={72}
+            autoComplete="current-password"
+            className="bg-background mt-2 pr-10"
+            {...register('password')}
+          />
+
+          <Button
+            variant="link"
+            type="button"
+            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
+            aria-label={showPassword ? 'Mask password' : 'Reveal password'}
+            onClick={() => setShowPassword((show) => !show)}
+          >
+            {showPassword ? (
+              <EyeOff className="text-muted-foreground h-5 w-5" />
+            ) : (
+              <Eye className="text-muted-foreground h-5 w-5" />
+            )}
+          </Button>
+        </div>
 
         <FormErrorMessage className="mt-1.5" error={errors.password} />
       </div>
@@ -213,67 +173,6 @@ export const SignInForm = ({ className }: SignInFormProps) => {
         <FcGoogle className="mr-2 h-5 w-5" />
         Google
       </Button>
-
-      <Dialog
-        open={isTwoFactorAuthenticationDialogOpen}
-        onOpenChange={onCloseTwoFactorAuthenticationDialog}
-      >
-        <DialogContent>
-          <DialogHeader>
-            <DialogTitle>Two-Factor Authentication</DialogTitle>
-          </DialogHeader>
-
-          <form onSubmit={handleSubmit(onFormSubmit)}>
-            {twoFactorAuthenticationMethod === 'totp' && (
-              <div>
-                <Label htmlFor="totpCode" className="text-muted-forground">
-                  Authentication Token
-                </Label>
-
-                <Input
-                  id="totpCode"
-                  type="text"
-                  className="bg-background mt-2"
-                  {...register('totpCode')}
-                />
-
-                <FormErrorMessage className="mt-1.5" error={errors.totpCode} />
-              </div>
-            )}
-
-            {twoFactorAuthenticationMethod === 'backup' && (
-              <div>
-                <Label htmlFor="backupCode" className="text-muted-forground">
-                  Backup Code
-                </Label>
-
-                <Input
-                  id="backupCode"
-                  type="text"
-                  className="bg-background mt-2"
-                  {...register('backupCode')}
-                />
-
-                <FormErrorMessage className="mt-1.5" error={errors.backupCode} />
-              </div>
-            )}
-
-            <div className="mt-4 flex items-center justify-between">
-              <Button
-                type="button"
-                variant="ghost"
-                onClick={onToggleTwoFactorAuthenticationMethodClick}
-              >
-                {twoFactorAuthenticationMethod === 'totp' ? 'Use Backup Code' : 'Use Authenticator'}
-              </Button>
-
-              <Button type="submit" loading={isSubmitting}>
-                Sign In
-              </Button>
-            </div>
-          </form>
-        </DialogContent>
-      </Dialog>
     </form>
   );
 };

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

@@ -21,10 +21,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 export const ZSignUpFormSchema = z.object({
   name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
   email: z.string().email().min(1),
-  password: z
-    .string()
-    .min(6, { message: 'Password should contain at least 6 characters' })
-    .max(72, { message: 'Password should not contain more than 72 characters' }),
+  password: z.string().min(6).max(72),
   signature: z.string().min(1, { message: 'We need your signature to sign documents' }),
 });
 
@@ -137,7 +134,6 @@ export const SignUpForm = ({ className }: SignUpFormProps) => {
             )}
           </Button>
         </div>
-        <FormErrorMessage className="mt-1.5" error={errors.password} />
       </div>
 
       <div>

apps/web/src/pages/api/health.ts

@@ -1,21 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-
-import { prisma } from '@documenso/prisma';
-
-export default async function handler(_req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await prisma.$queryRaw`SELECT 1`;
-
-    return res.json({
-      status: 'ok',
-      message: 'All systems operational',
-    });
-  } catch (err) {
-    console.error(err);
-
-    return res.status(500).json({
-      status: 'error',
-      message: err.message,
-    });
-  }
-}

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

@@ -2,10 +2,6 @@ import * as trpcNext from '@documenso/trpc/server/adapters/next';
 import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 
-export const config = {
-  maxDuration: 60,
-};
-
 export default trpcNext.createNextApiHandler({
   router: appRouter,
   createContext: async ({ req, res }) => createTrpcContext({ req, res }),

package.json

@@ -4,7 +4,7 @@
     "build": "turbo run build",
     "build:web": "turbo run build --filter=@documenso/web",
     "dev": "turbo run dev --filter=@documenso/web --filter=@documenso/marketing",
-    "start": "turbo run start --filter=@documenso/web --filter=@documenso/marketing",
+    "start": "cd apps && cd web && next start",
     "lint": "turbo run lint",
     "lint:fix": "turbo run lint:fix",
     "format": "prettier --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,mdx}\"",
@@ -19,7 +19,6 @@
     "prisma:generate": "npm run with:env -- npm run prisma:generate -w @documenso/prisma",
     "prisma:migrate-dev": "npm run with:env -- npm run prisma:migrate-dev -w @documenso/prisma",
     "prisma:migrate-deploy": "npm run with:env -- npm run prisma:migrate-deploy -w @documenso/prisma",
-    "prisma:seed": "npm run with:env -- npm run prisma:seed -w @documenso/prisma",
     "prisma:studio": "npm run with:env -- npx prisma studio --schema packages/prisma/schema.prisma",
     "with:env": "dotenv -e .env -e .env.local --",
     "reset:hard": "npm run clean && npm i && npm run prisma:generate"
@@ -47,13 +46,8 @@
     "apps/*",
     "packages/*"
   ],
-  "dependencies": {},
-  "overrides": {
-    "next-auth": {
-      "next": "14.0.3"
-    },
-    "next-contentlayer": {
-      "next": "14.0.3"
-    }
+  "dependencies": {
+    "react-hotkeys-hook": "^4.4.1",
+    "recharts": "^2.7.2"
   }
 }

packages/ee/package.json

@@ -17,8 +17,8 @@
     "@documenso/prisma": "*",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "14.0.3",
-    "next-auth": "4.24.5",
+    "next": "14.0.0",
+    "next-auth": "4.24.3",
     "react": "18.2.0",
     "ts-pattern": "^5.0.5",
     "zod": "^3.22.4"

packages/email/components.ts

@@ -1,17 +0,0 @@
-export * from '@react-email/body';
-export * from '@react-email/button';
-export * from '@react-email/column';
-export * from '@react-email/container';
-export * from '@react-email/font';
-export * from '@react-email/head';
-export * from '@react-email/heading';
-export * from '@react-email/hr';
-export * from '@react-email/html';
-export * from '@react-email/img';
-export * from '@react-email/link';
-export * from '@react-email/preview';
-export * from '@react-email/render';
-export * from '@react-email/row';
-export * from '@react-email/section';
-export * from '@react-email/tailwind';
-export * from '@react-email/text';

packages/email/mailer.ts

@@ -42,8 +42,12 @@ const getTransport = () => {
     });
   }
 
+  if (!process.env.NEXT_PRIVATE_SMTP_HOST) {
+    throw new Error('SMTP transport requires NEXT_PRIVATE_SMTP_HOST');
+  }
+
   return createTransport({
-    host: process.env.NEXT_PRIVATE_SMTP_HOST ?? 'localhost:2500',
+    host: process.env.NEXT_PRIVATE_SMTP_HOST,
     port: Number(process.env.NEXT_PRIVATE_SMTP_PORT) || 587,
     secure: process.env.NEXT_PRIVATE_SMTP_SECURE === 'true',
     auth: {

packages/email/package.json

@@ -17,27 +17,11 @@
     "worker:test": "tsup worker/index.ts --format esm"
   },
   "dependencies": {
-    "@documenso/nodemailer-resend": "2.0.0",
-    "@react-email/body": "0.0.4",
-    "@react-email/button": "0.0.11",
-    "@react-email/column": "0.0.8",
-    "@react-email/container": "0.0.10",
-    "@react-email/font": "0.0.4",
-    "@react-email/head": "0.0.6",
-    "@react-email/heading": "0.0.9",
-    "@react-email/hr": "0.0.6",
-    "@react-email/html": "0.0.6",
-    "@react-email/img": "0.0.6",
-    "@react-email/link": "0.0.6",
-    "@react-email/preview": "0.0.7",
-    "@react-email/render": "0.0.9",
-    "@react-email/row": "0.0.6",
-    "@react-email/section": "0.0.10",
-    "@react-email/tailwind": "0.0.13-canary.1",
-    "@react-email/text": "0.0.6",
+    "@documenso/nodemailer-resend": "1.0.0",
+    "@react-email/components": "^0.0.7",
     "nodemailer": "^6.9.3",
-    "react-email": "^1.9.5",
-    "resend": "^2.0.0"
+    "react-email": "^1.9.4",
+    "resend": "^1.1.0"
   },
   "devDependencies": {
     "@documenso/tailwind-config": "*",

packages/email/render.ts

@@ -1 +1 @@
-export { render, renderAsync } from '@react-email/render';
+export { render } from '@react-email/components';

packages/email/template-components/template-confirmation-email.tsx

@@ -1,41 +0,0 @@
-import { Button, Section, Text } from '../components';
-import { TemplateDocumentImage } from './template-document-image';
-
-export type TemplateConfirmationEmailProps = {
-  confirmationLink: string;
-  assetBaseUrl: string;
-};
-
-export const TemplateConfirmationEmail = ({
-  confirmationLink,
-  assetBaseUrl,
-}: TemplateConfirmationEmailProps) => {
-  return (
-    <>
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
-
-      <Section className="flex-row items-center justify-center">
-        <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          Welcome to Documenso!
-        </Text>
-
-        <Text className="my-1 text-center text-base text-slate-400">
-          Before you get started, please confirm your email address by clicking the button below:
-        </Text>
-
-        <Section className="mb-6 mt-8 text-center">
-          <Button
-            className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-            href={confirmationLink}
-          >
-            Confirm email
-          </Button>
-          <Text className="mt-8 text-center text-sm italic text-slate-400">
-            You can also copy and paste this link into your browser: {confirmationLink} (link
-            expires in 1 hour)
-          </Text>
-        </Section>
-      </Section>
-    </>
-  );
-};

packages/email/template-components/template-document-completed.tsx

@@ -1,4 +1,7 @@
-import { Button, Column, Img, Section, Text } from '../components';
+import { Button, Column, Img, Section, Tailwind, Text } from '@react-email/components';
+
+import * as config from '@documenso/tailwind-config';
+
 import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentCompletedProps {
@@ -17,7 +20,15 @@ export const TemplateDocumentCompleted = ({
   };
 
   return (
-    <>
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
       <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
       <Section>
@@ -61,7 +72,7 @@ export const TemplateDocumentCompleted = ({
           </Button>
         </Section>
       </Section>
-    </>
+    </Tailwind>
   );
 };
 

packages/email/template-components/template-document-image.tsx

@@ -1,4 +1,4 @@
-import { Column, Img, Row, Section } from '../components';
+import { Column, Img, Row, Section } from '@react-email/components';
 
 export interface TemplateDocumentImageProps {
   assetBaseUrl: string;

packages/email/template-components/template-document-invite.tsx

@@ -1,4 +1,7 @@
-import { Button, Section, Text } from '../components';
+import { Button, Section, Tailwind, Text } from '@react-email/components';
+
+import * as config from '@documenso/tailwind-config';
+
 import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentInviteProps {
@@ -16,7 +19,15 @@ export const TemplateDocumentInvite = ({
   assetBaseUrl,
 }: TemplateDocumentInviteProps) => {
   return (
-    <>
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
       <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
       <Section>
@@ -38,7 +49,7 @@ export const TemplateDocumentInvite = ({
           </Button>
         </Section>
       </Section>
-    </>
+    </Tailwind>
   );
 };
 

packages/email/template-components/template-document-pending.tsx

@@ -1,4 +1,7 @@
-import { Column, Img, Section, Text } from '../components';
+import { Column, Img, Section, Tailwind, Text } from '@react-email/components';
+
+import * as config from '@documenso/tailwind-config';
+
 import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentPendingProps {
@@ -15,7 +18,15 @@ export const TemplateDocumentPending = ({
   };
 
   return (
-    <>
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
       <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
       <Section>
@@ -41,7 +52,7 @@ export const TemplateDocumentPending = ({
           We'll notify you as soon as it's ready.
         </Text>
       </Section>
-    </>
+    </Tailwind>
   );
 };
 

packages/email/template-components/template-document-self-signed.tsx

@@ -1,4 +1,7 @@
-import { Button, Column, Img, Link, Section, Text } from '../components';
+import { Button, Column, Img, Link, Section, Tailwind, Text } from '@react-email/components';
+
+import * as config from '@documenso/tailwind-config';
+
 import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentSelfSignedProps {
@@ -17,7 +20,15 @@ export const TemplateDocumentSelfSigned = ({
   };
 
   return (
-    <>
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
       <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
       <Section className="flex-row items-center justify-center">
@@ -73,7 +84,7 @@ export const TemplateDocumentSelfSigned = ({
           </Button>
         </Section>
       </Section>
-    </>
+    </Tailwind>
   );
 };
 

packages/email/template-components/template-footer.tsx

@@ -1,4 +1,4 @@
-import { Link, Section, Text } from '../components';
+import { Link, Section, Text } from '@react-email/components';
 
 export type TemplateFooterProps = {
   isDocument?: boolean;

packages/email/template-components/template-forgot-password.tsx

@@ -1,4 +1,7 @@
-import { Button, Section, Text } from '../components';
+import { Button, Section, Tailwind, Text } from '@react-email/components';
+
+import * as config from '@documenso/tailwind-config';
+
 import { TemplateDocumentImage } from './template-document-image';
 
 export type TemplateForgotPasswordProps = {
@@ -11,7 +14,15 @@ export const TemplateForgotPassword = ({
   assetBaseUrl,
 }: TemplateForgotPasswordProps) => {
   return (
-    <>
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
       <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
       <Section className="flex-row items-center justify-center">
@@ -32,7 +43,7 @@ export const TemplateForgotPassword = ({
           </Button>
         </Section>
       </Section>
-    </>
+    </Tailwind>
   );
 };
 

packages/email/template-components/template-reset-password.tsx

@@ -1,4 +1,7 @@
-import { Button, Section, Text } from '../components';
+import { Button, Section, Tailwind, Text } from '@react-email/components';
+
+import * as config from '@documenso/tailwind-config';
+
 import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateResetPasswordProps {
@@ -9,7 +12,15 @@ export interface TemplateResetPasswordProps {
 
 export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordProps) => {
   return (
-    <>
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
       <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
       <Section className="flex-row items-center justify-center">
@@ -30,7 +41,7 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
           </Button>
         </Section>
       </Section>
-    </>
+    </Tailwind>
   );
 };
 

packages/email/templates/confirm-email.tsx

@@ -1,57 +0,0 @@
-import config from '@documenso/tailwind-config';
-
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
-import type { TemplateConfirmationEmailProps } from '../template-components/template-confirmation-email';
-import { TemplateConfirmationEmail } from '../template-components/template-confirmation-email';
-import { TemplateFooter } from '../template-components/template-footer';
-
-export const ConfirmEmailTemplate = ({
-  confirmationLink,
-  assetBaseUrl,
-}: TemplateConfirmationEmailProps) => {
-  const previewText = `Please confirm your email address`;
-
-  const getAssetUrl = (path: string) => {
-    return new URL(path, assetBaseUrl).toString();
-  };
-
-  return (
-    <Html>
-      <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
-                <Img
-                  src={getAssetUrl('/static/logo.png')}
-                  alt="Documenso Logo"
-                  className="mb-4 h-6"
-                />
-
-                <TemplateConfirmationEmail
-                  confirmationLink={confirmationLink}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
-            <div className="mx-auto mt-12 max-w-xl" />
-
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
-    </Html>
-  );
-};

packages/email/templates/document-completed.tsx

@@ -1,8 +1,20 @@
+import {
+  Body,
+  Container,
+  Head,
+  Html,
+  Img,
+  Preview,
+  Section,
+  Tailwind,
+} from '@react-email/components';
+
 import config from '@documenso/tailwind-config';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
-import type { TemplateDocumentCompletedProps } from '../template-components/template-document-completed';
-import { TemplateDocumentCompleted } from '../template-components/template-document-completed';
+import {
+  TemplateDocumentCompleted,
+  TemplateDocumentCompletedProps,
+} from '../template-components/template-document-completed';
 import { TemplateFooter } from '../template-components/template-footer';
 
 export type DocumentCompletedEmailTemplateProps = Partial<TemplateDocumentCompletedProps>;

packages/email/templates/document-invite.tsx

@@ -1,5 +1,3 @@
-import config from '@documenso/tailwind-config';
-
 import {
   Body,
   Container,
@@ -12,9 +10,14 @@ import {
   Section,
   Tailwind,
   Text,
-} from '../components';
-import type { TemplateDocumentInviteProps } from '../template-components/template-document-invite';
-import { TemplateDocumentInvite } from '../template-components/template-document-invite';
+} from '@react-email/components';
+
+import config from '@documenso/tailwind-config';
+
+import {
+  TemplateDocumentInvite,
+  TemplateDocumentInviteProps,
+} from '../template-components/template-document-invite';
 import { TemplateFooter } from '../template-components/template-footer';
 
 export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInviteProps> & {

packages/email/templates/document-pending.tsx

@@ -1,8 +1,20 @@
+import {
+  Body,
+  Container,
+  Head,
+  Html,
+  Img,
+  Preview,
+  Section,
+  Tailwind,
+} from '@react-email/components';
+
 import config from '@documenso/tailwind-config';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
-import type { TemplateDocumentPendingProps } from '../template-components/template-document-pending';
-import { TemplateDocumentPending } from '../template-components/template-document-pending';
+import {
+  TemplateDocumentPending,
+  TemplateDocumentPendingProps,
+} from '../template-components/template-document-pending';
 import { TemplateFooter } from '../template-components/template-footer';
 
 export type DocumentPendingEmailTemplateProps = Partial<TemplateDocumentPendingProps>;

packages/email/templates/document-self-signed.tsx

@@ -1,8 +1,20 @@
+import {
+  Body,
+  Container,
+  Head,
+  Html,
+  Img,
+  Preview,
+  Section,
+  Tailwind,
+} from '@react-email/components';
+
 import config from '@documenso/tailwind-config';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
-import type { TemplateDocumentSelfSignedProps } from '../template-components/template-document-self-signed';
-import { TemplateDocumentSelfSigned } from '../template-components/template-document-self-signed';
+import {
+  TemplateDocumentSelfSigned,
+  TemplateDocumentSelfSignedProps,
+} from '../template-components/template-document-self-signed';
 import { TemplateFooter } from '../template-components/template-footer';
 
 export type DocumentSelfSignedTemplateProps = TemplateDocumentSelfSignedProps;

packages/email/templates/forgot-password.tsx

@@ -1,9 +1,21 @@
+import {
+  Body,
+  Container,
+  Head,
+  Html,
+  Img,
+  Preview,
+  Section,
+  Tailwind,
+} from '@react-email/components';
+
 import config from '@documenso/tailwind-config';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
 import { TemplateFooter } from '../template-components/template-footer';
-import type { TemplateForgotPasswordProps } from '../template-components/template-forgot-password';
-import { TemplateForgotPassword } from '../template-components/template-forgot-password';
+import {
+  TemplateForgotPassword,
+  TemplateForgotPasswordProps,
+} from '../template-components/template-forgot-password';
 
 export type ForgotPasswordTemplateProps = Partial<TemplateForgotPasswordProps>;
 

packages/email/templates/reset-password.tsx

@@ -1,5 +1,3 @@
-import config from '@documenso/tailwind-config';
-
 import {
   Body,
   Container,
@@ -12,10 +10,15 @@ import {
   Section,
   Tailwind,
   Text,
-} from '../components';
+} from '@react-email/components';
+
+import config from '@documenso/tailwind-config';
+
 import { TemplateFooter } from '../template-components/template-footer';
-import type { TemplateResetPasswordProps } from '../template-components/template-reset-password';
-import { TemplateResetPassword } from '../template-components/template-reset-password';
+import {
+  TemplateResetPassword,
+  TemplateResetPasswordProps,
+} from '../template-components/template-reset-password';
 
 export type ResetPasswordTemplateProps = Partial<TemplateResetPasswordProps>;
 

packages/lib/constants/crypto.ts

@@ -1 +0,0 @@
-export const DOCUMENSO_ENCRYPTION_KEY = process.env.NEXT_PRIVATE_ENCRYPTION_KEY;

packages/lib/next-auth/auth-options.ts

@@ -1,17 +1,12 @@
-/// <reference types="../types/next-auth.d.ts" />
 import { PrismaAdapter } from '@next-auth/prisma-adapter';
 import { compare } from 'bcrypt';
 import { DateTime } from 'luxon';
-import type { AuthOptions, Session, User } from 'next-auth';
-import type { JWT } from 'next-auth/jwt';
+import { AuthOptions, Session, User } from 'next-auth';
 import CredentialsProvider from 'next-auth/providers/credentials';
-import type { GoogleProfile } from 'next-auth/providers/google';
-import GoogleProvider from 'next-auth/providers/google';
+import GoogleProvider, { GoogleProfile } from 'next-auth/providers/google';
 
 import { prisma } from '@documenso/prisma';
 
-import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble';
-import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa';
 import { getUserByEmail } from '../server-only/user/get-user-by-email';
 import { ErrorCode } from './error-codes';
 
@@ -27,19 +22,13 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
       credentials: {
         email: { label: 'Email', type: 'email' },
         password: { label: 'Password', type: 'password' },
-        totpCode: {
-          label: 'Two-factor Code',
-          type: 'input',
-          placeholder: 'Code from authenticator app',
-        },
-        backupCode: { label: 'Backup Code', type: 'input', placeholder: 'Two-factor backup code' },
       },
       authorize: async (credentials, _req) => {
         if (!credentials) {
           throw new Error(ErrorCode.CREDENTIALS_NOT_FOUND);
         }
 
-        const { email, password, backupCode, totpCode } = credentials;
+        const { email, password } = credentials;
 
         const user = await getUserByEmail({ email }).catch(() => {
           throw new Error(ErrorCode.INCORRECT_EMAIL_PASSWORD);
@@ -55,25 +44,10 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
           throw new Error(ErrorCode.INCORRECT_EMAIL_PASSWORD);
         }
 
-        const is2faEnabled = isTwoFactorAuthenticationEnabled({ user });
-
-        if (is2faEnabled) {
-          const isValid = await validateTwoFactorAuthentication({ backupCode, totpCode, user });
-
-          if (!isValid) {
-            throw new Error(
-              totpCode
-                ? ErrorCode.INCORRECT_TWO_FACTOR_CODE
-                : ErrorCode.INCORRECT_TWO_FACTOR_BACKUP_CODE,
-            );
-          }
-        }
-
         return {
           id: Number(user.id),
           email: user.email,
           name: user.name,
-          emailVerified: user.emailVerified?.toISOString() ?? null,
         } satisfies User;
       },
     }),
@@ -87,7 +61,6 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
           id: Number(profile.sub),
           name: profile.name || `${profile.given_name} ${profile.family_name}`.trim(),
           email: profile.email,
-          emailVerified: profile.email_verified ? new Date().toISOString() : null,
         };
       },
     }),
@@ -97,10 +70,9 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
       const merged = {
         ...token,
         ...user,
-        emailVerified: user?.emailVerified ? new Date(user.emailVerified).toISOString() : null,
-      } satisfies JWT;
+      };
 
-      if (!merged.email || typeof merged.emailVerified !== 'string') {
+      if (!merged.email) {
         const userId = Number(merged.id ?? token.sub);
 
         const retrieved = await prisma.user.findFirst({
@@ -116,7 +88,6 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
         merged.id = retrieved.id;
         merged.name = retrieved.name;
         merged.email = retrieved.email;
-        merged.emailVerified = retrieved.emailVerified?.toISOString() ?? null;
       }
 
       if (
@@ -126,7 +97,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
       ) {
         merged.lastSignedIn = new Date().toISOString();
 
-        const user = await prisma.user.update({
+        await prisma.user.update({
           where: {
             id: Number(merged.id),
           },
@@ -134,8 +105,6 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
             lastSignedIn: merged.lastSignedIn,
           },
         });
-
-        merged.emailVerified = user.emailVerified?.toISOString() ?? null;
       }
 
       return {
@@ -143,8 +112,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
         name: merged.name,
         email: merged.email,
         lastSignedIn: merged.lastSignedIn,
-        emailVerified: merged.emailVerified,
-      } satisfies JWT;
+      };
     },
 
     session({ token, session }) {
@@ -155,7 +123,6 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
             id: Number(token.id),
             name: token.name,
             email: token.email,
-            emailVerified: token.emailVerified ?? null,
           },
         } satisfies Session;
       }

packages/lib/next-auth/error-codes.ts

@@ -8,15 +8,4 @@ export const ErrorCode = {
   INCORRECT_EMAIL_PASSWORD: 'INCORRECT_EMAIL_PASSWORD',
   USER_MISSING_PASSWORD: 'USER_MISSING_PASSWORD',
   CREDENTIALS_NOT_FOUND: 'CREDENTIALS_NOT_FOUND',
-  INTERNAL_SEVER_ERROR: 'INTERNAL_SEVER_ERROR',
-  TWO_FACTOR_ALREADY_ENABLED: 'TWO_FACTOR_ALREADY_ENABLED',
-  TWO_FACTOR_SETUP_REQUIRED: 'TWO_FACTOR_SETUP_REQUIRED',
-  TWO_FACTOR_MISSING_SECRET: 'TWO_FACTOR_MISSING_SECRET',
-  TWO_FACTOR_MISSING_CREDENTIALS: 'TWO_FACTOR_MISSING_CREDENTIALS',
-  INCORRECT_TWO_FACTOR_CODE: 'INCORRECT_TWO_FACTOR_CODE',
-  INCORRECT_TWO_FACTOR_BACKUP_CODE: 'INCORRECT_TWO_FACTOR_BACKUP_CODE',
-  INCORRECT_IDENTITY_PROVIDER: 'INCORRECT_IDENTITY_PROVIDER',
-  INCORRECT_PASSWORD: 'INCORRECT_PASSWORD',
-  MISSING_ENCRYPTION_KEY: 'MISSING_ENCRYPTION_KEY',
-  MISSING_BACKUP_CODE: 'MISSING_BACKUP_CODE',
 } as const;

packages/lib/package.json

@@ -20,13 +20,10 @@
     "@aws-sdk/cloudfront-signer": "^3.410.0",
     "@aws-sdk/s3-request-presigner": "^3.410.0",
     "@aws-sdk/signature-v4-crt": "^3.410.0",
-    "@documenso/assets": "*",
     "@documenso/email": "*",
     "@documenso/prisma": "*",
     "@documenso/signing": "*",
     "@next-auth/prisma-adapter": "1.0.7",
-    "@noble/ciphers": "0.4.0",
-    "@noble/hashes": "1.3.2",
     "@pdf-lib/fontkit": "^1.1.1",
     "@scure/base": "^1.1.3",
     "@sindresorhus/slugify": "^2.2.1",
@@ -34,9 +31,8 @@
     "bcrypt": "^5.1.0",
     "luxon": "^3.4.0",
     "nanoid": "^4.0.2",
-    "next": "14.0.3",
-    "next-auth": "4.24.5",
-    "oslo": "^0.17.0",
+    "next": "14.0.0",
+    "next-auth": "4.24.3",
     "pdf-lib": "^1.17.1",
     "react": "18.2.0",
     "remeda": "^1.27.1",

packages/lib/server-only/2fa/disable-2fa.ts

@@ -1,48 +0,0 @@
-import { compare } from 'bcrypt';
-
-import { prisma } from '@documenso/prisma';
-import { User } from '@documenso/prisma/client';
-
-import { ErrorCode } from '../../next-auth/error-codes';
-import { validateTwoFactorAuthentication } from './validate-2fa';
-
-type DisableTwoFactorAuthenticationOptions = {
-  user: User;
-  backupCode: string;
-  password: string;
-};
-
-export const disableTwoFactorAuthentication = async ({
-  backupCode,
-  user,
-  password,
-}: DisableTwoFactorAuthenticationOptions) => {
-  if (!user.password) {
-    throw new Error(ErrorCode.USER_MISSING_PASSWORD);
-  }
-
-  const isCorrectPassword = await compare(password, user.password);
-
-  if (!isCorrectPassword) {
-    throw new Error(ErrorCode.INCORRECT_PASSWORD);
-  }
-
-  const isValid = await validateTwoFactorAuthentication({ backupCode, user });
-
-  if (!isValid) {
-    throw new Error(ErrorCode.INCORRECT_TWO_FACTOR_BACKUP_CODE);
-  }
-
-  await prisma.user.update({
-    where: {
-      id: user.id,
-    },
-    data: {
-      twoFactorEnabled: false,
-      twoFactorBackupCodes: null,
-      twoFactorSecret: null,
-    },
-  });
-
-  return true;
-};

packages/lib/server-only/2fa/enable-2fa.ts

@@ -1,47 +0,0 @@
-import { ErrorCode } from '@documenso/lib/next-auth/error-codes';
-import { prisma } from '@documenso/prisma';
-import { User } from '@documenso/prisma/client';
-
-import { getBackupCodes } from './get-backup-code';
-import { verifyTwoFactorAuthenticationToken } from './verify-2fa-token';
-
-type EnableTwoFactorAuthenticationOptions = {
-  user: User;
-  code: string;
-};
-
-export const enableTwoFactorAuthentication = async ({
-  user,
-  code,
-}: EnableTwoFactorAuthenticationOptions) => {
-  if (user.identityProvider !== 'DOCUMENSO') {
-    throw new Error(ErrorCode.INCORRECT_IDENTITY_PROVIDER);
-  }
-
-  if (user.twoFactorEnabled) {
-    throw new Error(ErrorCode.TWO_FACTOR_ALREADY_ENABLED);
-  }
-
-  if (!user.twoFactorSecret) {
-    throw new Error(ErrorCode.TWO_FACTOR_SETUP_REQUIRED);
-  }
-
-  const isValidToken = await verifyTwoFactorAuthenticationToken({ user, totpCode: code });
-
-  if (!isValidToken) {
-    throw new Error(ErrorCode.INCORRECT_TWO_FACTOR_CODE);
-  }
-
-  const updatedUser = await prisma.user.update({
-    where: {
-      id: user.id,
-    },
-    data: {
-      twoFactorEnabled: true,
-    },
-  });
-
-  const recoveryCodes = getBackupCodes({ user: updatedUser });
-
-  return { recoveryCodes };
-};

packages/lib/server-only/2fa/get-backup-code.ts

@@ -1,38 +0,0 @@
-import { z } from 'zod';
-
-import { User } from '@documenso/prisma/client';
-
-import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto';
-import { symmetricDecrypt } from '../../universal/crypto';
-
-interface GetBackupCodesOptions {
-  user: User;
-}
-
-const ZBackupCodeSchema = z.array(z.string());
-
-export const getBackupCodes = ({ user }: GetBackupCodesOptions) => {
-  const key = DOCUMENSO_ENCRYPTION_KEY;
-
-  if (!user.twoFactorEnabled) {
-    throw new Error('User has not enabled 2FA');
-  }
-
-  if (!user.twoFactorBackupCodes) {
-    throw new Error('User has no backup codes');
-  }
-
-  const secret = Buffer.from(symmetricDecrypt({ key, data: user.twoFactorBackupCodes })).toString(
-    'utf-8',
-  );
-
-  const data = JSON.parse(secret);
-
-  const result = ZBackupCodeSchema.safeParse(data);
-
-  if (result.success) {
-    return result.data;
-  }
-
-  return null;
-};

packages/lib/server-only/2fa/is-2fa-availble.ts

@@ -1,17 +0,0 @@
-import { User } from '@documenso/prisma/client';
-
-import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto';
-
-type IsTwoFactorAuthenticationEnabledOptions = {
-  user: User;
-};
-
-export const isTwoFactorAuthenticationEnabled = ({
-  user,
-}: IsTwoFactorAuthenticationEnabledOptions) => {
-  return (
-    user.twoFactorEnabled &&
-    user.identityProvider === 'DOCUMENSO' &&
-    typeof DOCUMENSO_ENCRYPTION_KEY === 'string'
-  );
-};

packages/lib/server-only/2fa/setup-2fa.ts

@@ -1,76 +0,0 @@
-import { base32 } from '@scure/base';
-import { compare } from 'bcrypt';
-import crypto from 'crypto';
-import { createTOTPKeyURI } from 'oslo/otp';
-
-import { ErrorCode } from '@documenso/lib/next-auth/error-codes';
-import { prisma } from '@documenso/prisma';
-import { User } from '@documenso/prisma/client';
-
-import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto';
-import { symmetricEncrypt } from '../../universal/crypto';
-
-type SetupTwoFactorAuthenticationOptions = {
-  user: User;
-  password: string;
-};
-
-const ISSUER = 'Documenso';
-
-export const setupTwoFactorAuthentication = async ({
-  user,
-  password,
-}: SetupTwoFactorAuthenticationOptions) => {
-  const key = DOCUMENSO_ENCRYPTION_KEY;
-
-  if (!key) {
-    throw new Error(ErrorCode.MISSING_ENCRYPTION_KEY);
-  }
-
-  if (user.identityProvider !== 'DOCUMENSO') {
-    throw new Error(ErrorCode.INCORRECT_IDENTITY_PROVIDER);
-  }
-
-  if (!user.password) {
-    throw new Error(ErrorCode.USER_MISSING_PASSWORD);
-  }
-
-  const isCorrectPassword = await compare(password, user.password);
-
-  if (!isCorrectPassword) {
-    throw new Error(ErrorCode.INCORRECT_PASSWORD);
-  }
-
-  const secret = crypto.randomBytes(10);
-
-  const backupCodes = new Array(10)
-    .fill(null)
-    .map(() => crypto.randomBytes(5).toString('hex'))
-    .map((code) => `${code.slice(0, 5)}-${code.slice(5)}`.toUpperCase());
-
-  const accountName = user.email;
-  const uri = createTOTPKeyURI(ISSUER, accountName, secret);
-  const encodedSecret = base32.encode(secret);
-
-  await prisma.user.update({
-    where: {
-      id: user.id,
-    },
-    data: {
-      twoFactorEnabled: false,
-      twoFactorBackupCodes: symmetricEncrypt({
-        data: JSON.stringify(backupCodes),
-        key: key,
-      }),
-      twoFactorSecret: symmetricEncrypt({
-        data: encodedSecret,
-        key: key,
-      }),
-    },
-  });
-
-  return {
-    secret: encodedSecret,
-    uri,
-  };
-};

packages/lib/server-only/2fa/validate-2fa.ts

@@ -1,35 +0,0 @@
-import { User } from '@documenso/prisma/client';
-
-import { ErrorCode } from '../../next-auth/error-codes';
-import { verifyTwoFactorAuthenticationToken } from './verify-2fa-token';
-import { verifyBackupCode } from './verify-backup-code';
-
-type ValidateTwoFactorAuthenticationOptions = {
-  totpCode?: string;
-  backupCode?: string;
-  user: User;
-};
-
-export const validateTwoFactorAuthentication = async ({
-  backupCode,
-  totpCode,
-  user,
-}: ValidateTwoFactorAuthenticationOptions) => {
-  if (!user.twoFactorEnabled) {
-    throw new Error(ErrorCode.TWO_FACTOR_SETUP_REQUIRED);
-  }
-
-  if (!user.twoFactorSecret) {
-    throw new Error(ErrorCode.TWO_FACTOR_MISSING_SECRET);
-  }
-
-  if (totpCode) {
-    return await verifyTwoFactorAuthenticationToken({ user, totpCode });
-  }
-
-  if (backupCode) {
-    return await verifyBackupCode({ user, backupCode });
-  }
-
-  throw new Error(ErrorCode.TWO_FACTOR_MISSING_CREDENTIALS);
-};

packages/lib/server-only/2fa/verify-2fa-token.ts

@@ -1,33 +0,0 @@
-import { base32 } from '@scure/base';
-import { TOTPController } from 'oslo/otp';
-
-import { User } from '@documenso/prisma/client';
-
-import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto';
-import { symmetricDecrypt } from '../../universal/crypto';
-
-const totp = new TOTPController();
-
-type VerifyTwoFactorAuthenticationTokenOptions = {
-  user: User;
-  totpCode: string;
-};
-
-export const verifyTwoFactorAuthenticationToken = async ({
-  user,
-  totpCode,
-}: VerifyTwoFactorAuthenticationTokenOptions) => {
-  const key = DOCUMENSO_ENCRYPTION_KEY;
-
-  if (!user.twoFactorSecret) {
-    throw new Error('user missing 2fa secret');
-  }
-
-  const secret = Buffer.from(symmetricDecrypt({ key, data: user.twoFactorSecret })).toString(
-    'utf-8',
-  );
-
-  const isValidToken = await totp.verify(totpCode, base32.decode(secret));
-
-  return isValidToken;
-};

packages/lib/server-only/2fa/verify-backup-code.ts

@@ -1,18 +0,0 @@
-import { User } from '@documenso/prisma/client';
-
-import { getBackupCodes } from './get-backup-code';
-
-type VerifyBackupCodeParams = {
-  user: User;
-  backupCode: string;
-};
-
-export const verifyBackupCode = async ({ user, backupCode }: VerifyBackupCodeParams) => {
-  const userBackupCodes = await getBackupCodes({ user });
-
-  if (!userBackupCodes) {
-    throw new Error('User has no backup codes');
-  }
-
-  return userBackupCodes.includes(backupCode);
-};

packages/lib/server-only/auth/hash.ts

@@ -1,4 +1,4 @@
-import { compareSync as bcryptCompareSync, hashSync as bcryptHashSync } from 'bcrypt';
+import { hashSync as bcryptHashSync } from 'bcrypt';
 
 import { SALT_ROUNDS } from '../../constants/auth';
 
@@ -8,7 +8,3 @@ import { SALT_ROUNDS } from '../../constants/auth';
 export const hashSync = (password: string) => {
   return bcryptHashSync(password, SALT_ROUNDS);
 };
-
-export const compareSync = (password: string, hash: string) => {
-  return bcryptCompareSync(password, hash);
-};

packages/lib/server-only/auth/send-confirmation-email.ts

@@ -1,56 +0,0 @@
-import { createElement } from 'react';
-
-import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
-import { ConfirmEmailTemplate } from '@documenso/email/templates/confirm-email';
-import { prisma } from '@documenso/prisma';
-
-export interface SendConfirmationEmailProps {
-  userId: number;
-}
-
-export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailProps) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    include: {
-      VerificationToken: {
-        orderBy: {
-          createdAt: 'desc',
-        },
-        take: 1,
-      },
-    },
-  });
-
-  const [verificationToken] = user.VerificationToken;
-
-  if (!verificationToken?.token) {
-    throw new Error('Verification token not found for the user');
-  }
-
-  const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
-  const confirmationLink = `${assetBaseUrl}/verify-email/${verificationToken.token}`;
-  const senderName = process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso';
-  const senderAdress = process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com';
-
-  const confirmationTemplate = createElement(ConfirmEmailTemplate, {
-    assetBaseUrl,
-    confirmationLink,
-  });
-
-  return mailer.sendMail({
-    to: {
-      address: user.email,
-      name: user.name || '',
-    },
-    from: {
-      name: senderName,
-      address: senderAdress,
-    },
-    subject: 'Please confirm your email',
-    html: render(confirmationTemplate),
-    text: render(confirmationTemplate, { plainText: true }),
-  });
-};

packages/lib/server-only/document/find-documents.ts

@@ -2,11 +2,10 @@ import { DateTime } from 'luxon';
 import { P, match } from 'ts-pattern';
 
 import { prisma } from '@documenso/prisma';
-import type { Document, Prisma } from '@documenso/prisma/client';
-import { SigningStatus } from '@documenso/prisma/client';
+import { Document, Prisma, SigningStatus } from '@documenso/prisma/client';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 
-import type { FindResultSet } from '../../types/find-result-set';
+import { FindResultSet } from '../../types/find-result-set';
 
 export interface FindDocumentsOptions {
   userId: number;
@@ -161,11 +160,19 @@ export const findDocuments = async ({
     }),
   ]);
 
+  const maskedData = data.map((doc) => ({
+    ...doc,
+    Recipient: doc.Recipient.map((recipient) => ({
+      ...recipient,
+      token: recipient.email === user.email ? recipient.token : '',
+    })),
+  }));
+
   return {
-    data,
+    data: maskedData,
     count,
     currentPage: Math.max(page, 1),
     perPage,
     totalPages: Math.ceil(count / perPage),
-  } satisfies FindResultSet<typeof data>;
+  } satisfies FindResultSet<typeof maskedData>;
 };

packages/lib/server-only/document/resend-document.tsx

@@ -57,7 +57,7 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD
     throw new Error('Can not send completed document');
   }
 
-  await Promise.all(
+  await Promise.all([
     document.Recipient.map(async (recipient) => {
       const { email, name } = recipient;
 
@@ -95,5 +95,5 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD
         text: render(template, { plainText: true }),
       });
     }),
-  );
+  ]);
 };

packages/lib/server-only/document/send-completed-email.ts

@@ -32,7 +32,7 @@ export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) =>
 
   const buffer = await getFile(document.documentData);
 
-  await Promise.all(
+  await Promise.all([
     document.Recipient.map(async (recipient) => {
       const { email, name, token } = recipient;
 
@@ -64,5 +64,5 @@ export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) =>
         ],
       });
     }),
-  );
+  ]);
 };

packages/lib/server-only/document/send-document.tsx

@@ -45,7 +45,7 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
     throw new Error('Can not send completed document');
   }
 
-  await Promise.all(
+  await Promise.all([
     document.Recipient.map(async (recipient) => {
       const { email, name } = recipient;
 
@@ -96,7 +96,7 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
         },
       });
     }),
-  );
+  ]);
 
   const updatedDocument = await prisma.document.update({
     where: {

packages/lib/server-only/document/update-title.ts

@@ -1,21 +0,0 @@
-'use server';
-
-import { prisma } from '@documenso/prisma';
-
-export type UpdateTitleOptions = {
-  userId: number;
-  documentId: number;
-  title: string;
-};
-
-export const updateTitle = async ({ userId, documentId, title }: UpdateTitleOptions) => {
-  return await prisma.document.update({
-    where: {
-      id: documentId,
-      userId,
-    },
-    data: {
-      title,
-    },
-  });
-};

packages/lib/server-only/field/sign-field-with-token.ts

@@ -54,7 +54,6 @@ export const signFieldWithToken = async ({
     field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE;
 
   let customText = !isSignatureField ? value : undefined;
-
   const signatureImageAsBase64 = isSignatureField && isBase64 ? value : undefined;
   const typedSignature = isSignatureField && !isBase64 ? value : undefined;
 
@@ -62,48 +61,29 @@ export const signFieldWithToken = async ({
     customText = DateTime.now().toFormat('yyyy-MM-dd hh:mm a');
   }
 
-  if (isSignatureField && !signatureImageAsBase64 && !typedSignature) {
-    throw new Error('Signature field must have a signature');
-  }
-
-  return await prisma.$transaction(async (tx) => {
-    const updatedField = await tx.field.update({
-      where: {
-        id: field.id,
-      },
-      data: {
-        customText,
-        inserted: true,
-      },
-    });
-
-    if (isSignatureField) {
-      if (!field.recipientId) {
-        throw new Error('Field has no recipientId');
-      }
-
-      const signature = await tx.signature.upsert({
-        where: {
-          fieldId: field.id,
-        },
-        create: {
-          fieldId: field.id,
-          recipientId: field.recipientId,
-          signatureImageAsBase64: signatureImageAsBase64,
-          typedSignature: typedSignature,
-        },
-        update: {
-          signatureImageAsBase64: signatureImageAsBase64,
-          typedSignature: typedSignature,
-        },
-      });
-
-      // Dirty but I don't want to deal with type information
-      Object.assign(updatedField, {
-        Signature: signature,
-      });
-    }
-
-    return updatedField;
+  await prisma.field.update({
+    where: {
+      id: field.id,
+    },
+    data: {
+      customText,
+      inserted: true,
+      Signature: isSignatureField
+        ? {
+            upsert: {
+              create: {
+                recipientId: field.recipientId,
+                signatureImageAsBase64,
+                typedSignature,
+              },
+              update: {
+                recipientId: field.recipientId,
+                signatureImageAsBase64,
+                typedSignature,
+              },
+            },
+          }
+        : undefined,
+    },
   });
 };

packages/lib/server-only/pdf/insert-field-in-pdf.ts

@@ -2,6 +2,7 @@ import fontkit from '@pdf-lib/fontkit';
 import { PDFDocument, StandardFonts } from 'pdf-lib';
 
 import {
+  CAVEAT_FONT_PATH,
   DEFAULT_HANDWRITING_FONT_SIZE,
   DEFAULT_STANDARD_FONT_SIZE,
   MIN_HANDWRITING_FONT_SIZE,
@@ -9,12 +10,12 @@ import {
 } from '@documenso/lib/constants/pdf';
 import { FieldType } from '@documenso/prisma/client';
 import { isSignatureFieldType } from '@documenso/prisma/guards/is-signature-field';
-import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
+import { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 
 export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignature) => {
-  const fontCaveat = await fetch(process.env.FONT_CAVEAT_URI).then(async (res) =>
-    res.arrayBuffer(),
-  );
+  // Fetch the font file from the public URL.
+  const fontResponse = await fetch(CAVEAT_FONT_PATH);
+  const fontCaveat = await fontResponse.arrayBuffer();
 
   const isSignatureField = isSignatureFieldType(field.type);
 

packages/lib/server-only/user/generate-confirmation-token.ts

@@ -1,41 +0,0 @@
-import crypto from 'crypto';
-
-import { prisma } from '@documenso/prisma';
-
-import { ONE_HOUR } from '../../constants/time';
-import { sendConfirmationEmail } from '../auth/send-confirmation-email';
-
-const IDENTIFIER = 'confirmation-email';
-
-export const generateConfirmationToken = async ({ email }: { email: string }) => {
-  const token = crypto.randomBytes(20).toString('hex');
-
-  const user = await prisma.user.findFirst({
-    where: {
-      email: email,
-    },
-  });
-
-  if (!user) {
-    throw new Error('User not found');
-  }
-
-  const createdToken = await prisma.verificationToken.create({
-    data: {
-      identifier: IDENTIFIER,
-      token: token,
-      expires: new Date(Date.now() + ONE_HOUR),
-      user: {
-        connect: {
-          id: user.id,
-        },
-      },
-    },
-  });
-
-  if (!createdToken) {
-    throw new Error(`Failed to create the verification token`);
-  }
-
-  return sendConfirmationEmail({ userId: user.id });
-};

packages/lib/server-only/user/get-all-users.ts

@@ -32,7 +32,7 @@ export const findUsers = async ({
   });
 
   const [users, count] = await Promise.all([
-    prisma.user.findMany({
+    await prisma.user.findMany({
       include: {
         Subscription: true,
         Document: {
@@ -45,7 +45,7 @@ export const findUsers = async ({
       skip: Math.max(page - 1, 0) * perPage,
       take: perPage,
     }),
-    prisma.user.count({
+    await prisma.user.count({
       where: whereClause,
     }),
   ]);

packages/lib/server-only/user/send-confirmation-token.ts

@@ -1,41 +0,0 @@
-import crypto from 'crypto';
-
-import { prisma } from '@documenso/prisma';
-
-import { ONE_HOUR } from '../../constants/time';
-import { sendConfirmationEmail } from '../auth/send-confirmation-email';
-
-const IDENTIFIER = 'confirmation-email';
-
-export const sendConfirmationToken = async ({ email }: { email: string }) => {
-  const token = crypto.randomBytes(20).toString('hex');
-
-  const user = await prisma.user.findFirst({
-    where: {
-      email: email,
-    },
-  });
-
-  if (!user) {
-    throw new Error('User not found');
-  }
-
-  const createdToken = await prisma.verificationToken.create({
-    data: {
-      identifier: IDENTIFIER,
-      token: token,
-      expires: new Date(Date.now() + ONE_HOUR),
-      user: {
-        connect: {
-          id: user.id,
-        },
-      },
-    },
-  });
-
-  if (!createdToken) {
-    throw new Error(`Failed to create the verification token`);
-  }
-
-  return sendConfirmationEmail({ userId: user.id });
-};

packages/lib/server-only/user/verify-email.ts

@@ -1,70 +0,0 @@
-import { DateTime } from 'luxon';
-
-import { prisma } from '@documenso/prisma';
-
-import { sendConfirmationToken } from './send-confirmation-token';
-
-export type VerifyEmailProps = {
-  token: string;
-};
-
-export const verifyEmail = async ({ token }: VerifyEmailProps) => {
-  const verificationToken = await prisma.verificationToken.findFirst({
-    include: {
-      user: true,
-    },
-    where: {
-      token,
-    },
-  });
-
-  if (!verificationToken) {
-    return null;
-  }
-
-  // check if the token is valid or expired
-  const valid = verificationToken.expires > new Date();
-
-  if (!valid) {
-    const mostRecentToken = await prisma.verificationToken.findFirst({
-      where: {
-        userId: verificationToken.userId,
-      },
-      orderBy: {
-        createdAt: 'desc',
-      },
-    });
-
-    // If there isn't a recent token or it's older than 1 hour, send a new token
-    if (
-      !mostRecentToken ||
-      DateTime.now().minus({ hours: 1 }).toJSDate() > mostRecentToken.createdAt
-    ) {
-      await sendConfirmationToken({ email: verificationToken.user.email });
-    }
-
-    return valid;
-  }
-
-  const [updatedUser, deletedToken] = await prisma.$transaction([
-    prisma.user.update({
-      where: {
-        id: verificationToken.userId,
-      },
-      data: {
-        emailVerified: new Date(),
-      },
-    }),
-    prisma.verificationToken.deleteMany({
-      where: {
-        userId: verificationToken.userId,
-      },
-    }),
-  ]);
-
-  if (!updatedUser || !deletedToken) {
-    throw new Error('Something went wrong while verifying your email. Please try again.');
-  }
-
-  return !!updatedUser && !!deletedToken;
-};

packages/lib/types/next-auth.d.ts

@@ -6,11 +6,11 @@ declare module 'next-auth' {
     user: User;
   }
 
-  interface User extends Omit<DefaultUser, 'id' | 'image' | 'emailVerified'> {
+  interface User extends Omit<DefaultUser, 'id' | 'image'> {
     id: PrismaUser['id'];
     name?: PrismaUser['name'];
     email?: PrismaUser['email'];
-    emailVerified?: string | null;
+    emailVerified?: PrismaUser['emailVerified'];
   }
 }
 
@@ -19,7 +19,6 @@ declare module 'next-auth/jwt' {
     id: string | number;
     name?: string | null;
     email: string | null;
-    emailVerified?: string | null;
     lastSignedIn?: string | null;
   }
 }