fix: completed count incorrect

.env.example

@@ -50,9 +50,7 @@ NEXT_PRIVATE_SMTP_SECURE=
 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
-NEXT_PRIVATE_RESEND_API_KEY=
-# OPTIONAL: The API key to use for MailChannels.
+# OPTIONAL: The API key to use for the MailChannels proxy endpoint.
 NEXT_PRIVATE_MAILCHANNELS_API_KEY=
 # OPTIONAL: The endpoint to use for the MailChannels API if using a proxy.
 NEXT_PRIVATE_MAILCHANNELS_ENDPOINT=

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

@@ -1,65 +0,0 @@
----
-title: The Early Adopters Plan
-description: We are still early. Early enough for you to get a sweet deal for supporting Documenso's Mission. Join the movement and get a shiny early adopter account in the process.
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2023-09-20
-tags:
-  - Paid Plan
-  - Metrics
-  - Open Startup
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/early.png"
-    width="1260"
-    height="630"
-    alt="XKCD: Bug"
-  />
-
-  <figcaption className="text-center">
-    "Being early is, uh, good." -Unknown
-  </figcaption>
-</figure>
-
-## Community-Driven Development
-
-As we ramp up hiring and development speed for Documenso, I want to discuss how we plan to build its core version.
-As we want to be a highly community-driven product, we want to capture the thoughts and ideas of said community in two ways:
-
-1. Everything we plan (i.e. documen.so/roadmap) and build (i.e. documen.so/repo) is public and open to comments and suggestions from everyone by design. We plan to have discussions, streams, and articles showcasing what we're up to, encouraging feedback and iterations on our plans.
-2. We're looking for 100 die-hard early adopters to get more deep hands-on feedback. If you want to be among the first to use and help shape Documenso, we have a special offer for you:
-
-## The Early Adopter Plan
-
-- All first 100 signups are entitled to the early adopter plan.
-- The plan includes everything we build in the next 12 months and unlimited<sup>1</sup> signatures
-- This plan is priced at $30/mo.
-- No matter what we add, the price is guaranteed for life as a thank you for supporting Documenso's mission<sup>2</sup>. And we plan to add a lot.
-- This also includes unlimited users<sup>3</sup> as part of the upcoming support for teams.
-- If you already claimed an early adopter account in the past and canceled, we are happy to reactivate your account with the early adopter pricing. Reach out to support@documenso.com
-
-## Being an Early Adopter
-
-Being eligible for the early adopter plan has no formal requirements like giving feedback or being active in the community. In good faith, we assume you sign the Documenso Supporter Pledge to be part of this. And if you want to use the newest version quietly, that's fine, too. Everything the die-hard community brings up will be carefully considered and prioritized <sup>4</sup>. Also, there will obviously be limited edition merch available for the first 100.
-Documenso currently runs the community reviewed 0.9.1 version. Getting from here to the globally loved and adopted signing tool we all deserve will take a lot of work, and we want you on board to help us create it. Join us in shaping the future of open signing and having fun doing it. [Malfunction Mania](https://documenso.com/blog/malfunction-mania) and releasing 1.0 will go a long way.
-
-## Extending our open metrics
-
-As part of our ongoing effort to be open and transparent in our doing, we are adding "Early Adopters" to our [/open page](https://documenso.com/open) page. After we exceed the early adopter slots, this metric will transition to "Customers". When no more early adopter seats can be claimed, the early adopter plan will transition to a standard paid plan. It will still be priced at $30/mo., but will no longer include upcoming features or unlimited seats.
-
-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
-
-\
-[1] Excluding signatures, we have to pay for i.e. third-party QES
-
-[2] The Documenso Manifest
-
-[3] Within reason. If you are unsure what that means, feel free to contact hi@documenso.com. But it should be fine if you don't plan to onboard a huge enterprise.
-
-[4] We won't be able to build everything everyone asks for. But we firmly plan to listen and build in a way everyone's requirements are met as well as possible.

apps/marketing/next.config.js

@@ -56,14 +56,6 @@ const config = {
       },
     ];
   },
-  async rewrites() {
-    return [
-      {
-        source: '/ingest/:path*',
-        destination: 'https://eu.posthog.com/:path*',
-      },
-    ];
-  },
 };
 
 module.exports = withContentlayer(config);

apps/marketing/src/app/(marketing)/open/funding-raised.tsx

@@ -7,14 +7,14 @@ import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recha
 import { formatMonth } from '@documenso/lib/client-only/format-month';
 import { cn } from '@documenso/ui/lib/utils';
 
-export type FundingRaisedProps = HTMLAttributes<HTMLDivElement> & {
-  data: Record<string, string | number>[];
-};
+import { FUNDING_RAISED } from '~/app/(marketing)/open/data';
 
-export const FundingRaised = ({ className, data, ...props }: FundingRaisedProps) => {
-  const formattedData = data.map((item) => ({
+export type FundingRaisedProps = HTMLAttributes<HTMLDivElement>;
+
+export const FundingRaised = ({ className, ...props }: FundingRaisedProps) => {
+  const formattedData = FUNDING_RAISED.map((item) => ({
     amount: Number(item.amount),
-    date: formatMonth(item.date as string),
+    date: formatMonth(item.date),
   }));
 
   return (

apps/marketing/src/app/(marketing)/open/gh-metrics.tsx

@@ -7,25 +7,26 @@ import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recha
 import { formatMonth } from '@documenso/lib/client-only/format-month';
 import { cn } from '@documenso/ui/lib/utils';
 
-export type BarMetricProps<T extends Record<string, unknown>> = HTMLAttributes<HTMLDivElement> & {
-  data: T;
-  metricKey: keyof T[string];
+import { StargazersType } from './page';
+
+export type MetricsDataKey = 'stars' | 'forks' | 'mergedPRs' | 'openIssues';
+export type GithubMetricProps = HTMLAttributes<HTMLDivElement> & {
+  data: StargazersType;
+  metricKey: MetricsDataKey;
   title: string;
   label: string;
   chartHeight?: number;
-  extraInfo?: JSX.Element;
 };
 
-export const BarMetric = <T extends Record<string, Record<keyof T[string], unknown>>>({
+export const GithubMetric = ({
   className,
   data,
   metricKey,
   title,
   label,
   chartHeight = 400,
-  extraInfo,
   ...props
-}: BarMetricProps<T>) => {
+}: GithubMetricProps) => {
   const formattedData = Object.keys(data)
     .map((key) => ({
       month: formatMonth(key),
@@ -35,10 +36,7 @@ export const BarMetric = <T extends Record<string, Record<keyof T[string], unkno
 
   return (
     <div className={cn('flex flex-col', className)} {...props}>
-      <div className="flex items-center px-4">
-        <h3 className="text-lg font-semibold">{title}</h3>
-        <span>{extraInfo}</span>
-      </div>
+      <h3 className="px-4 text-lg font-semibold">{title}</h3>
 
       <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border pr-2 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={chartHeight}>
@@ -52,7 +50,7 @@ export const BarMetric = <T extends Record<string, Record<keyof T[string], unkno
               formatter={(value) => [Number(value), label]}
               cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
             />
-            <Bar dataKey={metricKey as string} fill="hsl(var(--primary))" label={label} />{' '}
+            <Bar dataKey={metricKey} fill="hsl(var(--primary))" label={label} />
           </BarChart>
         </ResponsiveContainer>
       </div>

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

@@ -1,14 +1,12 @@
 import { z } from 'zod';
 
-import { FUNDING_RAISED } from '~/app/(marketing)/open/data';
 import { MetricCard } from '~/app/(marketing)/open/metric-card';
 import { SalaryBands } from '~/app/(marketing)/open/salary-bands';
 
-import { BarMetric } from './bar-metrics';
 import { CapTable } from './cap-table';
 import { FundingRaised } from './funding-raised';
+import { GithubMetric } from './gh-metrics';
 import { TeamMembers } from './team-members';
-import { OpenPageTooltip } from './tooltip';
 
 export const revalidate = 3600;
 
@@ -31,16 +29,9 @@ const ZStargazersLiveResponse = z.record(
   }),
 );
 
-const ZEarlyAdoptersResponse = z.record(
-  z.object({
-    id: z.number(),
-    time: z.string().datetime(),
-    earlyAdopters: z.number(),
-  }),
-);
-
 export type StargazersType = z.infer<typeof ZStargazersLiveResponse>;
-export type EarlyAdoptersType = z.infer<typeof ZEarlyAdoptersResponse>;
+
+// const ZOpenPullRequestsResponse = ZMergedPullRequestsResponse;
 
 export default async function OpenPage() {
   const {
@@ -74,14 +65,6 @@ export default async function OpenPage() {
     .then(async (res) => res.json())
     .then((res) => ZStargazersLiveResponse.parse(res));
 
-  const EARLY_ADOPTERS_DATA = await fetch('https://stargrazer-live.onrender.com/api/stats/stripe', {
-    headers: {
-      accept: 'application/json',
-    },
-  })
-    .then(async (res) => res.json())
-    .then((res) => ZEarlyAdoptersResponse.parse(res));
-
   return (
     <div className="mx-auto mt-6 max-w-screen-lg sm:mt-12">
       <div className="flex flex-col items-center justify-center">
@@ -124,20 +107,10 @@ export default async function OpenPage() {
 
         <SalaryBands className="col-span-12 lg:col-span-6" />
 
-        <FundingRaised data={FUNDING_RAISED} className="col-span-12 lg:col-span-6" />
+        <FundingRaised className="col-span-12 lg:col-span-6" />
 
         <CapTable className="col-span-12 lg:col-span-6" />
-
-        <BarMetric<EarlyAdoptersType>
-          data={EARLY_ADOPTERS_DATA}
-          metricKey="earlyAdopters"
-          title="Early Adopters"
-          label="Early Adopters"
-          className="col-span-12 lg:col-span-6"
-          extraInfo={<OpenPageTooltip />}
-        />
-
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="stars"
           title="Github: Total Stars"
@@ -145,31 +118,29 @@ export default async function OpenPage() {
           className="col-span-12 lg:col-span-6"
         />
 
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="mergedPRs"
           title="Github: Total Merged PRs"
           label="Merged PRs"
           chartHeight={300}
-          className="col-span-12 lg:col-span-6"
+          className="col-span-12 lg:col-span-4"
         />
-
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="forks"
           title="Github: Total Forks"
           label="Forks"
           chartHeight={300}
-          className="col-span-12 lg:col-span-6"
+          className="col-span-12 lg:col-span-4"
         />
-
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="openIssues"
           title="Github: Total Open Issues"
           label="Open Issues"
           chartHeight={300}
-          className="col-span-12 lg:col-span-6"
+          className="col-span-12 lg:col-span-4"
         />
 
         <div className="col-span-12 mt-12 flex flex-col items-center justify-center">

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

@@ -1,40 +0,0 @@
-import React from 'react';
-
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '@documenso/ui/primitives/tooltip';
-
-export function OpenPageTooltip() {
-  return (
-    <TooltipProvider>
-      <Tooltip>
-        <TooltipTrigger>
-          <svg
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            className="ml-2 mt-2.5"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM1.82707 7.49972C1.82707 4.36671 4.36689 1.82689 7.49991 1.82689C10.6329 1.82689 13.1727 4.36671 13.1727 7.49972C13.1727 10.6327 10.6329 13.1726 7.49991 13.1726C4.36689 13.1726 1.82707 10.6327 1.82707 7.49972ZM8.24992 4.49999C8.24992 4.9142 7.91413 5.24999 7.49992 5.24999C7.08571 5.24999 6.74992 4.9142 6.74992 4.49999C6.74992 4.08577 7.08571 3.74999 7.49992 3.74999C7.91413 3.74999 8.24992 4.08577 8.24992 4.49999ZM6.00003 5.99999H6.50003H7.50003C7.77618 5.99999 8.00003 6.22384 8.00003 6.49999V9.99999H8.50003H9.00003V11H8.50003H7.50003H6.50003H6.00003V9.99999H6.50003H7.00003V6.99999H6.50003H6.00003V5.99999Z"
-              fill="currentColor"
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-            ></path>
-          </svg>
-        </TooltipTrigger>
-        <TooltipContent>
-          <p>
-            August and earlier: Active subscribers. September and beyond: Numbers of active
-            subscriptions.
-          </p>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-}

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

@@ -48,9 +48,9 @@ export default function PricingPage() {
             <AccordionContent className="text-muted-foreground max-w-prose text-sm leading-relaxed">
               You can self-host Documenso for free or use our ready-to-use hosted version. The
               hosted version comes with additional support, painless scalability and more. Early
-              adopters will get access to all features we build this year, for no additional cost!
-              Forever! Yes, that includes multiple users per account later. If you want Documenso
-              for your enterprise, we are happy to talk about your needs.
+              adopters of the community plan will get access to all features we build this year, for
+              no additional cost! Forever! Yes, that includes multiple users per account later. If
+              you want Documenso for your enterprise, we are happy to talk about your needs.
             </AccordionContent>
           </AccordionItem>
 

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

@@ -40,7 +40,7 @@ export const Callout = ({ starCount }: CalloutProps) => {
         className="rounded-full bg-transparent backdrop-blur-sm"
         onClick={onSignUpClick}
       >
-        Get the Early Adopters Plan
+        Get the Community Plan
         <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">
           $30/mo. forever!
         </span>

apps/marketing/src/components/(marketing)/claim-plan-dialog.tsx

@@ -139,7 +139,7 @@ export const ClaimPlanDialog = ({ className, planId, children }: ClaimPlanDialog
             </div>
 
             <Button type="submit" size="lg" loading={isSubmitting}>
-              Claim the early adopters Plan (
+              Claim the Community Plan (
               {/* eslint-disable-next-line turbo/no-undeclared-env-vars */}
               {planId === process.env.NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID
                 ? 'Monthly'

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

@@ -114,7 +114,7 @@ export const Hero = ({ className, ...props }: HeroProps) => {
             className="rounded-full bg-transparent backdrop-blur-sm"
             onClick={onSignUpClick}
           >
-            Get the Early Adopters Plan
+            Get the Community Plan
             <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">
               $30/mo. forever!
             </span>

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

@@ -119,7 +119,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           data-plan="community"
           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">Early Adopters</p>
+          <p className="text-foreground text-4xl font-medium">Community</p>
           <div className="text-primary mt-2.5 text-xl font-medium">
             <AnimatePresence mode="wait">
               {period === 'MONTHLY' && <motion.div layoutId="pricing">$30</motion.div>}
@@ -136,22 +136,12 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           </ClaimPlanDialog>
 
           <div className="mt-8 flex w-full flex-col divide-y">
-            <p className="text-foreground py-4 font-medium">
-              {' '}
-              <a href="https://documenso.com/blog/early-adopters" target="_blank">
-                The Early Adopter Deal:
-              </a>
-            </p>
+            <p className="text-foreground py-4 font-medium">Documenso Early Adopter Deal:</p>
             <p className="text-foreground py-4">Join the movement</p>
             <p className="text-foreground py-4">Simple signing solution</p>
-            <p className="text-foreground py-4">Email, Discord and Slack assistance</p>
+            <p className="text-foreground py-4">Email and Slack assistance</p>
             <p className="text-foreground py-4">
-              <strong>
-                {' '}
-                <a href="https://documenso.com/blog/early-adopters" target="_blank">
-                  Includes all upcoming features
-                </a>
-              </strong>
+              <strong>Includes all upcoming features</strong>
             </p>
             <p className="text-foreground py-4">Fixed, straightforward pricing</p>
           </div>
@@ -178,7 +168,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           </Link>
 
           <div className="mt-8 flex w-full flex-col divide-y">
-            <p className="text-foreground py-4 font-medium">Everything in Early Adopters, plus:</p>
+            <p className="text-foreground py-4 font-medium">Everything in Community, 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>

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

@@ -177,7 +177,9 @@ export const createSinglePlayerDocument = async (
     },
   );
 
+  // Todo: Handle `downloadLink`
   const template = createElement(DocumentSelfSignedEmailTemplate, {
+    downloadLink: `${process.env.NEXT_PUBLIC_MARKETING_URL}/single-player-mode/${documentToken}`,
     documentName: documentName,
     assetBaseUrl: process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000',
   });
@@ -195,7 +197,6 @@ export const createSinglePlayerDocument = async (
     subject: 'Document signed',
     html: render(template),
     text: render(template, { plainText: true }),
-    attachments: [{ content: Buffer.from(pdfBytes), filename: documentName }],
   });
 
   return documentToken;

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

@@ -189,7 +189,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
             className="bg-foreground/5 col-span-12 flex flex-col rounded-2xl p-6 lg:col-span-5"
             onSubmit={handleSubmit(onFormSubmit)}
           >
-            <h3 className="text-2xl font-semibold">Sign up for the early adopters plan</h3>
+            <h3 className="text-2xl font-semibold">Sign up for the community plan</h3>
             <p className="text-muted-foreground mt-2 text-xs">
               with Timur Ercan & Lucas Smith from Documenso
             </p>

apps/web/next.config.js

@@ -29,14 +29,6 @@ const config = {
       transform: 'lucide-react/dist/esm/icons/{{ kebabCase member }}',
     },
   },
-  async rewrites() {
-    return [
-      {
-        source: '/ingest/:path*',
-        destination: 'https://eu.posthog.com/:path*',
-      },
-    ];
-  },
 };
 
 module.exports = config;

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

@@ -12,7 +12,7 @@ export type AdminSectionLayoutProps = {
 };
 
 export default async function AdminSectionLayout({ children }: AdminSectionLayoutProps) {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   if (!isAdmin(user)) {
     redirect('/documents');

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

@@ -10,7 +10,7 @@ export default function Loading() {
         Documents
       </Link>
 
-      <h1 className="mt-4 grow-0 truncate text-2xl font-semibold md:text-3xl">
+      <h1 className="mt-4 max-w-xs grow-0 truncate text-2xl font-semibold md:text-3xl">
         Loading Document...
       </h1>
       <div className="mt-8 grid h-[80vh] max-h-[60rem] w-full grid-cols-12 gap-x-8">

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

@@ -30,11 +30,11 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
     redirect('/documents');
   }
 
-  const { user } = await getRequiredServerComponentSession();
+  const session = await getRequiredServerComponentSession();
 
   const document = await getDocumentById({
     id: documentId,
-    userId: user.id,
+    userId: session.id,
   }).catch(() => null);
 
   if (!document || !document.documentData) {
@@ -50,11 +50,11 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
   const [recipients, fields] = await Promise.all([
     await getRecipientsForDocument({
       documentId,
-      userId: user.id,
+      userId: session.id,
     }),
     await getFieldsForDocument({
       documentId,
-      userId: user.id,
+      userId: session.id,
     }),
   ]);
 
@@ -65,7 +65,10 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
         Documents
       </Link>
 
-      <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
+      <h1
+        className="mt-4 max-w-xs truncate text-2xl font-semibold md:text-3xl"
+        title={document.title}
+      >
         {document.title}
       </h1>
 
@@ -87,7 +90,7 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
         <EditDocumentForm
           className="mt-8"
           document={document}
-          user={user}
+          user={session}
           recipients={recipients}
           fields={fields}
           dataUrl={documentDataUrl}

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

@@ -10,7 +10,7 @@ export default function DocumentSentPage() {
         Documents
       </Link>
 
-      <h1 className="mt-4 grow-0 truncate text-2xl font-semibold md:text-3xl">
+      <h1 className="mt-4 max-w-xs grow-0 truncate text-2xl font-semibold md:text-3xl">
         Loading Document...
       </h1>
     </div>

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

@@ -25,7 +25,7 @@ export type DocumentsPageProps = {
 };
 
 export default async function DocumentsPage({ searchParams = {} }: DocumentsPageProps) {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   const stats = await getStats({
     user,

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

@@ -24,7 +24,7 @@ export default async function AuthenticatedDashboardLayout({
     redirect('/signin');
   }
 
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   return (
     <NextAuthProvider session={session}>

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

@@ -12,7 +12,7 @@ import { Button } from '@documenso/ui/primitives/button';
 import { LocaleDate } from '~/components/formatter/locale-date';
 
 export default async function BillingSettingsPage() {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   const isBillingEnabled = await getServerComponentFlag('app_billing');
 

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

@@ -3,7 +3,7 @@ import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-
 import { PasswordForm } from '~/components/forms/password';
 
 export default async function PasswordSettingsPage() {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   return (
     <div>

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

@@ -3,7 +3,7 @@ import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-
 import { ProfileForm } from '~/components/forms/profile';
 
 export default async function ProfileSettingsPage() {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   return (
     <div>

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

@@ -53,7 +53,7 @@ export default async function CompletedSigningPage({
     recipient.email;
 
   return (
-    <div className="-mx-4 flex max-w-[100vw] flex-col items-center overflow-x-hidden px-4 pt-24 md:-mx-8 md:px-8 lg:pt-36 xl:pt-44">
+    <div className="flex flex-col items-center pt-24 lg:pt-36 xl:pt-44">
       {/* Card with recipient */}
       <SigningCard3D name={recipientName} signingCelebrationImage={signingCelebration} />
 

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

@@ -106,7 +106,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
         </Button>
       </DialogTrigger>
 
-      <DialogContent position="end">
+      <DialogContent>
         <DialogHeader>
           <DialogTitle>Share</DialogTitle>
 
@@ -119,7 +119,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
             <span className="font-medium text-blue-400">@documenso</span>
             . Check it out!
             <span className="mt-2 block" />
-            <span className="break-all font-medium text-blue-400">
+            <span className="font-medium text-blue-400">
               {window.location.origin}/share/{shareLink?.slug || '...'}
             </span>
           </div>

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

@@ -4,7 +4,6 @@ import { useMemo, useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import { useSession } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 
 import { completeDocumentWithToken } from '@documenso/lib/server-only/document/complete-document-with-token';
@@ -28,7 +27,6 @@ export type SigningFormProps = {
 
 export const SigningForm = ({ document, recipient, fields }: SigningFormProps) => {
   const router = useRouter();
-  const { data: session } = useSession();
 
   const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();
 
@@ -62,11 +60,7 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =
   return (
     <form
       className={cn(
-        'dark:bg-background border-border bg-widget sticky flex h-full flex-col rounded-xl border px-4 py-6',
-        {
-          'top-20 max-h-[min(68rem,calc(100vh-6rem))]': session,
-          'top-4 max-h-[min(68rem,calc(100vh-2rem))]': !session,
-        },
+        'dark:bg-background border-border bg-widget sticky top-20 flex h-full max-h-[80rem] flex-col rounded-xl border px-4 py-6',
       )}
       onSubmit={handleSubmit(onFormSubmit)}
     >
@@ -126,7 +120,6 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =
                 className="dark:bg-muted dark:hover:bg-muted/80 w-full  bg-black/5 hover:bg-black/10"
                 variant="secondary"
                 size="lg"
-                disabled={typeof window !== 'undefined' && window.history.length <= 1}
                 onClick={() => router.back()}
               >
                 Cancel

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

@@ -10,11 +10,11 @@ export type SigningLayoutProps = {
 };
 
 export default async function SigningLayout({ children }: SigningLayoutProps) {
-  const { user, session } = await getServerComponentSession();
+  const user = await getServerComponentSession();
 
   return (
-    <NextAuthProvider session={session}>
-      <div className="min-h-screen">
+    <NextAuthProvider>
+      <div className="min-h-screen overflow-hidden">
         {user && <AuthenticatedHeader user={user} />}
 
         <main className="mb-8 mt-8 px-4 md:mb-12 md:mt-12 md:px-8">{children}</main>

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

@@ -51,7 +51,7 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
     .then((buffer) => Buffer.from(buffer).toString('base64'))
     .then((data) => `data:application/pdf;base64,${data}`);
 
-  const { user } = await getServerComponentSession();
+  const user = await getServerComponentSession();
 
   if (
     document.status === DocumentStatus.COMPLETED ||
@@ -62,7 +62,7 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
 
   return (
     <SigningProvider email={recipient.email} fullName={recipient.name} signature={user?.signature}>
-      <div className="mx-auto w-full max-w-screen-xl">
+      <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
         <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
           {document.title}
         </h1>

apps/web/src/app/not-found.tsx

@@ -6,7 +6,7 @@ import { Button } from '@documenso/ui/primitives/button';
 import NotFoundPartial from '~/components/partials/not-found';
 
 export default async function NotFound() {
-  const { session } = await getServerComponentSession();
+  const session = await getServerComponentSession();
 
   return (
     <NotFoundPartial>

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

@@ -11,10 +11,10 @@ export type AddFieldsActionInput = TAddFieldsFormSchema & {
 export const addFields = async ({ documentId, fields }: AddFieldsActionInput) => {
   'use server';
 
-  const { user } = await getRequiredServerComponentSession();
+  const { id: userId } = await getRequiredServerComponentSession();
 
   await setFieldsForDocument({
-    userId: user.id,
+    userId,
     documentId,
     fields: fields.map((field) => ({
       id: field.nativeId,

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

@@ -11,10 +11,10 @@ export type AddSignersActionInput = TAddSignersFormSchema & {
 export const addSigners = async ({ documentId, signers }: AddSignersActionInput) => {
   'use server';
 
-  const { user } = await getRequiredServerComponentSession();
+  const { id: userId } = await getRequiredServerComponentSession();
 
   await setRecipientsForDocument({
-    userId: user.id,
+    userId,
     documentId,
     recipients: signers.map((signer) => ({
       id: signer.nativeId,

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

@@ -12,7 +12,7 @@ export type CompleteDocumentActionInput = TAddSubjectFormSchema & {
 export const completeDocument = async ({ documentId, email }: CompleteDocumentActionInput) => {
   'use server';
 
-  const { user } = await getRequiredServerComponentSession();
+  const { id: userId } = await getRequiredServerComponentSession();
 
   if (email.message || email.subject) {
     await upsertDocumentMeta({
@@ -23,7 +23,7 @@ export const completeDocument = async ({ documentId, email }: CompleteDocumentAc
   }
 
   return await sendDocument({
-    userId: user.id,
+    userId,
     documentId,
   });
 };

package-lock.json

@@ -21,7 +21,6 @@
         "eslint-config-custom": "*",
         "husky": "^8.0.0",
         "lint-staged": "^14.0.0",
-        "npm-run-all": "^4.1.5",
         "prettier": "^2.5.1",
         "rimraf": "^5.0.1",
         "turbo": "^1.9.3"
@@ -12295,12 +12294,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -12604,43 +12597,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/load-tsconfig": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.5.tgz",
@@ -13217,15 +13173,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/memorystream": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
-      "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
     "node_modules/meow": {
       "version": "8.1.2",
       "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
@@ -14374,12 +14321,6 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
     "node_modules/no-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -14530,234 +14471,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npm-run-all": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
-      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
-      },
-      "bin": {
-        "npm-run-all": "bin/npm-run-all/index.js",
-        "run-p": "bin/run-p/index.js",
-        "run-s": "bin/run-s/index.js"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/npm-run-all/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/npm-run-all/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/pidtree": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
-      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
-      "dev": true,
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/npm-run-path": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
@@ -17245,29 +16958,6 @@
         "node": ">=0.10.5"
       }
     },
-    "node_modules/resend": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resend/-/resend-1.1.0.tgz",
-      "integrity": "sha512-it8TIDVT+/gAiJsUlv2tdHuvzwCCv4Zwu+udDqIm/dIuByQwe68TtFDcPccxqpSVVrNCBxxXLzsdT1tsV+P3GA==",
-      "dependencies": {
-        "@react-email/render": "0.0.7",
-        "type-fest": "3.13.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/resend/node_modules/type-fest": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.0.tgz",
-      "integrity": "sha512-Gur3yQGM9qiLNs0KPP7LPgeRbio2QTt4xXouobMCarR0/wyW3F+F/+OWwshg3NG0Adon7uQfSZBpB46NfhoF1A==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/resolve": {
       "version": "1.22.2",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
@@ -17797,15 +17487,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/shelljs": {
       "version": "0.8.5",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
@@ -18096,23 +17777,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/string.prototype.padend": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.5.tgz",
-      "integrity": "sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
@@ -20109,8 +19773,7 @@
       "dependencies": {
         "@react-email/components": "^0.0.7",
         "nodemailer": "^6.9.3",
-        "react-email": "^1.9.4",
-        "resend": "^1.1.0"
+        "react-email": "^1.9.4"
       },
       "devDependencies": {
         "@documenso/tailwind-config": "*",

package.json

@@ -8,13 +8,7 @@
     "format": "prettier --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,mdx}\"",
     "prepare": "husky install",
     "commitlint": "commitlint --edit",
-    "clean": "turbo run clean && rimraf node_modules",
-    "docker:compose-up": "docker compose -f ./docker/compose-without-app.yml up -d || docker-compose -f ./docker/compose-without-app.yml up -d",
-    "docker:compose-down": "docker compose -f ./docker/compose-without-app.yml down || docker-compose -f ./docker/compose-without-app.yml down",
-    "db:migrate-dev": "npm run -w @documenso/prisma prisma:migrate-dev",
-    "db:seed": "npm run -w @documenso/prisma prisma:seed",
-    "dx": "npm install && run-s docker:compose-up db:migrate-dev",
-    "d": "npm install && run-s docker:compose-up db:migrate-dev db:seed dev"
+    "clean": "turbo run clean && rimraf node_modules"
   },
   "engines": {
     "npm": ">=8.6.0",
@@ -29,7 +23,6 @@
     "eslint-config-custom": "*",
     "husky": "^8.0.0",
     "lint-staged": "^14.0.0",
-    "npm-run-all": "^4.1.5",
     "prettier": "^2.5.1",
     "rimraf": "^5.0.1",
     "turbo": "^1.9.3"

packages/email/mailer.ts

@@ -1,7 +1,6 @@
 import { createTransport } from 'nodemailer';
 
 import { MailChannelsTransport } from './transports/mailchannels';
-import { ResendTransport } from './transports/resend';
 
 const getTransport = () => {
   const transport = process.env.NEXT_PRIVATE_SMTP_TRANSPORT ?? 'smtp-auth';
@@ -15,14 +14,6 @@ const getTransport = () => {
     );
   }
 
-  if (transport === 'resend') {
-    return createTransport(
-      ResendTransport.makeTransport({
-        apiKey: process.env.NEXT_PRIVATE_RESEND_API_KEY || '',
-      }),
-    );
-  }
-
   if (transport === 'smtp-api') {
     if (!process.env.NEXT_PRIVATE_SMTP_HOST || !process.env.NEXT_PRIVATE_SMTP_APIKEY) {
       throw new Error(

packages/email/package.json

@@ -19,8 +19,7 @@
   "dependencies": {
     "@react-email/components": "^0.0.7",
     "nodemailer": "^6.9.3",
-    "react-email": "^1.9.4",
-    "resend": "^1.1.0"
+    "react-email": "^1.9.4"
   },
   "devDependencies": {
     "@documenso/tailwind-config": "*",

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

@@ -1,9 +1,7 @@
-import { Button, Column, Img, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentCompletedProps {
   downloadLink: string;
   documentName: string;
@@ -29,20 +27,27 @@ export const TemplateDocumentCompleted = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section>
+        <Row className="table-fixed">
+          <Column />
+
+          <Column>
+            <Img
+              className="h-42 mx-auto"
+              src={getAssetUrl('/static/document.png')}
+              alt="Documenso"
+            />
+          </Column>
+
+          <Column />
+        </Row>
+      </Section>
 
       <Section>
-        <Section className="mb-4">
-          <Column align="center">
-            <Text className="text-base font-semibold text-[#7AC455]">
-              <Img
-                src={getAssetUrl('/static/completed.png')}
-                className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
-              />
-              Completed
-            </Text>
-          </Column>
-        </Section>
+        <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-[#7AC455]">
+          <Img src={getAssetUrl('/static/completed.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
+          Completed
+        </Text>
 
         <Text className="text-primary mb-0 text-center text-lg font-semibold">
           “{documentName}” was signed by all signers
@@ -61,13 +66,10 @@ export const TemplateDocumentCompleted = ({
             Review
           </Button> */}
           <Button
-            className="rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
+            className="inline-flex items-center justify-center rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
             href={downloadLink}
           >
-            <Img
-              src={getAssetUrl('/static/download.png')}
-              className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
-            />
+            <Img src={getAssetUrl('/static/download.png')} className="-mb-1 mr-2 inline h-5 w-5" />
             Download
           </Button>
         </Section>

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

@@ -1,28 +0,0 @@
-import { Column, Img, Row, Section } from '@react-email/components';
-
-export interface TemplateDocumentImageProps {
-  assetBaseUrl: string;
-  className?: string;
-}
-
-export const TemplateDocumentImage = ({ assetBaseUrl, className }: TemplateDocumentImageProps) => {
-  const getAssetUrl = (path: string) => {
-    return new URL(path, assetBaseUrl).toString();
-  };
-
-  return (
-    <Section className={className}>
-      <Row className="table-fixed">
-        <Column />
-
-        <Column>
-          <Img className="h-42 mx-auto" src={getAssetUrl('/static/document.png')} alt="Documenso" />
-        </Column>
-
-        <Column />
-      </Row>
-    </Section>
-  );
-};
-
-export default TemplateDocumentImage;

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

@@ -1,9 +1,7 @@
-import { Button, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentInviteProps {
   inviterName: string;
   inviterEmail: string;
@@ -18,6 +16,10 @@ export const TemplateDocumentInvite = ({
   signDocumentLink,
   assetBaseUrl,
 }: TemplateDocumentInviteProps) => {
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
   return (
     <Tailwind
       config={{
@@ -28,7 +30,21 @@ export const TemplateDocumentInvite = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section className="mt-4">
+        <Row className="table-fixed">
+          <Column />
+
+          <Column>
+            <Img
+              className="h-42 mx-auto"
+              src={getAssetUrl('/static/document.png')}
+              alt="Documenso"
+            />
+          </Column>
+
+          <Column />
+        </Row>
+      </Section>
 
       <Section>
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">

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

@@ -1,9 +1,7 @@
-import { Column, Img, Section, Tailwind, Text } from '@react-email/components';
+import { Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentPendingProps {
   documentName: string;
   assetBaseUrl: string;
@@ -27,20 +25,27 @@ export const TemplateDocumentPending = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section>
+        <Row className="table-fixed">
+          <Column />
+
+          <Column>
+            <Img
+              className="h-42 mx-auto"
+              src={getAssetUrl('/static/document.png')}
+              alt="Documenso"
+            />
+          </Column>
+
+          <Column />
+        </Row>
+      </Section>
 
       <Section>
-        <Section className="mb-4">
-          <Column align="center">
-            <Text className="text-base font-semibold text-blue-500">
-              <Img
-                src={getAssetUrl('/static/clock.png')}
-                className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
-              />
-              Waiting for others
-            </Text>
-          </Column>
-        </Section>
+        <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-blue-500">
+          <Img src={getAssetUrl('/static/clock.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
+          Waiting for others
+        </Text>
 
         <Text className="text-primary mb-0 text-center text-lg font-semibold">
           “{documentName}” has been signed

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

@@ -1,20 +1,18 @@
-import { Button, Column, Img, Link, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentSelfSignedProps {
+  downloadLink: string;
   documentName: string;
   assetBaseUrl: string;
 }
 
 export const TemplateDocumentSelfSigned = ({
+  downloadLink,
   documentName,
   assetBaseUrl,
 }: TemplateDocumentSelfSignedProps) => {
-  const signUpUrl = `${process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signup`;
-
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
   };
@@ -29,59 +27,39 @@ export const TemplateDocumentSelfSigned = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
-
       <Section className="flex-row items-center justify-center">
-        <Section>
-          <Column align="center">
-            <Text className="text-base font-semibold text-[#7AC455]">
-              <Img
-                src={getAssetUrl('/static/completed.png')}
-                className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
-              />
-              Completed
-            </Text>
-          </Column>
-        </Section>
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-        <Text className="text-primary mb-0 mt-6 text-center text-lg font-semibold">
+        <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-[#7AC455]">
+          <Img src={getAssetUrl('/static/completed.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
+          Completed
+        </Text>
+
+        <Text className="text-primary mb-0 text-center text-lg font-semibold">
           You have signed “{documentName}”
         </Text>
 
-        <Text className="mx-auto mb-6 mt-1 max-w-[80%] text-center text-base text-slate-400">
-          Create a{' '}
-          <Link
-            href={signUpUrl}
-            target="_blank"
-            className="text-documenso-700 hover:text-documenso-600 whitespace-nowrap"
-          >
-            free account
-          </Link>{' '}
-          to access your signed documents at any time.
+        <Text className="my-1 text-center text-base text-slate-400">
+          Check out our plans to access the full suite of features.
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
           <Button
-            href={signUpUrl}
-            className="mr-4 rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
-          >
-            <Img
-              src={getAssetUrl('/static/user-plus.png')}
-              className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
-            />
-            Create account
-          </Button>
-
-          <Button
-            className="rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
+            className="mr-4 inline-flex items-center justify-center rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
             href="https://documenso.com/pricing"
           >
-            <Img
-              src={getAssetUrl('/static/review.png')}
-              className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
-            />
+            <Img src={getAssetUrl('/static/review.png')} className="-mb-1 mr-2 inline h-5 w-5" />
             View plans
           </Button>
+          <Button
+            className="inline-flex items-center justify-center rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
+            href={downloadLink}
+          >
+            <Img src={getAssetUrl('/static/download.png')} className="-mb-1 mr-2 inline h-5 w-5" />
+            Download
+          </Button>
         </Section>
       </Section>
     </Tailwind>

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

@@ -1,9 +1,7 @@
-import { Button, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export type TemplateForgotPasswordProps = {
   resetPasswordLink: string;
   assetBaseUrl: string;
@@ -13,6 +11,10 @@ export const TemplateForgotPassword = ({
   resetPasswordLink,
   assetBaseUrl,
 }: TemplateForgotPasswordProps) => {
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
   return (
     <Tailwind
       config={{
@@ -23,9 +25,11 @@ export const TemplateForgotPassword = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section className="mt-4 flex-row items-center justify-center">
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-      <Section className="flex-row items-center justify-center">
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
           Forgot your password?
         </Text>

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

@@ -1,9 +1,7 @@
-import { Button, Section, Tailwind, Text } from '@react-email/components';
+import { Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateResetPasswordProps {
   userName: string;
   userEmail: string;
@@ -11,6 +9,10 @@ export interface TemplateResetPasswordProps {
 }
 
 export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordProps) => {
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
   return (
     <Tailwind
       config={{
@@ -21,9 +23,11 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section className="mt-4 flex-row items-center justify-center">
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-      <Section className="flex-row items-center justify-center">
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
           Password updated!
         </Text>
@@ -31,15 +35,6 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
         <Text className="my-1 text-center text-base text-slate-400">
           Your password has been updated.
         </Text>
-
-        <Section className="mb-6 mt-8 text-center">
-          <Button
-            className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-            href={`${process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signin`}
-          >
-            Sign In
-          </Button>
-        </Section>
       </Section>
     </Tailwind>
   );

packages/email/templates/document-completed.tsx

@@ -15,7 +15,7 @@ import {
   TemplateDocumentCompleted,
   TemplateDocumentCompletedProps,
 } from '../template-components/template-document-completed';
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 
 export type DocumentCompletedEmailTemplateProps = Partial<TemplateDocumentCompletedProps>;
 

packages/email/templates/document-invite.tsx

@@ -18,7 +18,7 @@ import {
   TemplateDocumentInvite,
   TemplateDocumentInviteProps,
 } from '../template-components/template-document-invite';
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 
 export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInviteProps> & {
   customBody?: string;

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

@@ -15,11 +15,12 @@ import {
   TemplateDocumentSelfSigned,
   TemplateDocumentSelfSignedProps,
 } from '../template-components/template-document-self-signed';
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 
 export type DocumentSelfSignedTemplateProps = TemplateDocumentSelfSignedProps;
 
 export const DocumentSelfSignedEmailTemplate = ({
+  downloadLink = 'https://documenso.com',
   documentName = 'Open Source Pledge.pdf',
   assetBaseUrl = 'http://localhost:3002',
 }: DocumentSelfSignedTemplateProps) => {
@@ -53,6 +54,7 @@ export const DocumentSelfSignedEmailTemplate = ({
                 />
 
                 <TemplateDocumentSelfSigned
+                  downloadLink={downloadLink}
                   documentName={documentName}
                   assetBaseUrl={assetBaseUrl}
                 />

packages/email/templates/forgot-password.tsx

@@ -11,7 +11,7 @@ import {
 
 import config from '@documenso/tailwind-config';
 
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 import {
   TemplateForgotPassword,
   TemplateForgotPasswordProps,

packages/email/templates/reset-password.tsx

@@ -14,7 +14,7 @@ import {
 
 import config from '@documenso/tailwind-config';
 
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 import {
   TemplateResetPassword,
   TemplateResetPasswordProps,

packages/email/transports/resend.ts

@@ -1,145 +0,0 @@
-import { type SentMessageInfo, type Transport } from 'nodemailer';
-import type Mail from 'nodemailer/lib/mailer';
-import type MailMessage from 'nodemailer/lib/mailer/mail-message';
-import { Resend } from 'resend';
-
-const VERSION = '1.0.0';
-
-type ResendTransportOptions = {
-  apiKey: string;
-};
-
-type ResendResponseError = {
-  statusCode: number;
-  name: string;
-  message: string;
-};
-
-const isResendResponseError = (error: unknown): error is ResendResponseError => {
-  // We could use Zod here, but it's not worth the extra bundle size
-  return (
-    typeof error === 'object' &&
-    error !== null &&
-    'statusCode' in error &&
-    typeof error.statusCode === 'number' &&
-    'name' in error &&
-    typeof error.name === 'string' &&
-    'message' in error &&
-    typeof error.message === 'string'
-  );
-};
-
-/**
- * Transport for sending email via the Resend SDK.
- */
-export class ResendTransport implements Transport<SentMessageInfo> {
-  public name = 'ResendMailTransport';
-  public version = VERSION;
-
-  private _client: Resend;
-  private _options: ResendTransportOptions;
-
-  public static makeTransport(options: Partial<ResendTransportOptions>) {
-    return new ResendTransport(options);
-  }
-
-  constructor(options: Partial<ResendTransportOptions>) {
-    const { apiKey = '' } = options;
-
-    this._options = {
-      apiKey,
-    };
-
-    this._client = new Resend(apiKey);
-  }
-
-  public send(mail: MailMessage, callback: (_err: Error | null, _info: SentMessageInfo) => void) {
-    if (!mail.data.to || !mail.data.from) {
-      return callback(new Error('Missing required fields "to" or "from"'), null);
-    }
-
-    this._client
-      .sendEmail({
-        subject: mail.data.subject ?? '',
-        from: this.toResendFromAddress(mail.data.from),
-        to: this.toResendAddresses(mail.data.to),
-        cc: this.toResendAddresses(mail.data.cc),
-        bcc: this.toResendAddresses(mail.data.bcc),
-        html: mail.data.html?.toString() || '',
-        text: mail.data.text?.toString() || '',
-        attachments: this.toResendAttachments(mail.data.attachments),
-      })
-      .then((response) => {
-        if (isResendResponseError(response)) {
-          throw new Error(`[${response.statusCode}]: ${response.name} ${response.message}`);
-        }
-
-        callback(null, response);
-      })
-      .catch((error) => {
-        callback(error, null);
-      });
-  }
-
-  private toResendAddresses(addresses: Mail.Options['to']) {
-    if (!addresses) {
-      return [];
-    }
-
-    if (typeof addresses === 'string') {
-      return [addresses];
-    }
-
-    if (Array.isArray(addresses)) {
-      return addresses.map((address) => {
-        if (typeof address === 'string') {
-          return address;
-        }
-
-        return address.address;
-      });
-    }
-
-    return [addresses.address];
-  }
-
-  private toResendFromAddress(address: Mail.Options['from']) {
-    if (!address) {
-      return '';
-    }
-
-    if (typeof address === 'string') {
-      return address;
-    }
-
-    return `${address.name} <${address.address}>`;
-  }
-
-  private toResendAttachments(attachments: Mail.Options['attachments']) {
-    if (!attachments) {
-      return [];
-    }
-
-    return attachments.map((attachment) => {
-      if (!attachment.filename || !attachment.content) {
-        throw new Error('Attachment is missing filename or content');
-      }
-
-      if (typeof attachment.content === 'string') {
-        return {
-          filename: attachment.filename,
-          content: Buffer.from(attachment.content),
-        };
-      }
-
-      if (attachment.content instanceof Buffer) {
-        return {
-          filename: attachment.filename,
-          content: attachment.content,
-        };
-      }
-
-      throw new Error('Attachment content must be a string or a buffer');
-    });
-  }
-}

packages/email/tsconfig.json

@@ -1,10 +1,5 @@
 {
   "extends": "@documenso/tsconfig/react-library.json",
-  "compilerOptions": {
-    "types": [
-      "@documenso/tsconfig/process-env.d.ts",
-    ]
-  },
   "include": ["**/*.ts", "**/*.tsx", "**/*.d.ts", "**/*.json"],
   "exclude": ["dist", "build", "node_modules"]
 }

packages/lib/constants/feature-flags.ts

@@ -1,5 +1,3 @@
-import { APP_BASE_URL } from './app';
-
 /**
  * The flag name for global session recording feature flag.
  */
@@ -25,7 +23,7 @@ export const LOCAL_FEATURE_FLAGS: Record<string, boolean> = {
  */
 export function extractPostHogConfig(): { key: string; host: string } | null {
   const postHogKey = process.env.NEXT_PUBLIC_POSTHOG_KEY;
-  const postHogHost = `${APP_BASE_URL}/ingest`;
+  const postHogHost = process.env.NEXT_PUBLIC_POSTHOG_HOST;
 
   if (!postHogKey || !postHogHost) {
     return null;

packages/lib/next-auth/get-server-session.ts

@@ -15,7 +15,7 @@ export const getServerSession = async ({ req, res }: GetServerSessionOptions) =>
   const session = await getNextAuthServerSession(req, res, NEXT_AUTH_OPTIONS);
 
   if (!session || !session.user?.email) {
-    return { user: null, session: null };
+    return null;
   }
 
   const user = await prisma.user.findFirstOrThrow({
@@ -24,14 +24,14 @@ export const getServerSession = async ({ req, res }: GetServerSessionOptions) =>
     },
   });
 
-  return { user, session };
+  return user;
 };
 
 export const getServerComponentSession = async () => {
   const session = await getNextAuthServerSession(NEXT_AUTH_OPTIONS);
 
   if (!session || !session.user?.email) {
-    return { user: null, session: null };
+    return null;
   }
 
   const user = await prisma.user.findFirstOrThrow({
@@ -40,15 +40,15 @@ export const getServerComponentSession = async () => {
     },
   });
 
-  return { user, session };
+  return user;
 };
 
 export const getRequiredServerComponentSession = async () => {
-  const { user, session } = await getServerComponentSession();
+  const session = await getServerComponentSession();
 
-  if (!user || !session) {
+  if (!session) {
     throw new Error('No session found');
   }
 
-  return { user, session };
+  return session;
 };

packages/lib/server-only/document/get-stats.ts

@@ -40,7 +40,7 @@ export const getStats = async ({ user }: GetStatsInput) => {
       },
       where: {
         status: {
-          not: ExtendedDocumentStatus.DRAFT,
+          in: [ExtendedDocumentStatus.DRAFT, ExtendedDocumentStatus.PENDING],
         },
         Recipient: {
           some: {

packages/lib/server-only/document/viewed-document.ts

@@ -14,6 +14,7 @@ export const viewedDocument = async ({ token }: ViewedDocumentOptions) => {
   });
 
   if (!recipient) {
+    console.warn(`No recipient found for token ${token}`);
     return;
   }
 

packages/lib/server-only/recipient/set-recipients-for-document.ts

@@ -57,13 +57,12 @@ export const setRecipientsForDocument = async ({
 
       return {
         ...recipient,
-        _persisted: existing,
+        ...existing,
       };
     })
     .filter((recipient) => {
       return (
-        recipient._persisted?.sendStatus !== SendStatus.SENT &&
-        recipient._persisted?.signingStatus !== SigningStatus.SIGNED
+        recipient.sendStatus !== SendStatus.SENT && recipient.signingStatus !== SigningStatus.SIGNED
       );
     });
 
@@ -73,7 +72,7 @@ export const setRecipientsForDocument = async ({
     linkedRecipients.map((recipient) =>
       prisma.recipient.upsert({
         where: {
-          id: recipient._persisted?.id ?? -1,
+          id: recipient.id ?? -1,
           documentId,
         },
         update: {

packages/lib/universal/upload/server-actions.ts

@@ -17,7 +17,7 @@ import { alphaid } from '../id';
 export const getPresignPostUrl = async (fileName: string, contentType: string) => {
   const client = getS3Client();
 
-  const { user } = await getServerComponentSession();
+  const user = await getServerComponentSession();
 
   // Get the basename and extension for the file
   const { name, ext } = path.parse(fileName);

packages/prisma/package.json

@@ -11,8 +11,7 @@
     "prisma:generate": "prisma generate",
     "prisma:migrate-dev": "prisma migrate dev",
     "prisma:migrate-deploy": "prisma migrate deploy",
-    "prisma:seed": "prisma db seed",
-    "prisma:studio": "prisma studio"
+    "prisma:seed": "prisma db seed"
   },
   "prisma": {
     "seed": "ts-node --transpileOnly --skipProject ./seed-database.ts"

packages/prisma/seed-database.ts

@@ -73,11 +73,7 @@ const seedDatabase = async () => {
 
 seedDatabase()
   .then(() => {
-    console.log(`
-✅ Database seeded
-    
-Email: example@documenso.com
-Password: password`);
+    console.log('Database seeded');
     process.exit(0);
   })
   .catch((error) => {

packages/trpc/server/context.ts

@@ -3,7 +3,7 @@ import { CreateNextContextOptions } from '@trpc/server/adapters/next';
 import { getServerSession } from '@documenso/lib/next-auth/get-server-session';
 
 export const createTrpcContext = async ({ req, res }: CreateNextContextOptions) => {
-  const { session, user } = await getServerSession({ req, res });
+  const session = await getServerSession({ req, res });
 
   if (!session) {
     return {
@@ -12,16 +12,9 @@ export const createTrpcContext = async ({ req, res }: CreateNextContextOptions)
     };
   }
 
-  if (!user) {
-    return {
-      session: null,
-      user: null,
-    };
-  }
-
   return {
     session,
-    user,
+    user: session,
   };
 };
 

packages/tsconfig/process-env.d.ts

@@ -27,9 +27,7 @@ declare namespace NodeJS {
     NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS?: string;
     NEXT_PRIVATE_SIGNING_LOCAL_FILE_ENCODING?: string;
 
-    NEXT_PRIVATE_SMTP_TRANSPORT?: 'mailchannels' | 'resend' | 'smtp-auth' | 'smtp-api';
-
-    NEXT_PRIVATE_RESEND_API_KEY?: string;
+    NEXT_PRIVATE_SMTP_TRANSPORT?: 'mailchannels' | 'smtp-auth' | 'smtp-api';
 
     NEXT_PRIVATE_MAILCHANNELS_API_KEY?: string;
     NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN?: string;

packages/ui/primitives/dialog.tsx

@@ -11,19 +11,9 @@ const Dialog = DialogPrimitive.Root;
 
 const DialogTrigger = DialogPrimitive.Trigger;
 
-const DialogPortal = ({
-  className,
-  children,
-  position = 'start',
-  ...props
-}: DialogPrimitive.DialogPortalProps & { position?: 'start' | 'end' }) => (
+const DialogPortal = ({ className, children, ...props }: DialogPrimitive.DialogPortalProps) => (
   <DialogPrimitive.Portal className={cn(className)} {...props}>
-    <div
-      className={cn('fixed inset-0 z-50 flex justify-center sm:items-center', {
-        'items-start': position === 'start',
-        'items-end': position === 'end',
-      })}
-    >
+    <div className="fixed inset-0 z-50 flex items-start justify-center sm:items-center">
       {children}
     </div>
   </DialogPrimitive.Portal>
@@ -49,14 +39,14 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & { position?: 'start' | 'end' }
->(({ className, children, position = 'start', ...props }, ref) => (
-  <DialogPortal position={position}>
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <DialogPortal>
     <DialogOverlay />
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'bg-background animate-in data-[state=open]:fade-in-90 sm:zoom-in-90 data-[state=open]:slide-in-from-bottom-10 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
+        'bg-background animate-in data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
         className,
       )}
       {...props}

packages/ui/primitives/document-flow/add-fields.tsx

@@ -351,11 +351,7 @@ export const AddFieldsFormPartial = ({
               <PopoverContent className="p-0" align="start">
                 <Command>
                   <CommandInput />
-                  <CommandEmpty>
-                    <span className="text-muted-foreground inline-block px-4">
-                      No recipient matching this description was found.
-                    </span>
-                  </CommandEmpty>
+                  <CommandEmpty />
 
                   <CommandGroup>
                     {recipients.map((recipient, index) => (

packages/ui/primitives/document-flow/add-signers.tsx

@@ -126,12 +126,12 @@ export const AddSignersFormPartial = ({
           <AnimatePresence>
             {signers.map((signer, index) => (
               <motion.div
-                key={signer.id}
+                key={signer.formId}
                 data-native-id={signer.nativeId}
                 className="flex flex-wrap items-end gap-x-4"
               >
                 <div className="flex-1">
-                  <Label htmlFor={`signer-${signer.id}-email`}>
+                  <Label htmlFor={`signer-${signer.formId}-email`}>
                     Email
                     <span className="text-destructive ml-1 inline-block font-medium">*</span>
                   </Label>
@@ -141,7 +141,7 @@ export const AddSignersFormPartial = ({
                     name={`signers.${index}.email`}
                     render={({ field }) => (
                       <Input
-                        id={`signer-${signer.id}-email`}
+                        id={`signer-${signer.formId}-email`}
                         type="email"
                         className="bg-background mt-2"
                         disabled={isSubmitting || hasBeenSentToRecipientId(signer.nativeId)}
@@ -153,14 +153,14 @@ export const AddSignersFormPartial = ({
                 </div>
 
                 <div className="flex-1">
-                  <Label htmlFor={`signer-${signer.id}-name`}>Name</Label>
+                  <Label htmlFor={`signer-${signer.formId}-name`}>Name</Label>
 
                   <Controller
                     control={control}
                     name={`signers.${index}.name`}
                     render={({ field }) => (
                       <Input
-                        id={`signer-${signer.id}-name`}
+                        id={`signer-${signer.formId}-name`}
                         type="text"
                         className="bg-background mt-2"
                         disabled={isSubmitting || hasBeenSentToRecipientId(signer.nativeId)}
@@ -195,11 +195,7 @@ export const AddSignersFormPartial = ({
           </AnimatePresence>
         </div>
 
-        <FormErrorMessage
-          className="mt-2"
-          // Dirty hack to handle errors when .root is populated for an array type
-          error={'signers__root' in errors && errors['signers__root']}
-        />
+        <FormErrorMessage className="mt-2" error={errors.signers} />
 
         <div className="mt-4">
           <Button type="button" disabled={isSubmitting} onClick={() => onAddSigner()}>

packages/ui/primitives/document-flow/add-signers.types.ts

@@ -1,24 +1,19 @@
 import { z } from 'zod';
 
-export const ZAddSignersFormSchema = z
-  .object({
-    signers: z.array(
+export const ZAddSignersFormSchema = z.object({
+  signers: z
+    .array(
       z.object({
         formId: z.string().min(1),
         nativeId: z.number().optional(),
         email: z.string().min(1).email(),
         name: z.string(),
       }),
-    ),
-  })
-  .refine(
-    (schema) => {
-      const emails = schema.signers.map((signer) => signer.email.toLowerCase());
-
+    )
+    .refine((signers) => {
+      const emails = signers.map((signer) => signer.email);
       return new Set(emails).size === emails.length;
-    },
-    // Dirty hack to handle errors when .root is populated for an array type
-    { message: 'Signers must have unique emails', path: ['signers__root'] },
-  );
+    }, 'Signers must have unique emails'),
+});
 
 export type TAddSignersFormSchema = z.infer<typeof ZAddSignersFormSchema>;

packages/ui/primitives/form/form-error-message.tsx

@@ -4,17 +4,13 @@ import { cn } from '@documenso/ui/lib/utils';
 
 export type FormErrorMessageProps = {
   className?: string;
-  error: { message?: string } | undefined | unknown;
-};
-
-const isErrorWithMessage = (error: unknown): error is { message?: string } => {
-  return typeof error === 'object' && error !== null && 'message' in error;
+  error: { message?: string } | undefined;
 };
 
 export const FormErrorMessage = ({ error, className }: FormErrorMessageProps) => {
   return (
     <AnimatePresence>
-      {isErrorWithMessage(error) && (
+      {error && (
         <motion.p
           initial={{
             opacity: 0,

turbo.json

@@ -50,7 +50,6 @@
     "NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS",
     "NEXT_PRIVATE_SIGNING_LOCAL_FILE_ENCODING",
     "NEXT_PRIVATE_SMTP_TRANSPORT",
-    "NEXT_PRIVATE_RESEND_API_KEY",
     "NEXT_PRIVATE_MAILCHANNELS_API_KEY",
     "NEXT_PRIVATE_MAILCHANNELS_ENDPOINT",
     "NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN",