v1.9.0-rc.1

Refactor find endpoints to be consistent in terms of input and output.

.devcontainer/devcontainer.json

@@ -10,13 +10,7 @@
     "ghcr.io/devcontainers/features/node:1": {}
   },
   "onCreateCommand": "./.devcontainer/on-create.sh",
-  "forwardPorts": [
-    3000,
-    54320,
-    9000,
-    2500,
-    1100
-  ],
+  "forwardPorts": [3000, 54320, 9000, 2500, 1100],
   "customizations": {
     "vscode": {
       "extensions": [
@@ -35,4 +29,4 @@
       ]
     }
   }
-}
+}

README.md

@@ -1,3 +1,7 @@
+> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="documen.so/sign-everywhere">The Platform Plan</a>!
+
+<a href="https://www.producthunt.com/posts/documenso-platform-plan?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso&#0045;platform&#0045;plan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=670576&theme=light" alt="Documenso&#0032;Platform&#0032;Plan - Whitelabeled&#0032;signing&#0032;flows&#0032;in&#0032;your&#0032;product | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
 <img src="https://github.com/documenso/documenso/assets/13398220/a643571f-0239-46a6-a73e-6bef38d1228b" alt="Documenso Logo">
 
 <p align="center" style="margin-top: 20px">

apps/documentation/README.md

@@ -1,36 +1 @@
-This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
-
-## Getting Started
-
-First, run the development server:
-
-```bash
-npm run dev
-# or
-yarn dev
-# or
-pnpm dev
-# or
-bun dev
-```
-
-Open [http://localhost:3002](http://localhost:3002) with your browser to see the result.
-
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
-
-This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
-
-## Deploy on Vercel
-
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
-
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
+# @documenso/documentation

apps/marketing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/marketing",
-  "version": "1.8.1-rc.7",
+  "version": "1.9.0-rc.1",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
@@ -47,7 +47,7 @@
     "recharts": "^2.7.2",
     "sharp": "0.32.6",
     "typescript": "5.2.2",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@lingui/loader": "^4.11.3",

apps/openpage-api/.gitignore

@@ -0,0 +1,40 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# env files (can opt-in for commiting if needed)
+.env*
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts

apps/openpage-api/README.md

@@ -0,0 +1 @@
+# @documenso/openpage-api

apps/openpage-api/app/community/route.ts

@@ -0,0 +1,36 @@
+import type { NextRequest } from 'next/server';
+
+import cors from '@/lib/cors';
+
+const paths = [
+  { path: '/total-prs', description: 'Total GitHub Merged PRs' },
+  { path: '/total-stars', description: 'Total GitHub Stars' },
+  { path: '/total-forks', description: 'Total GitHub Forks' },
+  { path: '/total-issues', description: 'Total GitHub Issues' },
+];
+
+export function GET(request: NextRequest) {
+  const url = request.nextUrl.toString();
+  const apis = paths.map(({ path, description }) => {
+    return { path: url + path, description };
+  });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(apis), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/community/total-forks/route.ts

@@ -0,0 +1,27 @@
+import cors from '@/lib/cors';
+import { transformData } from '@/lib/transform-data';
+
+export async function GET(request: Request) {
+  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
+  const data = await res.json();
+  const transformedData = transformData({ data, metric: 'forks' });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(transformedData), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/community/total-issues/route.ts

@@ -0,0 +1,27 @@
+import cors from '@/lib/cors';
+import { transformData } from '@/lib/transform-data';
+
+export async function GET(request: Request) {
+  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
+  const data = await res.json();
+  const transformedData = transformData({ data, metric: 'openIssues' });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(transformedData), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/community/total-prs/route.ts

@@ -0,0 +1,27 @@
+import cors from '@/lib/cors';
+import { transformData } from '@/lib/transform-data';
+
+export async function GET(request: Request) {
+  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
+  const data = await res.json();
+  const transformedData = transformData({ data, metric: 'mergedPRs' });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(transformedData), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/community/total-stars/route.ts

@@ -0,0 +1,27 @@
+import cors from '@/lib/cors';
+import { transformData } from '@/lib/transform-data';
+
+export async function GET(request: Request) {
+  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
+  const data = await res.json();
+  const transformedData = transformData({ data, metric: 'stars' });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(transformedData), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/github/forks/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+
+export async function GET(request: Request) {
+  const res = await fetch('https://api.github.com/repos/documenso/documenso');
+  const { forks_count } = await res.json();
+
+  return cors(
+    request,
+    new Response(JSON.stringify({ data: forks_count }), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/github/issues/route.ts

@@ -0,0 +1,27 @@
+import cors from '@/lib/cors';
+
+export async function GET(request: Request) {
+  const res = await fetch(
+    'https://api.github.com/search/issues?q=repo:documenso/documenso+type:issue+state:open&page=0&per_page=1',
+  );
+  const { total_count } = await res.json();
+
+  return cors(
+    request,
+    new Response(JSON.stringify({ data: total_count }), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/github/prs/route.ts

@@ -0,0 +1,27 @@
+import cors from '@/lib/cors';
+
+export async function GET(request: Request) {
+  const res = await fetch(
+    'https://api.github.com/search/issues?q=repo:documenso/documenso/+is:pr+merged:>=2010-01-01&page=0&per_page=1',
+  );
+  const { total_count } = await res.json();
+
+  return cors(
+    request,
+    new Response(JSON.stringify({ data: total_count }), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/github/route.ts

@@ -0,0 +1,36 @@
+import type { NextRequest } from 'next/server';
+
+import cors from '@/lib/cors';
+
+const paths = [
+  { path: '/forks', description: 'GitHub Forks' },
+  { path: '/stars', description: 'GitHub Stars' },
+  { path: '/issues', description: 'GitHub Merged Issues' },
+  { path: '/prs', description: 'GitHub Pull Requests' },
+];
+
+export function GET(request: NextRequest) {
+  const url = request.nextUrl.toString();
+  const apis = paths.map(({ path, description }) => {
+    return { path: url + path, description };
+  });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(apis), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/github/stars/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+
+export async function GET(request: Request) {
+  const res = await fetch('https://api.github.com/repos/documenso/documenso');
+  const { stargazers_count } = await res.json();
+
+  return cors(
+    request,
+    new Response(JSON.stringify({ data: stargazers_count }), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/completed-documents/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+import { getCompletedDocumentsMonthly } from '@/lib/growth/get-monthly-completed-document';
+
+export async function GET(request: Request) {
+  const completedDocuments = await getCompletedDocumentsMonthly();
+
+  return cors(
+    request,
+    new Response(JSON.stringify(completedDocuments), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/new-users/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+import { getUserMonthlyGrowth } from '@/lib/growth/get-user-monthly-growth';
+
+export async function GET(request: Request) {
+  const monthlyUsers = await getUserMonthlyGrowth();
+
+  return cors(
+    request,
+    new Response(JSON.stringify(monthlyUsers), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/route.ts

@@ -0,0 +1,39 @@
+import type { NextRequest } from 'next/server';
+
+import cors from '@/lib/cors';
+
+const paths = [
+  { path: '/total-customers', description: 'Total Customers' },
+  { path: '/total-users', description: 'Total Users' },
+  { path: '/new-users', description: 'New Users' },
+  { path: '/completed-documents', description: 'Completed Documents per Month' },
+  { path: '/total-completed-documents', description: 'Total Completed Documents' },
+  { path: '/signer-conversion', description: 'Signers That Signed Up' },
+  { path: '/total-signer-conversion', description: 'Total Signers That Signed Up' },
+];
+
+export function GET(request: NextRequest) {
+  const url = request.nextUrl.toString();
+  const apis = paths.map(({ path, description }) => {
+    return { path: url + path, description };
+  });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(apis), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/signer-conversion/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+import { getSignerConversionMonthly } from '@/lib/growth/get-signer-conversion';
+
+export async function GET(request: Request) {
+  const signers = await getSignerConversionMonthly();
+
+  return cors(
+    request,
+    new Response(JSON.stringify(signers), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/total-completed-documents/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+import { getCompletedDocumentsMonthly } from '@/lib/growth/get-monthly-completed-document';
+
+export async function GET(request: Request) {
+  const totalCompletedDocuments = await getCompletedDocumentsMonthly('cumulative');
+
+  return cors(
+    request,
+    new Response(JSON.stringify(totalCompletedDocuments), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/total-customers/route.ts

@@ -0,0 +1,31 @@
+import cors from '@/lib/cors';
+import { transformData } from '@/lib/transform-data';
+
+export async function GET(request: Request) {
+  const res = await fetch('https://stargrazer-live.onrender.com/api/stats/stripe');
+  const EARLY_ADOPTERS_DATA = await res.json();
+
+  const transformedData = transformData({
+    data: EARLY_ADOPTERS_DATA,
+    metric: 'earlyAdopters',
+  });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(transformedData), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/total-signer-conversion/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+import { getSignerConversionMonthly } from '@/lib/growth/get-signer-conversion';
+
+export async function GET(request: Request) {
+  const totalSigners = await getSignerConversionMonthly('cumulative');
+
+  return cors(
+    request,
+    new Response(JSON.stringify(totalSigners), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/growth/total-users/route.ts

@@ -0,0 +1,25 @@
+import cors from '@/lib/cors';
+import { getUserMonthlyGrowth } from '@/lib/growth/get-user-monthly-growth';
+
+export async function GET(request: Request) {
+  const totalUsers = await getUserMonthlyGrowth("cumulative");
+
+  return cors(
+    request,
+    new Response(JSON.stringify(totalUsers), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/app/route.ts

@@ -0,0 +1,35 @@
+import type { NextRequest } from 'next/server';
+
+import cors from '@/lib/cors';
+
+const paths = [
+  { path: 'github', description: 'GitHub Data' },
+  { path: 'community', description: 'Community Data' },
+  { path: 'growth', description: 'Growth Data' },
+];
+
+export function GET(request: NextRequest) {
+  const url = request.nextUrl.toString();
+  const apis = paths.map(({ path, description }) => {
+    return { path: url + path, description };
+  });
+
+  return cors(
+    request,
+    new Response(JSON.stringify(apis), {
+      status: 200,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }),
+  );
+}
+
+export function OPTIONS(request: Request) {
+  return cors(
+    request,
+    new Response(null, {
+      status: 204,
+    }),
+  );
+}

apps/openpage-api/lib/cors.ts

@@ -0,0 +1,135 @@
+/**
+ * Multi purpose CORS lib.
+ * Note: Based on the `cors` package in npm but using only web APIs.
+ * Taken from: https://github.com/vercel/examples/blob/main/edge-functions/cors/lib/cors.ts
+ */
+
+type StaticOrigin = boolean | string | RegExp | (boolean | string | RegExp)[];
+
+type OriginFn = (origin: string | undefined, req: Request) => StaticOrigin | Promise<StaticOrigin>;
+
+interface CorsOptions {
+  origin?: StaticOrigin | OriginFn;
+  methods?: string | string[];
+  allowedHeaders?: string | string[];
+  exposedHeaders?: string | string[];
+  credentials?: boolean;
+  maxAge?: number;
+  preflightContinue?: boolean;
+  optionsSuccessStatus?: number;
+}
+
+const defaultOptions: CorsOptions = {
+  origin: '*',
+  methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
+  preflightContinue: false,
+  optionsSuccessStatus: 204,
+};
+
+function isOriginAllowed(origin: string, allowed: StaticOrigin): boolean {
+  return Array.isArray(allowed)
+    ? allowed.some((o) => isOriginAllowed(origin, o))
+    : typeof allowed === 'string'
+    ? origin === allowed
+    : allowed instanceof RegExp
+    ? allowed.test(origin)
+    : !!allowed;
+}
+
+function getOriginHeaders(reqOrigin: string | undefined, origin: StaticOrigin) {
+  const headers = new Headers();
+
+  if (origin === '*') {
+    headers.set('Access-Control-Allow-Origin', '*');
+  } else if (typeof origin === 'string') {
+    headers.set('Access-Control-Allow-Origin', origin);
+    headers.append('Vary', 'Origin');
+  } else {
+    const allowed = isOriginAllowed(reqOrigin ?? '', origin);
+
+    if (allowed && reqOrigin) {
+      headers.set('Access-Control-Allow-Origin', reqOrigin);
+    }
+    headers.append('Vary', 'Origin');
+  }
+
+  return headers;
+}
+
+async function originHeadersFromReq(req: Request, origin: StaticOrigin | OriginFn) {
+  const reqOrigin = req.headers.get('Origin') || undefined;
+  const value = typeof origin === 'function' ? await origin(reqOrigin, req) : origin;
+
+  if (!value) return;
+  return getOriginHeaders(reqOrigin, value);
+}
+
+function getAllowedHeaders(req: Request, allowed?: string | string[]) {
+  const headers = new Headers();
+
+  if (!allowed) {
+    allowed = req.headers.get('Access-Control-Request-Headers')!;
+    headers.append('Vary', 'Access-Control-Request-Headers');
+  } else if (Array.isArray(allowed)) {
+    allowed = allowed.join(',');
+  }
+  if (allowed) {
+    headers.set('Access-Control-Allow-Headers', allowed);
+  }
+
+  return headers;
+}
+
+export default async function cors(req: Request, res: Response, options?: CorsOptions) {
+  const opts = { ...defaultOptions, ...options };
+  const { headers } = res;
+  const originHeaders = await originHeadersFromReq(req, opts.origin ?? false);
+  const mergeHeaders = (v: string, k: string) => {
+    if (k === 'Vary') headers.append(k, v);
+    else headers.set(k, v);
+  };
+
+  // If there's no origin we won't touch the response
+  if (!originHeaders) return res;
+
+  originHeaders.forEach(mergeHeaders);
+
+  if (opts.credentials) {
+    headers.set('Access-Control-Allow-Credentials', 'true');
+  }
+
+  const exposed = Array.isArray(opts.exposedHeaders)
+    ? opts.exposedHeaders.join(',')
+    : opts.exposedHeaders;
+
+  if (exposed) {
+    headers.set('Access-Control-Expose-Headers', exposed);
+  }
+
+  // Handle the preflight request
+  if (req.method === 'OPTIONS') {
+    if (opts.methods) {
+      const methods = Array.isArray(opts.methods) ? opts.methods.join(',') : opts.methods;
+
+      headers.set('Access-Control-Allow-Methods', methods);
+    }
+
+    getAllowedHeaders(req, opts.allowedHeaders).forEach(mergeHeaders);
+
+    if (typeof opts.maxAge === 'number') {
+      headers.set('Access-Control-Max-Age', String(opts.maxAge));
+    }
+
+    if (opts.preflightContinue) return res;
+
+    headers.set('Content-Length', '0');
+    return new Response(null, { status: opts.optionsSuccessStatus, headers });
+  }
+
+  // If we got here, it's a normal request
+  return res;
+}
+
+export function initCors(options?: CorsOptions) {
+  return async (req: Request, res: Response) => cors(req, res, options);
+}

apps/openpage-api/lib/growth/get-monthly-completed-document.ts

@@ -0,0 +1,43 @@
+import { DateTime } from 'luxon';
+
+import { kyselyPrisma, sql } from '@documenso/prisma';
+import { DocumentStatus } from '@documenso/prisma/client';
+
+export const getCompletedDocumentsMonthly = async (type: 'count' | 'cumulative' = 'count') => {
+  const qb = kyselyPrisma.$kysely
+    .selectFrom('Document')
+    .select(({ fn }) => [
+      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']).as('month'),
+      fn.count('id').as('count'),
+      fn
+        .sum(fn.count('id'))
+        // Feels like a bug in the Kysely extension but I just can not do this orderBy in a type-safe manner
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
+        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']) as any))
+        .as('cume_count'),
+    ])
+    .where(() => sql`"Document"."status" = ${DocumentStatus.COMPLETED}::"DocumentStatus"`)
+    .groupBy('month')
+    .orderBy('month', 'desc')
+    .limit(12);
+
+  const result = await qb.execute();
+
+  const transformedData = {
+    labels: result.map((row) => DateTime.fromJSDate(row.month).toFormat('MMM yyyy')).reverse(),
+    datasets: [
+      {
+        label: type === 'count' ? 'Completed Documents per Month' : 'Total Completed Documents',
+        data: result
+          .map((row) => (type === 'count' ? Number(row.count) : Number(row.cume_count)))
+          .reverse(),
+      },
+    ],
+  };
+
+  return transformedData;
+};
+
+export type GetCompletedDocumentsMonthlyResult = Awaited<
+  ReturnType<typeof getCompletedDocumentsMonthly>
+>;

apps/openpage-api/lib/growth/get-signer-conversion.ts

@@ -0,0 +1,42 @@
+import { DateTime } from 'luxon';
+
+import { kyselyPrisma, sql } from '@documenso/prisma';
+
+export const getSignerConversionMonthly = async (type: 'count' | 'cumulative' = 'count') => {
+  const qb = kyselyPrisma.$kysely
+    .selectFrom('Recipient')
+    .innerJoin('User', 'Recipient.email', 'User.email')
+    .select(({ fn }) => [
+      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']).as('month'),
+      fn.count('Recipient.email').distinct().as('count'),
+      fn
+        .sum(fn.count('Recipient.email').distinct())
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
+        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']) as any))
+        .as('cume_count'),
+    ])
+    .where('Recipient.signedAt', 'is not', null)
+    .where('Recipient.signedAt', '<', (eb) => eb.ref('User.createdAt'))
+    .groupBy(({ fn }) => fn('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']))
+    .orderBy('month', 'desc');
+
+  const result = await qb.execute();
+
+  const transformedData = {
+    labels: result.map((row) => DateTime.fromJSDate(row.month).toFormat('MMM yyyy')).reverse(),
+    datasets: [
+      {
+        label: type === 'count' ? 'Signers That Signed Up' : 'Total Signers That Signed Up',
+        data: result
+          .map((row) => (type === 'count' ? Number(row.count) : Number(row.cume_count)))
+          .reverse(),
+      },
+    ],
+  };
+
+  return transformedData;
+};
+
+export type GetSignerConversionMonthlyResult = Awaited<
+  ReturnType<typeof getSignerConversionMonthly>
+>;

apps/openpage-api/lib/growth/get-user-monthly-growth.ts

@@ -0,0 +1,38 @@
+import { DateTime } from 'luxon';
+
+import { kyselyPrisma, sql } from '@documenso/prisma';
+
+export const getUserMonthlyGrowth = async (type: 'count' | 'cumulative' = 'count') => {
+  const qb = kyselyPrisma.$kysely
+    .selectFrom('User')
+    .select(({ fn }) => [
+      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']).as('month'),
+      fn.count('id').as('count'),
+      fn
+        .sum(fn.count('id'))
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
+        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']) as any))
+        .as('cume_count'),
+    ])
+    .groupBy('month')
+    .orderBy('month', 'desc')
+    .limit(12);
+
+  const result = await qb.execute();
+
+  const transformedData = {
+    labels: result.map((row) => DateTime.fromJSDate(row.month).toFormat('MMM yyyy')).reverse(),
+    datasets: [
+      {
+        label: type === 'count' ? 'New Users' : 'Total Users',
+        data: result
+          .map((row) => (type === 'count' ? Number(row.count) : Number(row.cume_count)))
+          .reverse(),
+      },
+    ],
+  };
+
+  return transformedData;
+};
+
+export type GetUserMonthlyGrowthResult = Awaited<ReturnType<typeof getUserMonthlyGrowth>>;

apps/openpage-api/lib/transform-data.ts

@@ -0,0 +1,68 @@
+import { DateTime } from 'luxon';
+
+type MetricKeys = {
+  stars: number;
+  forks: number;
+  mergedPRs: number;
+  openIssues: number;
+  earlyAdopters: number;
+};
+
+type DataEntry = {
+  [key: string]: MetricKeys;
+};
+
+type TransformData = {
+  labels: string[];
+  datasets: {
+    label: string;
+    data: number[];
+  }[];
+};
+
+type MetricKey = keyof MetricKeys;
+
+const FRIENDLY_METRIC_NAMES: { [key in MetricKey]: string } = {
+  stars: 'Stars',
+  forks: 'Forks',
+  mergedPRs: 'Merged PRs',
+  openIssues: 'Open Issues',
+  earlyAdopters: 'Customers',
+};
+
+export function transformData({
+  data,
+  metric,
+}: {
+  data: DataEntry;
+  metric: MetricKey;
+}): TransformData {
+  const sortedEntries = Object.entries(data).sort(([dateA], [dateB]) => {
+    const [yearA, monthA] = dateA.split('-').map(Number);
+    const [yearB, monthB] = dateB.split('-').map(Number);
+
+    return DateTime.local(yearA, monthA).toMillis() - DateTime.local(yearB, monthB).toMillis();
+  });
+
+  const labels = sortedEntries.map(([date]) => {
+    const [year, month] = date.split('-');
+    const dateTime = DateTime.fromObject({
+      year: Number(year),
+      month: Number(month),
+    });
+    return dateTime.toFormat('MMM yyyy');
+  });
+
+  return {
+    labels,
+    datasets: [
+      {
+        label: `Total ${FRIENDLY_METRIC_NAMES[metric]}`,
+        data: sortedEntries.map(([_, stats]) => stats[metric]),
+      },
+    ],
+  };
+}
+
+// To be on the safer side
+export const transformRepoStats = transformData;

apps/openpage-api/next.config.js

@@ -0,0 +1,4 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {};
+
+module.exports = nextConfig;

apps/openpage-api/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "@documenso/openpage-api",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev -p 3003",
+    "build": "next build",
+    "start": "next start",
+    "lint:fix": "next lint --fix",
+    "clean": "rimraf .next && rimraf node_modules",
+    "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
+  },
+  "dependencies": {
+    "@documenso/prisma": "*",
+    "luxon": "^3.5.0",
+    "next": "14.2.6"
+  },
+  "devDependencies": {
+    "@types/node": "20.16.5",
+    "@types/react": "18.3.5",
+    "typescript": "5.5.4"
+  }
+}

apps/openpage-api/tsconfig.json

@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./*"]
+    }
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules"]
+}

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.8.1-rc.7",
+  "version": "1.9.0-rc.1",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
@@ -59,7 +59,7 @@
     "ts-pattern": "^5.0.5",
     "ua-parser-js": "^1.0.37",
     "uqr": "^0.1.2",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@documenso/tailwind-config": "*",

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

@@ -40,7 +40,7 @@ export const AdminDocumentResults = () => {
   const { data: findDocumentsData, isLoading: isFindDocumentsLoading } =
     trpc.admin.findDocuments.useQuery(
       {
-        term: debouncedTerm,
+        query: debouncedTerm,
         page: page || 1,
         perPage: perPage || 20,
       },

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

@@ -47,7 +47,7 @@ export const DocumentPageViewButton = ({ document, team }: DocumentPageViewButto
   const onDownloadClick = async () => {
     try {
       const documentWithData = await trpcClient.document.getDocumentById.query({
-        id: document.id,
+        documentId: document.id,
         teamId: team?.id,
       });
 

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

@@ -75,7 +75,7 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
   const onDownloadClick = async () => {
     try {
       const documentWithData = await trpcClient.document.getDocumentById.query({
-        id: document.id,
+        documentId: document.id,
         teamId: team?.id,
       });
 

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

@@ -60,7 +60,7 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
   const { user } = await getRequiredServerComponentSession();
 
   const document = await getDocumentById({
-    id: documentId,
+    documentId,
     userId: user.id,
     teamId: team?.id,
   }).catch(() => null);
@@ -221,7 +221,7 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
                 <DocumentPageViewDropdown document={documentWithRecipients} team={team} />
               </div>
 
-              <p className="text-muted-foreground mt-2 px-4 text-sm ">
+              <p className="text-muted-foreground mt-2 px-4 text-sm">
                 {match(document.status)
                   .with(DocumentStatus.COMPLETED, () => (
                     <Trans>This document has been signed by all recipients</Trans>

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

@@ -63,7 +63,7 @@ export const EditDocumentForm = ({
   const { data: document, refetch: refetchDocument } =
     trpc.document.getDocumentWithDetailsById.useQuery(
       {
-        id: initialDocument.id,
+        documentId: initialDocument.id,
         teamId: team?.id,
       },
       {
@@ -79,7 +79,7 @@ export const EditDocumentForm = ({
     onSuccess: (newData) => {
       utils.document.getDocumentWithDetailsById.setData(
         {
-          id: initialDocument.id,
+          documentId: initialDocument.id,
           teamId: team?.id,
         },
         (oldData) => ({ ...(oldData || initialDocument), ...newData }),
@@ -93,7 +93,7 @@ export const EditDocumentForm = ({
       onSuccess: (newData) => {
         utils.document.getDocumentWithDetailsById.setData(
           {
-            id: initialDocument.id,
+            documentId: initialDocument.id,
             teamId: team?.id,
           },
           (oldData) => ({ ...(oldData || initialDocument), ...newData, id: Number(newData.id) }),
@@ -106,7 +106,7 @@ export const EditDocumentForm = ({
     onSuccess: (newFields) => {
       utils.document.getDocumentWithDetailsById.setData(
         {
-          id: initialDocument.id,
+          documentId: initialDocument.id,
           teamId: team?.id,
         },
         (oldData) => ({ ...(oldData || initialDocument), Field: newFields }),
@@ -120,7 +120,7 @@ export const EditDocumentForm = ({
       onSuccess: (newData) => {
         utils.document.getDocumentWithDetailsById.setData(
           {
-            id: initialDocument.id,
+            documentId: initialDocument.id,
             teamId: team?.id,
           },
           (oldData) => ({
@@ -137,7 +137,7 @@ export const EditDocumentForm = ({
     onSuccess: (newRecipients) => {
       utils.document.getDocumentWithDetailsById.setData(
         {
-          id: initialDocument.id,
+          documentId: initialDocument.id,
           teamId: team?.id,
         },
         (oldData) => ({ ...(oldData || initialDocument), Recipient: newRecipients }),
@@ -150,7 +150,7 @@ export const EditDocumentForm = ({
     onSuccess: (newData) => {
       utils.document.getDocumentWithDetailsById.setData(
         {
-          id: initialDocument.id,
+          documentId: initialDocument.id,
           teamId: team?.id,
         },
         (oldData) => ({ ...(oldData || initialDocument), ...newData }),

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

@@ -41,7 +41,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
   const { user } = await getRequiredServerComponentSession();
 
   const document = await getDocumentWithDetailsById({
-    id: documentId,
+    documentId,
     userId: user.id,
     teamId: team?.id,
   }).catch(() => null);

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

@@ -11,7 +11,7 @@ import type { DateTimeFormatOptions } from 'luxon';
 import { UAParser } from 'ua-parser-js';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { formatDocumentAuditLogAction } from '@documenso/lib/utils/document-audit-logs';
 import { trpc } from '@documenso/trpc/react';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
@@ -35,9 +35,7 @@ export const DocumentLogsDataTable = ({ documentId }: DocumentLogsDataTableProps
   const searchParams = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
   const { data, isLoading, isInitialLoading, isLoadingError } =
     trpc.document.findDocumentAuditLogs.useQuery(

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

@@ -47,7 +47,7 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
 
   const [document, recipients] = await Promise.all([
     getDocumentById({
-      id: documentId,
+      documentId,
       userId: user.id,
       teamId: team?.id,
     }).catch(() => null),

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

@@ -54,7 +54,7 @@ export const DataTableActionButton = ({ row, team }: DataTableActionButtonProps)
 
       if (!recipient) {
         document = await trpcClient.document.getDocumentById.query({
-          id: row.id,
+          documentId: row.id,
           teamId: team?.id,
         });
       } else {

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

@@ -85,7 +85,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
 
       if (!recipient) {
         document = await trpcClient.document.getDocumentById.query({
-          id: row.id,
+          documentId: row.id,
           teamId: team?.id,
         });
       } else {

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

@@ -9,7 +9,7 @@ import { DateTime } from 'luxon';
 import { useSession } from 'next-auth/react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import type { FindResultSet } from '@documenso/lib/types/find-result-set';
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
 import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
@@ -24,7 +24,7 @@ import { DataTableActionDropdown } from './data-table-action-dropdown';
 import { DataTableTitle } from './data-table-title';
 
 export type DocumentsDataTableProps = {
-  results: FindResultSet<
+  results: FindResultResponse<
     Document & {
       Recipient: Recipient[];
       User: Pick<User, 'id' | 'name' | 'email'>;

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

@@ -76,7 +76,7 @@ export const DeleteDocumentDialog = ({
 
   const onDelete = async () => {
     try {
-      await deleteDocument({ id, teamId });
+      await deleteDocument({ documentId: id, teamId });
     } catch {
       toast({
         title: _(msg`Something went wrong`),

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

@@ -83,7 +83,7 @@ export const DocumentsPageView = async ({ searchParams = {}, team }: DocumentsPa
     perPage,
     period,
     senderIds,
-    search,
+    query: search,
   });
 
   const getTabHref = (value: typeof status) => {

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

@@ -36,7 +36,7 @@ export const DuplicateDocumentDialog = ({
   const { _ } = useLingui();
 
   const { data: document, isLoading } = trpcReact.document.getDocumentById.useQuery({
-    id,
+    documentId: id,
     teamId: team?.id,
   });
 
@@ -66,7 +66,7 @@ export const DuplicateDocumentDialog = ({
 
   const onDuplicate = async () => {
     try {
-      await duplicateDocument({ id, teamId: team?.id });
+      await duplicateDocument({ documentId: id, teamId: team?.id });
     } catch {
       toast({
         title: _(msg`Something went wrong`),
@@ -92,7 +92,7 @@ export const DuplicateDocumentDialog = ({
             </h1>
           </div>
         ) : (
-          <div className="p-2 [&>div]:h-[50vh] [&>div]:overflow-y-scroll  ">
+          <div className="p-2 [&>div]:h-[50vh] [&>div]:overflow-y-scroll">
             <LazyPDFViewer key={document?.id} documentData={documentData} />
           </div>
         )}

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

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

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

@@ -75,7 +75,7 @@ export const PublicProfilePageView = ({ user, team, profile }: PublicProfilePage
 
   const enabledPrivateDirectTemplates = useMemo(
     () =>
-      (data?.templates ?? []).filter(
+      (data?.data ?? []).filter(
         (template): template is DirectTemplate =>
           template.directLink?.enabled === true && template.type !== TemplateType.PUBLIC,
       ),

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

@@ -52,7 +52,7 @@ export const PublicTemplatesDataTable = () => {
   );
 
   const { directTemplates, publicDirectTemplates, privateDirectTemplates } = useMemo(() => {
-    const directTemplates = (data?.templates ?? []).filter(
+    const directTemplates = (data?.data ?? []).filter(
       (template): template is DirectTemplate => template.directLink?.enabled === true,
     );
 

apps/web/src/app/(dashboard)/settings/security/activity/user-security-activity-data-table.tsx

@@ -12,7 +12,7 @@ import { UAParser } from 'ua-parser-js';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
 import { USER_SECURITY_AUDIT_LOG_MAP } from '@documenso/lib/constants/auth';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { trpc } from '@documenso/trpc/react';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
@@ -33,9 +33,7 @@ export const UserSecurityActivityDataTable = () => {
   const searchParams = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
   const { data, isLoading, isInitialLoading, isLoadingError } =
     trpc.profile.findUserSecurityAuditLogs.useQuery(

apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table.tsx

@@ -9,7 +9,7 @@ import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { trpc } from '@documenso/trpc/react';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
@@ -27,9 +27,7 @@ export const UserPasskeysDataTable = () => {
   const searchParams = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
   const { data, isLoading, isInitialLoading, isLoadingError } = trpc.auth.findPasskeys.useQuery(
     {

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

@@ -59,16 +59,16 @@ export const EditTemplateForm = ({
 
   const utils = trpc.useUtils();
 
-  const { data: template, refetch: refetchTemplate } =
-    trpc.template.getTemplateWithDetailsById.useQuery(
-      {
-        id: initialTemplate.id,
-      },
-      {
-        initialData: initialTemplate,
-        ...SKIP_QUERY_BATCH_META,
-      },
-    );
+  const { data: template, refetch: refetchTemplate } = trpc.template.getTemplateById.useQuery(
+    {
+      templateId: initialTemplate.id,
+      teamId: initialTemplate.teamId || undefined,
+    },
+    {
+      initialData: initialTemplate,
+      ...SKIP_QUERY_BATCH_META,
+    },
+  );
 
   const { Recipient: recipients, Field: fields, templateDocumentData } = template;
 
@@ -92,12 +92,12 @@ export const EditTemplateForm = ({
 
   const currentDocumentFlow = documentFlow[step];
 
-  const { mutateAsync: updateTemplateSettings } = trpc.template.updateTemplateSettings.useMutation({
+  const { mutateAsync: updateTemplateSettings } = trpc.template.updateTemplate.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
+      utils.template.getTemplateById.setData(
         {
-          id: initialTemplate.id,
+          templateId: initialTemplate.id,
         },
         (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
       );
@@ -108,9 +108,9 @@ export const EditTemplateForm = ({
     trpc.template.setSigningOrderForTemplate.useMutation({
       ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
       onSuccess: (newData) => {
-        utils.template.getTemplateWithDetailsById.setData(
+        utils.template.getTemplateById.setData(
           {
-            id: initialTemplate.id,
+            templateId: initialTemplate.id,
           },
           (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
         );
@@ -120,9 +120,9 @@ export const EditTemplateForm = ({
   const { mutateAsync: addTemplateFields } = trpc.field.addTemplateFields.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
+      utils.template.getTemplateById.setData(
         {
-          id: initialTemplate.id,
+          templateId: initialTemplate.id,
         },
         (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
       );
@@ -132,9 +132,9 @@ export const EditTemplateForm = ({
   const { mutateAsync: addTemplateSigners } = trpc.recipient.addTemplateSigners.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
+      utils.template.getTemplateById.setData(
         {
-          id: initialTemplate.id,
+          templateId: initialTemplate.id,
         },
         (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
       );
@@ -145,9 +145,9 @@ export const EditTemplateForm = ({
     trpc.template.updateTemplateTypedSignatureSettings.useMutation({
       ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
       onSuccess: (newData) => {
-        utils.template.getTemplateWithDetailsById.setData(
+        utils.template.getTemplateById.setData(
           {
-            id: initialTemplate.id,
+            templateId: initialTemplate.id,
           },
           (oldData) => ({
             ...(oldData || initialTemplate),

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

@@ -8,7 +8,7 @@ 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 { 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';
 
@@ -37,9 +37,10 @@ export const TemplateEditPageView = async ({ params, team }: TemplateEditPageVie
 
   const { user } = await getRequiredServerComponentSession();
 
-  const template = await getTemplateWithDetailsById({
+  const template = await getTemplateById({
     id: templateId,
     userId: user.id,
+    teamId: team?.id,
   }).catch(() => null);
 
   if (!template || !template.templateDocumentData) {

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

@@ -12,7 +12,7 @@ import { DateTime } from 'luxon';
 import { z } from 'zod';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import type { Team } from '@documenso/prisma/client';
 import { DocumentSource, DocumentStatus as DocumentStatusEnum } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
@@ -40,7 +40,7 @@ const DOCUMENT_SOURCE_LABELS: { [key in DocumentSource]: MessageDescriptor } = {
   TEMPLATE_DIRECT_LINK: msg`Direct link`,
 };
 
-const ZTemplateSearchParamsSchema = ZBaseTableSearchParamsSchema.extend({
+const ZDocumentSearchParamsSchema = ZUrlSearchParamsSchema.extend({
   source: z
     .nativeEnum(DocumentSource)
     .optional()
@@ -49,10 +49,6 @@ const ZTemplateSearchParamsSchema = ZBaseTableSearchParamsSchema.extend({
     .nativeEnum(DocumentStatusEnum)
     .optional()
     .catch(() => undefined),
-  search: z.coerce
-    .string()
-    .optional()
-    .catch(() => undefined),
 });
 
 type TemplatePageViewDocumentsTableProps = {
@@ -69,7 +65,7 @@ export const TemplatePageViewDocumentsTable = ({
   const searchParams = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const parsedSearchParams = ZTemplateSearchParamsSchema.parse(
+  const parsedSearchParams = ZDocumentSearchParamsSchema.parse(
     Object.fromEntries(searchParams ?? []),
   );
 
@@ -80,7 +76,7 @@ export const TemplatePageViewDocumentsTable = ({
         teamId: team?.id,
         page: parsedSearchParams.page,
         perPage: parsedSearchParams.perPage,
-        search: parsedSearchParams.search,
+        query: parsedSearchParams.query,
         source: parsedSearchParams.source,
         status: parsedSearchParams.status,
       },

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

@@ -85,7 +85,7 @@ export const DeleteTemplateDialog = ({
             type="button"
             variant="destructive"
             loading={isLoading}
-            onClick={async () => deleteTemplate({ id, teamId })}
+            onClick={async () => deleteTemplate({ templateId: id, teamId })}
           >
             <Trans>Delete</Trans>
           </Button>

apps/web/src/app/(dashboard)/templates/templates-page-view.tsx

@@ -29,7 +29,7 @@ export const TemplatesPageView = async ({ searchParams = {}, team }: TemplatesPa
   const documentRootPath = formatDocumentsPath(team?.url);
   const templateRootPath = formatTemplatesPath(team?.url);
 
-  const { templates, totalPages } = await findTemplates({
+  const { data: templates, totalPages } = await findTemplates({
     userId: user.id,
     teamId: team?.id,
     page: page,

apps/web/src/app/(profile)/profile-header.tsx

@@ -9,7 +9,7 @@ import { Trans } from '@lingui/macro';
 import { PlusIcon } from 'lucide-react';
 
 import LogoIcon from '@documenso/assets/logo_icon.png';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import type { User } from '@documenso/prisma/client';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -19,7 +19,7 @@ import { Logo } from '~/components/branding/logo';
 
 type ProfileHeaderProps = {
   user?: User | null;
-  teams?: GetTeamsResponse;
+  teams?: TGetTeamsResponse;
 };
 
 export const ProfileHeader = ({ user, teams = [] }: ProfileHeaderProps) => {
@@ -58,7 +58,7 @@ export const ProfileHeader = ({ user, teams = [] }: ProfileHeaderProps) => {
             alt="Documenso Logo"
             width={48}
             height={48}
-            className="h-10 w-auto dark:invert sm:hidden"
+            className="h-10 w-auto sm:hidden dark:invert"
           />
         </Link>
 

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

@@ -40,7 +40,7 @@ export type TConfigureDirectTemplateFormSchema = z.infer<typeof ZConfigureDirect
 export type ConfigureDirectTemplateFormProps = {
   flowStep: DocumentFlowStep;
   isDocumentPdfLoaded: boolean;
-  template: TemplateWithDetails;
+  template: Omit<TemplateWithDetails, 'User'>;
   directTemplateRecipient: Recipient & { Field: Field[] };
   initialEmail?: string;
   onSubmit: (_data: TConfigureDirectTemplateFormSchema) => void;

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

@@ -28,7 +28,7 @@ import type { DirectTemplateLocalField } from './sign-direct-template';
 import { SignDirectTemplateForm } from './sign-direct-template';
 
 export type TemplatesDirectPageViewProps = {
-  template: TemplateWithDetails;
+  template: Omit<TemplateWithDetails, 'User'>;
   directTemplateToken: string;
   directTemplateRecipient: Recipient & { Field: Field[] };
 };

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

@@ -1,7 +1,6 @@
 import { useMemo, useState } from 'react';
 
 import { Trans } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';
 
@@ -56,7 +55,7 @@ export type SignDirectTemplateFormProps = {
   flowStep: DocumentFlowStep;
   directRecipient: Recipient;
   directRecipientFields: Field[];
-  template: TemplateWithDetails;
+  template: Omit<TemplateWithDetails, 'User'>;
   onSubmit: (_data: DirectTemplateLocalField[]) => Promise<void>;
 };
 
@@ -72,9 +71,8 @@ export const SignDirectTemplateForm = ({
   template,
   onSubmit,
 }: SignDirectTemplateFormProps) => {
-  const { _ } = useLingui();
-
-  const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();
+  const { fullName, signature, signatureValid, setFullName, setSignature } =
+    useRequiredSigningContext();
 
   const [localFields, setLocalFields] = useState<DirectTemplateLocalField[]>(directRecipientFields);
   const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
@@ -135,6 +133,8 @@ export const SignDirectTemplateForm = ({
     );
   };
 
+  const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);
+
   const uninsertedFields = useMemo(() => {
     return sortFieldsByPosition(localFields.filter((field) => !field.inserted));
   }, [localFields]);
@@ -147,6 +147,10 @@ export const SignDirectTemplateForm = ({
   const handleSubmit = async () => {
     setValidateUninsertedFields(true);
 
+    if (hasSignatureField && !signatureValid) {
+      return;
+    }
+
     const isFieldsValid = validateFieldsInserted(localFields);
 
     if (!isFieldsValid) {

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

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } 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';
@@ -23,7 +23,7 @@ export default async function RecipientLayout({ children }: RecipientLayoutProps
 
   const { user, session } = await getServerComponentSession();
 
-  let teams: GetTeamsResponse = [];
+  let teams: TGetTeamsResponse = [];
 
   if (user && session) {
     teams = await getTeams({ userId: user.id });

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

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

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

@@ -12,7 +12,7 @@ import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-document-by-token';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
-import { type Field, type Recipient, RecipientRole } from '@documenso/prisma/client';
+import { type Field, FieldType, type Recipient, RecipientRole } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { cn } from '@documenso/ui/lib/utils';
@@ -44,7 +44,8 @@ export const SigningForm = ({
   const analytics = useAnalytics();
   const { data: session } = useSession();
 
-  const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();
+  const { fullName, signature, setFullName, setSignature, signatureValid, setSignatureValid } =
+    useRequiredSigningContext();
 
   const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
 
@@ -56,6 +57,8 @@ export const SigningForm = ({
   // Keep the loading state going if successful since the redirect may take some time.
   const isSubmitting = formState.isSubmitting || formState.isSubmitSuccessful;
 
+  const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);
+
   const uninsertedFields = useMemo(() => {
     return sortFieldsByPosition(fields.filter((field) => !field.inserted));
   }, [fields]);
@@ -68,6 +71,10 @@ export const SigningForm = ({
   const onFormSubmit = async () => {
     setValidateUninsertedFields(true);
 
+    if (hasSignatureField && !signatureValid) {
+      return;
+    }
+
     const isFieldsValid = validateFieldsInserted(fields);
 
     if (!isFieldsValid) {
@@ -142,7 +149,7 @@ export const SigningForm = ({
                 <div className="flex flex-col gap-4 md:flex-row">
                   <Button
                     type="button"
-                    className="dark:bg-muted dark:hover:bg-muted/80 w-full  bg-black/5 hover:bg-black/10"
+                    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}
@@ -198,20 +205,33 @@ export const SigningForm = ({
                           className="h-44 w-full"
                           disabled={isSubmitting}
                           defaultValue={signature ?? undefined}
+                          onValidityChange={(isValid) => {
+                            setSignatureValid(isValid);
+                          }}
                           onChange={(value) => {
-                            setSignature(value);
+                            if (signatureValid) {
+                              setSignature(value);
+                            }
                           }}
                           allowTypedSignature={document.documentMeta?.typedSignatureEnabled}
                         />
                       </CardContent>
                     </Card>
+
+                    {hasSignatureField && !signatureValid && (
+                      <div className="text-destructive mt-2 text-sm">
+                        <Trans>
+                          Signature is too small. Please provide a more complete signature.
+                        </Trans>
+                      </div>
+                    )}
                   </div>
                 </div>
 
                 <div className="flex flex-col gap-4 md:flex-row">
                   <Button
                     type="button"
-                    className="dark:bg-muted dark:hover:bg-muted/80 w-full  bg-black/5 hover:bg-black/10"
+                    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}

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

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } 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';
@@ -17,7 +17,7 @@ export default async function SigningLayout({ children }: SigningLayoutProps) {
 
   const { user, session } = await getServerComponentSession();
 
-  let teams: GetTeamsResponse = [];
+  let teams: TGetTeamsResponse = [];
 
   if (user && session) {
     teams = await getTeams({ userId: user.id });

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

@@ -9,6 +9,8 @@ export type SigningContextValue = {
   setEmail: (_value: string) => void;
   signature: string | null;
   setSignature: (_value: string | null) => void;
+  signatureValid: boolean;
+  setSignatureValid: (_valid: boolean) => void;
 };
 
 const SigningContext = createContext<SigningContextValue | null>(null);
@@ -43,6 +45,7 @@ export const SigningProvider = ({
   const [fullName, setFullName] = useState(initialFullName || '');
   const [email, setEmail] = useState(initialEmail || '');
   const [signature, setSignature] = useState(initialSignature || null);
+  const [signatureValid, setSignatureValid] = useState(true);
 
   useEffect(() => {
     if (initialSignature) {
@@ -59,6 +62,8 @@ export const SigningProvider = ({
         setEmail,
         signature,
         setSignature,
+        signatureValid,
+        setSignatureValid,
       }}
     >
       {children}

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

@@ -55,8 +55,12 @@ export const SignatureField = ({
   const containerRef = useRef<HTMLDivElement>(null);
   const [fontSize, setFontSize] = useState(2);
 
-  const { signature: providedSignature, setSignature: setProvidedSignature } =
-    useRequiredSigningContext();
+  const {
+    signature: providedSignature,
+    setSignature: setProvidedSignature,
+    signatureValid,
+    setSignatureValid,
+  } = useRequiredSigningContext();
 
   const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
 
@@ -90,7 +94,7 @@ export const SignatureField = ({
   }, [field.inserted, signature?.signatureImageAsBase64]);
 
   const onPreSign = () => {
-    if (!providedSignature) {
+    if (!providedSignature || !signatureValid) {
       setShowSignatureModal(true);
       return false;
     }
@@ -117,7 +121,7 @@ export const SignatureField = ({
     try {
       const value = signature || providedSignature;
 
-      if (!value) {
+      if (!value || (signature && !signatureValid)) {
         setShowSignatureModal(true);
         return;
       }
@@ -282,12 +286,23 @@ export const SignatureField = ({
               <Trans>Signature</Trans>
             </Label>
 
-            <SignaturePad
-              id="signature"
-              className="border-border mt-2 h-44 w-full rounded-md border"
-              onChange={(value) => setLocalSignature(value)}
-              allowTypedSignature={typedSignatureEnabled}
-            />
+            <div className="border-border mt-2 rounded-md border">
+              <SignaturePad
+                id="signature"
+                className="h-44 w-full"
+                onChange={(value) => setLocalSignature(value)}
+                allowTypedSignature={typedSignatureEnabled}
+                onValidityChange={(isValid) => {
+                  setSignatureValid(isValid);
+                }}
+              />
+            </div>
+
+            {!signatureValid && (
+              <div className="text-destructive mt-2 text-sm">
+                <Trans>Signature is too small. Please provide a more complete signature.</Trans>
+              </div>
+            )}
           </div>
 
           <SigningDisclosure />
@@ -307,7 +322,7 @@ export const SignatureField = ({
               <Button
                 type="button"
                 className="flex-1"
-                disabled={!localSignature}
+                disabled={!localSignature || !signatureValid}
                 onClick={() => onDialogSignClick()}
               >
                 <Trans>Sign</Trans>

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

@@ -48,7 +48,7 @@ export default async function WaitingForTurnToSignPage({
 
   if (user) {
     isOwnerOrTeamMember = await getDocumentById({
-      id: document.id,
+      documentId: document.id,
       userId: user.id,
       teamId: document.teamId ?? undefined,
     })

apps/web/src/app/embed/css-vars.ts

@@ -1,5 +1,5 @@
 import { colord } from 'colord';
-import { toSnakeCase } from 'remeda';
+import { toKebabCase } from 'remeda';
 import { z } from 'zod';
 
 export const ZCssVarsSchema = z
@@ -47,7 +47,7 @@ export const toNativeCssVars = (vars: TCssVarsSchema) => {
       const color = colord(value);
       const { h, s, l } = color.toHsl();
 
-      cssVars[`--${toSnakeCase(key)}`] = `${h} ${s} ${l}`;
+      cssVars[`--${toKebabCase(key)}`] = `${h} ${s} ${l}`;
     }
   }
 

apps/web/src/app/embed/direct/[[...url]]/client.tsx

@@ -67,8 +67,16 @@ export const EmbedDirectTemplateClientPage = ({
 
   const searchParams = useSearchParams();
 
-  const { fullName, email, signature, setFullName, setEmail, setSignature } =
-    useRequiredSigningContext();
+  const {
+    fullName,
+    email,
+    signature,
+    signatureValid,
+    setFullName,
+    setEmail,
+    setSignature,
+    setSignatureValid,
+  } = useRequiredSigningContext();
 
   const [hasFinishedInit, setHasFinishedInit] = useState(false);
   const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
@@ -90,6 +98,8 @@ export const EmbedDirectTemplateClientPage = ({
     localFields.filter((field) => field.inserted),
   ];
 
+  const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);
+
   const { mutateAsync: createDocumentFromDirectTemplate, isLoading: isSubmitting } =
     trpc.template.createDocumentFromDirectTemplate.useMutation();
 
@@ -180,6 +190,10 @@ export const EmbedDirectTemplateClientPage = ({
 
   const onCompleteClick = async () => {
     try {
+      if (hasSignatureField && !signatureValid) {
+        return;
+      }
+
       const valid = validateFieldsInserted(localFields);
 
       if (!valid) {
@@ -417,6 +431,9 @@ export const EmbedDirectTemplateClientPage = ({
                         onChange={(value) => {
                           setSignature(value);
                         }}
+                        onValidityChange={(isValid) => {
+                          setSignatureValid(isValid);
+                        }}
                         allowTypedSignature={Boolean(
                           metadata &&
                             'typedSignatureEnabled' in metadata &&
@@ -425,6 +442,14 @@ export const EmbedDirectTemplateClientPage = ({
                       />
                     </CardContent>
                   </Card>
+
+                  {hasSignatureField && !signatureValid && (
+                    <div className="text-destructive mt-2 text-sm">
+                      <Trans>
+                        Signature is too small. Please provide a more complete signature.
+                      </Trans>
+                    </div>
+                  )}
                 </div>
               </div>
             </div>

apps/web/src/app/embed/sign/[[...url]]/client.tsx

@@ -10,7 +10,7 @@ import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn'
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { DocumentMeta, Recipient, TemplateMeta } from '@documenso/prisma/client';
-import { type DocumentData, type Field } from '@documenso/prisma/client';
+import { type DocumentData, type Field, FieldType } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { Button } from '@documenso/ui/primitives/button';
@@ -57,7 +57,15 @@ export const EmbedSignDocumentClientPage = ({
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { fullName, email, signature, setFullName, setSignature } = useRequiredSigningContext();
+  const {
+    fullName,
+    email,
+    signature,
+    signatureValid,
+    setFullName,
+    setSignature,
+    setSignatureValid,
+  } = useRequiredSigningContext();
 
   const [hasFinishedInit, setHasFinishedInit] = useState(false);
   const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
@@ -79,6 +87,8 @@ export const EmbedSignDocumentClientPage = ({
   const { mutateAsync: completeDocumentWithToken, isLoading: isSubmitting } =
     trpc.recipient.completeDocumentWithToken.useMutation();
 
+  const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);
+
   const onNextFieldClick = () => {
     validateFieldsInserted(fields);
 
@@ -88,6 +98,10 @@ export const EmbedSignDocumentClientPage = ({
 
   const onCompleteClick = async () => {
     try {
+      if (hasSignatureField && !signatureValid) {
+        return;
+      }
+
       const valid = validateFieldsInserted(fields);
 
       if (!valid) {
@@ -296,6 +310,9 @@ export const EmbedSignDocumentClientPage = ({
                         onChange={(value) => {
                           setSignature(value);
                         }}
+                        onValidityChange={(isValid) => {
+                          setSignatureValid(isValid);
+                        }}
                         allowTypedSignature={Boolean(
                           metadata &&
                             'typedSignatureEnabled' in metadata &&
@@ -304,6 +321,14 @@ export const EmbedSignDocumentClientPage = ({
                       />
                     </CardContent>
                   </Card>
+
+                  {hasSignatureField && !signatureValid && (
+                    <div className="text-destructive mt-2 text-sm">
+                      <Trans>
+                        Signature is too small. Please provide a more complete signature.
+                      </Trans>
+                    </div>
+                  )}
                 </div>
               </div>
             </div>
@@ -318,7 +343,7 @@ export const EmbedSignDocumentClientPage = ({
               ) : (
                 <Button
                   className="col-start-2"
-                  disabled={isThrottled}
+                  disabled={isThrottled || (hasSignatureField && !signatureValid)}
                   loading={isSubmitting}
                   onClick={() => throttledOnCompleteClick()}
                 >

apps/web/src/components/(dashboard)/layout/header.tsx

@@ -8,7 +8,7 @@ import { usePathname } from 'next/navigation';
 
 import { MenuIcon, SearchIcon } from 'lucide-react';
 
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { getRootHref } from '@documenso/lib/utils/params';
 import type { User } from '@documenso/prisma/client';
 import { cn } from '@documenso/ui/lib/utils';
@@ -22,7 +22,7 @@ import { MobileNavigation } from './mobile-navigation';
 
 export type HeaderProps = HTMLAttributes<HTMLDivElement> & {
   user: User;
-  teams: GetTeamsResponse;
+  teams: TGetTeamsResponse;
 };
 
 export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
@@ -75,7 +75,7 @@ export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
 
         <div
           className="flex gap-x-4 md:ml-8"
-          title={selectedTeam ? selectedTeam.name : user.name ?? ''}
+          title={selectedTeam ? selectedTeam.name : (user.name ?? '')}
         >
           <MenuSwitcher user={user} teams={teams} />
         </div>

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

@@ -14,7 +14,7 @@ import { signOut } from 'next-auth/react';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { TEAM_MEMBER_ROLE_MAP, TEAM_URL_REGEX } from '@documenso/lib/constants/teams';
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
 import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
 import type { User } from '@documenso/prisma/client';
@@ -36,7 +36,7 @@ const MotionLink = motion(Link);
 
 export type MenuSwitcherProps = {
   user: User;
-  teams: GetTeamsResponse;
+  teams: TGetTeamsResponse;
 };
 
 export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProps) => {

apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx

@@ -11,7 +11,7 @@ import { useLingui } from '@lingui/react';
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
 import { NEXT_PUBLIC_WEBAPP_URL, WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
 import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
@@ -30,13 +30,11 @@ export const CurrentUserTeamsDataTable = () => {
   const searchParams = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
   const { data, isLoading, isInitialLoading, isLoadingError } = trpc.team.findTeams.useQuery(
     {
-      term: parsedSearchParams.query,
+      query: parsedSearchParams.query,
       page: parsedSearchParams.page,
       perPage: parsedSearchParams.perPage,
     },

apps/web/src/components/(teams)/tables/pending-user-teams-data-table.tsx

@@ -9,7 +9,7 @@ import { useLingui } from '@lingui/react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
 import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { trpc } from '@documenso/trpc/react';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
@@ -27,15 +27,13 @@ export const PendingUserTeamsDataTable = () => {
   const searchParams = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
   const [checkoutPendingTeamId, setCheckoutPendingTeamId] = useState<number | null>(null);
 
   const { data, isLoading, isInitialLoading, isLoadingError } = trpc.team.findTeamsPending.useQuery(
     {
-      term: parsedSearchParams.query,
+      query: parsedSearchParams.query,
       page: parsedSearchParams.page,
       perPage: parsedSearchParams.perPage,
     },

apps/web/src/components/(teams)/tables/team-member-invites-data-table.tsx

@@ -10,7 +10,7 @@ import { History, MoreHorizontal, Trash2 } from 'lucide-react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
 import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { trpc } from '@documenso/trpc/react';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
@@ -38,15 +38,13 @@ export const TeamMemberInvitesDataTable = ({ teamId }: TeamMemberInvitesDataTabl
   const { _, i18n } = useLingui();
   const { toast } = useToast();
 
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
   const { data, isLoading, isInitialLoading, isLoadingError } =
     trpc.team.findTeamMemberInvites.useQuery(
       {
         teamId,
-        term: parsedSearchParams.query,
+        query: parsedSearchParams.query,
         page: parsedSearchParams.page,
         perPage: parsedSearchParams.perPage,
       },

apps/web/src/components/(teams)/tables/team-members-data-table.tsx

@@ -10,7 +10,7 @@ import { Edit, MoreHorizontal, Trash2 } from 'lucide-react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
 import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
 import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
 import type { TeamMemberRole } from '@documenso/prisma/client';
@@ -50,14 +50,12 @@ export const TeamMembersDataTable = ({
   const searchParams = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
   const { data, isLoading, isInitialLoading, isLoadingError } = trpc.team.findTeamMembers.useQuery(
     {
       teamId,
-      term: parsedSearchParams.query,
+      query: parsedSearchParams.query,
       page: parsedSearchParams.page,
       perPage: parsedSearchParams.perPage,
     },

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

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

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

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

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

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

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

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

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

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

apps/web/src/components/templates/manage-public-template-dialog.tsx

@@ -117,7 +117,7 @@ export const ManagePublicTemplateDialog = ({
   });
 
   const { mutateAsync: updateTemplateSettings, isLoading: isUpdatingTemplateSettings } =
-    trpc.template.updateTemplateSettings.useMutation();
+    trpc.template.updateTemplate.useMutation();
 
   const setTemplateToPrivate = async (templateId: number) => {
     try {

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

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

apps/web/src/providers/team.tsx

@@ -3,14 +3,14 @@
 import { createContext, useContext } from 'react';
 import React from 'react';
 
-import type { GetTeamResponse } from '@documenso/lib/server-only/team/get-team';
+import type { TGetTeamByIdResponse } from '@documenso/lib/server-only/team/get-team';
 
 interface TeamProviderProps {
   children: React.ReactNode;
-  team: GetTeamResponse;
+  team: TGetTeamByIdResponse;
 }
 
-const TeamContext = createContext<GetTeamResponse | null>(null);
+const TeamContext = createContext<TGetTeamByIdResponse | null>(null);
 
 export const useCurrentTeam = () => {
   const context = useContext(TeamContext);

apps/web/tailwind.config.js

@@ -6,7 +6,12 @@ module.exports = {
   ...baseConfig,
   content: [
     ...baseConfig.content,
-    `${path.join(require.resolve('@documenso/ui'), '..')}/**/*.{ts,tsx}`,
-    `${path.join(require.resolve('@documenso/email'), '..')}/**/*.{ts,tsx}`,
+    `${path.join(require.resolve('@documenso/ui'), '..')}/components/**/*.{ts,tsx}`,
+    `${path.join(require.resolve('@documenso/ui'), '..')}/icons/**/*.{ts,tsx}`,
+    `${path.join(require.resolve('@documenso/ui'), '..')}/lib/**/*.{ts,tsx}`,
+    `${path.join(require.resolve('@documenso/ui'), '..')}/primitives/**/*.{ts,tsx}`,
+    `${path.join(require.resolve('@documenso/email'), '..')}/templates/**/*.{ts,tsx}`,
+    `${path.join(require.resolve('@documenso/email'), '..')}/template-components/**/*.{ts,tsx}`,
+    `${path.join(require.resolve('@documenso/email'), '..')}/providers/**/*.{ts,tsx}`,
   ],
 };

package-lock.json

@@ -1,20 +1,22 @@
 {
   "name": "@documenso/root",
-  "version": "1.8.1-rc.7",
+  "version": "1.9.0-rc.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "1.8.1-rc.7",
+      "version": "1.9.0-rc.1",
       "workspaces": [
         "apps/*",
         "packages/*"
       ],
       "dependencies": {
         "@documenso/pdf-sign": "^0.1.0",
+        "@documenso/prisma": "^0.0.0",
         "@lingui/core": "^4.11.3",
         "inngest-cli": "^0.29.1",
+        "luxon": "^3.5.0",
         "next-runtime-env": "^3.2.0",
         "react": "^18"
       },
@@ -77,7 +79,7 @@
     },
     "apps/marketing": {
       "name": "@documenso/marketing",
-      "version": "1.8.1-rc.7",
+      "version": "1.9.0-rc.1",
       "license": "AGPL-3.0",
       "dependencies": {
         "@documenso/assets": "*",
@@ -113,7 +115,7 @@
         "recharts": "^2.7.2",
         "sharp": "0.32.6",
         "typescript": "5.2.2",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@lingui/loader": "^4.11.3",
@@ -436,9 +438,61 @@
         "node": ">=14.17"
       }
     },
+    "apps/openpage-api": {
+      "name": "@documenso/openpage-api",
+      "version": "1.0.0",
+      "dependencies": {
+        "@documenso/prisma": "*",
+        "luxon": "^3.5.0",
+        "next": "14.2.6"
+      },
+      "devDependencies": {
+        "@types/node": "20.16.5",
+        "@types/react": "18.3.5",
+        "typescript": "5.5.4"
+      }
+    },
+    "apps/openpage-api/node_modules/@types/node": {
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "apps/openpage-api/node_modules/@types/react": {
+      "version": "18.3.5",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
+      "integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
+      "dev": true,
+      "dependencies": {
+        "@types/prop-types": "*",
+        "csstype": "^3.0.2"
+      }
+    },
+    "apps/openpage-api/node_modules/typescript": {
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "apps/openpage-api/node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true
+    },
     "apps/web": {
       "name": "@documenso/web",
-      "version": "1.8.1-rc.7",
+      "version": "1.9.0-rc.1",
       "license": "AGPL-3.0",
       "dependencies": {
         "@documenso/api": "*",
@@ -485,7 +539,7 @@
         "ts-pattern": "^5.0.5",
         "ua-parser-js": "^1.0.37",
         "uqr": "^0.1.2",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@documenso/tailwind-config": "*",
@@ -2669,6 +2723,10 @@
         "nodemailer": "^6.9.3"
       }
     },
+    "node_modules/@documenso/openpage-api": {
+      "resolved": "apps/openpage-api",
+      "link": true
+    },
     "node_modules/@documenso/pdf-sign": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/@documenso/pdf-sign/-/pdf-sign-0.1.0.tgz",
@@ -14253,6 +14311,12 @@
         }
       }
     },
+    "node_modules/code-block-writer": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+      "dev": true
+    },
     "node_modules/color": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
@@ -19936,6 +20000,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/inngest/node_modules/zod": {
+      "version": "3.22.5",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.5.tgz",
+      "integrity": "sha512-HqnGsCdVZ2xc0qWPLdO25WnseXThh0kEYKIdV5F/hTHO75hNZFp8thxSeHhiPrHZKrFTo1SOgkAj9po5bexZlw==",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
     "node_modules/input-otp": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/input-otp/-/input-otp-1.2.4.tgz",
@@ -22298,9 +22370,9 @@
       }
     },
     "node_modules/luxon": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
-      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
+      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
       "engines": {
         "node": ">=12"
       }
@@ -35337,9 +35409,9 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.22.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
-      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -35352,6 +35424,36 @@
         "zod": "^3.20.2"
       }
     },
+    "node_modules/zod-prisma-types": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/zod-prisma-types/-/zod-prisma-types-3.1.8.tgz",
+      "integrity": "sha512-5oe0ays3ur4u2GtuUqlhgCraKBcsuMaMI8o7VMV4YAnFeOuVid7K2zGvjI19V0ue9PeNF2ICyVREQVohaQm5dw==",
+      "dev": true,
+      "dependencies": {
+        "@prisma/generator-helper": "^5.14.0",
+        "code-block-writer": "^12.0.0",
+        "lodash": "^4.17.21",
+        "zod": "^3.23.8"
+      },
+      "bin": {
+        "zod-prisma-types": "dist/bin.js"
+      }
+    },
+    "node_modules/zod-prisma-types/node_modules/@prisma/debug": {
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz",
+      "integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==",
+      "dev": true
+    },
+    "node_modules/zod-prisma-types/node_modules/@prisma/generator-helper": {
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/@prisma/generator-helper/-/generator-helper-5.22.0.tgz",
+      "integrity": "sha512-LwqcBQ5/QsuAaLNQZAIVIAJDJBMjHwMwn16e06IYx/3Okj/xEEfw9IvrqB2cJCl3b2mCBlh3eVH0w9WGmi4aHg==",
+      "dev": true,
+      "dependencies": {
+        "@prisma/debug": "5.22.0"
+      }
+    },
     "node_modules/zwitch": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
@@ -35376,7 +35478,7 @@
         "superjson": "^1.13.1",
         "swagger-ui-react": "^5.11.0",
         "ts-pattern": "^5.0.5",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
       }
     },
     "packages/api/node_modules/@ts-rest/next": {
@@ -35441,7 +35543,7 @@
         "next-auth": "4.24.5",
         "react": "^18",
         "ts-pattern": "^5.0.5",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
       }
     },
     "packages/email": {
@@ -36650,7 +36752,7 @@
         "sharp": "0.32.6",
         "stripe": "^12.7.0",
         "ts-pattern": "^5.0.5",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@playwright/browser-chromium": "1.43.0",
@@ -36721,7 +36823,8 @@
         "dotenv-cli": "^7.3.0",
         "prisma-kysely": "^1.8.0",
         "tsx": "^4.11.0",
-        "typescript": "5.2.2"
+        "typescript": "5.2.2",
+        "zod-prisma-types": "^3.1.8"
       }
     },
     "packages/prisma/node_modules/ts-pattern": {
@@ -36787,9 +36890,8 @@
         "luxon": "^3.4.0",
         "superjson": "^1.13.1",
         "ts-pattern": "^5.0.5",
-        "zod": "^3.22.4"
-      },
-      "devDependencies": {}
+        "zod": "^3.23.8"
+      }
     },
     "packages/trpc/node_modules/@ts-rest/next": {
       "version": "3.30.5",
@@ -36868,7 +36970,7 @@
         "tailwind-merge": "^1.12.0",
         "tailwindcss-animate": "^1.0.5",
         "ts-pattern": "^5.0.5",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@documenso/tailwind-config": "*",

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.8.1-rc.7",
+  "version": "1.9.0-rc.1",
   "scripts": {
     "build": "turbo run build",
     "build:web": "turbo run build --filter=@documenso/web",
@@ -8,7 +8,8 @@
     "dev:web": "turbo run dev --filter=@documenso/web",
     "dev:marketing": "turbo run dev --filter=@documenso/marketing",
     "dev:docs": "turbo run dev --filter=@documenso/documentation",
-    "start": "turbo run start --filter=@documenso/web --filter=@documenso/marketing --filter=@documenso/documentation",
+    "dev:openpage-api": "turbo run dev --filter=@documenso/openpage-api",
+    "start": "turbo run start --filter=@documenso/web --filter=@documenso/marketing --filter=@documenso/documentation --filter=@documenso/openpage-api",
     "lint": "turbo run lint",
     "lint:fix": "turbo run lint:fix",
     "format": "prettier --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,mdx}\"",
@@ -32,7 +33,7 @@
     "trigger:dev": "npm run with:env -- npx trigger-cli dev --handler-path=\"/api/jobs\"",
     "inngest:dev": "inngest dev -u http://localhost:3000/api/jobs",
     "make:version": " npm version --workspace @documenso/web --workspace @documenso/marketing --include-workspace-root --no-git-tag-version -m \"v%s\"",
-    "translate:extract": "lingui extract",
+    "translate:extract": "lingui extract --clean",
     "translate:compile": "turbo run translate:compile --filter=@documenso/web --filter=@documenso/marketing --filter=@documenso/ui"
   },
   "packageManager": "npm@10.7.0",
@@ -63,8 +64,10 @@
   ],
   "dependencies": {
     "@documenso/pdf-sign": "^0.1.0",
+    "@documenso/prisma": "^0.0.0",
     "@lingui/core": "^4.11.3",
     "inngest-cli": "^0.29.1",
+    "luxon": "^3.5.0",
     "next-runtime-env": "^3.2.0",
     "react": "^18"
   },

packages/api/package.json

@@ -25,6 +25,6 @@
     "superjson": "^1.13.1",
     "swagger-ui-react": "^5.11.0",
     "ts-pattern": "^5.0.5",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   }
-}
+}

packages/api/v1/implementation.ts

@@ -19,6 +19,7 @@ import { updateDocument } from '@documenso/lib/server-only/document/update-docum
 import { updateDocumentSettings } from '@documenso/lib/server-only/document/update-document-settings';
 import { deleteField } from '@documenso/lib/server-only/field/delete-field';
 import { getFieldById } from '@documenso/lib/server-only/field/get-field-by-id';
+import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
 import { updateField } from '@documenso/lib/server-only/field/update-field';
 import { insertFormValuesInPdf } from '@documenso/lib/server-only/pdf/insert-form-values-in-pdf';
 import { deleteRecipient } from '@documenso/lib/server-only/recipient/delete-recipient';
@@ -87,7 +88,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
 
     try {
       const document = await getDocumentById({
-        id: Number(documentId),
+        documentId: Number(documentId),
         userId: user.id,
         teamId: team?.id,
       });
@@ -98,6 +99,30 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         userId: user.id,
       });
 
+      const fields = await getFieldsForDocument({
+        documentId: Number(documentId),
+        userId: user.id,
+      });
+
+      const parsedMetaFields = fields.map((field) => {
+        let parsedMetaOrNull = null;
+
+        if (field.fieldMeta) {
+          const result = ZFieldMetaSchema.safeParse(field.fieldMeta);
+
+          if (!result.success) {
+            throw new Error('Field meta parsing failed for field ' + field.id);
+          }
+
+          parsedMetaOrNull = result.data;
+        }
+
+        return {
+          ...field,
+          fieldMeta: parsedMetaOrNull,
+        };
+      });
+
       return {
         status: 200,
         body: {
@@ -106,6 +131,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
             ...recipient,
             signingUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`,
           })),
+          fields: parsedMetaFields,
         },
       };
     } catch (err) {
@@ -132,7 +158,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       }
 
       const document = await getDocumentById({
-        id: Number(documentId),
+        documentId: Number(documentId),
         userId: user.id,
         teamId: team?.id,
       });
@@ -185,7 +211,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
 
     try {
       const document = await getDocumentById({
-        id: Number(documentId),
+        documentId: Number(documentId),
         userId: user.id,
         teamId: team?.id,
       });
@@ -401,7 +427,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     const perPage = Number(args.query.perPage) || 10;
 
     try {
-      const { templates, totalPages } = await findTemplates({
+      const { data: templates, totalPages } = await findTemplates({
         page,
         perPage,
         userId: user.id,
@@ -614,7 +640,11 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     const { id } = args.params;
     const { sendEmail = true } = args.body ?? {};
 
-    const document = await getDocumentById({ id: Number(id), userId: user.id, teamId: team?.id });
+    const document = await getDocumentById({
+      documentId: Number(id),
+      userId: user.id,
+      teamId: team?.id,
+    });
 
     if (!document) {
       return {
@@ -731,7 +761,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     const { name, email, role, authOptions, signingOrder } = args.body;
 
     const document = await getDocumentById({
-      id: Number(documentId),
+      documentId: Number(documentId),
       userId: user.id,
       teamId: team?.id,
     });
@@ -822,7 +852,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     const { name, email, role, authOptions, signingOrder } = args.body;
 
     const document = await getDocumentById({
-      id: Number(documentId),
+      documentId: Number(documentId),
       userId: user.id,
       teamId: team?.id,
     });
@@ -881,7 +911,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     const { id: documentId, recipientId } = args.params;
 
     const document = await getDocumentById({
-      id: Number(documentId),
+      documentId: Number(documentId),
       userId: user.id,
       teamId: team?.id,
     });
@@ -1108,7 +1138,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       args.body;
 
     const document = await getDocumentById({
-      id: Number(documentId),
+      documentId: Number(documentId),
       userId: user.id,
       teamId: team?.id,
     });
@@ -1197,7 +1227,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
     const { id: documentId, fieldId } = args.params;
 
     const document = await getDocumentById({
-      id: Number(documentId),
+      documentId: Number(documentId),
       userId: user.id,
     });
 

packages/api/v1/schema.ts

@@ -58,6 +58,22 @@ export const ZSuccessfulDocumentResponseSchema = z.object({
 
 export const ZSuccessfulGetDocumentResponseSchema = ZSuccessfulDocumentResponseSchema.extend({
   recipients: z.lazy(() => z.array(ZSuccessfulRecipientResponseSchema)),
+  fields: z.lazy(() =>
+    ZFieldSchema.pick({
+      id: true,
+      recipientId: true,
+      type: true,
+      page: true,
+      positionX: true,
+      positionY: true,
+      width: true,
+      height: true,
+    })
+      .extend({
+        fieldMeta: ZFieldMetaSchema.nullish(),
+      })
+      .array(),
+  ),
 });
 
 export type TSuccessfulGetDocumentResponseSchema = z.infer<
@@ -145,7 +161,10 @@ export const ZCreateDocumentMutationSchema = z.object({
       globalAccessAuth: ZDocumentAccessAuthTypesSchema.optional(),
       globalActionAuth: ZDocumentActionAuthTypesSchema.optional(),
     })
-    .optional(),
+    .optional()
+    .openapi({
+      description: 'The globalActionAuth property is only available for Enterprise accounts.',
+    }),
   formValues: z.record(z.string(), z.union([z.string(), z.boolean(), z.number()])).optional(),
 });
 
@@ -309,7 +328,10 @@ export const ZCreateRecipientMutationSchema = z.object({
     .object({
       actionAuth: ZRecipientActionAuthTypesSchema.optional(),
     })
-    .optional(),
+    .optional()
+    .openapi({
+      description: 'The authOptions property is only available for Enterprise accounts.',
+    }),
 });
 
 /**
@@ -424,7 +446,7 @@ export const ZSuccessfulSigningResponseSchema = z
   .object({
     message: z.string(),
   })
-  .and(ZSuccessfulGetDocumentResponseSchema);
+  .and(ZSuccessfulGetDocumentResponseSchema.omit({ fields: true }));
 
 export type TSuccessfulSigningResponseSchema = z.infer<typeof ZSuccessfulSigningResponseSchema>;
 

packages/app-tests/e2e/document-auth/action-auth.spec.ts

@@ -39,9 +39,9 @@ test('[DOCUMENT_AUTH]: should allow signing when no auth setup', async ({ page }
     const canvas = page.locator('canvas').first();
     const box = await canvas.boundingBox();
     if (box) {
-      await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+      await page.mouse.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 
@@ -96,9 +96,9 @@ test('[DOCUMENT_AUTH]: should allow signing with valid global auth', async ({ pa
   const canvas = page.locator('canvas').first();
   const box = await canvas.boundingBox();
   if (box) {
-    await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+    await page.mouse.move(box.x + 40, box.y + 40);
     await page.mouse.down();
-    await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+    await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
     await page.mouse.up();
   }
 
@@ -265,9 +265,9 @@ test('[DOCUMENT_AUTH]: should allow field signing when required for recipient au
     const canvas = page.locator('canvas').first();
     const box = await canvas.boundingBox();
     if (box) {
-      await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+      await page.mouse.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 
@@ -376,9 +376,9 @@ test('[DOCUMENT_AUTH]: should allow field signing when required for recipient an
     const canvas = page.locator('canvas').first();
     const box = await canvas.boundingBox();
     if (box) {
-      await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+      await page.mouse.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 

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

@@ -107,6 +107,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document', async ({ page }) =>
 
   // Add subject and send
   await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+  await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -191,6 +192,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
 
   // Add subject and send
   await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+  await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -288,6 +290,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
 
   // Add subject and send
   await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+  await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -369,9 +372,9 @@ test('[DOCUMENT_FLOW]: should be able to approve a document', async ({ page }) =
     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.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 
@@ -426,6 +429,7 @@ test('[DOCUMENT_FLOW]: should be able to create, send with redirect url, sign a
   await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
   await page.getByRole('button', { name: 'Continue' }).click();
 
+  await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -567,6 +571,7 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
   await page.getByRole('button', { name: 'Continue' }).click();
 
   await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+  await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -608,9 +613,9 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
     const canvas = page.locator('canvas#signature');
     const box = await canvas.boundingBox();
     if (box) {
-      await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+      await page.mouse.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 

packages/app-tests/e2e/features/include-document-certificate.spec.ts

@@ -39,9 +39,9 @@ test.describe('Signing Certificate Tests', () => {
     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.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 
@@ -116,9 +116,9 @@ test.describe('Signing Certificate Tests', () => {
     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.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 
@@ -193,9 +193,9 @@ test.describe('Signing Certificate Tests', () => {
     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.move(box.x + 40, box.y + 40);
       await page.mouse.down();
-      await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+      await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
       await page.mouse.up();
     }
 

packages/app-tests/e2e/user/auth-flow.spec.ts

@@ -20,11 +20,10 @@ test('[USER] can sign up with email and password', async ({ page }: { page: Page
 
   const canvas = page.locator('canvas').first();
   const box = await canvas.boundingBox();
-
   if (box) {
-    await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+    await page.mouse.move(box.x + 40, box.y + 40);
     await page.mouse.down();
-    await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
+    await page.mouse.move(box.x + box.width - 2, box.y + box.height - 2);
     await page.mouse.up();
   }
 

packages/app-tests/e2e/user/update-name.spec.ts

@@ -12,15 +12,7 @@ test('[USER] update full name', async ({ page }) => {
 
   await page.getByLabel('Full Name').fill('John Doe');
 
-  const canvas = page.locator('canvas').first();
-  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();
-  }
+  await page.getByPlaceholder('Type your signature').fill('John Doe');
 
   await page.getByRole('button', { name: 'Update profile' }).click();
 

packages/ee/package.json

@@ -21,6 +21,6 @@
     "next-auth": "4.24.5",
     "react": "^18",
     "ts-pattern": "^5.0.5",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   }
-}
+}

packages/lib/constants/auth.ts

@@ -46,3 +46,10 @@ export const PASSKEY_TIMEOUT = 60000;
  * The maximum number of passkeys are user can have.
  */
 export const MAXIMUM_PASSKEYS = 50;
+
+export const useSecureCookies =
+  process.env.NODE_ENV === 'production' && String(process.env.NEXTAUTH_URL).startsWith('https://');
+
+const secureCookiePrefix = useSecureCookies ? '__Secure-' : '';
+
+export const formatSecureCookieName = (name: string) => `${secureCookiePrefix}${name}`;

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

@@ -13,6 +13,7 @@ import { env } from 'next-runtime-env';
 import { prisma } from '@documenso/prisma';
 import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/client';
 
+import { formatSecureCookieName, useSecureCookies } from '../constants/auth';
 import { AppError, AppErrorCode } from '../errors/app-error';
 import { jobsClient } from '../jobs/client';
 import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble';
@@ -26,10 +27,6 @@ import { extractNextAuthRequestMetadata } from '../universal/extract-request-met
 import { getAuthenticatorOptions } from '../utils/authenticator';
 import { ErrorCode } from './error-codes';
 
-const useSecureCookies =
-  process.env.NODE_ENV === 'production' && String(process.env.NEXTAUTH_URL).startsWith('https://');
-const cookiePrefix = useSecureCookies ? '__Secure-' : '';
-
 export const NEXT_AUTH_OPTIONS: AuthOptions = {
   adapter: PrismaAdapter(prisma),
   secret: process.env.NEXTAUTH_SECRET ?? 'secret',
@@ -437,7 +434,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
   },
   cookies: {
     sessionToken: {
-      name: `${cookiePrefix}next-auth.session-token`,
+      name: formatSecureCookieName('next-auth.session-token'),
       options: {
         httpOnly: true,
         sameSite: useSecureCookies ? 'none' : 'lax',
@@ -446,7 +443,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
       },
     },
     callbackUrl: {
-      name: `${cookiePrefix}next-auth.callback-url`,
+      name: formatSecureCookieName('next-auth.callback-url'),
       options: {
         sameSite: useSecureCookies ? 'none' : 'lax',
         path: '/',
@@ -456,7 +453,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
     csrfToken: {
       // Default to __Host- for CSRF token for additional protection if using useSecureCookies
       // NB: The `__Host-` prefix is stricter than the `__Secure-` prefix.
-      name: `${cookiePrefix}next-auth.csrf-token`,
+      name: formatSecureCookieName('next-auth.csrf-token'),
       options: {
         httpOnly: true,
         sameSite: useSecureCookies ? 'none' : 'lax',
@@ -465,7 +462,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
       },
     },
     pkceCodeVerifier: {
-      name: `${cookiePrefix}next-auth.pkce.code_verifier`,
+      name: formatSecureCookieName('next-auth.pkce.code_verifier'),
       options: {
         httpOnly: true,
         sameSite: useSecureCookies ? 'none' : 'lax',
@@ -474,7 +471,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
       },
     },
     state: {
-      name: `${cookiePrefix}next-auth.state`,
+      name: formatSecureCookieName('next-auth.state'),
       options: {
         httpOnly: true,
         sameSite: useSecureCookies ? 'none' : 'lax',