chore: draft onBlur and unmount

Signed-off-by: Adithya Krishna <aadithya794@gmail.com>

.env.example

@@ -13,10 +13,6 @@ NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY="DEADBEEF"
 NEXT_PRIVATE_GOOGLE_CLIENT_ID=""
 NEXT_PRIVATE_GOOGLE_CLIENT_SECRET=""
 
-NEXT_PRIVATE_OIDC_WELL_KNOWN=""
-NEXT_PRIVATE_OIDC_CLIENT_ID=""
-NEXT_PRIVATE_OIDC_CLIENT_SECRET=""
-
 # [[URLS]]
 NEXT_PUBLIC_WEBAPP_URL="http://localhost:3000"
 NEXT_PUBLIC_MARKETING_URL="http://localhost:3001"
@@ -79,7 +75,7 @@ NEXT_PRIVATE_SMTP_APIKEY=
 # OPTIONAL: Defines whether to force the use of TLS.
 NEXT_PRIVATE_SMTP_SECURE=
 # REQUIRED: Defines the sender name to use for the from address.
-NEXT_PRIVATE_SMTP_FROM_NAME="Documenso"
+NEXT_PRIVATE_SMTP_FROM_NAME="No Reply @ Documenso"
 # REQUIRED: Defines the email address to use as the from address.
 NEXT_PRIVATE_SMTP_FROM_ADDRESS="noreply@documenso.com"
 # OPTIONAL: The API key to use for Resend.com

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/codeql-analysis.yml

@@ -33,9 +33,9 @@ jobs:
       - uses: ./.github/actions/cache-build
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2

.github/workflows/e2e-tests.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Run Playwright tests
         run: npm run ci
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: test-results

.github/workflows/issue-assignee-check.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Check Assigned User's Issue Count
         id: parse-comment
-        uses: actions/github-script@v6
+        uses: actions/github-script@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/issue-labeler.yml

@@ -1,25 +0,0 @@
-name: Auto Label Assigned Issues
-
-on:
-  issues:
-    types: [assigned]
-
-jobs:
-  label-when-assigned:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label issue
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const issue = context.issue;
-            // To run only on issues and not on PR
-            if (github.context.payload.issue.pull_request === undefined) {
-              const labelResponse = await github.rest.issues.addLabels({
-                owner: issue.owner,
-                repo: issue.repo,
-                issue_number: issue.number,
-                labels: ['status: assigned']
-              });
-            }

.github/workflows/issue-opened.yml

@@ -17,5 +17,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ["status: triage"]
+              labels: ["needs triage"]
             })

.github/workflows/pr-review-reminder.yml

@@ -2,14 +2,14 @@ name: 'PR Review Reminder'
 
 on:
   pull_request:
-    types: ['opened', 'ready_for_review']
+    types: ['opened', 'reopened', 'ready_for_review', 'review_requested']
 
 permissions:
   pull-requests: write
 
 jobs:
   checkPRs:
-    if: ${{ github.event.pull_request.user.login }} && github.event.action == ('opened' || 'ready_for_review')
+    if: ${{ github.event.pull_request.user.login }} && github.event.action == ('opened' || 'reopened' || 'ready_for_review' || 'review_requested')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-pr-stale: 90

.gitpod.yml

@@ -29,6 +29,16 @@ ports:
     visibility: private 
     onOpen: ignore
 
+
+github:
+  prebuilds:
+    master: true
+    pullRequests: true
+    pullRequestsFromForks: true
+    addCheck: true
+    addComment: true
+    addBadge: true
+
 vscode:
   extensions:
     - aaron-bond.better-comments
@@ -37,5 +47,9 @@ vscode:
     - esbenp.prettier-vscode
     - mikestead.dotenv
     - unifiedjs.vscode-mdx
+    - GitHub.copilot-chat
+    - GitHub.copilot-labs
+    - GitHub.copilot
     - GitHub.vscode-pull-request-github
     - Prisma.prisma
+    - VisualStudioExptTeam.vscodeintellicode

apps/marketing/content/blog/sunsetting-early-adopters.mdx

@@ -1,49 +0,0 @@
----
-title: Sunsetting the Early Adopters Plan
-description: We reached or Early Adopter cap and not transition to our regular pricing 🎉
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2024-06-12
-tags:
-  - Early Adopters
-  - Pricing 
-  - Open Startup
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/sunset.jpg"
-    width="1260"
-    height="630"
-    alt="A beautiful sunset as a metaphor for the Early Adopter phase ending"
-  />
-
-  <figcaption className="text-center">
-    "Being early is, uh, good." -Unknown
-  </figcaption>
-</figure>
-
-> TLDR; The Early Adopters Plan ended, and we have a new pricing. If you are an Early Adopter, reach out for a Discord community badge 🏅
-
-# The End of the Beginning
-12 months, 13 releases, and 344 merged pull requests after announcing the Early Adopter plan in our first-ever launch week, and we hit the cap of 100. Documenso has changed and grown a lot since then. For us, this is a great milestone towards our broader mission of bringing open signing to the world since now we are joined by a community consisting of contributors and early customers all around the world. 
-
-# The New Plans
-Starting today, we are sunsetting the Early Adopter Plan in favor of our new, more nuanced pricing model. The Early Adopter plan will succeeded by the **Individual plan**, which is still priced at $30/mo. The Individual plans will still include unlimited signatures and recipients since this aligns with our core belief of empowering our users wherever possible. If you managed to grab an Early Adopter plan, reach out on X or Discord to receive a special community badge. Early Adopters are meant to get preferential treatment where possible.
-
-Previously soft-launched as part of Early Adopters, we are officially introducing the **Team Plan** to our pricing for customers requiring multi-user accounts. Priced at $50/ mo. for 5 users, this plan offers unlimited signature volume as well. Additional users can be added for $10/mo. as needed. We have carefully crafted the billing of teams to ensure that dynamic changes are accurately reflected at the end of each billing cycle, providing you with a fair-value pricing structure.
-
-Our **Free Plan** stays unchanged, offering coverage to casual users and an easy way to try out Documenso or start developing.
-
-Check out our [new pricing page here](https://documen.so/pricing). We also updated our [open page](https://documen.so/open) to reflect the end of Early Adopters. The metric now counts active subscriptions from Individuals and Teams.
-
-# API Access
-All plans include access to the API as per our philosophy, making Documenso an open platform, and allowing everyone to build on it, no matter how big or small. Besides the Free Plan's 5 signatures per month limit, the API does not have access restrictions. Even the free plan can keep using the API after using its signature volume for non-signing operations like reading, editing, and even creating documents. Since the individual plan technically allows for running a Fortune 500 company for $30/ mo., plan we are adding a fair use clause here: You are free to use the API "a lot" if you are a big organization trying to stay on the Individual Plan we will ask to have a word about upgrading (which might make sense anyway considering your requirements). Fair use excludes Early Adopters, which we consider limitless by any measure. If you need clarification on whether your case is covered under fair use, you can contact us on Discord or support@documenso.com. It's probably fine, though.
-
-We also have a lot in the pipeline, and we are excited to share everything with you soon. A Big Shoutout to all Early Adopters. We salute you, and you will receive the preferred treatment where possible.
-
-If you have any questions or comments, please reach out on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord).
-
-Best from Hamburg\
-Timur

apps/marketing/next.config.js

@@ -18,10 +18,6 @@ const FONT_CAVEAT_BYTES = fs.readFileSync(
   path.join(__dirname, '../../packages/assets/fonts/caveat.ttf'),
 );
 
-const FONT_NOTO_SANS_BYTES = fs.readFileSync(
-  path.join(__dirname, '../../packages/assets/fonts/noto-sans.ttf'),
-);
-
 /** @type {import('next').NextConfig} */
 const config = {
   experimental: {
@@ -42,7 +38,6 @@ const config = {
   env: {
     NEXT_PUBLIC_PROJECT: 'marketing',
     FONT_CAVEAT_URI: `data:font/ttf;base64,${FONT_CAVEAT_BYTES.toString('base64')}`,
-    FONT_NOTO_SANS_URI: `data:font/ttf;base64,${FONT_NOTO_SANS_BYTES.toString('base64')}`,
   },
   modularizeImports: {
     'lucide-react': {

apps/marketing/package.json

@@ -21,9 +21,6 @@
     "@hookform/resolvers": "^3.1.0",
     "@openstatus/react": "^0.0.3",
     "contentlayer": "^0.3.4",
-    "embla-carousel": "^8.1.3",
-    "embla-carousel-autoplay": "^8.1.3",
-    "embla-carousel-react": "^8.1.3",
     "framer-motion": "^10.12.8",
     "lucide-react": "^0.279.0",
     "luxon": "^3.4.0",

apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart.tsx

@@ -3,11 +3,11 @@
 import { DateTime } from 'luxon';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
-import type { GetCompletedDocumentsMonthlyResult } from '@documenso/lib/server-only/user/get-monthly-completed-document';
+import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
 
 export type MonthlyCompletedDocumentsChartProps = {
   className?: string;
-  data: GetCompletedDocumentsMonthlyResult;
+  data: GetUserMonthlyGrowthResult;
 };
 
 export const MonthlyCompletedDocumentsChart = ({

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

@@ -247,8 +247,8 @@ export default async function OpenPage() {
           <BarMetric<EarlyAdoptersType>
             data={EARLY_ADOPTERS_DATA}
             metricKey="earlyAdopters"
-            title="Total Customers"
-            label="Total Customers"
+            title="Early Adopters"
+            label="Early Adopters"
             className="col-span-12 lg:col-span-6"
             extraInfo={<OpenPageTooltip />}
           />

apps/marketing/src/app/(marketing)/open/tooltip.tsx

@@ -29,7 +29,7 @@ export function OpenPageTooltip() {
           </svg>
         </TooltipTrigger>
         <TooltipContent>
-          <p>Customers with an Active Subscriptions.</p>
+          <p>Active Subscriptions.</p>
         </TooltipContent>
       </Tooltip>
     </TooltipProvider>

apps/marketing/src/app/(marketing)/open/total-signed-documents-chart.tsx

@@ -3,11 +3,11 @@
 import { DateTime } from 'luxon';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
-import type { GetCompletedDocumentsMonthlyResult } from '@documenso/lib/server-only/user/get-monthly-completed-document';
+import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
 
 export type TotalSignedDocumentsChartProps = {
   className?: string;
-  data: GetCompletedDocumentsMonthlyResult;
+  data: GetUserMonthlyGrowthResult;
 };
 
 export const TotalSignedDocumentsChart = ({ className, data }: TotalSignedDocumentsChartProps) => {

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

@@ -9,7 +9,6 @@ import {
 } from '@documenso/ui/primitives/accordion';
 import { Button } from '@documenso/ui/primitives/button';
 
-import { Enterprise } from '~/components/(marketing)/enterprise';
 import { PricingTable } from '~/components/(marketing)/pricing-table';
 
 export const metadata: Metadata = {
@@ -43,10 +42,6 @@ export default function PricingPage() {
         <PricingTable />
       </div>
 
-      <div className="mt-12">
-        <Enterprise />
-      </div>
-
       <div className="mx-auto mt-36 max-w-2xl">
         <h2 className="text-center text-2xl font-semibold">
           None of these work for you? Try self-hosting!

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

@@ -8,7 +8,7 @@ import { useRouter } from 'next/navigation';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { base64 } from '@documenso/lib/universal/base64';
-import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
+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';
@@ -115,7 +115,7 @@ export const SinglePlayerClient = () => {
     }
 
     try {
-      const putFileData = await putPdfFile(uploadedFile.file);
+      const putFileData = await putFile(uploadedFile.file);
 
       const documentToken = await createSinglePlayerDocument({
         documentData: {
@@ -248,7 +248,6 @@ export const SinglePlayerClient = () => {
                   recipients={uploadedFile ? [placeholderRecipient] : []}
                   fields={fields}
                   onSubmit={onFieldsSubmit}
-                  canGoBack={true}
                   isDocumentPdfLoaded={true}
                 />
               </fieldset>

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

@@ -34,18 +34,17 @@ export const Callout = ({ starCount }: CalloutProps) => {
 
   return (
     <div className="mt-8 flex flex-wrap items-center justify-center gap-x-6 gap-y-4">
-      <Link href="https://app.documenso.com/signup?utm_source=marketing-callout">
       <Button
         type="button"
         variant="outline"
         className="rounded-full bg-transparent backdrop-blur-sm"
+        onClick={onSignUpClick}
       >
-          Try our Free Plan
+        Claim Early Adopter Plan
         <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs font-medium">
-            No Credit Card required
+          $30/mo
         </span>
       </Button>
-      </Link>
 
       <Link
         href="https://github.com/documenso/documenso"

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

@@ -1,261 +0,0 @@
-'use client';
-
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-
-import Autoplay from 'embla-carousel-autoplay';
-import useEmblaCarousel from 'embla-carousel-react';
-import { useTheme } from 'next-themes';
-
-import { Card } from '@documenso/ui/primitives/card';
-import { Progress } from '@documenso/ui/primitives/progress';
-
-import { Slide } from './slide';
-
-const SLIDES = [
-  {
-    label: 'Signing Process',
-    type: 'video',
-    srcLight: 'https://github.com/documenso/design/raw/main/marketing/signing.webm',
-    srcDark: 'https://github.com/documenso/design/raw/main/marketing/dark/signing.webm',
-  },
-  {
-    label: 'Teams',
-    type: 'video',
-    srcLight: 'https://github.com/documenso/design/raw/main/marketing/teams.webm',
-    srcDark: 'https://github.com/documenso/design/raw/main/marketing/dark/teams.webm',
-  },
-  {
-    label: 'Zapier',
-    type: 'video',
-    srcLight: 'https://github.com/documenso/design/raw/main/marketing/zapier.webm',
-    srcDark: 'https://github.com/documenso/design/raw/main/marketing/dark/zapier.webm',
-  },
-  {
-    label: 'Webhooks',
-    type: 'video',
-    srcLight: 'https://github.com/documenso/design/raw/main/marketing/webhooks.webm',
-    srcDark: 'https://github.com/documenso/design/raw/main/marketing/dark/webhooks.webm',
-  },
-  {
-    label: 'API',
-    type: 'video',
-    srcLight: 'https://github.com/documenso/design/raw/main/marketing/api.webm',
-    srcDark: 'https://github.com/documenso/design/raw/main/marketing/dark/api.webm',
-  },
-  {
-    label: 'Profile',
-    type: 'video',
-    srcLight: 'https://github.com/documenso/design/raw/main/marketing/profile_teaser.webm',
-    srcDark: 'https://github.com/documenso/design/raw/main/marketing/dark/profile_teaser.webm',
-  },
-];
-
-export const Carousel = () => {
-  const slides = SLIDES;
-  const [_isPlaying, setIsPlaying] = useState(false);
-  const [selectedIndex, setSelectedIndex] = useState(0);
-  const [progress, setProgress] = useState(0);
-  const videoRefs = useRef<(HTMLVideoElement | null)[]>([]);
-  const [autoplayDelay, setAutoplayDelay] = useState<number[]>([]);
-  const { resolvedTheme } = useTheme();
-  const [mounted, setMounted] = useState(false);
-
-  useEffect(() => {
-    setMounted(true);
-  }, []);
-
-  const [emblaRef, emblaApi] = useEmblaCarousel({ loop: true }, [
-    Autoplay({ playOnInit: true, delay: autoplayDelay[selectedIndex] || 5000 }),
-  ]);
-  const [emblaThumbsRef, emblaThumbsApi] = useEmblaCarousel(
-    {
-      loop: true,
-      containScroll: 'keepSnaps',
-      dragFree: true,
-    },
-    [Autoplay({ playOnInit: true, delay: autoplayDelay[selectedIndex] || 5000 })],
-  );
-
-  const onThumbClick = useCallback(
-    (index: number) => {
-      if (!emblaApi || !emblaThumbsApi) return;
-      emblaApi.scrollTo(index);
-    },
-    [emblaApi, emblaThumbsApi],
-  );
-
-  const onSelect = useCallback(() => {
-    if (!emblaApi || !emblaThumbsApi) return;
-    setSelectedIndex(emblaApi.selectedScrollSnap());
-    emblaThumbsApi.scrollTo(emblaApi.selectedScrollSnap());
-
-    resetProgress();
-    const autoplay = emblaApi.plugins()?.autoplay;
-
-    if (autoplay) {
-      autoplay.reset();
-    }
-  }, [emblaApi, emblaThumbsApi, setSelectedIndex]);
-
-  const resetProgress = useCallback(() => {
-    setProgress(0);
-  }, []);
-
-  useEffect(() => {
-    const setVideoDurations = async () => {
-      const durations = await Promise.all(
-        videoRefs.current.map(
-          async (video) =>
-            new Promise<number>((resolve) => {
-              if (video) {
-                video.onloadedmetadata = () => resolve(video.duration * 1000);
-              } else {
-                resolve(5000);
-              }
-            }),
-        ),
-      );
-
-      setAutoplayDelay(durations);
-    };
-
-    void setVideoDurations();
-  }, [slides, mounted, resolvedTheme]);
-
-  useEffect(() => {
-    const observer = new IntersectionObserver(
-      (entries) => {
-        entries.forEach((entry) => {
-          if (entry.isIntersecting) {
-            const video = entry.target as HTMLVideoElement;
-            video
-              .play()
-              .catch((error) => console.log('Error attempting to play the video:', error));
-          } else {
-            const video = entry.target as HTMLVideoElement;
-            video.pause();
-          }
-        });
-      },
-      {
-        threshold: 0.5,
-      },
-    );
-
-    videoRefs.current.forEach((video) => {
-      if (video) {
-        observer.observe(video);
-      }
-    });
-
-    return () => {
-      observer.disconnect();
-    };
-  }, [slides, mounted, resolvedTheme]);
-
-  useEffect(() => {
-    if (!emblaApi) return;
-    onSelect();
-
-    emblaApi.on('select', onSelect).on('reInit', onSelect);
-  }, [emblaApi, onSelect, mounted, resolvedTheme]);
-
-  useEffect(() => {
-    const autoplay = emblaApi?.plugins()?.autoplay;
-    if (!autoplay) return;
-
-    setIsPlaying(autoplay.isPlaying());
-    emblaApi
-      .on('autoplay:play', () => setIsPlaying(true))
-      .on('autoplay:stop', () => setIsPlaying(false))
-      .on('reInit', () => setIsPlaying(autoplay.isPlaying()));
-  }, [emblaApi, mounted, resolvedTheme]);
-
-  useEffect(() => {
-    if (autoplayDelay[selectedIndex] === undefined) return;
-
-    const updateInterval = 50;
-    const increment = 100 / (autoplayDelay[selectedIndex] / updateInterval);
-    let progressValue = 0;
-
-    const timer = setInterval(() => {
-      setProgress((prevProgress) => {
-        progressValue = prevProgress + increment;
-        if (progressValue >= 100) {
-          clearInterval(timer);
-          if (emblaApi) {
-            emblaApi.scrollNext();
-          }
-          return 100;
-        }
-        return progressValue;
-      });
-    }, updateInterval);
-
-    return () => clearInterval(timer);
-  }, [selectedIndex, autoplayDelay, emblaApi, mounted, resolvedTheme]);
-
-  useEffect(() => {
-    if (!emblaApi) return;
-
-    const resetCarousel = () => {
-      emblaApi.reInit();
-      emblaApi.scrollTo(0);
-    };
-
-    resetCarousel();
-  }, [emblaApi, autoplayDelay, mounted, resolvedTheme]);
-
-  // Ensure the component renders only after mounting to avoid theme issues
-  if (!mounted) return null;
-  return (
-    <>
-      <Card className="mx-auto mt-12 w-full max-w-4xl rounded-2xl p-1 before:rounded-2xl" gradient>
-        <div className="overflow-hidden rounded-xl" ref={emblaRef}>
-          <div className="flex touch-pan-y rounded-xl">
-            {slides.map((slide, index) => (
-              <div className="min-w-[10rem] flex-none basis-full rounded-xl" key={index}>
-                {slide.type === 'video' && (
-                  <video
-                    key={`${resolvedTheme}-${index}`}
-                    ref={(el) => (videoRefs.current[index] = el)}
-                    muted
-                    loop
-                    className="h-auto w-full rounded-xl"
-                  >
-                    <source
-                      src={resolvedTheme === 'dark' ? slide.srcDark : slide.srcLight}
-                      type="video/webm"
-                    />
-                    Your browser does not support the video tag.
-                  </video>
-                )}
-              </div>
-            ))}
-          </div>
-        </div>
-
-        <div className="dark:bg-background absolute bottom-2 right-2 flex w-[5%] flex-col items-center space-y-1 rounded-lg bg-white  p-1.5">
-          <span className="text-foreground dark:text-muted-foreground text-xs">
-            {selectedIndex + 1}/{slides.length}
-          </span>
-          <Progress value={progress} className="h-1" />
-        </div>
-      </Card>
-
-      <div className="mx-auto mt-12 max-w-4xl px-2">
-        <div className="mt-2 flex justify-between" ref={emblaThumbsRef}>
-          {slides.map((slide, index) => (
-            <Slide
-              key={index}
-              onClick={() => onThumbClick(index)}
-              selected={index === selectedIndex}
-              index={index}
-              label={slide.label}
-            />
-          ))}
-        </div>
-      </div>
-    </>
-  );
-};

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

@@ -1,36 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-
-import { usePlausible } from 'next-plausible';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-export const Enterprise = () => {
-  const event = usePlausible();
-
-  return (
-    <div className="mx-auto mt-36 max-w-2xl">
-      <h2 className="text-center text-2xl font-semibold">
-        Enterprise Compliance, License or Technical Needs?
-      </h2>
-
-      <p className="text-muted-foreground mt-4 text-center leading-relaxed">
-        Our Enterprise License is great large organizations looking to switch to Documenso for all
-        their signing needs. It's availible for our cloud offering as well as self-hosted setups and
-        offer a wide range of compliance and Adminstration Features.
-      </p>
-
-      <div className="mt-4 flex justify-center">
-        <Link
-          href="https://dub.sh/enterprise"
-          target="_blank"
-          className="mt-6"
-          onClick={() => event('enterprise-contact')}
-        >
-          <Button className="rounded-full text-base">Contact Us</Button>
-        </Link>
-      </div>
-    </div>
-  );
-};

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

@@ -14,7 +14,7 @@ import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-fl
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
-import { Carousel } from './carousel';
+import { Widget } from './widget';
 
 export type HeroProps = {
   className?: string;
@@ -50,21 +50,6 @@ const HeroTitleVariants: Variants = {
   },
 };
 
-const HeroCarouselVariants: Variants = {
-  initial: {
-    opacity: 0,
-    y: 60,
-  },
-  animate: {
-    opacity: 1,
-    y: 0,
-    transition: {
-      delay: 0.5,
-      duration: 0.8,
-    },
-  },
-};
-
 export const Hero = ({ className, ...props }: HeroProps) => {
   const event = usePlausible();
 
@@ -72,6 +57,23 @@ export const Hero = ({ className, ...props }: HeroProps) => {
 
   const heroMarketingCTA = getFlag('marketing_landing_hero_cta');
 
+  const onSignUpClick = () => {
+    const el = document.getElementById('email');
+
+    if (el) {
+      const { top } = el.getBoundingClientRect();
+
+      window.scrollTo({
+        top: top - 120,
+        behavior: 'smooth',
+      });
+
+      requestAnimationFrame(() => {
+        el.focus();
+      });
+    }
+  };
+
   return (
     <motion.div className={cn('relative', className)} {...props}>
       <div className="absolute -inset-24 -z-10">
@@ -106,18 +108,18 @@ export const Hero = ({ className, ...props }: HeroProps) => {
           animate="animate"
           className="mt-8 flex flex-wrap items-center justify-center gap-x-6 gap-y-4"
         >
-          <Link href="https://app.documenso.com/signup?utm_source=marketing-hero">
           <Button
             type="button"
             variant="outline"
             className="rounded-full bg-transparent backdrop-blur-sm"
+            onClick={onSignUpClick}
           >
-              Try our Free Plan
+            Claim Early Adopter Plan
             <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs font-medium">
-                No Credit Card required
+              $30/mo
             </span>
           </Button>
-          </Link>
+
           <Link href="https://github.com/documenso/documenso" onClick={() => event('view-github')}>
             <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
               <LuGithub className="mr-2 h-5 w-5" />
@@ -168,11 +170,74 @@ export const Hero = ({ className, ...props }: HeroProps) => {
 
         <motion.div
           className="mt-12"
-          variants={HeroCarouselVariants}
+          variants={{
+            initial: {
+              scale: 0.2,
+              opacity: 0,
+            },
+            animate: {
+              scale: 1,
+              opacity: 1,
+              transition: {
+                ease: 'easeInOut',
+                delay: 0.5,
+                duration: 0.8,
+              },
+            },
+          }}
           initial="initial"
           animate="animate"
         >
-          <Carousel />
+          <Widget className="mt-12">
+            <strong>Documenso Supporter Pledge</strong>
+            <p className="w-full max-w-[70ch]">
+              Our mission is to create an open signing infrastructure that empowers the world,
+              enabling businesses to embrace openness, cooperation, and transparency. We believe
+              that signing, as a fundamental act, should embody these values. By offering an
+              open-source signing solution, we aim to make document signing accessible, transparent,
+              and trustworthy.
+            </p>
+
+            <p className="w-full max-w-[70ch]">
+              Through our platform, called Documenso, we strive to earn your trust by allowing
+              self-hosting and providing complete visibility into its inner workings. We value
+              inclusivity and foster an environment where diverse perspectives and contributions are
+              welcomed, even though we may not implement them all.
+            </p>
+
+            <p className="w-full max-w-[70ch]">
+              At Documenso, we envision a web-enabled future for business and contracts, and we are
+              committed to being the leading provider of open signing infrastructure. By combining
+              exceptional product design with open-source principles, we aim to deliver a robust and
+              well-designed application that exceeds your expectations.
+            </p>
+
+            <p className="w-full max-w-[70ch]">
+              We understand that exceptional products are born from exceptional communities, and we
+              invite you to join our open-source community. Your contributions, whether technical or
+              non-technical, will help shape the future of signing. Together, we can create a better
+              future for everyone.
+            </p>
+
+            <p className="w-full max-w-[70ch]">
+              Today we invite you to join us on this journey: By signing this mission statement you
+              signal your support of Documenso's mission{' '}
+              <span className="bg-primary text-black">
+                (in a non-legally binding, but heartfelt way)
+              </span>{' '}
+              and lock in the early adopter plan for forever, including everything we build this
+              year.
+            </p>
+
+            <div className="flex h-24 items-center">
+              <p className={cn('text-5xl [font-family:var(--font-caveat)]')}>Timur & Lucas</p>
+            </div>
+
+            <div>
+              <strong>Timur Ercan & Lucas Smith</strong>
+              <p className="mt-1">Co-Founders, Documenso</p>
+            </div>
+          </Widget>
         </motion.div>
       </div>
     </motion.div>

apps/marketing/src/components/(marketing)/pricing-table.tsx

@@ -58,7 +58,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           >
             Yearly
             <div className="bg-muted text-foreground block rounded-full px-2 py-0.5 text-xs">
-              Save $60 or $100
+              Save $60
             </div>
             {period === 'YEARLY' && (
               <motion.div
@@ -75,7 +75,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           data-plan="free"
           className="bg-background shadow-foreground/5 flex flex-col items-center justify-center rounded-lg border px-8 py-12 shadow-lg"
         >
-          <p className="text-foreground text-4xl font-medium">Free</p>
+          <p className="text-foreground text-4xl font-medium">Free Plan</p>
           <p className="text-primary mt-2.5 text-xl font-medium">$0</p>
 
           <p className="text-foreground mt-4 max-w-[30ch] text-center">
@@ -102,10 +102,10 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
         </div>
 
         <div
-          data-plan="individual"
-          className="bg-background shadow-foreground/5 flex flex-col items-center justify-center rounded-lg border-2 px-8 py-12 shadow-[0px_0px_0px_4px_#E3E3E380]"
+          data-plan="early-adopter"
+          className="border-primary bg-background shadow-foreground/5 flex flex-col items-center justify-center rounded-lg border-2 px-8 py-12 shadow-[0px_0px_0px_4px_#E3E3E380]"
         >
-          <p className="text-foreground text-4xl font-medium">Individual</p>
+          <p className="text-foreground text-4xl font-medium">Early Adopters</p>
           <div className="text-primary mt-2.5 text-xl font-medium">
             <AnimatePresence mode="wait">
               {period === 'MONTHLY' && <motion.div layoutId="pricing">$30</motion.div>}
@@ -114,12 +114,12 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           </div>
 
           <p className="text-foreground mt-4 max-w-[30ch] text-center">
-            Everything you need for a great signing experience.
+            For fast-growing companies that aim to scale across multiple teams.
           </p>
 
           <Button className="mt-6 rounded-full text-base" asChild>
             <Link
-              href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup?utm_source=pricing-individual-plan`}
+              href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup?utm_source=pricing-early-adopter`}
               target="_blank"
             >
               Signup Now
@@ -127,46 +127,51 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           </Button>
 
           <div className="mt-8 flex w-full flex-col divide-y">
-            <p className="text-foreground py-4">Unlimited Documents per Month</p>
-            <p className="text-foreground py-4">API Accesss</p>
-            <p className="text-foreground py-4">Email and Discord Support</p>
-            <p className="text-foreground py-4">Premium Profile Name</p>
+            <p className="text-foreground py-4">
+              <a
+                href="https://documen.so/early-adopters-pricing-page"
+                target="_blank"
+                rel="noreferrer"
+              >
+                Limited Time Offer: <span className="text-documenso-700">Read More</span>
+              </a>
+            </p>
+            <p className="text-foregro‚und py-4">Unlimited Teams</p>
+            <p className="text-foregro‚und py-4">Unlimited Users</p>
+            <p className="text-foregro‚und py-4">Unlimited Documents per month</p>
+            <p className="text-foreground py-4">Includes all upcoming features</p>
+            <p className="text-foreground py-4">Email, Discord and Slack assistance</p>
           </div>
           <div className="flex-1" />
         </div>
 
         <div
-          data-plan="teams"
-          className="border-primary bg-background shadow-foreground/5 flex flex-col items-center justify-center rounded-lg border px-8 py-12 shadow-lg"
+          data-plan="enterprise"
+          className="bg-background shadow-foreground/5 flex flex-col items-center justify-center rounded-lg border px-8 py-12 shadow-lg"
         >
-          <p className="text-foreground text-4xl font-medium">Teams</p>
-          <div className="text-primary mt-2.5 text-xl font-medium">
-            <AnimatePresence mode="wait">
-              {period === 'MONTHLY' && <motion.div layoutId="pricingTeams">$50</motion.div>}
-              {period === 'YEARLY' && <motion.div layoutId="pricingTeams">$500</motion.div>}
-            </AnimatePresence>
-          </div>
+          <p className="text-foreground text-4xl font-medium">Enterprise</p>
+          <p className="text-primary mt-2.5 text-xl font-medium">Pricing on request</p>
 
           <p className="text-foreground mt-4 max-w-[30ch] text-center">
-            For companies looking to scale across multiple teams.
+            For large organizations that need extra flexibility and control.
           </p>
 
-          <Button className="mt-6 rounded-full text-base" asChild>
           <Link
-              href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup?utm_source=pricing-teams-plan`}
+            href="https://dub.sh/enterprise"
             target="_blank"
+            className="mt-6"
+            onClick={() => event('enterprise-contact')}
           >
-              Signup Now
+            <Button className="rounded-full text-base">Contact Us</Button>
           </Link>
-          </Button>
 
           <div className="mt-8 flex w-full flex-col divide-y">
-            <p className="text-foreground py-4">Unlimited Documents per Month</p>
-            <p className="text-foreground py-4">API Accesss</p>
-            <p className="text-foreground py-4">Email and Discord Support</p>
-            <p className="text-foreground py-4 font-medium">Team Inbox</p>
-            <p className="text-foreground py-4">5 Users Included</p>
-            <p className="text-foreground py-4">Add More Users for $10/ mo.</p>
+            <p className="text-foreground py-4 font-medium">Everything in Early Adopters, plus:</p>
+            <p className="text-foreground py-4">Custom Subdomain</p>
+            <p className="text-foreground py-4">Compliance Check</p>
+            <p className="text-foreground py-4">Guaranteed Uptime</p>
+            <p className="text-foreground py-4">Reporting & Analysis</p>
+            <p className="text-foreground py-4">24/7 Support</p>
           </div>
         </div>
       </div>

apps/marketing/src/components/(marketing)/share-connect-paid-widget-bento.tsx

@@ -70,7 +70,7 @@ export const ShareConnectPaidWidgetBento = ({
           <CardContent className="grid grid-cols-1 gap-8 p-6">
             <p className="text-foreground/80 leading-relaxed">
               <strong className="block">Get paid (Soon).</strong>
-              Integrated payments with Stripe so you don’t have to worry about getting paid.
+              Integrated payments with stripe so you don’t have to worry about getting paid.
             </p>
 
             <div className="flex items-center justify-center p-8">

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

@@ -1,29 +0,0 @@
-import React from 'react';
-
-import { cn } from '@documenso/ui/lib/utils';
-
-type SlideProps = {
-  selected: boolean;
-  index: number;
-  onClick: () => void;
-  label: string;
-};
-
-export const Slide: React.FC<SlideProps> = (props) => {
-  const { selected, label, onClick } = props;
-
-  return (
-    <button
-      onClick={onClick}
-      type="button"
-      className={cn(
-        'text-muted-foreground dark:text-muted-foreground/60 border-b-2 border-transparent py-4',
-        {
-          'border-primary text-foreground dark:text-muted-foreground border-b-2': selected,
-        },
-      )}
-    >
-      {label}
-    </button>
-  );
-};

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

@@ -0,0 +1,421 @@
+'use client';
+
+import type { HTMLAttributes, KeyboardEvent } from 'react';
+import { useMemo, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AnimatePresence, motion } from 'framer-motion';
+import { Loader } from 'lucide-react';
+import { usePlausible } from 'next-plausible';
+import { env } from 'next-runtime-env';
+import { Controller, useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@documenso/ui/primitives/dialog';
+import { Input } from '@documenso/ui/primitives/input';
+import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { claimPlan } from '~/api/claim-plan/fetcher';
+
+import { STEP } from '../constants';
+import { FormErrorMessage } from '../form/form-error-message';
+
+const ZWidgetFormSchema = z
+  .object({
+    email: z.string().email({ message: 'Please enter a valid email address.' }),
+    name: z.string().trim().min(3, { message: 'Please enter a valid name.' }),
+  })
+  .and(
+    z.union([
+      z.object({
+        signatureDataUrl: z.string().min(1),
+        signatureText: z.null().or(z.string().max(0)),
+      }),
+      z.object({
+        signatureDataUrl: z.null().or(z.string().max(0)),
+        signatureText: z.string().trim().min(1),
+      }),
+    ]),
+  );
+
+export type TWidgetFormSchema = z.infer<typeof ZWidgetFormSchema>;
+
+type StepKeys = keyof typeof STEP;
+type StepValues = (typeof STEP)[StepKeys];
+
+export type WidgetProps = HTMLAttributes<HTMLDivElement>;
+
+export const Widget = ({ className, children, ...props }: WidgetProps) => {
+  const { toast } = useToast();
+  const event = usePlausible();
+
+  const [step, setStep] = useState<StepValues>(STEP.EMAIL);
+  const [showSigningDialog, setShowSigningDialog] = useState(false);
+  const [draftSignatureDataUrl, setDraftSignatureDataUrl] = useState<string | null>(null);
+
+  const {
+    control,
+    register,
+    handleSubmit,
+    setValue,
+    trigger,
+    watch,
+    formState: { errors, isSubmitting, isValid },
+  } = useForm<TWidgetFormSchema>({
+    mode: 'onChange',
+    defaultValues: {
+      email: '',
+      name: '',
+      signatureDataUrl: null,
+      signatureText: '',
+    },
+    resolver: zodResolver(ZWidgetFormSchema),
+  });
+
+  const signatureDataUrl = watch('signatureDataUrl');
+  const signatureText = watch('signatureText');
+
+  const stepsRemaining = useMemo(() => {
+    if (step === STEP.NAME) {
+      return 2;
+    }
+
+    if (step === STEP.EMAIL) {
+      return 3;
+    }
+
+    return 1;
+  }, [step]);
+
+  const onNextStepClick = () => {
+    if (step === STEP.EMAIL) {
+      setStep(STEP.NAME);
+
+      setTimeout(() => {
+        document.querySelector<HTMLElement>('#name')?.focus();
+      }, 0);
+    }
+
+    if (step === STEP.NAME) {
+      setStep(STEP.SIGN);
+
+      setTimeout(() => {
+        document.querySelector<HTMLElement>('#signatureText')?.focus();
+      }, 0);
+    }
+  };
+
+  const onEnterPress = (callback: () => void) => {
+    return (e: KeyboardEvent) => {
+      if (e.key === 'Enter') {
+        e.preventDefault();
+
+        callback();
+      }
+    };
+  };
+
+  const onSignatureConfirmClick = () => {
+    setValue('signatureDataUrl', draftSignatureDataUrl);
+    setValue('signatureText', '');
+
+    void trigger('signatureDataUrl');
+    setShowSigningDialog(false);
+  };
+
+  const onFormSubmit = async ({
+    email,
+    name,
+    signatureDataUrl,
+    signatureText,
+  }: TWidgetFormSchema) => {
+    try {
+      const delay = new Promise<void>((resolve) => {
+        setTimeout(resolve, 1000);
+      });
+
+      const planId = env('NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID');
+
+      if (!planId) {
+        throw new Error('No plan ID found.');
+      }
+
+      const claimPlanInput = signatureDataUrl
+        ? {
+            name,
+            email,
+            planId,
+            signatureDataUrl: signatureDataUrl,
+            signatureText: null,
+          }
+        : {
+            name,
+            email,
+            planId,
+            signatureDataUrl: null,
+            signatureText: signatureText ?? '',
+          };
+
+      const [result] = await Promise.all([claimPlan(claimPlanInput), delay]);
+
+      event('claim-plan-widget');
+
+      window.location.href = result;
+    } catch (error) {
+      event('claim-plan-failed');
+
+      toast({
+        title: 'Something went wrong',
+        description: error instanceof Error ? error.message : 'Please try again later.',
+        variant: 'destructive',
+      });
+    }
+  };
+
+  return (
+    <>
+      <Card
+        className={cn('mx-auto w-full max-w-4xl rounded-3xl before:rounded-3xl', className)}
+        gradient
+        {...props}
+      >
+        <div className="grid grid-cols-12 gap-y-8 overflow-hidden p-2 lg:gap-x-8">
+          <div className="text-muted-foreground col-span-12 flex flex-col gap-y-4 p-4 text-xs leading-relaxed lg:col-span-7">
+            {children}
+          </div>
+
+          <form
+            className="bg-foreground/5 col-span-12 flex flex-col rounded-2xl p-6 lg:col-span-5"
+            onSubmit={handleSubmit(onFormSubmit)}
+          >
+            <h3 className="text-xl font-semibold">Sign up to Early Adopter Plan</h3>
+            <p className="text-muted-foreground mt-2 text-xs">
+              with Timur Ercan & Lucas Smith from Documenso
+            </p>
+
+            <hr className="mb-6 mt-4" />
+
+            <AnimatePresence>
+              <motion.div key="email">
+                <label htmlFor="email" className="text-foreground font-medium ">
+                  What’s your email?
+                </label>
+
+                <Controller
+                  control={control}
+                  name="email"
+                  render={({ field }) => (
+                    <div className="relative mt-2">
+                      <Input
+                        id="email"
+                        type="email"
+                        placeholder="your@example.com"
+                        className="bg-background w-full pr-16"
+                        disabled={isSubmitting}
+                        onKeyDown={(e) =>
+                          field.value !== '' &&
+                          !errors.email?.message &&
+                          onEnterPress(onNextStepClick)(e)
+                        }
+                        {...field}
+                      />
+
+                      <div className="absolute inset-y-0 right-0 p-1.5">
+                        <Button
+                          type="button"
+                          className="bg-primary h-full w-14 rounded"
+                          disabled={!field.value || !!errors.email?.message}
+                          onClick={() => step === STEP.EMAIL && onNextStepClick()}
+                        >
+                          Next
+                        </Button>
+                      </div>
+                    </div>
+                  )}
+                />
+
+                <FormErrorMessage error={errors.email} className="mt-1" />
+              </motion.div>
+
+              {(step === STEP.NAME || step === STEP.SIGN) && (
+                <motion.div
+                  key="name"
+                  className="mt-4"
+                  animate={{
+                    opacity: 1,
+                    transform: 'translateX(0)',
+                  }}
+                  initial={{
+                    opacity: 0,
+                    transform: 'translateX(-25%)',
+                  }}
+                  exit={{
+                    opacity: 0,
+                    transform: 'translateX(25%)',
+                  }}
+                >
+                  <label htmlFor="name" className="text-foreground font-medium ">
+                    And your name?
+                  </label>
+
+                  <Controller
+                    control={control}
+                    name="name"
+                    render={({ field }) => (
+                      <div className="relative mt-2">
+                        <Input
+                          id="name"
+                          type="text"
+                          placeholder=""
+                          className="bg-background w-full pr-16"
+                          disabled={isSubmitting}
+                          onKeyDown={(e) =>
+                            field.value !== '' &&
+                            !errors.name?.message &&
+                            onEnterPress(onNextStepClick)(e)
+                          }
+                          {...field}
+                        />
+
+                        <div className="absolute inset-y-0 right-0 p-1.5">
+                          <Button
+                            type="button"
+                            className="bg-primary h-full w-14 rounded"
+                            disabled={!field.value || !!errors.name?.message}
+                            onClick={() => onNextStepClick()}
+                          >
+                            Next
+                          </Button>
+                        </div>
+                      </div>
+                    )}
+                  />
+
+                  <FormErrorMessage error={errors.name} className="mt-1" />
+                </motion.div>
+              )}
+            </AnimatePresence>
+
+            <div className="mt-12 flex-1" />
+
+            <div className="flex items-center justify-between">
+              <p className="text-muted-foreground text-xs">
+                {isValid ? 'Ready for Signing' : `${stepsRemaining} step(s) until signed`}
+              </p>
+
+              <p className="text-muted-foreground block text-xs md:hidden">Minimise contract</p>
+            </div>
+
+            <div className="bg-background relative mt-2.5 h-[2px] w-full">
+              <div
+                className={cn('bg-primary/60 absolute inset-y-0 left-0 duration-200', {
+                  'w-1/3': stepsRemaining === 3,
+                  'w-2/3': stepsRemaining === 2,
+                  'w-11/12': stepsRemaining === 1,
+                  'w-full': isValid,
+                })}
+              />
+            </div>
+
+            <Card id="signature" className="mt-4" degrees={-140} gradient>
+              <CardContent
+                role="button"
+                className="relative cursor-pointer pt-6"
+                onClick={() => setShowSigningDialog(true)}
+              >
+                <div className="flex h-28 items-center justify-center pb-6">
+                  {!signatureText && signatureDataUrl && (
+                    <img
+                      src={signatureDataUrl}
+                      alt="user signature"
+                      className="h-full dark:invert"
+                    />
+                  )}
+
+                  {signatureText && (
+                    <p
+                      className={cn(
+                        'text-foreground truncate text-4xl font-semibold [font-family:var(--font-caveat)]',
+                      )}
+                    >
+                      {signatureText}
+                    </p>
+                  )}
+                </div>
+
+                <div
+                  className="absolute inset-x-0 bottom-0 flex cursor-auto items-center justify-between px-4 pb-2"
+                  onClick={(e) => e.stopPropagation()}
+                >
+                  <Input
+                    id="signatureText"
+                    className="text-foreground placeholder:text-muted-foreground truncate border-none p-0 text-sm focus-visible:ring-0"
+                    placeholder="Draw or type name here"
+                    disabled={isSubmitting}
+                    {...register('signatureText', {
+                      onChange: (e) => {
+                        if (e.target.value !== '') {
+                          setValue('signatureDataUrl', null);
+                        }
+                      },
+                    })}
+                  />
+
+                  <Button
+                    type="submit"
+                    className="disabled:bg-muted disabled:text-muted-foreground disabled:hover:bg-muted h-8"
+                    disabled={!isValid || isSubmitting}
+                  >
+                    {isSubmitting && <Loader className="mr-2 h-4 w-4 animate-spin" />}
+                    Sign
+                  </Button>
+                </div>
+              </CardContent>
+            </Card>
+          </form>
+        </div>
+      </Card>
+
+      <Dialog open={showSigningDialog} onOpenChange={setShowSigningDialog}>
+        <DialogContent position="center">
+          <DialogHeader>
+            <DialogTitle>Add your signature</DialogTitle>
+          </DialogHeader>
+
+          <DialogDescription>
+            By signing you signal your support of Documenso's mission in a <br></br>
+            <strong>non-legally binding, but heartfelt way</strong>. <br></br>
+            <br></br>You also unlock the option to purchase the early supporter plan including
+            everything we build this year for fixed price.
+          </DialogDescription>
+
+          <SignaturePad
+            disabled={isSubmitting}
+            className="aspect-video w-full rounded-md border"
+            defaultValue={signatureDataUrl || ''}
+            onChange={setDraftSignatureDataUrl}
+          />
+
+          <DialogFooter>
+            <Button variant="ghost" onClick={() => setShowSigningDialog(false)}>
+              Cancel
+            </Button>
+
+            <Button onClick={() => onSignatureConfirmClick()}>Confirm</Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </>
+  );
+};

apps/marketing/src/pages/api/stripe/webhook/index.ts

@@ -13,7 +13,6 @@ import { updateFile } from '@documenso/lib/universal/upload/update-file';
 import { prisma } from '@documenso/prisma';
 import {
   DocumentDataType,
-  DocumentSource,
   DocumentStatus,
   FieldType,
   ReadStatus,
@@ -105,7 +104,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
       const document = await prisma.document.create({
         data: {
-          source: DocumentSource.DOCUMENT,
           title: 'Documenso Supporter Pledge.pdf',
           status: DocumentStatus.COMPLETED,
           userId: user.id,

apps/web/next.config.js

@@ -18,10 +18,6 @@ const FONT_CAVEAT_BYTES = fs.readFileSync(
   path.join(__dirname, '../../packages/assets/fonts/caveat.ttf'),
 );
 
-const FONT_NOTO_SANS_BYTES = fs.readFileSync(
-  path.join(__dirname, '../../packages/assets/fonts/noto-sans.ttf'),
-);
-
 /** @type {import('next').NextConfig} */
 const config = {
   output: process.env.DOCKER_OUTPUT ? 'standalone' : undefined,
@@ -46,7 +42,6 @@ const config = {
     APP_VERSION: version,
     NEXT_PUBLIC_PROJECT: 'web',
     FONT_CAVEAT_URI: `data:font/ttf;base64,${FONT_CAVEAT_BYTES.toString('base64')}`,
-    FONT_NOTO_SANS_URI: `data:font/ttf;base64,${FONT_NOTO_SANS_BYTES.toString('base64')}`,
   },
   modularizeImports: {
     'lucide-react': {

apps/web/package.json

@@ -28,7 +28,6 @@
     "cookie-es": "^1.0.0",
     "formidable": "^2.1.1",
     "framer-motion": "^10.12.8",
-    "input-otp": "^1.2.4",
     "lucide-react": "^0.279.0",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",

apps/web/process-env.d.ts

@@ -12,9 +12,5 @@ declare namespace NodeJS {
 
     NEXT_PRIVATE_GOOGLE_CLIENT_ID: string;
     NEXT_PRIVATE_GOOGLE_CLIENT_SECRET: string;
-
-    NEXT_PRIVATE_OIDC_WELL_KNOWN: string;
-    NEXT_PRIVATE_OIDC_CLIENT_ID: string;
-    NEXT_PRIVATE_OIDC_CLIENT_SECRET: string;
   }
 }

apps/web/src/app/(dashboard)/admin/documents/[id]/admin-actions.tsx

@@ -2,8 +2,7 @@
 
 import Link from 'next/link';
 
-import type { Recipient } from '@documenso/prisma/client';
-import { type Document, SigningStatus } from '@documenso/prisma/client';
+import { type Document, DocumentStatus } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -18,10 +17,9 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 export type AdminActionsProps = {
   className?: string;
   document: Document;
-  recipients: Recipient[];
 };
 
-export const AdminActions = ({ className, document, recipients }: AdminActionsProps) => {
+export const AdminActions = ({ className, document }: AdminActionsProps) => {
   const { toast } = useToast();
 
   const { mutate: resealDocument, isLoading: isResealDocumentLoading } =
@@ -49,9 +47,7 @@ export const AdminActions = ({ className, document, recipients }: AdminActionsPr
             <Button
               variant="outline"
               loading={isResealDocumentLoading}
-              disabled={recipients.some(
-                (recipient) => recipient.signingStatus !== SigningStatus.SIGNED,
-              )}
+              disabled={document.status !== DocumentStatus.COMPLETED}
               onClick={() => resealDocument({ id: document.id })}
             >
               Reseal document

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

@@ -53,7 +53,7 @@ export default async function AdminDocumentDetailsPage({ params }: AdminDocument
 
       <h2 className="text-lg font-semibold">Admin Actions</h2>
 
-      <AdminActions className="mt-2" document={document} recipients={document.Recipient} />
+      <AdminActions className="mt-2" document={document} />
 
       <hr className="my-4" />
       <h2 className="text-lg font-semibold">Recipients</h2>

apps/web/src/app/(dashboard)/admin/users/page.tsx

@@ -19,7 +19,7 @@ export default async function AdminManageUsers({ searchParams = {} }: AdminManag
 
   const [{ users, totalPages }, individualPrices] = await Promise.all([
     search(searchString, page, perPage),
-    getPricesByPlan([STRIPE_PLAN_TYPE.REGULAR, STRIPE_PLAN_TYPE.COMMUNITY]).catch(() => []),
+    getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY).catch(() => []),
   ]);
 
   const individualPriceIds = individualPrices.map((price) => price.id);

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

@@ -8,7 +8,6 @@ import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
 import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
-import { getCompletedFieldsForDocument } from '@documenso/lib/server-only/field/get-completed-fields-for-document';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
@@ -21,7 +20,6 @@ import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
 
 import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip';
 import { DocumentHistorySheet } from '~/components/document/document-history-sheet';
-import { DocumentReadOnlyFields } from '~/components/document/document-read-only-fields';
 import {
   DocumentStatus as DocumentStatusComponent,
   FRIENDLY_STATUS_MAP,
@@ -86,16 +84,11 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
     documentMeta.password = securePassword;
   }
 
-  const [recipients, completedFields] = await Promise.all([
-    getRecipientsForDocument({
+  const recipients = await getRecipientsForDocument({
     documentId,
     teamId: team?.id,
     userId: user.id,
-    }),
-    getCompletedFieldsForDocument({
-      documentId,
-    }),
-  ]);
+  });
 
   const documentWithRecipients = {
     ...document,
@@ -162,13 +155,6 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
           </CardContent>
         </Card>
 
-        {document.status === DocumentStatus.PENDING && (
-          <DocumentReadOnlyFields
-            fields={completedFields}
-            documentMeta={document.documentMeta || undefined}
-          />
-        )}
-
         <div className="col-span-12 lg:col-span-6 xl:col-span-5">
           <div className="space-y-6">
             <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">

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

@@ -224,6 +224,10 @@ export const EditDocumentForm = ({
     }
   };
 
+  const setSubjectFormFields = (subject?: string, message?: string) => {
+    // Add functionality here
+  };
+
   const onAddFieldsFormSubmit = async (data: TAddFieldsFormSchema) => {
     try {
       await addFields({
@@ -332,7 +336,6 @@ export const EditDocumentForm = ({
               isDocumentPdfLoaded={isDocumentPdfLoaded}
               onSubmit={onAddSettingsFormSubmit}
             />
-
             <AddSignersFormPartial
               key={recipients.length}
               documentFlow={documentFlow.signers}
@@ -360,6 +363,7 @@ export const EditDocumentForm = ({
               fields={fields}
               onSubmit={onAddSubjectFormSubmit}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
+              setSubjectFormFields={setSubjectFormFields}
             />
           </Stepper>
         </DocumentFlowFormContainer>

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

@@ -36,6 +36,11 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
 
   const { user } = await getRequiredServerComponentSession();
 
+  const isDocumentEnterprise = await isUserEnterprise({
+    userId: user.id,
+    teamId: team?.id,
+  });
+
   const document = await getDocumentWithDetailsById({
     id: documentId,
     userId: user.id,
@@ -69,11 +74,6 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
     documentMeta.password = securePassword;
   }
 
-  const isDocumentEnterprise = await isUserEnterprise({
-    userId: user.id,
-    teamId: team?.id,
-  });
-
   return (
     <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
       <Link href={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">

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

@@ -133,11 +133,7 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
         </div>
 
         <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">
-          <DownloadCertificateButton
-            className="mr-2"
-            documentId={document.id}
-            documentStatus={document.status}
-          />
+          <DownloadCertificateButton className="mr-2" documentId={document.id} />
 
           <DownloadAuditLogButton documentId={document.id} />
         </div>

apps/web/src/app/(dashboard)/documents/[id]/logs/download-certificate-button.tsx

@@ -2,7 +2,6 @@
 
 import { DownloadIcon } from 'lucide-react';
 
-import { DocumentStatus } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -11,13 +10,11 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 export type DownloadCertificateButtonProps = {
   className?: string;
   documentId: number;
-  documentStatus: DocumentStatus;
 };
 
 export const DownloadCertificateButton = ({
   className,
   documentId,
-  documentStatus,
 }: DownloadCertificateButtonProps) => {
   const { toast } = useToast();
 
@@ -72,7 +69,6 @@ export const DownloadCertificateButton = ({
       className={cn('w-full sm:w-auto', className)}
       loading={isLoading}
       variant="outline"
-      disabled={documentStatus !== DocumentStatus.COMPLETED}
       onClick={() => void onDownloadCertificatesClick()}
     >
       {!isLoading && <DownloadIcon className="mr-1.5 h-4 w-4" />}

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

@@ -3,7 +3,6 @@
 import { useTransition } from 'react';
 
 import { Loader } from 'lucide-react';
-import { DateTime } from 'luxon';
 import { useSession } from 'next-auth/react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
@@ -63,12 +62,7 @@ export const DocumentsDataTable = ({
           {
             header: 'Created',
             accessorKey: 'createdAt',
-            cell: ({ row }) => (
-              <LocaleDate
-                date={row.original.createdAt}
-                format={{ ...DateTime.DATETIME_SHORT, hourCycle: 'h12' }}
-              />
-            ),
+            cell: ({ row }) => <LocaleDate date={row.original.createdAt} />,
           },
           {
             header: 'Title',

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

@@ -10,9 +10,8 @@ import { useSession } from 'next-auth/react';
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
-import { AppError } from '@documenso/lib/errors/app-error';
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
-import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
@@ -58,7 +57,7 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
     try {
       setIsLoading(true);
 
-      const { type, data } = await putPdfFile(file);
+      const { type, data } = await putFile(file);
 
       const { id: documentDataId } = await createDocumentData({
         type,
@@ -84,21 +83,13 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
       });
 
       router.push(`${formatDocumentsPath(team?.url)}/${id}/edit`);
-    } catch (err) {
-      const error = AppError.parseError(err);
+    } catch (error) {
+      console.error(error);
 
-      console.error(err);
-
-      if (error.code === 'INVALID_DOCUMENT_FILE') {
-        toast({
-          title: 'Invalid file',
-          description: 'You cannot upload encrypted PDFs',
-          variant: 'destructive',
-        });
-      } else if (err instanceof TRPCClientError) {
+      if (error instanceof TRPCClientError) {
         toast({
           title: 'Error',
-          description: err.message,
+          description: error.message,
           variant: 'destructive',
         });
       } else {

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

@@ -39,7 +39,7 @@ export default async function BillingSettingsPage() {
 
   const [subscriptions, prices, primaryAccountPlanPrices] = await Promise.all([
     getSubscriptionsByUserId({ userId: user.id }),
-    getPricesByInterval({ plan: STRIPE_PLAN_TYPE.REGULAR }),
+    getPricesByInterval({ plan: STRIPE_PLAN_TYPE.COMMUNITY }),
     getPrimaryAccountPlanPrices(),
   ]);
 

apps/web/src/app/(dashboard)/templates/[id]/edit-template.tsx

@@ -1,14 +1,10 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import {
-  DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-  SKIP_QUERY_BATCH_META,
-} from '@documenso/lib/constants/trpc';
-import type { TemplateWithDetails } from '@documenso/prisma/types/template';
+import type { DocumentData, Field, Recipient, Template, User } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@@ -23,135 +19,52 @@ import { AddTemplateFieldsFormPartial } from '@documenso/ui/primitives/template-
 import type { TAddTemplateFieldsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-fields.types';
 import { AddTemplatePlaceholderRecipientsFormPartial } from '@documenso/ui/primitives/template-flow/add-template-placeholder-recipients';
 import type { TAddTemplatePlacholderRecipientsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-placeholder-recipients.types';
-import { AddTemplateSettingsFormPartial } from '@documenso/ui/primitives/template-flow/add-template-settings';
-import type { TAddTemplateSettingsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-settings.types';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
-
 export type EditTemplateFormProps = {
   className?: string;
-  initialTemplate: TemplateWithDetails;
-  isEnterprise: boolean;
+  user: User;
+  template: Template;
+  recipients: Recipient[];
+  fields: Field[];
+  documentData: DocumentData;
   templateRootPath: string;
 };
 
-type EditTemplateStep = 'settings' | 'signers' | 'fields';
-const EditTemplateSteps: EditTemplateStep[] = ['settings', 'signers', 'fields'];
+type EditTemplateStep = 'signers' | 'fields';
+const EditTemplateSteps: EditTemplateStep[] = ['signers', 'fields'];
 
 export const EditTemplateForm = ({
-  initialTemplate,
   className,
-  isEnterprise,
+  template,
+  recipients,
+  fields,
+  user: _user,
+  documentData,
   templateRootPath,
 }: EditTemplateFormProps) => {
   const { toast } = useToast();
   const router = useRouter();
 
-  const team = useOptionalCurrentTeam();
-
-  const [step, setStep] = useState<EditTemplateStep>('settings');
-
-  const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);
-
-  const utils = trpc.useUtils();
-
-  const { data: template, refetch: refetchTemplate } =
-    trpc.template.getTemplateWithDetailsById.useQuery(
-      {
-        id: initialTemplate.id,
-      },
-      {
-        initialData: initialTemplate,
-        ...SKIP_QUERY_BATCH_META,
-      },
-    );
-
-  const { Recipient: recipients, Field: fields, templateDocumentData } = template;
+  const [step, setStep] = useState<EditTemplateStep>('signers');
 
   const documentFlow: Record<EditTemplateStep, DocumentFlowStep> = {
-    settings: {
-      title: 'General',
-      description: 'Configure general settings for the template.',
-      stepIndex: 1,
-    },
     signers: {
       title: 'Add Placeholders',
       description: 'Add all relevant placeholders for each recipient.',
-      stepIndex: 2,
+      stepIndex: 1,
     },
     fields: {
       title: 'Add Fields',
       description: 'Add all relevant fields for each recipient.',
-      stepIndex: 3,
+      stepIndex: 2,
     },
   };
 
   const currentDocumentFlow = documentFlow[step];
 
-  const { mutateAsync: updateTemplateSettings } = trpc.template.updateTemplateSettings.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
-        {
-          id: initialTemplate.id,
-        },
-        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
-      );
-    },
-  });
-
-  const { mutateAsync: addTemplateFields } = trpc.field.addTemplateFields.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
-        {
-          id: initialTemplate.id,
-        },
-        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
-      );
-    },
-  });
-
-  const { mutateAsync: addTemplateSigners } = trpc.recipient.addTemplateSigners.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
-        {
-          id: initialTemplate.id,
-        },
-        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
-      );
-    },
-  });
-
-  const onAddSettingsFormSubmit = async (data: TAddTemplateSettingsFormSchema) => {
-    try {
-      await updateTemplateSettings({
-        templateId: template.id,
-        teamId: team?.id,
-        data: {
-          title: data.title,
-          globalAccessAuth: data.globalAccessAuth ?? null,
-          globalActionAuth: data.globalActionAuth ?? null,
-        },
-        meta: data.meta,
-      });
-
-      // Router refresh is here to clear the router cache for when navigating to /documents.
-      router.refresh();
-
-      setStep('signers');
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: 'Error',
-        description: 'An error occurred while updating the document settings.',
-        variant: 'destructive',
-      });
-    }
-  };
+  const { mutateAsync: addTemplateFields } = trpc.field.addTemplateFields.useMutation();
+  const { mutateAsync: addTemplateSigners } = trpc.recipient.addTemplateSigners.useMutation();
 
   const onAddTemplatePlaceholderFormSubmit = async (
     data: TAddTemplatePlacholderRecipientsFormSchema,
@@ -159,11 +72,9 @@ export const EditTemplateForm = ({
     try {
       await addTemplateSigners({
         templateId: template.id,
-        teamId: team?.id,
         signers: data.signers,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
 
       setStep('fields');
@@ -189,9 +100,6 @@ export const EditTemplateForm = ({
         duration: 5000,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
-      router.refresh();
-
       router.push(templateRootPath);
     } catch (err) {
       toast({
@@ -202,15 +110,6 @@ export const EditTemplateForm = ({
     }
   };
 
-  /**
-   * Refresh the data in the background when steps change.
-   */
-  useEffect(() => {
-    void refetchTemplate();
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [step]);
-
   return (
     <div className={cn('grid w-full grid-cols-12 gap-8', className)}>
       <Card
@@ -218,11 +117,7 @@ export const EditTemplateForm = ({
         gradient
       >
         <CardContent className="p-2">
-          <LazyPDFViewer
-            key={templateDocumentData.id}
-            documentData={templateDocumentData}
-            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
-          />
+          <LazyPDFViewer key={documentData.id} documentData={documentData} />
         </CardContent>
       </Card>
 
@@ -240,26 +135,12 @@ export const EditTemplateForm = ({
             currentStep={currentDocumentFlow.stepIndex}
             setCurrentStep={(step) => setStep(EditTemplateSteps[step - 1])}
           >
-            <AddTemplateSettingsFormPartial
-              key={recipients.length}
-              template={template}
-              documentFlow={documentFlow.settings}
-              recipients={recipients}
-              fields={fields}
-              onSubmit={onAddSettingsFormSubmit}
-              isEnterprise={isEnterprise}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
-            />
-
             <AddTemplatePlaceholderRecipientsFormPartial
               key={recipients.length}
               documentFlow={documentFlow.signers}
               recipients={recipients}
               fields={fields}
-              templateDirectLink={template.directLink}
               onSubmit={onAddTemplatePlaceholderFormSubmit}
-              isEnterprise={isEnterprise}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
 
             <AddTemplateFieldsFormPartial

apps/web/src/app/(dashboard)/templates/[id]/template-direct-link-dialog-wrapper.tsx

@@ -1,40 +0,0 @@
-'use client';
-
-import React, { useState } from 'react';
-
-import { LinkIcon } from 'lucide-react';
-
-import type { Recipient, Template, TemplateDirectLink } from '@documenso/prisma/client';
-import { Button } from '@documenso/ui/primitives/button';
-
-import { TemplateDirectLinkDialog } from '../template-direct-link-dialog';
-
-export type TemplatePageViewProps = {
-  template: Template & { directLink?: TemplateDirectLink | null; Recipient: Recipient[] };
-};
-
-export const TemplateDirectLinkDialogWrapper = ({ template }: TemplatePageViewProps) => {
-  const [isTemplateDirectLinkOpen, setTemplateDirectLinkOpen] = useState(false);
-
-  return (
-    <div>
-      <Button
-        variant="outline"
-        className="px-3"
-        onClick={(e) => {
-          e.preventDefault();
-          setTemplateDirectLinkOpen(true);
-        }}
-      >
-        <LinkIcon className="mr-1.5 h-3.5 w-3.5" />
-        {template.directLink ? 'Manage' : 'Create'} Direct Link
-      </Button>
-
-      <TemplateDirectLinkDialog
-        template={template}
-        open={isTemplateDirectLinkOpen}
-        onOpenChange={setTemplateDirectLinkOpen}
-      />
-    </div>
-  );
-};

apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx

@@ -5,17 +5,16 @@ import { redirect } from 'next/navigation';
 
 import { ChevronLeft } from 'lucide-react';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getTemplateWithDetailsById } from '@documenso/lib/server-only/template/get-template-with-details-by-id';
+import { getFieldsForTemplate } from '@documenso/lib/server-only/field/get-fields-for-template';
+import { getRecipientsForTemplate } from '@documenso/lib/server-only/recipient/get-recipients-for-template';
+import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
 import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 import type { Team } from '@documenso/prisma/client';
 
 import { TemplateType } from '~/components/formatter/template-type';
 
-import { TemplateDirectLinkBadge } from '../template-direct-link-badge';
 import { EditTemplateForm } from './edit-template';
-import { TemplateDirectLinkDialogWrapper } from './template-direct-link-dialog-wrapper';
 
 export type TemplatePageViewProps = {
   params: {
@@ -36,7 +35,7 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
 
   const { user } = await getRequiredServerComponentSession();
 
-  const template = await getTemplateWithDetailsById({
+  const template = await getTemplateById({
     id: templateId,
     userId: user.id,
   }).catch(() => null);
@@ -45,15 +44,21 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
     redirect(templateRootPath);
   }
 
-  const isTemplateEnterprise = await isUserEnterprise({
+  const { templateDocumentData } = template;
+
+  const [templateRecipients, templateFields] = await Promise.all([
+    getRecipientsForTemplate({
+      templateId,
       userId: user.id,
-    teamId: team?.id,
-  });
+    }),
+    getFieldsForTemplate({
+      templateId,
+      userId: user.id,
+    }),
+  ]);
 
   return (
-    <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">
-      <div className="flex flex-col justify-between sm:flex-row">
-        <div>
+    <div className="mx-auto max-w-screen-xl px-4 md:px-8">
       <Link href="/templates" className="flex items-center text-[#7AC455] hover:opacity-80">
         <ChevronLeft className="mr-2 inline-block h-5 w-5" />
         Templates
@@ -63,29 +68,18 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
         {template.title}
       </h1>
 
-          <div className="mt-2.5 flex items-center">
-            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
-
-            {template.directLink?.token && (
-              <TemplateDirectLinkBadge
-                className="ml-4"
-                token={template.directLink.token}
-                enabled={template.directLink.enabled}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className="mt-2 sm:mt-0 sm:self-end">
-          <TemplateDirectLinkDialogWrapper template={template} />
-        </div>
+      <div className="mt-2.5 flex items-center gap-x-6">
+        <TemplateType inheritColor type={template.type} className="text-muted-foreground" />
       </div>
 
       <EditTemplateForm
-        className="mt-6"
-        initialTemplate={template}
+        className="mt-8"
+        template={template}
+        user={user}
+        recipients={templateRecipients}
+        fields={templateFields}
+        documentData={templateDocumentData}
         templateRootPath={templateRootPath}
-        isEnterprise={isTemplateEnterprise}
       />
     </div>
   );

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

@@ -4,10 +4,10 @@ import { useState } from 'react';
 
 import Link from 'next/link';
 
-import { Copy, Edit, MoreHorizontal, Share2Icon, Trash2 } from 'lucide-react';
+import { Copy, Edit, MoreHorizontal, Trash2 } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
-import { type FindTemplateRow } from '@documenso/lib/server-only/template/find-templates';
+import type { Template } from '@documenso/prisma/client';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -18,10 +18,9 @@ import {
 
 import { DeleteTemplateDialog } from './delete-template-dialog';
 import { DuplicateTemplateDialog } from './duplicate-template-dialog';
-import { TemplateDirectLinkDialog } from './template-direct-link-dialog';
 
 export type DataTableActionDropdownProps = {
-  row: FindTemplateRow;
+  row: Template;
   templateRootPath: string;
   teamId?: number;
 };
@@ -34,7 +33,6 @@ export const DataTableActionDropdown = ({
   const { data: session } = useSession();
 
   const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [isTemplateDirectLinkDialogOpen, setTemplateDirectLinkDialogOpen] = useState(false);
   const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);
 
   if (!session) {
@@ -68,11 +66,6 @@ export const DataTableActionDropdown = ({
           Duplicate
         </DropdownMenuItem>
 
-        <DropdownMenuItem onClick={() => setTemplateDirectLinkDialogOpen(true)}>
-          <Share2Icon className="mr-2 h-4 w-4" />
-          Direct link
-        </DropdownMenuItem>
-
         <DropdownMenuItem
           disabled={!isOwner && !isTeamTemplate}
           onClick={() => setDeleteDialogOpen(true)}
@@ -89,12 +82,6 @@ export const DataTableActionDropdown = ({
         onOpenChange={setDuplicateDialogOpen}
       />
 
-      <TemplateDirectLinkDialog
-        template={row}
-        open={isTemplateDirectLinkDialogOpen}
-        onOpenChange={setTemplateDirectLinkDialogOpen}
-      />
-
       <DeleteTemplateDialog
         id={row.id}
         open={isDeleteDialogOpen}

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

@@ -4,26 +4,32 @@ import { useTransition } from 'react';
 
 import Link from 'next/link';
 
-import { AlertTriangle, Globe2Icon, InfoIcon, Link2Icon, Loader, LockIcon } from 'lucide-react';
+import { AlertTriangle, Loader } from 'lucide-react';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import type { FindTemplateRow } from '@documenso/lib/server-only/template/find-templates';
+import type { Recipient, Template } from '@documenso/prisma/client';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 
 import { LocaleDate } from '~/components/formatter/locale-date';
 import { TemplateType } from '~/components/formatter/template-type';
 
 import { DataTableActionDropdown } from './data-table-action-dropdown';
 import { DataTableTitle } from './data-table-title';
-import { TemplateDirectLinkBadge } from './template-direct-link-badge';
 import { UseTemplateDialog } from './use-template-dialog';
 
+type TemplateWithRecipient = Template & {
+  Recipient: Recipient[];
+};
+
 type TemplatesDataTableProps = {
-  templates: FindTemplateRow[];
+  templates: Array<
+    TemplateWithRecipient & {
+      team: { id: number; url: string } | null;
+    }
+  >;
   perPage: number;
   page: number;
   totalPages: number;
@@ -42,7 +48,6 @@ export const TemplatesDataTable = ({
   teamId,
 }: TemplatesDataTableProps) => {
   const [isPending, startTransition] = useTransition();
-
   const updateSearchParams = useUpdateSearchParams();
 
   const { remaining } = useLimits();
@@ -83,70 +88,9 @@ export const TemplatesDataTable = ({
             cell: ({ row }) => <DataTableTitle row={row.original} />,
           },
           {
-            header: () => (
-              <div className="flex flex-row items-center">
-                Type
-                <Tooltip>
-                  <TooltipTrigger>
-                    <InfoIcon className="mx-2 h-4 w-4" />
-                  </TooltipTrigger>
-
-                  <TooltipContent className="text-foreground max-w-md space-y-2 !p-0">
-                    <ul className="text-muted-foreground space-y-0.5 divide-y [&>li]:p-4">
-                      <li>
-                        <h2 className="mb-2 flex flex-row items-center font-semibold">
-                          <Globe2Icon className="mr-2 h-5 w-5 text-green-500 dark:text-green-300" />
-                          Public
-                        </h2>
-
-                        <p>
-                          Public templates are connected to your public profile. Any modifications
-                          to public templates will also appear in your public profile.
-                        </p>
-                      </li>
-                      <li>
-                        <div className="mb-2 flex w-fit flex-row items-center rounded border border-neutral-300 bg-neutral-200 px-1.5 py-0.5 text-xs dark:border-neutral-500 dark:bg-neutral-600">
-                          <Link2Icon className="mr-1 h-3 w-3" />
-                          direct link
-                        </div>
-
-                        <p>
-                          Direct link templates contain one dynamic recipient placeholder. Anyone
-                          with access to this link can sign the document, and it will then appear on
-                          your documents page.
-                        </p>
-                      </li>
-                      <li>
-                        <h2 className="mb-2 flex flex-row items-center font-semibold">
-                          <LockIcon className="mr-2 h-5 w-5 text-blue-600 dark:text-blue-300" />
-                          {teamId ? 'Team Only' : 'Private'}
-                        </h2>
-
-                        <p>
-                          {teamId
-                            ? 'Team only templates are not linked anywhere and are visible only to your team.'
-                            : 'Private templates can only be modified and viewed by you.'}
-                        </p>
-                      </li>
-                    </ul>
-                  </TooltipContent>
-                </Tooltip>
-              </div>
-            ),
+            header: 'Type',
             accessorKey: 'type',
-            cell: ({ row }) => (
-              <div className="flex flex-row items-center">
-                <TemplateType type="PRIVATE" />
-
-                {row.original.directLink?.token && (
-                  <TemplateDirectLinkBadge
-                    className="ml-2"
-                    token={row.original.directLink.token}
-                    enabled={row.original.directLink.enabled}
-                  />
-                )}
-              </div>
-            ),
+            cell: ({ row }) => <TemplateType type={row.original.type} />,
           },
           {
             header: 'Actions',

apps/web/src/app/(dashboard)/templates/new-template-dialog.tsx

@@ -1,16 +1,21 @@
 'use client';
 
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import { FilePlus, Loader } from 'lucide-react';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { FilePlus, X } from 'lucide-react';
 import { useSession } from 'next-auth/react';
+import { useForm } from 'react-hook-form';
+import * as z from 'zod';
 
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
-import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
+import { base64 } from '@documenso/lib/universal/base64';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
 import {
   Dialog,
   DialogClose,
@@ -22,8 +27,24 @@ import {
   DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  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';
 
+const ZCreateTemplateFormSchema = z.object({
+  name: z.string(),
+});
+
+type TCreateTemplateFormSchema = z.infer<typeof ZCreateTemplateFormSchema>;
+
 type NewTemplateDialogProps = {
   teamId?: number;
   templateRootPath: string;
@@ -35,20 +56,50 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
   const { data: session } = useSession();
   const { toast } = useToast();
 
+  const form = useForm<TCreateTemplateFormSchema>({
+    defaultValues: {
+      name: '',
+    },
+    resolver: zodResolver(ZCreateTemplateFormSchema),
+  });
+
   const { mutateAsync: createTemplate } = trpc.template.createTemplate.useMutation();
 
   const [showNewTemplateDialog, setShowNewTemplateDialog] = useState(false);
-  const [isUploadingFile, setIsUploadingFile] = useState(false);
+  const [uploadedFile, setUploadedFile] = useState<{ file: File; fileBase64: string } | null>();
 
   const onFileDrop = async (file: File) => {
-    if (isUploadingFile) {
+    try {
+      const arrayBuffer = await file.arrayBuffer();
+      const base64String = base64.encode(new Uint8Array(arrayBuffer));
+
+      setUploadedFile({
+        file,
+        fileBase64: `data:application/pdf;base64,${base64String}`,
+      });
+
+      if (!form.getValues('name')) {
+        form.setValue('name', file.name);
+      }
+    } catch {
+      toast({
+        title: 'Something went wrong',
+        description: 'Please try again later.',
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const onSubmit = async (values: TCreateTemplateFormSchema) => {
+    if (!uploadedFile) {
       return;
     }
 
-    setIsUploadingFile(true);
+    const file: File = uploadedFile.file;
 
     try {
-      const { type, data } = await putPdfFile(file);
+      const { type, data } = await putFile(file);
+
       const { id: templateDocumentDataId } = await createDocumentData({
         type,
         data,
@@ -56,7 +107,7 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
 
       const { id } = await createTemplate({
         teamId,
-        title: file.name,
+        title: values.name ? values.name : file.name,
         templateDocumentDataId,
       });
 
@@ -76,16 +127,26 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
         description: 'Please try again later.',
         variant: 'destructive',
       });
-
-      setIsUploadingFile(false);
     }
   };
 
+  const resetForm = () => {
+    if (form.getValues('name') === uploadedFile?.file.name) {
+      form.reset();
+    }
+
+    setUploadedFile(null);
+  };
+
+  useEffect(() => {
+    if (!showNewTemplateDialog) {
+      form.reset();
+      setUploadedFile(null);
+    }
+  }, [form, showNewTemplateDialog]);
+
   return (
-    <Dialog
-      open={showNewTemplateDialog}
-      onOpenChange={(value) => !isUploadingFile && setShowNewTemplateDialog(value)}
-    >
+    <Dialog open={showNewTemplateDialog} onOpenChange={setShowNewTemplateDialog}>
       <DialogTrigger asChild>
         <Button className="cursor-pointer" disabled={!session?.user.emailVerified}>
           <FilePlus className="-ml-1 mr-2 h-4 w-4" />
@@ -101,23 +162,80 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
           </DialogDescription>
         </DialogHeader>
 
-        <div className="relative">
-          <DocumentDropzone className="h-[40vh]" onDrop={onFileDrop} type="template" />
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)}>
+            <fieldset disabled={form.formState.isSubmitting} className="flex flex-col gap-y-4">
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Template name</FormLabel>
+                    <FormControl>
+                      <Input {...field} />
+                    </FormControl>
+                    <FormDescription>
+                      <span className="text-muted-foreground text-xs">
+                        Leave this empty if you would like to use your document's name for the
+                        template
+                      </span>
+                    </FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
 
-          {isUploadingFile && (
-            <div className="bg-background/50 absolute inset-0 flex items-center justify-center rounded-lg">
-              <Loader className="text-muted-foreground h-12 w-12 animate-spin" />
+              <div className="mt-1.5">
+                {uploadedFile ? (
+                  <Card gradient className="h-[40vh]">
+                    <CardContent className="flex h-full flex-col items-center justify-center p-2">
+                      <button
+                        onClick={() => resetForm()}
+                        title="Remove Template"
+                        className="text-muted-foreground absolute right-2.5 top-2.5 rounded-sm opacity-60 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none"
+                      >
+                        <X className="h-6 w-6" />
+                        <span className="sr-only">Remove Template</span>
+                      </button>
+
+                      <div className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm">
+                        <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
+                        <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-5/6 rounded-[2px]" />
+                        <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
                       </div>
+
+                      <p className="group-hover:text-foreground text-muted-foreground mt-4 font-medium">
+                        Uploaded Document
+                      </p>
+
+                      <span className="text-muted-foreground/80 mt-1 text-sm">
+                        {uploadedFile.file.name}
+                      </span>
+                    </CardContent>
+                  </Card>
+                ) : (
+                  <DocumentDropzone className="h-[40vh]" onDrop={onFileDrop} type="template" />
                 )}
               </div>
 
               <DialogFooter>
                 <DialogClose asChild>
-            <Button type="button" variant="secondary" disabled={isUploadingFile}>
-              Close
+                  <Button type="button" variant="secondary">
+                    Cancel
                   </Button>
                 </DialogClose>
+
+                <Button
+                  loading={form.formState.isSubmitting}
+                  disabled={!uploadedFile}
+                  type="submit"
+                >
+                  Create template
+                </Button>
               </DialogFooter>
+            </fieldset>
+          </form>
+        </Form>
       </DialogContent>
     </Dialog>
   );

apps/web/src/app/(dashboard)/templates/template-direct-link-badge.tsx

@@ -1,45 +0,0 @@
-'use client';
-
-import { Link2Icon } from 'lucide-react';
-
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
-import { cn } from '@documenso/ui/lib/utils';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-type TemplateDirectLinkBadgeProps = {
-  token: string;
-  enabled: boolean;
-  className?: string;
-};
-
-export const TemplateDirectLinkBadge = ({
-  token,
-  enabled,
-  className,
-}: TemplateDirectLinkBadgeProps) => {
-  const [, copy] = useCopyToClipboard();
-  const { toast } = useToast();
-
-  const onCopyClick = async (token: string) =>
-    copy(formatDirectTemplatePath(token)).then(() => {
-      toast({
-        title: 'Copied to clipboard',
-        description: 'The direct link has been copied to your clipboard',
-      });
-    });
-
-  return (
-    <button
-      title="Copy direct link"
-      className={cn(
-        'flex flex-row items-center rounded border border-neutral-300 bg-neutral-200 px-1.5 py-0.5 text-xs dark:border-neutral-500 dark:bg-neutral-600',
-        className,
-      )}
-      onClick={async () => onCopyClick(token)}
-    >
-      <Link2Icon className="mr-1 h-3 w-3" />
-      direct link {!enabled && 'disabled'}
-    </button>
-  );
-};

apps/web/src/app/(dashboard)/templates/template-direct-link-dialog.tsx

@@ -1,448 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
-
-import { CircleDotIcon, CircleIcon, ClipboardCopyIcon, InfoIcon, LoaderIcon } from 'lucide-react';
-import { P, match } from 'ts-pattern';
-
-import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import {
-  DIRECT_TEMPLATE_DOCUMENTATION,
-  DIRECT_TEMPLATE_RECIPIENT_EMAIL,
-} from '@documenso/lib/constants/template';
-import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
-import {
-  type Recipient,
-  RecipientRole,
-  type Template,
-  type TemplateDirectLink,
-} from '@documenso/prisma/client';
-import { trpc as trpcReact } from '@documenso/trpc/react';
-import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
-import { Switch } from '@documenso/ui/primitives/switch';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@documenso/ui/primitives/table';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-type TemplateDirectLinkDialogProps = {
-  template: Template & {
-    directLink?: Pick<TemplateDirectLink, 'token' | 'enabled'> | null;
-    Recipient: Recipient[];
-  };
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-};
-
-type TemplateDirectLinkStep = 'ONBOARD' | 'SELECT_RECIPIENT' | 'MANAGE' | 'CONFIRM_DELETE';
-
-export const TemplateDirectLinkDialog = ({
-  template,
-  open,
-  onOpenChange,
-}: TemplateDirectLinkDialogProps) => {
-  const { toast } = useToast();
-  const { quota, remaining } = useLimits();
-
-  const [, copy] = useCopyToClipboard();
-  const router = useRouter();
-
-  const [isEnabled, setIsEnabled] = useState(template.directLink?.enabled ?? false);
-  const [token, setToken] = useState(template.directLink?.token ?? null);
-  const [selectedRecipientId, setSelectedRecipientId] = useState<number | null>(null);
-  const [currentStep, setCurrentStep] = useState<TemplateDirectLinkStep>(
-    token ? 'MANAGE' : 'ONBOARD',
-  );
-
-  const validDirectTemplateRecipients = useMemo(
-    () => template.Recipient.filter((recipient) => recipient.role !== RecipientRole.CC),
-    [template.Recipient],
-  );
-
-  const {
-    mutateAsync: createTemplateDirectLink,
-    isLoading: isCreatingTemplateDirectLink,
-    reset: resetCreateTemplateDirectLink,
-  } = trpcReact.template.createTemplateDirectLink.useMutation({
-    onSuccess: (data) => {
-      setToken(data.token);
-      setIsEnabled(data.enabled);
-      setCurrentStep('MANAGE');
-
-      router.refresh();
-    },
-    onError: () => {
-      setSelectedRecipientId(null);
-
-      toast({
-        title: 'Something went wrong',
-        description: 'Unable to create direct template access. Please try again later.',
-        variant: 'destructive',
-      });
-    },
-  });
-
-  const { mutateAsync: toggleTemplateDirectLink, isLoading: isTogglingTemplateAccess } =
-    trpcReact.template.toggleTemplateDirectLink.useMutation({
-      onSuccess: (data) => {
-        toast({
-          title: 'Success',
-          description: `Direct link signing has been ${data.enabled ? 'enabled' : 'disabled'}`,
-        });
-      },
-      onError: (_ctx, data) => {
-        toast({
-          title: 'Something went wrong',
-          description: `An error occurred while ${
-            data.enabled ? 'enabling' : 'disabling'
-          } direct link signing.`,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  const { mutateAsync: deleteTemplateDirectLink, isLoading: isDeletingTemplateDirectLink } =
-    trpcReact.template.deleteTemplateDirectLink.useMutation({
-      onSuccess: () => {
-        onOpenChange(false);
-        setToken(null);
-
-        toast({
-          title: 'Success',
-          description: 'Direct template link deleted',
-          duration: 5000,
-        });
-
-        router.refresh();
-        setToken(null);
-      },
-      onError: () => {
-        toast({
-          title: 'Something went wrong',
-          description:
-            'We encountered an error while removing the direct template link. Please try again later.',
-          variant: 'destructive',
-        });
-      },
-    });
-
-  const onCopyClick = async (token: string) =>
-    copy(formatDirectTemplatePath(token)).then(() => {
-      toast({
-        title: 'Copied to clipboard',
-        description: 'The direct link has been copied to your clipboard',
-      });
-    });
-
-  const onRecipientTableRowClick = async (recipientId: number) => {
-    if (isLoading) {
-      return;
-    }
-
-    setSelectedRecipientId(recipientId);
-
-    await createTemplateDirectLink({
-      templateId: template.id,
-      directRecipientId: recipientId,
-    });
-  };
-
-  const isLoading =
-    isCreatingTemplateDirectLink || isTogglingTemplateAccess || isDeletingTemplateDirectLink;
-
-  useEffect(() => {
-    resetCreateTemplateDirectLink();
-    setCurrentStep(token ? 'MANAGE' : 'ONBOARD');
-    setSelectedRecipientId(null);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open]);
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
-      <fieldset disabled={isLoading} className="relative">
-        <AnimateGenericFadeInOut motionKey={currentStep}>
-          {match({ token, currentStep })
-            .with({ token: P.nullish, currentStep: 'ONBOARD' }, () => (
-              <DialogContent>
-                <DialogHeader>
-                  <DialogTitle>Create Direct Signing Link</DialogTitle>
-
-                  <DialogDescription>Here's how it works:</DialogDescription>
-                </DialogHeader>
-
-                <ul className="mt-4 space-y-4 pl-12">
-                  {DIRECT_TEMPLATE_DOCUMENTATION.map((step, index) => (
-                    <li className="relative" key={index}>
-                      <div className="absolute -left-12">
-                        <div className="flex h-8 w-8 items-center justify-center rounded-full border-[3px] border-neutral-200 text-sm font-bold">
-                          {index + 1}
-                        </div>
-                      </div>
-
-                      <h3 className="font-semibold">{step.title}</h3>
-                      <p className="text-muted-foreground mt-1 text-sm">{step.description}</p>
-                    </li>
-                  ))}
-                </ul>
-
-                {remaining.directTemplates === 0 && (
-                  <Alert variant="warning">
-                    <AlertTitle>
-                      Direct template link usage exceeded ({quota.directTemplates}/
-                      {quota.directTemplates})
-                    </AlertTitle>
-                    <AlertDescription>
-                      You have reached the maximum limit of {quota.directTemplates} direct
-                      templates.{' '}
-                      <Link
-                        className="mt-1 block underline underline-offset-4"
-                        href="/settings/billing"
-                      >
-                        Upgrade your account to continue!
-                      </Link>
-                    </AlertDescription>
-                  </Alert>
-                )}
-
-                {remaining.directTemplates !== 0 && (
-                  <DialogFooter className="mx-auto mt-4">
-                    <Button type="button" onClick={() => setCurrentStep('SELECT_RECIPIENT')}>
-                      Enable direct link signing
-                    </Button>
-                  </DialogFooter>
-                )}
-              </DialogContent>
-            ))
-            .with({ token: P.nullish, currentStep: 'SELECT_RECIPIENT' }, () => (
-              <DialogContent className="relative">
-                {isCreatingTemplateDirectLink && validDirectTemplateRecipients.length !== 0 && (
-                  <div className="absolute inset-0 z-50 flex items-center justify-center rounded bg-white/50 dark:bg-black/50">
-                    <LoaderIcon className="h-6 w-6 animate-spin text-gray-500" />
-                  </div>
-                )}
-
-                <DialogHeader>
-                  <DialogTitle>Choose Direct Link Recipient</DialogTitle>
-
-                  <DialogDescription>
-                    Choose an existing recipient from below to continue
-                  </DialogDescription>
-                </DialogHeader>
-
-                <div className="custom-scrollbar max-h-[60vh] overflow-y-auto rounded-md border">
-                  <Table>
-                    <TableHeader>
-                      <TableRow>
-                        <TableHead>Recipient</TableHead>
-                        <TableHead>Role</TableHead>
-                        <TableHead></TableHead>
-                      </TableRow>
-                    </TableHeader>
-                    <TableBody>
-                      {validDirectTemplateRecipients.length === 0 && (
-                        <TableRow>
-                          <TableCell colSpan={3} className="h-16 text-center">
-                            <p className="text-muted-foreground">No valid recipients found</p>
-                          </TableCell>
-                        </TableRow>
-                      )}
-
-                      {validDirectTemplateRecipients.map((row) => (
-                        <TableRow
-                          className="cursor-pointer"
-                          key={row.id}
-                          onClick={async () => onRecipientTableRowClick(row.id)}
-                        >
-                          <TableCell>
-                            <div className="text-muted-foreground text-sm">
-                              <p>{row.name}</p>
-                              <p className="text-muted-foreground/70 text-xs">{row.email}</p>
-                            </div>
-                          </TableCell>
-
-                          <TableCell className="text-muted-foreground text-sm">
-                            {RECIPIENT_ROLES_DESCRIPTION[row.role].roleName}
-                          </TableCell>
-
-                          <TableCell>
-                            {selectedRecipientId === row.id ? (
-                              <CircleDotIcon className="h-5 w-5 text-neutral-300" />
-                            ) : (
-                              <CircleIcon className="h-5 w-5 text-neutral-300" />
-                            )}
-                          </TableCell>
-                        </TableRow>
-                      ))}
-                    </TableBody>
-                  </Table>
-                </div>
-
-                {/* Prevent creating placeholder direct template recipient if the email already exists. */}
-                {!template.Recipient.some(
-                  (recipient) => recipient.email === DIRECT_TEMPLATE_RECIPIENT_EMAIL,
-                ) && (
-                  <DialogFooter className="mx-auto">
-                    <div className="flex flex-col items-center justify-center">
-                      {validDirectTemplateRecipients.length !== 0 && (
-                        <p className="text-muted-foreground text-sm">Or</p>
-                      )}
-
-                      <Button
-                        type="button"
-                        className="mt-2"
-                        loading={isCreatingTemplateDirectLink && !selectedRecipientId}
-                        onClick={async () =>
-                          createTemplateDirectLink({
-                            templateId: template.id,
-                          })
-                        }
-                      >
-                        Create one automatically
-                      </Button>
-                    </div>
-                  </DialogFooter>
-                )}
-              </DialogContent>
-            ))
-            .with({ token: P.string, currentStep: 'MANAGE' }, ({ token }) => (
-              <DialogContent className="relative">
-                <DialogHeader>
-                  <DialogTitle>Direct Link Signing</DialogTitle>
-
-                  <DialogDescription>
-                    Manage the direct link signing for this template
-                  </DialogDescription>
-                </DialogHeader>
-
-                <div>
-                  <div className="flex flex-row items-center justify-between">
-                    <Label className="flex flex-row">
-                      Enable Direct Link Signing
-                      <Tooltip>
-                        <TooltipTrigger tabIndex={-1} className="ml-2">
-                          <InfoIcon className="h-4 w-4" />
-                        </TooltipTrigger>
-                        <TooltipContent className="text-foreground z-9999 max-w-md p-4">
-                          Disabling direct link signing will prevent anyone from accessing the link.
-                        </TooltipContent>
-                      </Tooltip>
-                    </Label>
-
-                    <Switch
-                      className="mt-2"
-                      checked={isEnabled}
-                      onCheckedChange={(value) => setIsEnabled(value)}
-                    />
-                  </div>
-
-                  <div className="mt-2">
-                    <Label htmlFor="copy-direct-link">Copy Shareable Link</Label>
-
-                    <div className="relative mt-1">
-                      <Input
-                        id="copy-direct-link"
-                        disabled
-                        value={formatDirectTemplatePath(token).replace(/https?:\/\//, '')}
-                        readOnly
-                        className="pr-12"
-                      />
-
-                      <div className="absolute bottom-0 right-1 top-0 flex items-center justify-center">
-                        <Button
-                          variant="none"
-                          type="button"
-                          className="h-8 w-8"
-                          onClick={() => void onCopyClick(token)}
-                        >
-                          <ClipboardCopyIcon className="h-4 w-4 flex-shrink-0" />
-                        </Button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <DialogFooter className='mt-4'>
-                  <Button
-                    type="button"
-                    variant="destructive"
-                    className="mr-auto w-full sm:w-auto"
-                    loading={isDeletingTemplateDirectLink}
-                    onClick={() => setCurrentStep('CONFIRM_DELETE')}
-                  >
-                    Remove
-                  </Button>
-
-                  <Button
-                    type="button"
-                    loading={isTogglingTemplateAccess}
-                    onClick={async () =>
-                      toggleTemplateDirectLink({
-                        templateId: template.id,
-                        enabled: isEnabled,
-                      })
-                    }
-                  >
-                    Save
-                  </Button>
-                </DialogFooter>
-              </DialogContent>
-            ))
-            .with({ token: P.string, currentStep: 'CONFIRM_DELETE' }, () => (
-              <DialogContent className="relative">
-                <DialogHeader>
-                  <DialogTitle>Are you sure?</DialogTitle>
-
-                  <DialogDescription>
-                    Please note that proceeding will remove direct linking recipient and turn it
-                    into a placeholder.
-                  </DialogDescription>
-                </DialogHeader>
-
-                <DialogFooter>
-                  <Button
-                    type="button"
-                    variant="secondary"
-                    onClick={() => setCurrentStep('MANAGE')}
-                  >
-                    Cancel
-                  </Button>
-
-                  <Button
-                    type="button"
-                    variant="destructive"
-                    loading={isDeletingTemplateDirectLink}
-                    onClick={() => void deleteTemplateDirectLink({ templateId: template.id })}
-                  >
-                    Confirm
-                  </Button>
-                </DialogFooter>
-              </DialogContent>
-            ))
-            .otherwise(() => null)}
-        </AnimateGenericFadeInOut>
-      </fieldset>
-    </Dialog>
-  );
-};

apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx

@@ -1,21 +1,14 @@
-import { useEffect, useState } from 'react';
-
 import { useRouter } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { InfoIcon, Plus } from 'lucide-react';
-import { useFieldArray, useForm } from 'react-hook-form';
+import { Plus } from 'lucide-react';
+import { Controller, useFieldArray, useForm } from 'react-hook-form';
 import * as z from 'zod';
 
-import {
-  TEMPLATE_RECIPIENT_EMAIL_PLACEHOLDER_REGEX,
-  TEMPLATE_RECIPIENT_NAME_PLACEHOLDER_REGEX,
-} from '@documenso/lib/constants/template';
-import { AppError } from '@documenso/lib/errors/app-error';
 import type { Recipient } from '@documenso/prisma/client';
+import { RecipientRole } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
 import {
   Dialog,
   DialogClose,
@@ -26,59 +19,24 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
+import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
 import { Input } from '@documenso/ui/primitives/input';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
-import type { Toast } from '@documenso/ui/primitives/use-toast';
+import { Label } from '@documenso/ui/primitives/label';
+import { ROLE_ICONS } from '@documenso/ui/primitives/recipient-role-icons';
+import { Select, SelectContent, SelectItem, SelectTrigger } from '@documenso/ui/primitives/select';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { useOptionalCurrentTeam } from '~/providers/team';
 
-const ZAddRecipientsForNewDocumentSchema = z
-  .object({
-    sendDocument: z.boolean(),
+const ZAddRecipientsForNewDocumentSchema = z.object({
   recipients: z.array(
     z.object({
-        id: z.number(),
       email: z.string().email(),
       name: z.string(),
+      role: z.nativeEnum(RecipientRole),
     }),
   ),
-  })
-  // Display exactly which rows are duplicates.
-  .superRefine((items, ctx) => {
-    const uniqueEmails = new Map<string, number>();
-
-    for (const [index, recipients] of items.recipients.entries()) {
-      const email = recipients.email.toLowerCase();
-
-      const firstFoundIndex = uniqueEmails.get(email);
-
-      if (firstFoundIndex === undefined) {
-        uniqueEmails.set(email, index);
-        continue;
-      }
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['recipients', index, 'email'],
-      });
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['recipients', firstFoundIndex, 'email'],
-      });
-    }
-  });
+});
 
 type TAddRecipientsForNewDocumentSchema = z.infer<typeof ZAddRecipientsForNewDocumentSchema>;
 
@@ -96,33 +54,35 @@ export function UseTemplateDialog({
   const router = useRouter();
   const { toast } = useToast();
 
-  const [open, setOpen] = useState(false);
-
   const team = useOptionalCurrentTeam();
 
-  const form = useForm<TAddRecipientsForNewDocumentSchema>({
+  const {
+    control,
+    handleSubmit,
+    formState: { errors, isSubmitting },
+  } = useForm<TAddRecipientsForNewDocumentSchema>({
     resolver: zodResolver(ZAddRecipientsForNewDocumentSchema),
     defaultValues: {
-      sendDocument: false,
-      recipients: recipients.map((recipient) => {
-        const isRecipientEmailPlaceholder = recipient.email.match(
-          TEMPLATE_RECIPIENT_EMAIL_PLACEHOLDER_REGEX,
-        );
-
-        const isRecipientNamePlaceholder = recipient.name.match(
-          TEMPLATE_RECIPIENT_NAME_PLACEHOLDER_REGEX,
-        );
-
-        return {
-          id: recipient.id,
-          name: !isRecipientNamePlaceholder ? recipient.name : '',
-          email: !isRecipientEmailPlaceholder ? recipient.email : '',
-        };
-      }),
+      recipients:
+        recipients.length > 0
+          ? recipients.map((recipient) => ({
+              nativeId: recipient.id,
+              formId: String(recipient.id),
+              name: recipient.name,
+              email: recipient.email,
+              role: recipient.role,
+            }))
+          : [
+              {
+                name: '',
+                email: '',
+                role: RecipientRole.SIGNER,
+              },
+            ],
     },
   });
 
-  const { mutateAsync: createDocumentFromTemplate } =
+  const { mutateAsync: createDocumentFromTemplate, isLoading: isCreatingDocumentFromTemplate } =
     trpc.template.createDocumentFromTemplate.useMutation();
 
   const onSubmit = async (data: TAddRecipientsForNewDocumentSchema) => {
@@ -131,7 +91,6 @@ export function UseTemplateDialog({
         templateId,
         teamId: team?.id,
         recipients: data.recipients,
-        sendDocument: data.sendDocument,
       });
 
       toast({
@@ -142,147 +101,146 @@ export function UseTemplateDialog({
 
       router.push(`${documentRootPath}/${id}`);
     } catch (err) {
-      const error = AppError.parseError(err);
-
-      const toastPayload: Toast = {
+      toast({
         title: 'Error',
         description: 'An error occurred while creating document from template.',
         variant: 'destructive',
-      };
-
-      if (error.code === 'DOCUMENT_SEND_FAILED') {
-        toastPayload.description = 'The document was created but could not be sent to recipients.';
-      }
-
-      toast(toastPayload);
+      });
     }
   };
 
+  const onCreateDocumentFromTemplate = handleSubmit(onSubmit);
+
   const { fields: formRecipients } = useFieldArray({
-    control: form.control,
+    control,
     name: 'recipients',
   });
 
-  useEffect(() => {
-    if (!open) {
-      form.reset();
-    }
-  }, [open, form]);
-
   return (
-    <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}>
+    <Dialog>
       <DialogTrigger asChild>
-        <Button variant="outline" className="bg-background">
+        <Button className="cursor-pointer">
           <Plus className="-ml-1 mr-2 h-4 w-4" />
           Use Template
         </Button>
       </DialogTrigger>
       <DialogContent className="sm:max-w-lg">
         <DialogHeader>
-          <DialogTitle>Create document from template</DialogTitle>
-          <DialogDescription>
-            {recipients.length === 0
-              ? 'A draft document will be created'
-              : 'Add the recipients to create the document with'}
-          </DialogDescription>
+          <DialogTitle>Document Recipients</DialogTitle>
+          <DialogDescription>Add the recipients to create the template with.</DialogDescription>
         </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)}>
-            <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
-              <div className="custom-scrollbar -m-1 max-h-[60vh] space-y-4 overflow-y-auto p-1">
+        <div className="flex flex-col space-y-4">
           {formRecipients.map((recipient, index) => (
-                  <div className="flex w-full flex-row space-x-4" key={recipient.id}>
-                    <FormField
-                      control={form.control}
+            <div
+              key={recipient.id}
+              data-native-id={recipient.id}
+              className="flex flex-wrap items-end gap-x-4"
+            >
+              <div className="flex-1">
+                <Label htmlFor={`recipient-${recipient.id}-email`}>
+                  Email
+                  <span className="text-destructive ml-1 inline-block font-medium">*</span>
+                </Label>
+
+                <Controller
+                  control={control}
                   name={`recipients.${index}.email`}
                   render={({ field }) => (
-                        <FormItem className="w-full">
-                          {index === 0 && <FormLabel required>Email</FormLabel>}
-
-                          <FormControl>
-                            <Input {...field} placeholder={recipients[index].email || 'Email'} />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
+                    <Input
+                      id={`recipient-${recipient.id}-email`}
+                      type="email"
+                      className="bg-background mt-2"
+                      disabled={isSubmitting}
+                      {...field}
+                    />
                   )}
                 />
+              </div>
 
-                    <FormField
-                      control={form.control}
+              <div className="flex-1">
+                <Label htmlFor={`recipient-${recipient.id}-name`}>Name</Label>
+
+                <Controller
+                  control={control}
                   name={`recipients.${index}.name`}
                   render={({ field }) => (
-                        <FormItem className="w-full">
-                          {index === 0 && <FormLabel>Name</FormLabel>}
-
-                          <FormControl>
-                            <Input {...field} placeholder={recipients[index].name || 'Name'} />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
+                    <Input
+                      id={`recipient-${recipient.id}-name`}
+                      type="text"
+                      className="bg-background mt-2"
+                      disabled={isSubmitting}
+                      {...field}
+                    />
                   )}
                 />
               </div>
+
+              <div className="w-[60px]">
+                <Controller
+                  control={control}
+                  name={`recipients.${index}.role`}
+                  render={({ field: { value, onChange } }) => (
+                    <Select value={value} onValueChange={(x) => onChange(x)}>
+                      <SelectTrigger className="bg-background">{ROLE_ICONS[value]}</SelectTrigger>
+
+                      <SelectContent className="" align="end">
+                        <SelectItem value={RecipientRole.SIGNER}>
+                          <div className="flex items-center">
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.SIGNER]}</span>
+                            Signer
+                          </div>
+                        </SelectItem>
+
+                        <SelectItem value={RecipientRole.CC}>
+                          <div className="flex items-center">
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.CC]}</span>
+                            Receives copy
+                          </div>
+                        </SelectItem>
+
+                        <SelectItem value={RecipientRole.APPROVER}>
+                          <div className="flex items-center">
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.APPROVER]}</span>
+                            Approver
+                          </div>
+                        </SelectItem>
+
+                        <SelectItem value={RecipientRole.VIEWER}>
+                          <div className="flex items-center">
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.VIEWER]}</span>
+                            Viewer
+                          </div>
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                  )}
+                />
+              </div>
+
+              <div className="w-full">
+                <FormErrorMessage className="mt-2" error={errors.recipients?.[index]?.email} />
+                <FormErrorMessage className="mt-2" error={errors.recipients?.[index]?.name} />
+              </div>
+            </div>
           ))}
         </div>
 
-              {recipients.length > 0 && (
-                <div className="mt-4 flex flex-row items-center">
-                  <FormField
-                    control={form.control}
-                    name="sendDocument"
-                    render={({ field }) => (
-                      <FormItem>
-                        <div className="flex flex-row items-center">
-                          <Checkbox
-                            id="sendDocument"
-                            className="h-5 w-5"
-                            checkClassName="dark:text-white text-primary"
-                            checked={field.value}
-                            onCheckedChange={field.onChange}
-                          />
-
-                          <label
-                            className="text-muted-foreground ml-2 flex items-center text-sm"
-                            htmlFor="sendDocument"
-                          >
-                            Send document
-                            <Tooltip>
-                              <TooltipTrigger type="button">
-                                <InfoIcon className="mx-1 h-4 w-4" />
-                              </TooltipTrigger>
-
-                              <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
-                                <p>
-                                  The document will be immediately sent to recipients if this is
-                                  checked.
-                                </p>
-
-                                <p>Otherwise, the document will be created as a draft.</p>
-                              </TooltipContent>
-                            </Tooltip>
-                          </label>
-                        </div>
-                      </FormItem>
-                    )}
-                  />
-                </div>
-              )}
-
-              <DialogFooter>
+        <DialogFooter className="justify-end">
           <DialogClose asChild>
             <Button type="button" variant="secondary">
               Close
             </Button>
           </DialogClose>
 
-                <Button type="submit" loading={form.formState.isSubmitting}>
-                  {form.getValues('sendDocument') ? 'Create and send' : 'Create as draft'}
+          <Button
+            type="button"
+            loading={isCreatingDocumentFromTemplate}
+            disabled={isCreatingDocumentFromTemplate}
+            onClick={onCreateDocumentFromTemplate}
+          >
+            Create Document
           </Button>
         </DialogFooter>
-            </fieldset>
-          </form>
-        </Form>
       </DialogContent>
     </Dialog>
   );

apps/web/src/app/(recipient)/d/[token]/configure-direct-template.tsx

@@ -1,158 +0,0 @@
-'use client';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useSession } from 'next-auth/react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import type { Field, Recipient } from '@documenso/prisma/client';
-import type { TemplateWithDetails } from '@documenso/prisma/types/template';
-import {
-  DocumentFlowFormContainerActions,
-  DocumentFlowFormContainerContent,
-  DocumentFlowFormContainerFooter,
-  DocumentFlowFormContainerHeader,
-  DocumentFlowFormContainerStep,
-} from '@documenso/ui/primitives/document-flow/document-flow-root';
-import { ShowFieldItem } from '@documenso/ui/primitives/document-flow/show-field-item';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useStep } from '@documenso/ui/primitives/stepper';
-
-import { useRequiredDocumentAuthContext } from '~/app/(signing)/sign/[token]/document-auth-provider';
-
-const ZConfigureDirectTemplateFormSchema = z.object({
-  email: z.string().email('Email is invalid'),
-});
-
-export type TConfigureDirectTemplateFormSchema = z.infer<typeof ZConfigureDirectTemplateFormSchema>;
-
-export type ConfigureDirectTemplateFormProps = {
-  flowStep: DocumentFlowStep;
-  isDocumentPdfLoaded: boolean;
-  template: TemplateWithDetails;
-  directTemplateRecipient: Recipient & { Field: Field[] };
-  initialEmail?: string;
-  onSubmit: (_data: TConfigureDirectTemplateFormSchema) => void;
-};
-
-export const ConfigureDirectTemplateFormPartial = ({
-  flowStep,
-  isDocumentPdfLoaded,
-  template,
-  directTemplateRecipient,
-  initialEmail,
-  onSubmit,
-}: ConfigureDirectTemplateFormProps) => {
-  const { Recipient } = template;
-  const { derivedRecipientAccessAuth } = useRequiredDocumentAuthContext();
-  const { data: session } = useSession();
-
-  const recipientsWithBlankDirectRecipientEmail = Recipient.map((recipient) => {
-    if (recipient.id === directTemplateRecipient.id) {
-      return {
-        ...recipient,
-        email: '',
-      };
-    }
-
-    return recipient;
-  });
-
-  const form = useForm<TConfigureDirectTemplateFormSchema>({
-    resolver: zodResolver(
-      ZConfigureDirectTemplateFormSchema.superRefine((items, ctx) => {
-        if (template.Recipient.map((recipient) => recipient.email).includes(items.email)) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: 'Email cannot already exist in the template',
-            path: ['email'],
-          });
-        }
-      }),
-    ),
-    defaultValues: {
-      email: initialEmail || '',
-    },
-  });
-
-  const { stepIndex, currentStep, totalSteps, previousStep } = useStep();
-
-  return (
-    <>
-      <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />
-
-      <DocumentFlowFormContainerContent>
-        {isDocumentPdfLoaded &&
-          directTemplateRecipient.Field.map((field, index) => (
-            <ShowFieldItem
-              key={index}
-              field={field}
-              recipients={recipientsWithBlankDirectRecipientEmail}
-            />
-          ))}
-
-        <Form {...form}>
-          <fieldset
-            className="flex h-full flex-col space-y-6"
-            disabled={form.formState.isSubmitting}
-          >
-            <FormField
-              control={form.control}
-              name="email"
-              render={({ field, fieldState }) => (
-                <FormItem>
-                  <FormLabel required>Email</FormLabel>
-
-                  <FormControl>
-                    <Input
-                      {...field}
-                      disabled={
-                        field.disabled ||
-                        derivedRecipientAccessAuth !== null ||
-                        session?.user.email !== undefined
-                      }
-                      placeholder="recipient@documenso.com"
-                    />
-                  </FormControl>
-
-                  {!fieldState.error && (
-                    <p className="text-muted-foreground text-xs">
-                      Enter your email address to receive the completed document.
-                    </p>
-                  )}
-
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          </fieldset>
-        </Form>
-      </DocumentFlowFormContainerContent>
-
-      <DocumentFlowFormContainerFooter>
-        <DocumentFlowFormContainerStep
-          title={flowStep.title}
-          step={currentStep}
-          maxStep={totalSteps}
-        />
-
-        <DocumentFlowFormContainerActions
-          loading={form.formState.isSubmitting}
-          disabled={form.formState.isSubmitting}
-          canGoBack={stepIndex !== 0}
-          onGoBackClick={previousStep}
-          onGoNextClick={form.handleSubmit(onSubmit)}
-        />
-      </DocumentFlowFormContainerFooter>
-    </>
-  );
-};

apps/web/src/app/(recipient)/d/[token]/direct-template.tsx

@@ -1,159 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { useRouter } from 'next/navigation';
-
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import type { Field } from '@documenso/prisma/client';
-import { type Recipient } from '@documenso/prisma/client';
-import type { TemplateWithDetails } from '@documenso/prisma/types/template';
-import { trpc } from '@documenso/trpc/react';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import { DocumentFlowFormContainer } from '@documenso/ui/primitives/document-flow/document-flow-root';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
-import { Stepper } from '@documenso/ui/primitives/stepper';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { useRequiredDocumentAuthContext } from '~/app/(signing)/sign/[token]/document-auth-provider';
-import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
-
-import type { TConfigureDirectTemplateFormSchema } from './configure-direct-template';
-import { ConfigureDirectTemplateFormPartial } from './configure-direct-template';
-import type { DirectTemplateLocalField } from './sign-direct-template';
-import { SignDirectTemplateForm } from './sign-direct-template';
-
-export type TemplatesDirectPageViewProps = {
-  template: TemplateWithDetails;
-  directTemplateToken: string;
-  directTemplateRecipient: Recipient & { Field: Field[] };
-};
-
-type DirectTemplateStep = 'configure' | 'sign';
-const DirectTemplateSteps: DirectTemplateStep[] = ['configure', 'sign'];
-
-export const DirectTemplatePageView = ({
-  template,
-  directTemplateRecipient,
-  directTemplateToken,
-}: TemplatesDirectPageViewProps) => {
-  const router = useRouter();
-
-  const { toast } = useToast();
-
-  const { email, setEmail } = useRequiredSigningContext();
-  const { recipient, setRecipient } = useRequiredDocumentAuthContext();
-
-  const [step, setStep] = useState<DirectTemplateStep>('configure');
-  const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);
-
-  const recipientRoleDescription = RECIPIENT_ROLES_DESCRIPTION[directTemplateRecipient.role];
-
-  const directTemplateFlow: Record<DirectTemplateStep, DocumentFlowStep> = {
-    configure: {
-      title: 'General',
-      description: 'Preview and configure template.',
-      stepIndex: 1,
-    },
-    sign: {
-      title: `${recipientRoleDescription.actionVerb} document`,
-      description: `${recipientRoleDescription.actionVerb} the document to complete the process.`,
-      stepIndex: 2,
-    },
-  };
-
-  const { mutateAsync: createDocumentFromDirectTemplate } =
-    trpc.template.createDocumentFromDirectTemplate.useMutation();
-
-  /**
-   * Set the email into a temporary recipient so it can be used for reauth and signing email fields.
-   */
-  const onConfigureDirectTemplateSubmit = ({ email }: TConfigureDirectTemplateFormSchema) => {
-    setEmail(email);
-
-    setRecipient({
-      ...recipient,
-      email,
-    });
-
-    setStep('sign');
-  };
-
-  const onSignDirectTemplateSubmit = async (fields: DirectTemplateLocalField[]) => {
-    try {
-      const token = await createDocumentFromDirectTemplate({
-        directTemplateToken,
-        directRecipientEmail: recipient.email,
-        templateUpdatedAt: template.updatedAt,
-        signedFieldValues: fields.map((field) => {
-          if (!field.signedValue) {
-            throw new Error('Invalid configuration');
-          }
-
-          return field.signedValue;
-        }),
-      });
-
-      const redirectUrl = template.templateMeta?.redirectUrl;
-
-      redirectUrl ? router.push(redirectUrl) : router.push(`/sign/${token}/complete`);
-    } catch (err) {
-      toast({
-        title: 'Something went wrong',
-        description: 'We were unable to submit this document at this time. Please try again later.',
-        variant: 'destructive',
-      });
-
-      throw err;
-    }
-  };
-
-  const currentDocumentFlow = directTemplateFlow[step];
-
-  return (
-    <div className="grid w-full grid-cols-12 gap-8">
-      <Card
-        className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
-        gradient
-      >
-        <CardContent className="p-2">
-          <LazyPDFViewer
-            key={template.id}
-            documentData={template.templateDocumentData}
-            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
-          />
-        </CardContent>
-      </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()}
-        >
-          <Stepper
-            currentStep={currentDocumentFlow.stepIndex}
-            setCurrentStep={(step) => setStep(DirectTemplateSteps[step - 1])}
-          >
-            <ConfigureDirectTemplateFormPartial
-              flowStep={directTemplateFlow.configure}
-              template={template}
-              directTemplateRecipient={directTemplateRecipient}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
-              onSubmit={onConfigureDirectTemplateSubmit}
-              initialEmail={email}
-            />
-
-            <SignDirectTemplateForm
-              flowStep={directTemplateFlow.sign}
-              directRecipient={recipient}
-              directRecipientFields={directTemplateRecipient.Field}
-              template={template}
-              onSubmit={onSignDirectTemplateSubmit}
-            />
-          </Stepper>
-        </DocumentFlowFormContainer>
-      </div>
-    </div>
-  );
-};

apps/web/src/app/(recipient)/d/[token]/not-found.tsx

@@ -1,33 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-
-import { ChevronLeft } from 'lucide-react';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-export default function NotFound() {
-  return (
-    <div className="mx-auto flex min-h-[80vh] w-full items-center justify-center py-32">
-      <div>
-        <p className="text-muted-foreground font-semibold">404 Template not found</p>
-
-        <h1 className="mt-3 text-2xl font-bold md:text-3xl">Oops! Something went wrong.</h1>
-
-        <p className="text-muted-foreground mt-4 text-sm">
-          The template you are looking for may have been disabled, deleted or may have never
-          existed.
-        </p>
-
-        <div className="mt-6 flex gap-x-2.5 gap-y-4 md:items-center">
-          <Button asChild className="w-32">
-            <Link href="/">
-              <ChevronLeft className="mr-2 h-4 w-4" />
-              Go Back
-            </Link>
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/web/src/app/(recipient)/d/[token]/page.tsx

@@ -1,92 +0,0 @@
-import { notFound, redirect } from 'next/navigation';
-
-import { UsersIcon } from 'lucide-react';
-import { match } from 'ts-pattern';
-
-import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
-import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
-import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-
-import { DocumentAuthProvider } from '~/app/(signing)/sign/[token]/document-auth-provider';
-import { SigningProvider } from '~/app/(signing)/sign/[token]/provider';
-import { truncateTitle } from '~/helpers/truncate-title';
-
-import { DirectTemplatePageView } from './direct-template';
-import { DirectTemplateAuthPageView } from './signing-auth-page';
-
-export type TemplatesDirectPageProps = {
-  params: {
-    token: string;
-  };
-};
-
-export default async function TemplatesDirectPage({ params }: TemplatesDirectPageProps) {
-  const { token } = params;
-
-  if (!token) {
-    redirect('/');
-  }
-
-  const { user } = await getServerComponentSession();
-
-  const template = await getTemplateByDirectLinkToken({
-    token,
-  }).catch(() => null);
-
-  if (!template || !template.directLink?.enabled) {
-    notFound();
-  }
-
-  const directTemplateRecipient = template.Recipient.find(
-    (recipient) => recipient.id === template.directLink?.directTemplateRecipientId,
-  );
-
-  if (!directTemplateRecipient) {
-    notFound();
-  }
-
-  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
-    documentAuth: template.authOptions,
-  });
-
-  // Ensure typesafety when we add more options.
-  const isAccessAuthValid = match(derivedRecipientAccessAuth)
-    .with(DocumentAccessAuth.ACCOUNT, () => user !== null)
-    .with(null, () => true)
-    .exhaustive();
-
-  if (!isAccessAuthValid) {
-    return <DirectTemplateAuthPageView />;
-  }
-
-  return (
-    <SigningProvider email={user?.email} fullName={user?.name} signature={user?.signature}>
-      <DocumentAuthProvider
-        documentAuthOptions={template.authOptions}
-        recipient={directTemplateRecipient}
-        user={user}
-      >
-        <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
-            {truncateTitle(template.title)}
-          </h1>
-
-          <div className="text-muted-foreground mb-8 mt-2.5 flex items-center gap-x-2">
-            <UsersIcon className="h-4 w-4" />
-            <p className="text-muted-foreground/80">
-              {template.Recipient.length}{' '}
-              {template.Recipient.length > 1 ? 'recipients' : 'recipient'}
-            </p>
-          </div>
-
-          <DirectTemplatePageView
-            directTemplateRecipient={directTemplateRecipient}
-            directTemplateToken={template.directLink.token}
-            template={template}
-          />
-        </div>
-      </DocumentAuthProvider>
-    </SigningProvider>
-  );
-}

apps/web/src/app/(recipient)/d/[token]/sign-direct-template.tsx

@@ -1,278 +0,0 @@
-import { useMemo, useState } from 'react';
-
-import { DateTime } from 'luxon';
-import { match } from 'ts-pattern';
-
-import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
-import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
-import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
-import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
-import type { Field, Recipient, Signature } from '@documenso/prisma/client';
-import { FieldType } from '@documenso/prisma/client';
-import type { TemplateWithDetails } from '@documenso/prisma/types/template';
-import type {
-  TRemovedSignedFieldWithTokenMutationSchema,
-  TSignFieldWithTokenMutationSchema,
-} from '@documenso/trpc/server/field-router/schema';
-import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import {
-  DocumentFlowFormContainerContent,
-  DocumentFlowFormContainerFooter,
-  DocumentFlowFormContainerHeader,
-  DocumentFlowFormContainerStep,
-} from '@documenso/ui/primitives/document-flow/document-flow-root';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import { ElementVisible } from '@documenso/ui/primitives/element-visible';
-import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
-import { useStep } from '@documenso/ui/primitives/stepper';
-
-import { DateField } from '~/app/(signing)/sign/[token]/date-field';
-import { EmailField } from '~/app/(signing)/sign/[token]/email-field';
-import { NameField } from '~/app/(signing)/sign/[token]/name-field';
-import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
-import { SignDialog } from '~/app/(signing)/sign/[token]/sign-dialog';
-import { SignatureField } from '~/app/(signing)/sign/[token]/signature-field';
-import { TextField } from '~/app/(signing)/sign/[token]/text-field';
-
-export type SignDirectTemplateFormProps = {
-  flowStep: DocumentFlowStep;
-  directRecipient: Recipient;
-  directRecipientFields: Field[];
-  template: TemplateWithDetails;
-  onSubmit: (_data: DirectTemplateLocalField[]) => Promise<void>;
-};
-
-export type DirectTemplateLocalField = Field & {
-  signedValue?: TSignFieldWithTokenMutationSchema;
-  Signature?: Signature;
-};
-
-export const SignDirectTemplateForm = ({
-  flowStep,
-  directRecipient,
-  directRecipientFields,
-  template,
-  onSubmit,
-}: SignDirectTemplateFormProps) => {
-  const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();
-
-  const [localFields, setLocalFields] = useState<DirectTemplateLocalField[]>(directRecipientFields);
-  const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const { currentStep, totalSteps, previousStep } = useStep();
-
-  const onSignField = (value: TSignFieldWithTokenMutationSchema) => {
-    setLocalFields(
-      localFields.map((field) => {
-        if (field.id !== value.fieldId) {
-          return field;
-        }
-
-        const tempField: DirectTemplateLocalField = {
-          ...field,
-          customText: value.value,
-          inserted: true,
-          signedValue: value,
-        };
-
-        if (field.type === FieldType.SIGNATURE) {
-          tempField.Signature = {
-            id: 1,
-            created: new Date(),
-            recipientId: 1,
-            fieldId: 1,
-            signatureImageAsBase64: value.value,
-            typedSignature: null,
-          };
-        }
-
-        if (field.type === FieldType.DATE) {
-          tempField.customText = DateTime.now()
-            .setZone(template.templateMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE)
-            .toFormat(template.templateMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT);
-        }
-        return tempField;
-      }),
-    );
-  };
-
-  const onUnsignField = (value: TRemovedSignedFieldWithTokenMutationSchema) => {
-    setLocalFields(
-      localFields.map((field) => {
-        if (field.id !== value.fieldId) {
-          return field;
-        }
-
-        return {
-          ...field,
-          customText: '',
-          inserted: false,
-          signedValue: undefined,
-          Signature: undefined,
-        };
-      }),
-    );
-  };
-
-  const uninsertedFields = useMemo(() => {
-    return sortFieldsByPosition(localFields.filter((field) => !field.inserted));
-  }, [localFields]);
-
-  const fieldsValidated = () => {
-    setValidateUninsertedFields(true);
-    validateFieldsInserted(localFields);
-  };
-
-  const handleSubmit = async () => {
-    setValidateUninsertedFields(true);
-
-    const isFieldsValid = validateFieldsInserted(localFields);
-
-    if (!isFieldsValid) {
-      return;
-    }
-
-    setIsSubmitting(true);
-
-    try {
-      await onSubmit(localFields);
-    } catch {
-      setIsSubmitting(false);
-    }
-
-    // Do not reset to false since we do a redirect.
-  };
-
-  return (
-    <>
-      <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />
-
-      <DocumentFlowFormContainerContent>
-        <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
-          {validateUninsertedFields && uninsertedFields[0] && (
-            <FieldToolTip key={uninsertedFields[0].id} field={uninsertedFields[0]} color="warning">
-              Click to insert field
-            </FieldToolTip>
-          )}
-
-          {localFields.map((field) =>
-            match(field.type)
-              .with(FieldType.SIGNATURE, () => (
-                <SignatureField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.NAME, () => (
-                <NameField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.DATE, () => (
-                <DateField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  dateFormat={template.templateMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}
-                  timezone={template.templateMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.EMAIL, () => (
-                <EmailField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.TEXT, () => (
-                <TextField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .otherwise(() => null),
-          )}
-        </ElementVisible>
-
-        <div className="-mx-2 flex flex-1 flex-col gap-4 overflow-y-auto px-2">
-          <div className="flex flex-1 flex-col gap-y-4">
-            <div>
-              <Label htmlFor="full-name">Full Name</Label>
-
-              <Input
-                id="full-name"
-                value={fullName}
-                onChange={(e) => setFullName(e.target.value.trimStart())}
-              />
-            </div>
-
-            <div>
-              <Label htmlFor="Signature">Signature</Label>
-
-              <Card className="mt-2" gradient degrees={-120}>
-                <CardContent className="p-0">
-                  <SignaturePad
-                    className="h-44 w-full"
-                    disabled={isSubmitting}
-                    defaultValue={signature ?? undefined}
-                    onChange={(value) => {
-                      setSignature(value);
-                    }}
-                  />
-                </CardContent>
-              </Card>
-            </div>
-          </div>
-        </div>
-      </DocumentFlowFormContainerContent>
-
-      <DocumentFlowFormContainerFooter>
-        <DocumentFlowFormContainerStep
-          title={flowStep.title}
-          step={currentStep}
-          maxStep={totalSteps}
-        />
-
-        <div className="mt-4 flex gap-x-4">
-          <Button
-            className="dark:bg-muted dark:hover:bg-muted/80 w-full bg-black/5 hover:bg-black/10"
-            size="lg"
-            variant="secondary"
-            disabled={isSubmitting}
-            onClick={previousStep}
-          >
-            Back
-          </Button>
-
-          <SignDialog
-            isSubmitting={isSubmitting}
-            onSignatureComplete={handleSubmit}
-            documentTitle={template.title}
-            fields={localFields}
-            fieldsValidated={fieldsValidated}
-            role={directRecipient.role}
-          />
-        </div>
-      </DocumentFlowFormContainerFooter>
-    </>
-  );
-};

apps/web/src/app/(recipient)/d/[token]/signing-auth-page.tsx

@@ -1,54 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { signOut } from 'next-auth/react';
-
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export const DirectTemplateAuthPageView = () => {
-  const { toast } = useToast();
-
-  const [isSigningOut, setIsSigningOut] = useState(false);
-
-  const handleChangeAccount = async () => {
-    try {
-      setIsSigningOut(true);
-
-      await signOut({
-        callbackUrl: '/signin',
-      });
-    } catch {
-      toast({
-        title: 'Something went wrong',
-        description: 'We were unable to log you out at this time.',
-        duration: 10000,
-        variant: 'destructive',
-      });
-    }
-
-    setIsSigningOut(false);
-  };
-
-  return (
-    <div className="mx-auto flex h-[70vh] w-full max-w-md flex-col items-center justify-center">
-      <div>
-        <h1 className="text-3xl font-semibold">Authentication required</h1>
-
-        <p className="text-muted-foreground mt-2 text-sm">
-          You need to be logged in to view this page.
-        </p>
-
-        <Button
-          className="mt-4 w-full"
-          type="submit"
-          onClick={async () => handleChangeAccount()}
-          loading={isSigningOut}
-        >
-          Login
-        </Button>
-      </div>
-    </div>
-  );
-};

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

@@ -1,38 +0,0 @@
-import React from 'react';
-
-import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
-import { getTeams } from '@documenso/lib/server-only/team/get-teams';
-
-import { Header as AuthenticatedHeader } from '~/components/(dashboard)/layout/header';
-import { NextAuthProvider } from '~/providers/next-auth';
-
-type RecipientLayoutProps = {
-  children: React.ReactNode;
-};
-
-/**
- * A layout to handle scenarios where the user is a recipient of a given resource
- * where we do not care whether they are authenticated or not.
- *
- * Such as direct template access, or signing.
- */
-export default async function RecipientLayout({ children }: RecipientLayoutProps) {
-  const { user, session } = await getServerComponentSession();
-
-  let teams: GetTeamsResponse = [];
-
-  if (user && session) {
-    teams = await getTeams({ userId: user.id });
-  }
-
-  return (
-    <NextAuthProvider session={session}>
-      <div className="min-h-screen">
-        {user && <AuthenticatedHeader user={user} teams={teams} />}
-
-        <main className="mb-8 mt-8 px-4 md:mb-12 md:mt-12 md:px-8">{children}</main>
-      </div>
-    </NextAuthProvider>
-  );
-}

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

@@ -67,7 +67,7 @@ export default async function CompletedSigningPage({
 
   const isDocumentAccessValid = await isRecipientAuthorized({
     type: 'ACCESS',
-    documentAuthOptions: document.authOptions,
+    document,
     recipient,
     userId: user?.id,
   });
@@ -131,7 +131,7 @@ export default async function CompletedSigningPage({
               </div>
             ))
             .with({ deletedAt: null }, () => (
-              <div className="mt-4 flex items-center text-center text-blue-600">
+              <div className="flex items-center mt-4 text-center text-blue-600">
                 <Clock8 className="mr-2 h-5 w-5" />
                 <span className="text-sm">Waiting for others to sign</span>
               </div>

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

@@ -17,10 +17,6 @@ import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
-import type {
-  TRemovedSignedFieldWithTokenMutationSchema,
-  TSignFieldWithTokenMutationSchema,
-} from '@documenso/trpc/server/field-router/schema';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { SigningFieldContainer } from './signing-field-container';
@@ -30,8 +26,6 @@ export type DateFieldProps = {
   recipient: Recipient;
   dateFormat?: string | null;
   timezone?: string | null;
-  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
-  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };
 
 export const DateField = ({
@@ -39,8 +33,6 @@ export const DateField = ({
   recipient,
   dateFormat = DEFAULT_DOCUMENT_DATE_FORMAT,
   timezone = DEFAULT_DOCUMENT_TIME_ZONE,
-  onSignField,
-  onUnsignField,
 }: DateFieldProps) => {
   const router = useRouter();
 
@@ -66,19 +58,12 @@ export const DateField = ({
 
   const onSign = async (authOptions?: TRecipientActionAuth) => {
     try {
-      const payload: TSignFieldWithTokenMutationSchema = {
+      await signFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
         value: dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT,
         authOptions,
-      };
-
-      if (onSignField) {
-        await onSignField(payload);
-        return;
-      }
-
-      await signFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {
@@ -100,17 +85,10 @@ export const DateField = ({
 
   const onRemove = async () => {
     try {
-      const payload: TRemovedSignedFieldWithTokenMutationSchema = {
+      await removeSignedFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
-      };
-
-      if (onUnsignField) {
-        await onUnsignField(payload);
-        return;
-      }
-
-      await removeSignedFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {

apps/web/src/app/(signing)/sign/[token]/document-action-auth-2fa.tsx

@@ -18,7 +18,7 @@ import {
   FormLabel,
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
-import { PinInput, PinInputGroup, PinInputSlot } from '@documenso/ui/primitives/pin-input';
+import { Input } from '@documenso/ui/primitives/input';
 
 import { EnableAuthenticatorAppDialog } from '~/components/forms/2fa/enable-authenticator-app-dialog';
 
@@ -138,15 +138,7 @@ export const DocumentActionAuth2FA = ({
                   <FormLabel required>2FA token</FormLabel>
 
                   <FormControl>
-                    <PinInput {...field} value={field.value ?? ''} maxLength={6}>
-                      {Array(6)
-                        .fill(null)
-                        .map((_, i) => (
-                          <PinInputGroup key={i}>
-                            <PinInputSlot index={i} />
-                          </PinInputGroup>
-                        ))}
-                    </PinInput>
+                    <Input {...field} placeholder="Token" />
                   </FormControl>
 
                   <FormMessage />

apps/web/src/app/(signing)/sign/[token]/document-auth-provider.tsx

@@ -34,9 +34,9 @@ type PasskeyData = {
 
 export type DocumentAuthContextValue = {
   executeActionAuthProcedure: (_value: ExecuteActionAuthProcedureOptions) => Promise<void>;
-  documentAuthOptions: Document['authOptions'];
+  document: Document;
   documentAuthOption: TDocumentAuthOptions;
-  setDocumentAuthOptions: (_value: Document['authOptions']) => void;
+  setDocument: (_value: Document) => void;
   recipient: Recipient;
   recipientAuthOption: TRecipientAuthOptions;
   setRecipient: (_value: Recipient) => void;
@@ -69,19 +69,19 @@ export const useRequiredDocumentAuthContext = () => {
 };
 
 export interface DocumentAuthProviderProps {
-  documentAuthOptions: Document['authOptions'];
+  document: Document;
   recipient: Recipient;
   user?: User | null;
   children: React.ReactNode;
 }
 
 export const DocumentAuthProvider = ({
-  documentAuthOptions: initialDocumentAuthOptions,
+  document: initialDocument,
   recipient: initialRecipient,
   user,
   children,
 }: DocumentAuthProviderProps) => {
-  const [documentAuthOptions, setDocumentAuthOptions] = useState(initialDocumentAuthOptions);
+  const [document, setDocument] = useState(initialDocument);
   const [recipient, setRecipient] = useState(initialRecipient);
 
   const [isCurrentlyAuthenticating, setIsCurrentlyAuthenticating] = useState(false);
@@ -95,10 +95,10 @@ export const DocumentAuthProvider = ({
   } = useMemo(
     () =>
       extractDocumentAuthMethods({
-        documentAuth: documentAuthOptions,
+        documentAuth: document.authOptions,
         recipientAuth: recipient.authOptions,
       }),
-    [documentAuthOptions, recipient],
+    [document, recipient],
   );
 
   const passkeyQuery = trpc.auth.findPasskeys.useQuery(
@@ -189,8 +189,8 @@ export const DocumentAuthProvider = ({
     <DocumentAuthContext.Provider
       value={{
         user,
-        documentAuthOptions,
-        setDocumentAuthOptions,
+        document,
+        setDocument,
         executeActionAuthProcedure,
         recipient,
         setRecipient,

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

@@ -12,10 +12,6 @@ import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
-import type {
-  TRemovedSignedFieldWithTokenMutationSchema,
-  TSignFieldWithTokenMutationSchema,
-} from '@documenso/trpc/server/field-router/schema';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { useRequiredSigningContext } from './provider';
@@ -24,11 +20,9 @@ import { SigningFieldContainer } from './signing-field-container';
 export type EmailFieldProps = {
   field: FieldWithSignature;
   recipient: Recipient;
-  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
-  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };
 
-export const EmailField = ({ field, recipient, onSignField, onUnsignField }: EmailFieldProps) => {
+export const EmailField = ({ field, recipient }: EmailFieldProps) => {
   const router = useRouter();
 
   const { toast } = useToast();
@@ -49,22 +43,13 @@ export const EmailField = ({ field, recipient, onSignField, onUnsignField }: Ema
 
   const onSign = async (authOptions?: TRecipientActionAuth) => {
     try {
-      const value = providedEmail ?? '';
-
-      const payload: TSignFieldWithTokenMutationSchema = {
+      await signFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
-        value,
+        value: providedEmail ?? '',
         isBase64: false,
         authOptions,
-      };
-
-      if (onSignField) {
-        await onSignField(payload);
-        return;
-      }
-
-      await signFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {
@@ -86,17 +71,10 @@ export const EmailField = ({ field, recipient, onSignField, onUnsignField }: Ema
 
   const onRemove = async () => {
     try {
-      const payload: TRemovedSignedFieldWithTokenMutationSchema = {
+      await removeSignedFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
-      };
-
-      if (onUnsignField) {
-        await onUnsignField(payload);
-        return;
-      }
-
-      await removeSignedFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {

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

@@ -145,7 +145,7 @@ export const SigningForm = ({ document, recipient, fields, redirectUrl }: Signin
                   <SignDialog
                     isSubmitting={isSubmitting}
                     onSignatureComplete={handleSubmit(onFormSubmit)}
-                    documentTitle={document.title}
+                    document={document}
                     fields={fields}
                     fieldsValidated={fieldsValidated}
                     role={recipient.role}
@@ -208,7 +208,7 @@ export const SigningForm = ({ document, recipient, fields, redirectUrl }: Signin
                   <SignDialog
                     isSubmitting={isSubmitting}
                     onSignatureComplete={handleSubmit(onFormSubmit)}
-                    documentTitle={document.title}
+                    document={document}
                     fields={fields}
                     fieldsValidated={fieldsValidated}
                     role={recipient.role}

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

@@ -12,10 +12,6 @@ import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { type Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
-import type {
-  TRemovedSignedFieldWithTokenMutationSchema,
-  TSignFieldWithTokenMutationSchema,
-} from '@documenso/trpc/server/field-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
 import { Input } from '@documenso/ui/primitives/input';
@@ -29,11 +25,9 @@ import { SigningFieldContainer } from './signing-field-container';
 export type NameFieldProps = {
   field: FieldWithSignature;
   recipient: Recipient;
-  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
-  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };
 
-export const NameField = ({ field, recipient, onSignField, onUnsignField }: NameFieldProps) => {
+export const NameField = ({ field, recipient }: NameFieldProps) => {
   const router = useRouter();
 
   const { toast } = useToast();
@@ -89,20 +83,13 @@ export const NameField = ({ field, recipient, onSignField, onUnsignField }: Name
         return;
       }
 
-      const payload: TSignFieldWithTokenMutationSchema = {
+      await signFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
         value,
         isBase64: false,
         authOptions,
-      };
-
-      if (onSignField) {
-        await onSignField(payload);
-        return;
-      }
-
-      await signFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {
@@ -124,17 +111,10 @@ export const NameField = ({ field, recipient, onSignField, onUnsignField }: Name
 
   const onRemove = async () => {
     try {
-      const payload: TRemovedSignedFieldWithTokenMutationSchema = {
+      await removeSignedFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
-      };
-
-      if (onUnsignField) {
-        await onUnsignField(payload);
-        return;
-      }
-
-      await removeSignedFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {

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

@@ -6,7 +6,6 @@ import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-c
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { isRecipientAuthorized } from '@documenso/lib/server-only/document/is-recipient-authorized';
 import { viewedDocument } from '@documenso/lib/server-only/document/viewed-document';
-import { getCompletedFieldsForToken } from '@documenso/lib/server-only/field/get-completed-fields-for-token';
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
@@ -38,7 +37,7 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
 
   const requestMetadata = extractNextHeaderRequestMetadata(requestHeaders);
 
-  const [document, fields, recipient, completedFields] = await Promise.all([
+  const [document, fields, recipient] = await Promise.all([
     getDocumentAndSenderByToken({
       token,
       userId: user?.id,
@@ -46,7 +45,6 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
     }).catch(() => null),
     getFieldsForToken({ token }),
     getRecipientByToken({ token }).catch(() => null),
-    getCompletedFieldsForToken({ token }),
   ]);
 
   if (
@@ -65,7 +63,7 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
 
   const isDocumentAccessValid = await isRecipientAuthorized({
     type: 'ACCESS',
-    documentAuthOptions: document.authOptions,
+    document,
     recipient,
     userId: user?.id,
   });
@@ -126,17 +124,8 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
       fullName={user?.email === recipient.email ? user.name : recipient.name}
       signature={user?.email === recipient.email ? user.signature : undefined}
     >
-      <DocumentAuthProvider
-        documentAuthOptions={document.authOptions}
-        recipient={recipient}
-        user={user}
-      >
-        <SigningPageView
-          recipient={recipient}
-          document={document}
-          fields={fields}
-          completedFields={completedFields}
-        />
+      <DocumentAuthProvider document={document} recipient={recipient} user={user}>
+        <SigningPageView recipient={recipient} document={document} fields={fields} />
       </DocumentAuthProvider>
     </SigningProvider>
   );

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

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 
-import type { Field } from '@documenso/prisma/client';
+import type { Document, Field } from '@documenso/prisma/client';
 import { RecipientRole } from '@documenso/prisma/client';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -16,7 +16,7 @@ import { truncateTitle } from '~/helpers/truncate-title';
 
 export type SignDialogProps = {
   isSubmitting: boolean;
-  documentTitle: string;
+  document: Document;
   fields: Field[];
   fieldsValidated: () => void | Promise<void>;
   onSignatureComplete: () => void | Promise<void>;
@@ -25,14 +25,14 @@ export type SignDialogProps = {
 
 export const SignDialog = ({
   isSubmitting,
-  documentTitle,
+  document,
   fields,
   fieldsValidated,
   onSignatureComplete,
   role,
 }: SignDialogProps) => {
   const [showDialog, setShowDialog] = useState(false);
-  const truncatedTitle = truncateTitle(documentTitle);
+  const truncatedTitle = truncateTitle(document.title);
   const isComplete = fields.every((field) => field.inserted);
 
   const handleOpenChange = (open: boolean) => {
@@ -40,6 +40,18 @@ export const SignDialog = ({
       return;
     }
 
+    // Reauth is currently not required for signing the document.
+    // if (isAuthRedirectRequired) {
+    //   await executeActionAuthProcedure({
+    //     actionTarget: 'DOCUMENT',
+    //     onReauthFormSubmit: () => {
+    //       // Do nothing since the user should be redirected.
+    //     },
+    //   });
+
+    //   return;
+    // }
+
     setShowDialog(open);
   };
 

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

@@ -12,10 +12,6 @@ import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { type Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
-import type {
-  TRemovedSignedFieldWithTokenMutationSchema,
-  TSignFieldWithTokenMutationSchema,
-} from '@documenso/trpc/server/field-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
 import { Label } from '@documenso/ui/primitives/label';
@@ -33,16 +29,9 @@ type SignatureFieldState = 'empty' | 'signed-image' | 'signed-text';
 export type SignatureFieldProps = {
   field: FieldWithSignature;
   recipient: Recipient;
-  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
-  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };
 
-export const SignatureField = ({
-  field,
-  recipient,
-  onSignField,
-  onUnsignField,
-}: SignatureFieldProps) => {
+export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
   const router = useRouter();
 
   const { toast } = useToast();
@@ -116,20 +105,13 @@ export const SignatureField = ({
         return;
       }
 
-      const payload: TSignFieldWithTokenMutationSchema = {
+      await signFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
         value,
         isBase64: true,
         authOptions,
-      };
-
-      if (onSignField) {
-        await onSignField(payload);
-        return;
-      }
-
-      await signFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {
@@ -151,17 +133,10 @@ export const SignatureField = ({
 
   const onRemove = async () => {
     try {
-      const payload: TRemovedSignedFieldWithTokenMutationSchema = {
+      await removeSignedFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
-      };
-
-      if (onUnsignField) {
-        await onUnsignField(payload);
-        return;
-      }
-
-      await removeSignedFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {

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

@@ -4,14 +4,12 @@ import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-form
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
 import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-document-by-token';
-import type { CompletedField } from '@documenso/lib/types/fields';
 import type { Field, Recipient } from '@documenso/prisma/client';
 import { FieldType, RecipientRole } from '@documenso/prisma/client';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
 
-import { DocumentReadOnlyFields } from '~/components/document/document-read-only-fields';
 import { truncateTitle } from '~/helpers/truncate-title';
 
 import { DateField } from './date-field';
@@ -25,15 +23,9 @@ export type SigningPageViewProps = {
   document: DocumentAndSender;
   recipient: Recipient;
   fields: Field[];
-  completedFields: CompletedField[];
 };
 
-export const SigningPageView = ({
-  document,
-  recipient,
-  fields,
-  completedFields,
-}: SigningPageViewProps) => {
+export const SigningPageView = ({ document, recipient, fields }: SigningPageViewProps) => {
   const truncatedTitle = truncateTitle(document.title);
 
   const { documentData, documentMeta } = document;
@@ -78,8 +70,6 @@ export const SigningPageView = ({
         </div>
       </div>
 
-      <DocumentReadOnlyFields fields={completedFields} />
-
       <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
         {fields.map((field) =>
           match(field.type)

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

@@ -12,10 +12,6 @@ import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
-import type {
-  TRemovedSignedFieldWithTokenMutationSchema,
-  TSignFieldWithTokenMutationSchema,
-} from '@documenso/trpc/server/field-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
 import { Input } from '@documenso/ui/primitives/input';
@@ -28,11 +24,9 @@ import { SigningFieldContainer } from './signing-field-container';
 export type TextFieldProps = {
   field: FieldWithSignature;
   recipient: Recipient;
-  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
-  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };
 
-export const TextField = ({ field, recipient, onSignField, onUnsignField }: TextFieldProps) => {
+export const TextField = ({ field, recipient }: TextFieldProps) => {
   const router = useRouter();
 
   const { toast } = useToast();
@@ -87,20 +81,13 @@ export const TextField = ({ field, recipient, onSignField, onUnsignField }: Text
         return;
       }
 
-      const payload: TSignFieldWithTokenMutationSchema = {
+      await signFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
         value: localText,
         isBase64: true,
         authOptions,
-      };
-
-      if (onSignField) {
-        await onSignField(payload);
-        return;
-      }
-
-      await signFieldWithToken(payload);
+      });
 
       setLocalCustomText('');
 
@@ -124,17 +111,10 @@ export const TextField = ({ field, recipient, onSignField, onUnsignField }: Text
 
   const onRemove = async () => {
     try {
-      const payload: TRemovedSignedFieldWithTokenMutationSchema = {
+      await removeSignedFieldWithToken({
         token: recipient.token,
         fieldId: field.id,
-      };
-
-      if (onUnsignField) {
-        await onUnsignField(payload);
-        return;
-      }
-
-      await removeSignedFieldWithToken(payload);
+      });
 
       startTransition(() => router.refresh());
     } catch (err) {

apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx

@@ -1,10 +1,7 @@
 import { DateTime } from 'luxon';
-import { match } from 'ts-pattern';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { GetTeamTokensResponse } from '@documenso/lib/server-only/public-api/get-all-team-tokens';
 import { getTeamTokens } from '@documenso/lib/server-only/public-api/get-all-team-tokens';
 import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
 import { Button } from '@documenso/ui/primitives/button';
@@ -26,24 +23,7 @@ export default async function ApiTokensPage({ params }: ApiTokensPageProps) {
 
   const team = await getTeamByUrl({ userId: user.id, teamUrl });
 
-  let tokens: GetTeamTokensResponse | null = null;
-
-  try {
-    tokens = await getTeamTokens({ userId: user.id, teamId: team.id });
-  } catch (err) {
-    const error = AppError.parseError(err);
-
-    return (
-      <div>
-        <h3 className="text-2xl font-semibold">API Tokens</h3>
-        <p className="text-muted-foreground mt-2 text-sm">
-          {match(error.code)
-            .with(AppErrorCode.UNAUTHORIZED, () => error.message)
-            .otherwise(() => 'Something went wrong.')}
-        </p>
-      </div>
-    );
-  }
+  const tokens = await getTeamTokens({ userId: user.id, teamId: team.id });
 
   return (
     <div>

apps/web/src/app/(unauthenticated)/articles/signature-disclosure/page.tsx

@@ -5,7 +5,7 @@ import { Button } from '@documenso/ui/primitives/button';
 export default function SignatureDisclosure() {
   return (
     <div>
-      <article className="prose dark:prose-invert">
+      <article className="prose">
         <h1>Electronic Signature Disclosure</h1>
 
         <h2>Welcome</h2>

apps/web/src/app/(unauthenticated)/signin/page.tsx

@@ -4,7 +4,7 @@ import { redirect } from 'next/navigation';
 
 import { env } from 'next-runtime-env';
 
-import { IS_GOOGLE_SSO_ENABLED, IS_OIDC_SSO_ENABLED } from '@documenso/lib/constants/auth';
+import { IS_GOOGLE_SSO_ENABLED } from '@documenso/lib/constants/auth';
 import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
 
 import { SignInForm } from '~/components/forms/signin';
@@ -37,13 +37,10 @@ export default function SignInPage({ searchParams }: SignInPageProps) {
         <p className="text-muted-foreground mt-2 text-sm">
           Welcome back, we are lucky to have you.
         </p>
+
         <hr className="-mx-6 my-4" />
 
-        <SignInForm
-          initialEmail={email || undefined}
-          isGoogleSSOEnabled={IS_GOOGLE_SSO_ENABLED}
-          isOIDCSSOEnabled={IS_OIDC_SSO_ENABLED}
-        />
+        <SignInForm initialEmail={email || undefined} isGoogleSSOEnabled={IS_GOOGLE_SSO_ENABLED} />
 
         {NEXT_PUBLIC_DISABLE_SIGNUP !== 'true' && (
           <p className="text-muted-foreground mt-6 text-center text-sm">

apps/web/src/app/(unauthenticated)/signup/page.tsx

@@ -3,7 +3,7 @@ import { redirect } from 'next/navigation';
 
 import { env } from 'next-runtime-env';
 
-import { IS_GOOGLE_SSO_ENABLED, IS_OIDC_SSO_ENABLED } from '@documenso/lib/constants/auth';
+import { IS_GOOGLE_SSO_ENABLED } from '@documenso/lib/constants/auth';
 import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
 
 import { SignUpFormV2 } from '~/components/forms/v2/signup';
@@ -37,7 +37,6 @@ export default function SignUpPage({ searchParams }: SignUpPageProps) {
       className="w-screen max-w-screen-2xl px-4 md:px-16 lg:-my-16"
       initialEmail={email || undefined}
       isGoogleSSOEnabled={IS_GOOGLE_SSO_ENABLED}
-      isOIDCSSOEnabled={IS_OIDC_SSO_ENABLED}
     />
   );
 }

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

@@ -1,10 +1,12 @@
 'use client';
 
+import { useRef, useState } from 'react';
+
 import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
 import type { DocumentStatus, Recipient } from '@documenso/prisma/client';
-import { PopoverHover } from '@documenso/ui/primitives/popover';
+import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover';
 
 import { AvatarWithRecipient } from './avatar-with-recipient';
 import { StackAvatar } from './stack-avatar';
@@ -23,6 +25,11 @@ export const StackAvatarsWithTooltip = ({
   position,
   children,
 }: StackAvatarsWithTooltipProps) => {
+  const [open, setOpen] = useState(false);
+
+  const isControlled = useRef(false);
+  const isMouseOverTimeout = useRef<NodeJS.Timeout | null>(null);
+
   const waitingRecipients = recipients.filter(
     (recipient) => getRecipientType(recipient) === 'waiting',
   );
@@ -39,13 +46,55 @@ export const StackAvatarsWithTooltip = ({
     (recipient) => getRecipientType(recipient) === 'unsigned',
   );
 
+  const onMouseEnter = () => {
+    if (isMouseOverTimeout.current) {
+      clearTimeout(isMouseOverTimeout.current);
+    }
+
+    if (isControlled.current) {
+      return;
+    }
+
+    isMouseOverTimeout.current = setTimeout(() => {
+      setOpen((o) => (!o ? true : o));
+    }, 200);
+  };
+
+  const onMouseLeave = () => {
+    if (isMouseOverTimeout.current) {
+      clearTimeout(isMouseOverTimeout.current);
+    }
+
+    if (isControlled.current) {
+      return;
+    }
+
+    setTimeout(() => {
+      setOpen((o) => (o ? false : o));
+    }, 200);
+  };
+
+  const onOpenChange = (newOpen: boolean) => {
+    isControlled.current = newOpen;
+
+    setOpen(newOpen);
+  };
+
   return (
-    <PopoverHover
-      trigger={children || <StackAvatars recipients={recipients} />}
-      contentProps={{
-        className: 'flex flex-col gap-y-5 py-2',
-        side: position,
-      }}
+    <Popover open={open} onOpenChange={onOpenChange}>
+      <PopoverTrigger
+        className="flex cursor-pointer"
+        onMouseEnter={onMouseEnter}
+        onMouseLeave={onMouseLeave}
+      >
+        {children || <StackAvatars recipients={recipients} />}
+      </PopoverTrigger>
+
+      <PopoverContent
+        side={position}
+        onMouseEnter={onMouseEnter}
+        onMouseLeave={onMouseLeave}
+        className="flex flex-col gap-y-5 py-2"
       >
         {completedRecipients.length > 0 && (
           <div>
@@ -107,6 +156,7 @@ export const StackAvatarsWithTooltip = ({
             ))}
           </div>
         )}
-    </PopoverHover>
+      </PopoverContent>
+    </Popover>
   );
 };

apps/web/src/components/(dashboard)/layout/menu-switcher.tsx

@@ -3,7 +3,6 @@
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 
-import { motion } from 'framer-motion';
 import { CheckCircle2, ChevronsUpDown, Plus, Settings2 } from 'lucide-react';
 import { signOut } from 'next-auth/react';
 
@@ -26,8 +25,6 @@ import {
   DropdownMenuTrigger,
 } from '@documenso/ui/primitives/dropdown-menu';
 
-const MotionLink = motion(Link);
-
 export type MenuSwitcherProps = {
   user: User;
   teams: GetTeamsResponse;
@@ -173,43 +170,18 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
             <div className="custom-scrollbar max-h-[40vh] overflow-auto">
               {teams.map((team) => (
                 <DropdownMenuItem asChild key={team.id}>
-                  <MotionLink
-                    initial="initial"
-                    animate="initial"
-                    whileHover="animate"
-                    href={formatRedirectUrlOnSwitch(team.url)}
-                  >
+                  <Link href={formatRedirectUrlOnSwitch(team.url)}>
                     <AvatarWithText
                       avatarFallback={formatAvatarFallback(team.name)}
                       primaryText={team.name}
-                      secondaryText={
-                        <div className="relative">
-                          <motion.span
-                            className="overflow-hidden"
-                            variants={{
-                              initial: { opacity: 1, translateY: 0 },
-                              animate: { opacity: 0, translateY: '100%' },
-                            }}
-                          >
-                            {formatSecondaryAvatarText(team)}
-                          </motion.span>
-
-                          <motion.span
-                            className="absolute inset-0"
-                            variants={{
-                              initial: { opacity: 0, translateY: '100%' },
-                              animate: { opacity: 1, translateY: 0 },
-                            }}
-                          >{`/t/${team.url}`}</motion.span>
-                        </div>
-                      }
+                      secondaryText={formatSecondaryAvatarText(team)}
                       rightSideComponent={
                         isPathTeamUrl(team.url) && (
                           <CheckCircle2 className="ml-auto fill-black text-white dark:fill-white dark:text-black" />
                         )
                       }
                     />
-                  </MotionLink>
+                  </Link>
                 </DropdownMenuItem>
               ))}
             </div>

apps/web/src/components/document/document-read-only-fields.tsx

@@ -1,112 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { P, match } from 'ts-pattern';
-
-import {
-  DEFAULT_DOCUMENT_DATE_FORMAT,
-  convertToLocalSystemFormat,
-} from '@documenso/lib/constants/date-formats';
-import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
-import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
-import type { CompletedField } from '@documenso/lib/types/fields';
-import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
-import type { DocumentMeta } from '@documenso/prisma/client';
-import { FieldType } from '@documenso/prisma/client';
-import { FieldRootContainer } from '@documenso/ui/components/field/field';
-import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import { FRIENDLY_FIELD_TYPE } from '@documenso/ui/primitives/document-flow/types';
-import { ElementVisible } from '@documenso/ui/primitives/element-visible';
-import { PopoverHover } from '@documenso/ui/primitives/popover';
-
-export type DocumentReadOnlyFieldsProps = {
-  fields: CompletedField[];
-  documentMeta?: DocumentMeta;
-};
-
-export const DocumentReadOnlyFields = ({ documentMeta, fields }: DocumentReadOnlyFieldsProps) => {
-  const [hiddenFieldIds, setHiddenFieldIds] = useState<Record<string, boolean>>({});
-
-  const handleHideField = (fieldId: string) => {
-    setHiddenFieldIds((prev) => ({ ...prev, [fieldId]: true }));
-  };
-
-  return (
-    <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
-      {fields.map(
-        (field) =>
-          !hiddenFieldIds[field.secondaryId] && (
-            <FieldRootContainer
-              field={field}
-              key={field.id}
-              cardClassName="border-gray-100/50 !shadow-none backdrop-blur-[1px] bg-background/90"
-            >
-              <div className="absolute -right-3 -top-3">
-                <PopoverHover
-                  trigger={
-                    <Avatar className="dark:border-border h-8 w-8 border-2 border-solid border-gray-200/50 transition-colors hover:border-gray-200">
-                      <AvatarFallback className="bg-neutral-50 text-xs text-gray-400">
-                        {extractInitials(field.Recipient.name || field.Recipient.email)}
-                      </AvatarFallback>
-                    </Avatar>
-                  }
-                  contentProps={{
-                    className: 'flex w-fit flex-col py-2.5 text-sm',
-                  }}
-                >
-                  <p>
-                    <span className="font-semibold">
-                      {field.Recipient.name
-                        ? `${field.Recipient.name} (${field.Recipient.email})`
-                        : field.Recipient.email}{' '}
-                    </span>
-                    inserted a {FRIENDLY_FIELD_TYPE[field.type].toLowerCase()}
-                  </p>
-
-                  <Button
-                    variant="outline"
-                    className="mt-2.5 h-6 text-xs focus:outline-none focus-visible:ring-0"
-                    onClick={() => handleHideField(field.secondaryId)}
-                  >
-                    Hide field
-                  </Button>
-                </PopoverHover>
-              </div>
-
-              <div className="text-muted-foreground break-all text-sm">
-                {match(field)
-                  .with({ type: FieldType.SIGNATURE }, (field) =>
-                    field.Signature?.signatureImageAsBase64 ? (
-                      <img
-                        src={field.Signature.signatureImageAsBase64}
-                        alt="Signature"
-                        className="h-full w-full object-contain dark:invert"
-                      />
-                    ) : (
-                      <p className="font-signature text-muted-foreground text-lg duration-200 sm:text-xl md:text-2xl lg:text-3xl">
-                        {field.Signature?.typedSignature}
-                      </p>
-                    ),
-                  )
-                  .with(
-                    { type: P.union(FieldType.NAME, FieldType.TEXT, FieldType.EMAIL) },
-                    () => field.customText,
-                  )
-                  .with({ type: FieldType.DATE }, () =>
-                    convertToLocalSystemFormat(
-                      field.customText,
-                      documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT,
-                      documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE,
-                    ),
-                  )
-                  .with({ type: FieldType.FREE_SIGNATURE }, () => null)
-                  .exhaustive()}
-              </div>
-            </FieldRootContainer>
-          ),
-      )}
-    </ElementVisible>
-  );
-};

apps/web/src/components/formatter/template-type.tsx

@@ -1,6 +1,6 @@
 import type { HTMLAttributes } from 'react';
 
-import { Globe2, Lock } from 'lucide-react';
+import { Globe, Lock } from 'lucide-react';
 import type { LucideIcon } from 'lucide-react/dist/lucide-react';
 
 import type { TemplateType as TemplateTypePrisma } from '@documenso/prisma/client';
@@ -22,7 +22,7 @@ const TEMPLATE_TYPES: Record<TemplateTypes, TemplateTypeIcon> = {
   },
   PUBLIC: {
     label: 'Public',
-    icon: Globe2,
+    icon: Globe,
     color: 'text-green-500 dark:text-green-300',
   },
 };

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

@@ -28,7 +28,7 @@ import {
   FormItem,
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
-import { PinInput, PinInputGroup, PinInputSlot } from '@documenso/ui/primitives/pin-input';
+import { Input } from '@documenso/ui/primitives/input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export const ZDisable2FAForm = z.object({
@@ -107,15 +107,7 @@ export const DisableAuthenticatorAppDialog = () => {
                 render={({ field }) => (
                   <FormItem>
                     <FormControl>
-                      <PinInput {...field} value={field.value ?? ''} maxLength={6}>
-                        {Array(6)
-                          .fill(null)
-                          .map((_, i) => (
-                            <PinInputGroup key={i}>
-                              <PinInputSlot index={i} />
-                            </PinInputGroup>
-                          ))}
-                      </PinInput>
+                      <Input {...field} placeholder="Token" />
                     </FormControl>
                     <FormMessage />
                   </FormItem>

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

@@ -30,7 +30,7 @@ import {
   FormLabel,
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
-import { PinInput, PinInputGroup, PinInputSlot } from '@documenso/ui/primitives/pin-input';
+import { Input } from '@documenso/ui/primitives/input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { RecoveryCodeList } from './recovery-code-list';
@@ -212,15 +212,7 @@ export const EnableAuthenticatorAppDialog = ({ onSuccess }: EnableAuthenticatorA
                         <FormItem>
                           <FormLabel className="text-muted-foreground">Token</FormLabel>
                           <FormControl>
-                            <PinInput {...field} value={field.value ?? ''} maxLength={6}>
-                              {Array(6)
-                                .fill(null)
-                                .map((_, i) => (
-                                  <PinInputGroup key={i}>
-                                    <PinInputSlot index={i} />
-                                  </PinInputGroup>
-                                ))}
-                            </PinInput>
+                            <Input {...field} type="text" value={field.value ?? ''} />
                           </FormControl>
                           <FormMessage />
                         </FormItem>

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

@@ -30,7 +30,7 @@ import {
   FormItem,
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
-import { PinInput, PinInputGroup, PinInputSlot } from '@documenso/ui/primitives/pin-input';
+import { Input } from '@documenso/ui/primitives/input';
 
 import { RecoveryCodeList } from './recovery-code-list';
 
@@ -115,15 +115,7 @@ export const ViewRecoveryCodesDialog = () => {
                   render={({ field }) => (
                     <FormItem>
                       <FormControl>
-                        <PinInput {...field} value={field.value ?? ''} maxLength={6}>
-                          {Array(6)
-                            .fill(null)
-                            .map((_, i) => (
-                              <PinInputGroup key={i}>
-                                <PinInputSlot index={i} />
-                              </PinInputGroup>
-                            ))}
-                        </PinInput>
+                        <Input {...field} placeholder="Token" />
                       </FormControl>
                       <FormMessage />
                     </FormItem>

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

@@ -10,7 +10,6 @@ import { browserSupportsWebAuthn, startAuthentication } from '@simplewebauthn/br
 import { KeyRoundIcon } from 'lucide-react';
 import { signIn } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
-import { FaIdCardClip } from 'react-icons/fa6';
 import { FcGoogle } from 'react-icons/fc';
 import { match } from 'ts-pattern';
 import { z } from 'zod';
@@ -39,7 +38,6 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
 import { PasswordInput } from '@documenso/ui/primitives/password-input';
-import { PinInput, PinInputGroup, PinInputSlot } from '@documenso/ui/primitives/pin-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 const ERROR_MESSAGES: Partial<Record<keyof typeof ErrorCode, string>> = {
@@ -70,15 +68,9 @@ export type SignInFormProps = {
   className?: string;
   initialEmail?: string;
   isGoogleSSOEnabled?: boolean;
-  isOIDCSSOEnabled?: boolean;
 };
 
-export const SignInForm = ({
-  className,
-  initialEmail,
-  isGoogleSSOEnabled,
-  isOIDCSSOEnabled,
-}: SignInFormProps) => {
+export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: SignInFormProps) => {
   const { toast } = useToast();
   const { getFlag } = useFeatureFlags();
 
@@ -264,19 +256,6 @@ export const SignInForm = ({
     }
   };
 
-  const onSignInWithOIDCClick = async () => {
-    try {
-      await signIn('oidc', { callbackUrl: LOGIN_REDIRECT_PATH });
-    } catch (err) {
-      toast({
-        title: 'An unknown error occurred',
-        description:
-          'We encountered an unknown error while attempting to sign you In. Please try again later.',
-        variant: 'destructive',
-      });
-    }
-  };
-
   return (
     <Form {...form}>
       <form
@@ -337,7 +316,7 @@ export const SignInForm = ({
             {isSubmitting ? 'Signing in...' : 'Sign In'}
           </Button>
 
-          {(isGoogleSSOEnabled || isPasskeyEnabled || isOIDCSSOEnabled) && (
+          {(isGoogleSSOEnabled || isPasskeyEnabled) && (
             <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
               <div className="bg-border h-px flex-1" />
               <span className="text-muted-foreground bg-transparent">Or continue with</span>
@@ -359,20 +338,6 @@ export const SignInForm = ({
             </Button>
           )}
 
-          {isOIDCSSOEnabled && (
-            <Button
-              type="button"
-              size="lg"
-              variant="outline"
-              className="bg-background text-muted-foreground border"
-              disabled={isSubmitting}
-              onClick={onSignInWithOIDCClick}
-            >
-              <FaIdCardClip className="mr-2 h-5 w-5" />
-              OIDC
-            </Button>
-          )}
-
           {isPasskeyEnabled && (
             <Button
               type="button"
@@ -407,17 +372,9 @@ export const SignInForm = ({
                   name="totpCode"
                   render={({ field }) => (
                     <FormItem>
-                      <FormLabel>Token</FormLabel>
+                      <FormLabel>Authentication Token</FormLabel>
                       <FormControl>
-                        <PinInput {...field} value={field.value ?? ''} maxLength={6}>
-                          {Array(6)
-                            .fill(null)
-                            .map((_, i) => (
-                              <PinInputGroup key={i}>
-                                <PinInputSlot index={i} />
-                              </PinInputGroup>
-                            ))}
-                        </PinInput>
+                        <Input type="text" {...field} />
                       </FormControl>
                       <FormMessage />
                     </FormItem>

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

@@ -52,15 +52,9 @@ export type SignUpFormProps = {
   className?: string;
   initialEmail?: string;
   isGoogleSSOEnabled?: boolean;
-  isOIDCSSOEnabled?: boolean;
 };
 
-export const SignUpForm = ({
-  className,
-  initialEmail,
-  isGoogleSSOEnabled,
-  isOIDCSSOEnabled,
-}: SignUpFormProps) => {
+export const SignUpForm = ({ className, initialEmail, isGoogleSSOEnabled }: SignUpFormProps) => {
   const { toast } = useToast();
   const analytics = useAnalytics();
   const router = useRouter();
@@ -127,19 +121,6 @@ export const SignUpForm = ({
     }
   };
 
-  const onSignUpWithOIDCClick = async () => {
-    try {
-      await signIn('oidc', { callbackUrl: SIGN_UP_REDIRECT_PATH });
-    } catch (err) {
-      toast({
-        title: 'An unknown error occurred',
-        description:
-          'We encountered an unknown error while attempting to sign you Up. Please try again later.',
-        variant: 'destructive',
-      });
-    }
-  };
-
   return (
     <Form {...form}>
       <form
@@ -240,28 +221,6 @@ export const SignUpForm = ({
             </Button>
           </>
         )}
-
-        {isOIDCSSOEnabled && (
-          <>
-            <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
-              <div className="bg-border h-px flex-1" />
-              <span className="text-muted-foreground bg-transparent">Or</span>
-              <div className="bg-border h-px flex-1" />
-            </div>
-
-            <Button
-              type="button"
-              size="lg"
-              variant={'outline'}
-              className="bg-background text-muted-foreground border"
-              disabled={isSubmitting}
-              onClick={onSignUpWithOIDCClick}
-            >
-              <FcGoogle className="mr-2 h-5 w-5" />
-              Sign Up with OIDC
-            </Button>
-          </>
-        )}
       </form>
     </Form>
   );

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

@@ -10,7 +10,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { AnimatePresence, motion } from 'framer-motion';
 import { signIn } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
-import { FaIdCardClip } from 'react-icons/fa6';
 import { FcGoogle } from 'react-icons/fc';
 import { z } from 'zod';
 
@@ -74,14 +73,12 @@ export type SignUpFormV2Props = {
   className?: string;
   initialEmail?: string;
   isGoogleSSOEnabled?: boolean;
-  isOIDCSSOEnabled?: boolean;
 };
 
 export const SignUpFormV2 = ({
   className,
   initialEmail,
   isGoogleSSOEnabled,
-  isOIDCSSOEnabled,
 }: SignUpFormV2Props) => {
   const { toast } = useToast();
   const analytics = useAnalytics();
@@ -182,19 +179,6 @@ export const SignUpFormV2 = ({
     }
   };
 
-  const onSignUpWithOIDCClick = async () => {
-    try {
-      await signIn('oidc', { callbackUrl: SIGN_UP_REDIRECT_PATH });
-    } catch (err) {
-      toast({
-        title: 'An unknown error occurred',
-        description:
-          'We encountered an unknown error while attempting to sign you Up. Please try again later.',
-        variant: 'destructive',
-      });
-    }
-  };
-
   return (
     <div className={cn('flex justify-center gap-x-12', className)}>
       <div className="border-border relative hidden flex-1 overflow-hidden rounded-xl border xl:flex">
@@ -271,7 +255,7 @@ export const SignUpFormV2 = ({
               <fieldset
                 className={cn(
                   'flex h-[550px] w-full flex-col gap-y-4',
-                  (isGoogleSSOEnabled || isOIDCSSOEnabled) && 'h-[650px]',
+                  isGoogleSSOEnabled && 'h-[650px]',
                 )}
                 disabled={isSubmitting}
               >
@@ -339,18 +323,14 @@ export const SignUpFormV2 = ({
                   )}
                 />
 
-                {(isGoogleSSOEnabled || isOIDCSSOEnabled) && (
+                {isGoogleSSOEnabled && (
                   <>
                     <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
                       <div className="bg-border h-px flex-1" />
                       <span className="text-muted-foreground bg-transparent">Or</span>
                       <div className="bg-border h-px flex-1" />
                     </div>
-                  </>
-                )}
 
-                {isGoogleSSOEnabled && (
-                  <>
                     <Button
                       type="button"
                       size="lg"
@@ -365,22 +345,6 @@ export const SignUpFormV2 = ({
                   </>
                 )}
 
-                {isOIDCSSOEnabled && (
-                  <>
-                    <Button
-                      type="button"
-                      size="lg"
-                      variant={'outline'}
-                      className="bg-background text-muted-foreground border"
-                      disabled={isSubmitting}
-                      onClick={onSignUpWithOIDCClick}
-                    >
-                      <FaIdCardClip className="mr-2 h-5 w-5" />
-                      Sign Up with OIDC
-                    </Button>
-                  </>
-                )}
-
                 <p className="text-muted-foreground mt-4 text-sm">
                   Already have an account?{' '}
                   <Link href="/signin" className="text-documenso-700 duration-200 hover:opacity-70">

apps/web/src/pages/api/auth/[...nextauth].ts

@@ -2,8 +2,6 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 
 import NextAuth from 'next-auth';
 
-import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options';
 import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { prisma } from '@documenso/prisma';
@@ -20,29 +18,15 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
       error: '/signin',
     },
     events: {
-      signIn: async ({ user: { id: userId } }) => {
-        const [user] = await Promise.all([
-          await prisma.user.findFirstOrThrow({
-            where: {
-              id: userId,
-            },
-          }),
+      signIn: async ({ user }) => {
         await prisma.userSecurityAuditLog.create({
           data: {
-              userId,
+            userId: user.id,
             ipAddress,
             userAgent,
             type: UserSecurityAuditLogType.SIGN_IN,
           },
-          }),
-        ]);
-
-        // Create the Stripe customer and attach it to the user if it doesn't exist.
-        if (user.customerId === null && IS_BILLING_ENABLED()) {
-          await getStripeCustomerByUser(user).catch((err) => {
-            console.error(err);
         });
-        }
       },
       signOut: async ({ token }) => {
         const userId = typeof token.id === 'string' ? parseInt(token.id) : token.id;

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

@@ -3,7 +3,7 @@ import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 
 export const config = {
-  maxDuration: 120,
+  maxDuration: 60,
   api: {
     bodyParser: {
       sizeLimit: '50mb',

docker/README.md

@@ -41,7 +41,7 @@ volumes:
 1. Run the following command to start the containers:
 
 ```
-docker-compose --env-file ./.env up -d
+docker-compose --env-file ./.env -d up
 ```
 
 This will start the PostgreSQL database and the Documenso application containers.

docker/production/compose.yml

@@ -58,7 +58,7 @@ services:
       - NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT=${NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT}
       - NEXT_PUBLIC_POSTHOG_KEY=${NEXT_PUBLIC_POSTHOG_KEY}
       - NEXT_PUBLIC_DISABLE_SIGNUP=${NEXT_PUBLIC_DISABLE_SIGNUP}
-      - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=${NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH:-/opt/documenso/cert.p12}
+      - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=${NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH?:-/opt/documenso/cert.p12}
     ports:
       - ${PORT:-3000}:${PORT:-3000}
     volumes:

package.json

@@ -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:migrate-reset": "npm run with:env -- npm run prisma:migrate-reset -w @documenso/prisma",
     "prisma:seed": "npm run with:env -- npm run prisma:seed -w @documenso/prisma",
     "prisma:studio": "npm run with:env -- npm run prisma:studio -w @documenso/prisma",
     "with:env": "dotenv -e .env -e .env.local --",
@@ -39,7 +38,7 @@
     "eslint-config-custom": "*",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
-    "playwright": "1.43.0",
+    "playwright": "1.41.0",
     "prettier": "^2.5.1",
     "rimraf": "^5.0.1",
     "turbo": "^1.9.3"

packages/api/v1/contract.ts

@@ -12,8 +12,6 @@ import {
   ZDeleteFieldMutationSchema,
   ZDeleteRecipientMutationSchema,
   ZDownloadDocumentSuccessfulSchema,
-  ZGenerateDocumentFromTemplateMutationResponseSchema,
-  ZGenerateDocumentFromTemplateMutationSchema,
   ZGetDocumentsQuerySchema,
   ZSendDocumentForSigningMutationSchema,
   ZSuccessfulDocumentResponseSchema,
@@ -87,24 +85,6 @@ export const ApiContractV1 = c.router(
         404: ZUnsuccessfulResponseSchema,
       },
       summary: 'Create a new document from an existing template',
-      deprecated: true,
-      description: `This has been deprecated in favour of "/api/v1/templates/:templateId/generate-document". You may face unpredictable behavior using this endpoint as it is no longer maintained.`,
-    },
-
-    generateDocumentFromTemplate: {
-      method: 'POST',
-      path: '/api/v1/templates/:templateId/generate-document',
-      body: ZGenerateDocumentFromTemplateMutationSchema,
-      responses: {
-        200: ZGenerateDocumentFromTemplateMutationResponseSchema,
-        400: ZUnsuccessfulResponseSchema,
-        401: ZUnsuccessfulResponseSchema,
-        404: ZUnsuccessfulResponseSchema,
-        500: ZUnsuccessfulResponseSchema,
-      },
-      summary: 'Create a new document from an existing template',
-      description:
-        'Create a new document from an existing template. Passing in values for title and meta will override the original values defined in the template. If you do not pass in values for recipients, it will use the values defined in the template.',
     },
 
     sendDocument: {

packages/api/v1/implementation.ts

@@ -1,8 +1,6 @@
 import { createNextRoute } from '@ts-rest/next';
 
 import { getServerLimits } from '@documenso/ee/server-only/limits/server';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { AppError } from '@documenso/lib/errors/app-error';
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
 import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta';
 import { createDocument } from '@documenso/lib/server-only/document/create-document';
@@ -21,12 +19,10 @@ import { getRecipientById } from '@documenso/lib/server-only/recipient/get-recip
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document';
 import { updateRecipient } from '@documenso/lib/server-only/recipient/update-recipient';
-import type { CreateDocumentFromTemplateResponse } from '@documenso/lib/server-only/template/create-document-from-template';
 import { createDocumentFromTemplate } from '@documenso/lib/server-only/template/create-document-from-template';
-import { createDocumentFromTemplateLegacy } from '@documenso/lib/server-only/template/create-document-from-template-legacy';
 import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
-import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
 import {
   getPresignGetUrl,
   getPresignPostUrl,
@@ -77,10 +73,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         status: 200,
         body: {
           ...document,
-          recipients: recipients.map((recipient) => ({
-            ...recipient,
-            signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`,
-          })),
+          recipients,
         },
       };
     } catch (err) {
@@ -236,13 +229,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         requestMetadata: extractNextApiRequestMetadata(args.req),
       });
 
-      await upsertDocumentMeta({
-        documentId: document.id,
-        userId: user.id,
-        ...body.meta,
-        requestMetadata: extractNextApiRequestMetadata(args.req),
-      });
-
       const recipients = await setRecipientsForDocument({
         userId: user.id,
         teamId: team?.id,
@@ -262,8 +248,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
             email: recipient.email,
             token: recipient.token,
             role: recipient.role,
-
-            signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`,
           })),
         },
       };
@@ -295,7 +279,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
 
     const fileName = body.title.endsWith('.pdf') ? body.title : `${body.title}.pdf`;
 
-    const document = await createDocumentFromTemplateLegacy({
+    const document = await createDocumentFromTemplate({
       templateId,
       userId: user.id,
       teamId: team?.id,
@@ -312,7 +296,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         formValues: body.formValues,
       });
 
-      const newDocumentData = await putPdfFile({
+      const newDocumentData = await putFile({
         name: fileName,
         type: 'application/pdf',
         arrayBuffer: async () => Promise.resolve(prefilled),
@@ -340,7 +324,10 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       await upsertDocumentMeta({
         documentId: document.id,
         userId: user.id,
-        ...body.meta,
+        subject: body.meta.subject,
+        message: body.meta.message,
+        dateFormat: body.meta.dateFormat,
+        timezone: body.meta.timezone,
         requestMetadata: extractNextApiRequestMetadata(args.req),
       });
     }
@@ -355,89 +342,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
           email: recipient.email,
           token: recipient.token,
           role: recipient.role,
-
-          signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`,
-        })),
-      },
-    };
-  }),
-
-  generateDocumentFromTemplate: authenticatedMiddleware(async (args, user, team) => {
-    const { body, params } = args;
-
-    const { remaining } = await getServerLimits({ email: user.email, teamId: team?.id });
-
-    if (remaining.documents <= 0) {
-      return {
-        status: 400,
-        body: {
-          message: 'You have reached the maximum number of documents allowed for this month',
-        },
-      };
-    }
-
-    const templateId = Number(params.templateId);
-
-    let document: CreateDocumentFromTemplateResponse | null = null;
-
-    try {
-      document = await createDocumentFromTemplate({
-        templateId,
-        userId: user.id,
-        teamId: team?.id,
-        recipients: body.recipients,
-        override: {
-          title: body.title,
-          ...body.meta,
-        },
-      });
-    } catch (err) {
-      return AppError.toRestAPIError(err);
-    }
-
-    if (body.formValues) {
-      const fileName = document.title.endsWith('.pdf') ? document.title : `${document.title}.pdf`;
-
-      const pdf = await getFile(document.documentData);
-
-      const prefilled = await insertFormValuesInPdf({
-        pdf: Buffer.from(pdf),
-        formValues: body.formValues,
-      });
-
-      const newDocumentData = await putPdfFile({
-        name: fileName,
-        type: 'application/pdf',
-        arrayBuffer: async () => Promise.resolve(prefilled),
-      });
-
-      await updateDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team?.id,
-        data: {
-          formValues: body.formValues,
-          documentData: {
-            connect: {
-              id: newDocumentData.id,
-            },
-          },
-        },
-      });
-    }
-
-    return {
-      status: 200,
-      body: {
-        documentId: document.id,
-        recipients: document.Recipient.map((recipient) => ({
-          recipientId: recipient.id,
-          name: recipient.name,
-          email: recipient.email,
-          token: recipient.token,
-          role: recipient.role,
-
-          signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`,
         })),
       },
     };
@@ -445,7 +349,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
 
   sendDocument: authenticatedMiddleware(async (args, user, team) => {
     const { id } = args.params;
-    const { sendEmail = true } = args.body ?? {};
 
     const document = await getDocumentById({ id: Number(id), userId: user.id, teamId: team?.id });
 
@@ -501,11 +404,10 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       //     });
       //   }
 
-      const { Recipient: recipients, ...sentDocument } = await sendDocument({
+      await sendDocument({
         documentId: Number(id),
         userId: user.id,
         teamId: team?.id,
-        sendEmail,
         requestMetadata: extractNextApiRequestMetadata(args.req),
       });
 
@@ -513,11 +415,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         status: 200,
         body: {
           message: 'Document sent for signing successfully',
-          ...sentDocument,
-          recipients: recipients.map((recipient) => ({
-            ...recipient,
-            signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`,
-          })),
         },
       };
     } catch (err) {
@@ -602,7 +499,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         body: {
           ...newRecipient,
           documentId: Number(documentId),
-          signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${newRecipient.token}`,
         },
       };
     } catch (err) {
@@ -668,7 +564,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       body: {
         ...updatedRecipient,
         documentId: Number(documentId),
-        signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${updatedRecipient.token}`,
       },
     };
   }),
@@ -722,7 +617,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       body: {
         ...deletedRecipient,
         documentId: Number(documentId),
-        signingUrl: '',
       },
     };
   }),

packages/api/v1/schema.ts

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 
-import { ZUrlSchema } from '@documenso/lib/schemas/common';
 import {
   FieldType,
   ReadStatus,
@@ -45,11 +44,7 @@ export type TSuccessfulGetDocumentResponseSchema = z.infer<
 
 export type TSuccessfulDocumentResponseSchema = z.infer<typeof ZSuccessfulDocumentResponseSchema>;
 
-export const ZSendDocumentForSigningMutationSchema = z
-  .object({
-    sendEmail: z.boolean().optional().default(true),
-  })
-  .or(z.literal('').transform(() => ({ sendEmail: true })));
+export const ZSendDocumentForSigningMutationSchema = null;
 
 export type TSendDocumentForSigningMutationSchema = typeof ZSendDocumentForSigningMutationSchema;
 
@@ -93,12 +88,8 @@ export const ZCreateDocumentMutationResponseSchema = z.object({
   recipients: z.array(
     z.object({
       recipientId: z.number(),
-      name: z.string(),
-      email: z.string().email().min(1),
       token: z.string(),
       role: z.nativeEnum(RecipientRole),
-
-      signingUrl: z.string(),
     }),
   ),
 });
@@ -142,8 +133,6 @@ export const ZCreateDocumentFromTemplateMutationResponseSchema = z.object({
       email: z.string().email().min(1),
       token: z.string(),
       role: z.nativeEnum(RecipientRole).optional().default(RecipientRole.SIGNER),
-
-      signingUrl: z.string(),
     }),
   ),
 });
@@ -152,61 +141,6 @@ export type TCreateDocumentFromTemplateMutationResponseSchema = z.infer<
   typeof ZCreateDocumentFromTemplateMutationResponseSchema
 >;
 
-export const ZGenerateDocumentFromTemplateMutationSchema = z.object({
-  title: z.string().optional(),
-  recipients: z
-    .array(
-      z.object({
-        id: z.number(),
-        name: z.string().optional(),
-        email: z.string().email().min(1),
-      }),
-    )
-    .refine(
-      (schema) => {
-        const emails = schema.map((signer) => signer.email.toLowerCase());
-        const ids = schema.map((signer) => signer.id);
-
-        return new Set(emails).size === emails.length && new Set(ids).size === ids.length;
-      },
-      { message: 'Recipient IDs and emails must be unique' },
-    ),
-  meta: z
-    .object({
-      subject: z.string(),
-      message: z.string(),
-      timezone: z.string(),
-      dateFormat: z.string(),
-      redirectUrl: ZUrlSchema,
-    })
-    .partial()
-    .optional(),
-  formValues: z.record(z.string(), z.union([z.string(), z.boolean(), z.number()])).optional(),
-});
-
-export type TGenerateDocumentFromTemplateMutationSchema = z.infer<
-  typeof ZGenerateDocumentFromTemplateMutationSchema
->;
-
-export const ZGenerateDocumentFromTemplateMutationResponseSchema = z.object({
-  documentId: z.number(),
-  recipients: z.array(
-    z.object({
-      recipientId: z.number(),
-      name: z.string(),
-      email: z.string().email().min(1),
-      token: z.string(),
-      role: z.nativeEnum(RecipientRole),
-
-      signingUrl: z.string(),
-    }),
-  ),
-});
-
-export type TGenerateDocumentFromTemplateMutationResponseSchema = z.infer<
-  typeof ZGenerateDocumentFromTemplateMutationResponseSchema
->;
-
 export const ZCreateRecipientMutationSchema = z.object({
   name: z.string().min(1),
   email: z.string().email().min(1),
@@ -241,8 +175,6 @@ export const ZSuccessfulRecipientResponseSchema = z.object({
   readStatus: z.nativeEnum(ReadStatus),
   signingStatus: z.nativeEnum(SigningStatus),
   sendStatus: z.nativeEnum(SendStatus),
-
-  signingUrl: z.string(),
 });
 
 export type TSuccessfulRecipientResponseSchema = z.infer<typeof ZSuccessfulRecipientResponseSchema>;
@@ -293,11 +225,9 @@ export const ZSuccessfulResponseSchema = z.object({
 
 export type TSuccessfulResponseSchema = z.infer<typeof ZSuccessfulResponseSchema>;
 
-export const ZSuccessfulSigningResponseSchema = z
-  .object({
+export const ZSuccessfulSigningResponseSchema = z.object({
   message: z.string(),
-  })
-  .and(ZSuccessfulGetDocumentResponseSchema);
+});
 
 export type TSuccessfulSigningResponseSchema = z.infer<typeof ZSuccessfulSigningResponseSchema>;
 

packages/app-tests/e2e/document-flow/settings-step.spec.ts

@@ -41,8 +41,8 @@ test.describe('[EE_ONLY]', () => {
 
     // Set EE action auth.
     await page.getByTestId('documentActionSelectValue').click();
-    await page.getByLabel('Require passkey').getByText('Require passkey').click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
+    await page.getByLabel('Require account').getByText('Require account').click();
+    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require account');
 
     // Save the settings by going to the next step.
     await page.getByRole('button', { name: 'Continue' }).click();
@@ -52,7 +52,11 @@ test.describe('[EE_ONLY]', () => {
     await page.getByRole('button', { name: 'Go Back' }).click();
     await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
 
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
+    // Todo: Verify that the values are correct once we fix the issue where going back
+    // does not show the updated values.
+    // await expect(page.getByLabel('Title')).toContainText('New Title');
+    // await expect(page.getByTestId('documentAccessSelectValue')).toContainText('Require account');
+    // await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require account');
 
     await unseedUser(user.id);
   });
@@ -85,8 +89,8 @@ test.describe('[EE_ONLY]', () => {
 
     // Set EE action auth.
     await page.getByTestId('documentActionSelectValue').click();
-    await page.getByLabel('Require passkey').getByText('Require passkey').click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
+    await page.getByLabel('Require account').getByText('Require account').click();
+    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require account');
 
     // Save the settings by going to the next step.
     await page.getByRole('button', { name: 'Continue' }).click();
@@ -164,8 +168,11 @@ test('[DOCUMENT_FLOW]: add settings', async ({ page }) => {
   await page.getByRole('button', { name: 'Go Back' }).click();
   await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
 
-  await expect(page.getByLabel('Title')).toHaveValue('New Title');
-  await expect(page.getByTestId('documentAccessSelectValue')).toContainText('Require account');
+  // Todo: Verify that the values are correct once we fix the issue where going back
+  // does not show the updated values.
+  // await expect(page.getByLabel('Title')).toContainText('New Title');
+  // await expect(page.getByTestId('documentAccessSelectValue')).toContainText('Require account');
+  // await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require account');
 
   await unseedUser(user.id);
 });

packages/app-tests/e2e/document-flow/signers-step.spec.ts

@@ -48,7 +48,7 @@ test.describe('[EE_ONLY]', () => {
     await page.getByRole('textbox', { name: 'Name', exact: true }).nth(1).fill('Recipient 2');
 
     // Display advanced settings.
-    await page.getByLabel('Show advanced settings').check();
+    await page.getByLabel('Show advanced settings').click();
 
     // Navigate to the next step and back.
     await page.getByRole('button', { name: 'Continue' }).click();
@@ -62,6 +62,7 @@ test.describe('[EE_ONLY]', () => {
   });
 });
 
+// Note: Not complete yet due to issue with back button.
 test('[DOCUMENT_FLOW]: add signers', async ({ page }) => {
   const user = await seedUser();
   const document = await seedBlankDocument(user);
@@ -92,5 +93,26 @@ test('[DOCUMENT_FLOW]: add signers', async ({ page }) => {
   await page.getByRole('button', { name: 'Go Back' }).click();
   await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
 
+  // Todo: Fix stepper component back issue before finishing test.
+
+  // // Expect that the advanced settings is unchecked, since no advanced settings were applied.
+  // await expect(page.getByLabel('Show advanced settings')).toBeChecked({ checked: false });
+
+  // // Add advanced settings for a single recipient.
+  // await page.getByLabel('Show advanced settings').click();
+  // await page.getByRole('combobox').first().click();
+  // await page.getByLabel('Require account').click();
+
+  // // Navigate to the next step and back.
+  // await page.getByRole('button', { name: 'Continue' }).click();
+  // await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+  // await page.getByRole('button', { name: 'Go Back' }).click();
+  // await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  // Expect that the advanced settings is visible, and the checkbox is hidden. Since advanced
+  // settings were applied.
+
+  // Todo: Fix stepper component back issue before finishing test.
+
   await unseedUser(user.id);
 });

packages/app-tests/e2e/document-flow/stepper-component.spec.ts

@@ -1,14 +1,10 @@
 import { expect, test } from '@playwright/test';
-import { DateTime } from 'luxon';
 import path from 'node:path';
 
 import { getRecipientByEmail } from '@documenso/lib/server-only/recipient/get-recipient-by-email';
 import { prisma } from '@documenso/prisma';
-import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/client';
-import {
-  seedBlankDocument,
-  seedPendingDocumentWithFullFields,
-} from '@documenso/prisma/seed/documents';
+import { DocumentStatus } from '@documenso/prisma/client';
+import { seedBlankDocument } from '@documenso/prisma/seed/documents';
 import { seedUser, unseedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
@@ -196,102 +192,6 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
   await unseedUser(user.id);
 });
 
-test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipients with different roles', async ({
-  page,
-}) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
-  });
-
-  // Set title
-  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
-  await page.getByLabel('Title').fill('Test Title');
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add signers
-  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-  // Add 2 signers.
-  await page.getByPlaceholder('Email').fill('user1@example.com');
-  await page.getByPlaceholder('Name').fill('User 1');
-  await page.getByRole('button', { name: 'Add Signer' }).click();
-
-  await page.getByRole('textbox', { name: 'Email', exact: true }).fill('user2@example.com');
-  await page.getByRole('textbox', { name: 'Name', exact: true }).nth(1).fill('User 2');
-  await page.locator('button[role="combobox"]').nth(1).click();
-  await page.getByLabel('Receives copy').click();
-  await page.getByRole('button', { name: 'Add Signer' }).click();
-
-  await page.getByRole('textbox', { name: 'Email', exact: true }).nth(1).fill('user3@example.com');
-  await page.getByRole('textbox', { name: 'Name', exact: true }).nth(2).fill('User 3');
-  await page.locator('button[role="combobox"]').nth(2).click();
-  await page.getByLabel('Needs to approve').click();
-  await page.getByRole('button', { name: 'Add Signer' }).click();
-
-  await page.getByRole('textbox', { name: 'Email', exact: true }).nth(2).fill('user4@example.com');
-  await page.getByRole('textbox', { name: 'Name', exact: true }).nth(3).fill('User 4');
-  await page.locator('button[role="combobox"]').nth(3).click();
-  await page.getByLabel('Needs to view').click();
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add fields
-  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-  await page.getByRole('button', { name: 'User 1 Signature' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 100,
-      y: 100,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Email Email' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 100,
-      y: 200,
-    },
-  });
-
-  await page.getByText('User 1 (user1@example.com)').click();
-  await page.getByText('User 3 (user3@example.com)').click();
-
-  await page.getByRole('button', { name: 'User 3 Signature' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 500,
-      y: 100,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Email Email' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 500,
-      y: 200,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add subject and send
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
-  await page.getByRole('button', { name: 'Send' }).click();
-
-  await page.waitForURL('/documents');
-
-  // Assert document was created
-  await expect(page.getByRole('link', { name: 'Test Title' })).toBeVisible();
-
-  await unseedUser(user.id);
-});
-
 test('[DOCUMENT_FLOW]: should be able to create, send and sign a document', async ({ page }) => {
   const user = await seedUser();
   const document = await seedBlankDocument(user);
@@ -334,7 +234,6 @@ test('[DOCUMENT_FLOW]: should be able to create, send and sign a document', asyn
   await page.getByRole('link', { name: documentTitle }).click();
   await page.waitForURL(/\/documents\/\d+/);
 
-  // Start signing process
   const url = page.url().split('/');
   const documentId = url[url.length - 1];
 
@@ -364,63 +263,6 @@ test('[DOCUMENT_FLOW]: should be able to create, send and sign a document', asyn
   await unseedUser(user.id);
 });
 
-test('[DOCUMENT_FLOW]: should be able to approve a document', async ({ page }) => {
-  const user = await seedUser();
-
-  const { recipients } = await seedPendingDocumentWithFullFields({
-    owner: user,
-    recipients: ['user@documenso.com', 'approver@documenso.com'],
-    recipientsCreateOptions: [
-      {
-        email: 'user@documenso.com',
-        role: RecipientRole.SIGNER,
-      },
-      {
-        email: 'approver@documenso.com',
-        role: RecipientRole.APPROVER,
-      },
-    ],
-    fields: [FieldType.SIGNATURE],
-  });
-
-  for (const recipient of recipients) {
-    const { token, Field, role } = recipient;
-
-    const signUrl = `/sign/${token}`;
-
-    await page.goto(signUrl);
-    await expect(
-      page.getByRole('heading', {
-        name: role === RecipientRole.SIGNER ? 'Sign Document' : 'Approve Document',
-      }),
-    ).toBeVisible();
-
-    // Add signature.
-    const canvas = page.locator('canvas');
-    const box = await canvas.boundingBox();
-    if (box) {
-      await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
-      await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
-      await page.mouse.up();
-    }
-
-    for (const field of Field) {
-      await page.locator(`#field-${field.id}`).getByRole('button').click();
-
-      await expect(page.locator(`#field-${field.id}`)).toHaveAttribute('data-inserted', 'true');
-    }
-
-    await page.getByRole('button', { name: 'Complete' }).click();
-    await page
-      .getByRole('button', { name: role === RecipientRole.SIGNER ? 'Sign' : 'Approve' })
-      .click();
-    await page.waitForURL(`${signUrl}/complete`);
-  }
-
-  await unseedUser(user.id);
-});
-
 test('[DOCUMENT_FLOW]: should be able to create, send with redirect url, sign a document and redirect to redirect url', async ({
   page,
 }) => {
@@ -491,46 +333,3 @@ test('[DOCUMENT_FLOW]: should be able to create, send with redirect url, sign a
 
   await unseedUser(user.id);
 });
-
-test('[DOCUMENT_FLOW]: should be able to sign a document with custom date', async ({ page }) => {
-  const user = await seedUser();
-  const customDate = DateTime.local().toFormat('yyyy-MM-dd hh:mm a');
-
-  const { document, recipients } = await seedPendingDocumentWithFullFields({
-    owner: user,
-    recipients: ['user1@example.com'],
-    fields: [FieldType.DATE],
-  });
-
-  const { token, Field } = recipients[0];
-  const [recipientField] = Field;
-
-  await page.goto(`/sign/${token}`);
-  await page.waitForURL(`/sign/${token}`);
-
-  await page.locator(`#field-${recipientField.id}`).getByRole('button').click();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await expect(page.getByRole('dialog').getByText('Complete Signing').first()).toBeVisible();
-  await page.getByRole('button', { name: 'Sign' }).click();
-
-  await page.waitForURL(`/sign/${token}/complete`);
-  await expect(page.getByText('Document Signed')).toBeVisible();
-
-  const field = await prisma.field.findFirst({
-    where: {
-      Recipient: {
-        email: 'user1@example.com',
-      },
-      documentId: Number(document.id),
-    },
-  });
-
-  expect(field?.customText).toBe(customDate);
-
-  // Check if document has been signed
-  const { status: completedStatus } = await getDocumentByToken(token);
-  expect(completedStatus).toBe(DocumentStatus.COMPLETED);
-
-  await unseedUser(user.id);
-});