From 051e681701c90e436038ce62d0f823fb3406a20d Mon Sep 17 00:00:00 2001
From: Ansari <ansari_official@yahoo.com>
Date: Wed, 10 May 2023 20:13:07 +0530
Subject: [PATCH 01/66] =?UTF-8?q?Long=20filename=20fix=20=F0=9F=97=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui/components/dialog/Dialog.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index 07c92686b..81aa2d1f1 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -71,7 +71,9 @@ export function Dialog({
                     </DialogComponent.Title>
                     <div className="mt-2">
                       <p className="text-sm text-gray-500">
-                        {`"${document.title}" will be sent to ${unsentEmailsLength} recipients.`}
+                        {`"${document.title.length > 20 ? document.title.substring(0, 7) + "..." +
+                          document.title.substring(document.title.length - 7) : document.title}" 
+                            will be sent to ${unsentEmailsLength} recipients.`}
                       </p>
                     </div>
                   </div>

From 9b993c08f15cd316f097f23f44d09035b74963c7 Mon Sep 17 00:00:00 2001
From: Ansari <ansari_official@yahoo.com>
Date: Mon, 15 May 2023 15:39:37 +0530
Subject: [PATCH 02/66] Truncate prop added

---
 packages/ui/components/dialog/Dialog.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index 81aa2d1f1..23a4821d1 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -19,6 +19,7 @@ type DialogProps = {
   formValues: FormValue[];
   setLoading: (loading: boolean) => void;
   icon: React.ReactNode;
+  trunate: boolean;
 };
 
 export function Dialog({
@@ -29,11 +30,17 @@ export function Dialog({
   formValues,
   setLoading,
   icon,
+  trunate = true,
 }: DialogProps) {
   const unsentEmailsLength = formValues.filter(
     (s: any) => s.email && s.sendStatus != "SENT"
   ).length;
 
+  if (trunate && document.title.length > 20) {
+    document.title = document.title.substring(0, 7) + "..." +
+      document.title.substring(document.title.length - 7);
+  }
+
   return (
     <Transition.Root show={open} as={Fragment}>
       <DialogComponent as="div" className="relative z-10" onClose={setOpen}>
@@ -71,9 +78,7 @@ export function Dialog({
                     </DialogComponent.Title>
                     <div className="mt-2">
                       <p className="text-sm text-gray-500">
-                        {`"${document.title.length > 20 ? document.title.substring(0, 7) + "..." +
-                          document.title.substring(document.title.length - 7) : document.title}" 
-                            will be sent to ${unsentEmailsLength} recipients.`}
+                        {`"${document.title}" will be sent to ${unsentEmailsLength} recipients.`}
                       </p>
                     </div>
                   </div>

From 8bf6594cf41aa45d498e5a22c06fa148bf023064 Mon Sep 17 00:00:00 2001
From: Ansari <ansari_official@yahoo.com>
Date: Mon, 15 May 2023 15:43:29 +0530
Subject: [PATCH 03/66] =?UTF-8?q?prop=20name=20changed=20=F0=9F=93=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui/components/dialog/Dialog.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index 23a4821d1..c1244394a 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -19,7 +19,7 @@ type DialogProps = {
   formValues: FormValue[];
   setLoading: (loading: boolean) => void;
   icon: React.ReactNode;
-  trunate: boolean;
+  trunateTitle: boolean;
 };
 
 export function Dialog({
@@ -30,13 +30,13 @@ export function Dialog({
   formValues,
   setLoading,
   icon,
-  trunate = true,
+  trunateTitle = true,
 }: DialogProps) {
   const unsentEmailsLength = formValues.filter(
     (s: any) => s.email && s.sendStatus != "SENT"
   ).length;
 
-  if (trunate && document.title.length > 20) {
+  if (trunateTitle && document.title.length > 20) {
     document.title = document.title.substring(0, 7) + "..." +
       document.title.substring(document.title.length - 7);
   }

From 748f842115b41534a9b8ca09315ae3460d4eab88 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Thu, 25 May 2023 18:43:37 +1000
Subject: [PATCH 04/66] fix: update prop typo, extract truncate method

---
 apps/web/pages/documents/[id]/signed.tsx |  3 ++-
 packages/lib/helpers/index.ts            |  1 +
 packages/lib/helpers/strings.ts          | 13 +++++++++++++
 packages/ui/components/dialog/Dialog.tsx | 14 ++++++--------
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 packages/lib/helpers/index.ts
 create mode 100644 packages/lib/helpers/strings.ts

diff --git a/apps/web/pages/documents/[id]/signed.tsx b/apps/web/pages/documents/[id]/signed.tsx
index 53f375ab2..131cf734d 100644
--- a/apps/web/pages/documents/[id]/signed.tsx
+++ b/apps/web/pages/documents/[id]/signed.tsx
@@ -5,6 +5,7 @@ import prisma from "@documenso/prisma";
 import { Button, IconButton } from "@documenso/ui";
 import { NextPageWithLayout } from "../../_app";
 import { ArrowDownTrayIcon, CheckBadgeIcon } from "@heroicons/react/24/outline";
+import { truncate } from "@documenso/lib/helpers";
 
 const Signed: NextPageWithLayout = (props: any) => {
   const router = useRouter();
@@ -21,7 +22,7 @@ const Signed: NextPageWithLayout = (props: any) => {
         <CheckBadgeIcon className="text-neon mr-1 inline w-10"></CheckBadgeIcon>
         <h1 className="text-neon inline align-middle text-base font-medium">It's done!</h1>
         <p className="mt-2 text-4xl font-bold tracking-tight">
-          You signed "{props.document.title}"
+          You signed "{truncate(props.document.title)}"
         </p>
         <p className="mt-2 max-w-sm text-base text-gray-500" hidden={allRecipientsSigned}>
           You will be notfied when all recipients have signed.
diff --git a/packages/lib/helpers/index.ts b/packages/lib/helpers/index.ts
new file mode 100644
index 000000000..cf29797bb
--- /dev/null
+++ b/packages/lib/helpers/index.ts
@@ -0,0 +1 @@
+export * from './strings';
\ No newline at end of file
diff --git a/packages/lib/helpers/strings.ts b/packages/lib/helpers/strings.ts
new file mode 100644
index 000000000..eaf45b7f1
--- /dev/null
+++ b/packages/lib/helpers/strings.ts
@@ -0,0 +1,13 @@
+/**
+ * Truncates a title to a given max length substituting the middle with an ellipsis.
+ */
+export const truncate = (str: string, maxLength: number = 20) => {
+    if (str.length <= maxLength) {
+        return str;
+    }
+    
+    const startLength = Math.ceil((maxLength - 3) / 2);
+    const endLength = Math.floor((maxLength - 3) / 2);
+    
+    return `${str.slice(0, startLength)}...${str.slice(-endLength)}`;
+};
diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index c1244394a..9cf3b446d 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -1,6 +1,7 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { Fragment } from "react";
 import { sendSigningRequests } from "@documenso/lib/api";
+import { truncate } from "@documenso/lib/helpers";
 import { Button } from "@documenso/ui";
 import { Dialog as DialogComponent, Transition } from "@headlessui/react";
 import { Document as PrismaDocument } from "@prisma/client";
@@ -19,7 +20,7 @@ type DialogProps = {
   formValues: FormValue[];
   setLoading: (loading: boolean) => void;
   icon: React.ReactNode;
-  trunateTitle: boolean;
+  truncateTitle: boolean;
 };
 
 export function Dialog({
@@ -30,16 +31,13 @@ export function Dialog({
   formValues,
   setLoading,
   icon,
-  trunateTitle = true,
+  truncateTitle = true,
 }: DialogProps) {
   const unsentEmailsLength = formValues.filter(
     (s: any) => s.email && s.sendStatus != "SENT"
   ).length;
 
-  if (trunateTitle && document.title.length > 20) {
-    document.title = document.title.substring(0, 7) + "..." +
-      document.title.substring(document.title.length - 7);
-  }
+  const documentTitle = truncate(document.title)
 
   return (
     <Transition.Root show={open} as={Fragment}>
@@ -78,7 +76,7 @@ export function Dialog({
                     </DialogComponent.Title>
                     <div className="mt-2">
                       <p className="text-sm text-gray-500">
-                        {`"${document.title}" will be sent to ${unsentEmailsLength} recipients.`}
+                        {`"${documentTitle}" will be sent to ${unsentEmailsLength} recipients.`}
                       </p>
                     </div>
                   </div>

From 3444d7fd9338c3b6da1860753b5fd020760f787a Mon Sep 17 00:00:00 2001
From: Doug Andrade <contact@dougandrade.com>
Date: Sun, 28 May 2023 19:44:00 -0400
Subject: [PATCH 05/66] task: simplify next.config.js

---
 apps/web/next.config.js | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index c7b94279e..1ea48cefb 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -4,22 +4,15 @@ require("dotenv").config({ path: "../../.env" });
 const nextConfig = {
   reactStrictMode: true,
   swcMinify: false,
+  transpilePackages: [
+    "@documenso/prisma",
+    "@documenso/lib",
+    "@documenso/ui",
+    "@documenso/pdf",
+    "@documenso/features",
+    "@documenso/signing",
+    "react-signature-canvas",
+  ],
 };
 
-const transpileModules = require("next-transpile-modules")([
-  "@documenso/prisma",
-  "@documenso/lib",
-  "@documenso/ui",
-  "@documenso/pdf",
-  "@documenso/features",
-  "@documenso/signing",
-  "react-signature-canvas",
-]);
-
-const plugins = [
-  transpileModules
-];
-
-const moduleExports = () => plugins.reduce((acc, next) => next(acc), nextConfig);
-
-module.exports = moduleExports;
+module.exports = nextConfig;

From ad4d844b4d7c26961649719bbe99fda5086a1068 Mon Sep 17 00:00:00 2001
From: Doug Andrade <contact@dougandrade.com>
Date: Sun, 28 May 2023 19:53:44 -0400
Subject: [PATCH 06/66] remove: next-transpile-modules dependency

---
 apps/web/package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/web/package.json b/apps/web/package.json
index a104e0fde..349936c8a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -56,11 +56,10 @@
     "eslint": "8.27.0",
     "eslint-config-next": "13.0.3",
     "file-loader": "^6.2.0",
-    "next-transpile-modules": "^10.0.0",
     "postcss": "^8.4.19",
     "sass": "^1.57.1",
     "stripe-cli": "^0.1.0",
     "tailwindcss": "^3.2.4",
     "typescript": "4.8.4"
   }
-}
\ No newline at end of file
+}

From b928993510b9c4633ffcf74de401b5c7453ff137 Mon Sep 17 00:00:00 2001
From: Doug Andrade <contact@dougandrade.com>
Date: Sun, 28 May 2023 20:06:43 -0400
Subject: [PATCH 07/66] typo: /ressources >> /resources

---
 README.md                                          |  10 ++++------
 apps/web/{ressources => resources}/certificate.p12 | Bin
 apps/web/{ressources => resources}/example.pdf     | Bin
 packages/signing/addDigitalSignature.ts            |   2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename apps/web/{ressources => resources}/certificate.p12 (100%)
 rename apps/web/{ressources => resources}/example.pdf (100%)

diff --git a/README.md b/README.md
index 26316054f..0861312fb 100644
--- a/README.md
+++ b/README.md
@@ -78,8 +78,6 @@ The current project goal is to <b>[release a production ready version](https://g
 
 - To contribute please see our [contribution guide](https://github.com/documenso/documenso/blob/main/CONTRIBUTING.md).
 
-
-
 # Tech
 
 Documenso is built using awesome open source tech including:
@@ -123,7 +121,7 @@ Want to get up and running quickly? Follow these steps:
   - This will spin up a postgres database and inbucket mail server in docker containers.
 - Run `npm run dev` in the root directory
 - Want it even faster? Just use
-    ```sh
+  ```sh
   npm run d
   ```
 
@@ -157,10 +155,10 @@ Follow these steps to setup documenso on you local machine:
 ---
 
 - Optional: Seed the database using <code>npm run db-seed</code> to create a test user and document
-- Optional: Upload and sign <code>apps/web/ressources/example.pdf</code> manually to test your setup
+- Optional: Upload and sign <code>apps/web/resources/example.pdf</code> manually to test your setup
 
 - Optional: Create your own signing certificate
-  - A demo certificate is provided in `/app/web/ressources/certificate.p12`
+  - A demo certificate is provided in `/app/web/resources/certificate.p12`
   - To generate your own using these steps and a Linux Terminal or Windows Subsystem for Linux (WSL) see **[Create your own signing certificate](#creating-your-own-signing-certificate)**.
 
 ## Updating
@@ -185,7 +183,7 @@ For the digital signature of your documents you need a signing certificate in .p
 3. Combine the private key and the self-signed certificate to create the p12 certificate. You can run the following command to do this: \
    <code>openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt</code>
 4. You will be prompted to enter a password for the p12 file. Choose a strong password and remember it, as you will need it to use the certificate (**can be empty for dev certificates**)
-5. Place the certificate <code>/apps/web/ressource/certificate.p12</code>
+5. Place the certificate <code>/apps/web/resources/certificate.p12</code>
 
 # Docker
 
diff --git a/apps/web/ressources/certificate.p12 b/apps/web/resources/certificate.p12
similarity index 100%
rename from apps/web/ressources/certificate.p12
rename to apps/web/resources/certificate.p12
diff --git a/apps/web/ressources/example.pdf b/apps/web/resources/example.pdf
similarity index 100%
rename from apps/web/ressources/example.pdf
rename to apps/web/resources/example.pdf
diff --git a/packages/signing/addDigitalSignature.ts b/packages/signing/addDigitalSignature.ts
index f4f565c8f..8bd219bb5 100644
--- a/packages/signing/addDigitalSignature.ts
+++ b/packages/signing/addDigitalSignature.ts
@@ -10,7 +10,7 @@ export const addDigitalSignature = async (documentAsBase64: string): Promise<str
   const pdfBuffer = Buffer.from(documentAsBase64, "base64");
   const p12Buffer = Buffer.from(
     fs
-      .readFileSync(process.env.CERT_FILE_PATH || "ressources/certificate.p12")
+      .readFileSync(process.env.CERT_FILE_PATH || "resources/certificate.p12")
       .toString(process.env.CERT_FILE_ENCODING ? undefined : "binary"),
     (process.env.CERT_FILE_ENCODING as BufferEncoding) || "binary"
   );

From 4c06b5e64006b9d1929df16c21e4f66008543fbd Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 29 May 2023 08:01:12 +0000
Subject: [PATCH 08/66] fix: logo only on dashboard

---
 apps/web/components/navigation.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/web/components/navigation.tsx b/apps/web/components/navigation.tsx
index c09d5b912..290023975 100644
--- a/apps/web/components/navigation.tsx
+++ b/apps/web/components/navigation.tsx
@@ -116,7 +116,6 @@ export default function TopNavigation() {
                     href="/dashboard"
                     className="flex flex-shrink-0 items-center gap-x-2 self-center overflow-hidden">
                     <Logo className="h-8 w-8" />
-                    <h2 className="text-2xl font-semibold">Documenso</h2>
                   </Link>
 
                   <div className="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-8">

From 8ecd5cf215a24f909a41e56f135f51d2b7e751e7 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Mon, 29 May 2023 18:47:54 +1000
Subject: [PATCH 09/66] fix: respect truncate title prop

---
 packages/ui/components/dialog/Dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index 9cf3b446d..1e03135af 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -37,7 +37,7 @@ export function Dialog({
     (s: any) => s.email && s.sendStatus != "SENT"
   ).length;
 
-  const documentTitle = truncate(document.title)
+  const documentTitle = truncateTitle ? truncate(document.title) : document.title;
 
   return (
     <Transition.Root show={open} as={Fragment}>

From 2f3be1cfe5b0c0aa96c7b6d626e3735c1bfa6c43 Mon Sep 17 00:00:00 2001
From: Lee Robinson <lrobinson2011@gmail.com>
Date: Mon, 29 May 2023 10:38:24 -0500
Subject: [PATCH 10/66] Add turborepo to monorepo.

---
 .gitignore              |  3 +++
 apps/web/next.config.js | 27 ++++++++++-----------------
 package.json            |  8 ++++----
 turbo.json              | 13 +++++++++++++
 4 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 turbo.json

diff --git a/.gitignore b/.gitignore
index 9965f5ca6..d7f66a11a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@ yarn-error.log*
 next-env.d.ts
 .env
 .env.example
+
+# turborepo
+.turbo
\ No newline at end of file
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index c7b94279e..1ea48cefb 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -4,22 +4,15 @@ require("dotenv").config({ path: "../../.env" });
 const nextConfig = {
   reactStrictMode: true,
   swcMinify: false,
+  transpilePackages: [
+    "@documenso/prisma",
+    "@documenso/lib",
+    "@documenso/ui",
+    "@documenso/pdf",
+    "@documenso/features",
+    "@documenso/signing",
+    "react-signature-canvas",
+  ],
 };
 
-const transpileModules = require("next-transpile-modules")([
-  "@documenso/prisma",
-  "@documenso/lib",
-  "@documenso/ui",
-  "@documenso/pdf",
-  "@documenso/features",
-  "@documenso/signing",
-  "react-signature-canvas",
-]);
-
-const plugins = [
-  transpileModules
-];
-
-const moduleExports = () => plugins.reduce((acc, next) => next(acc), nextConfig);
-
-module.exports = moduleExports;
+module.exports = nextConfig;
diff --git a/package.json b/package.json
index 9c2a55c14..12d9db61c 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "name": "documenso-monorepo",
   "version": "0.0.0",
   "scripts": {
-    "dev": "npm run dev -w apps/web",
-    "build": "npm i && cd apps && cd web && npm i && next build",
-    "start": "cd apps && cd web && next start",
+    "dev": "turbo run dev --filter=web",
+    "build": "turbo run build --filter=web",
+    "start": "turbo run start --filter=web",
     "db-migrate:dev": "prisma migrate dev",
     "db-seed": "prisma db seed",
     "db-studio": "prisma studio",
@@ -54,4 +54,4 @@
     "prettier-plugin-tailwindcss": "^0.2.5",
     "typescript": "4.8.4"
   }
-}
\ No newline at end of file
+}
diff --git a/turbo.json b/turbo.json
new file mode 100644
index 000000000..3def58b36
--- /dev/null
+++ b/turbo.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "globalDependencies": [".env"],
+  "pipeline": {
+    "build": {
+      "outputs": [".next/**", "!.next/cache/**"]
+    },
+    "dev": {
+      "cache": false,
+      "persistent": true
+    }
+  }
+}

From 82fbedf8e31b34c923697e857c0ae784968d7aa8 Mon Sep 17 00:00:00 2001
From: Piyush Maurya <piyushkumarmaurya@gmail.com>
Date: Tue, 30 May 2023 00:23:18 +0530
Subject: [PATCH 11/66] fix: deprecated type checks and imports from @prisma

---
 packages/lib/server/getServerErrorFromUnknown.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/lib/server/getServerErrorFromUnknown.ts b/packages/lib/server/getServerErrorFromUnknown.ts
index 8a4823082..fa53e8585 100644
--- a/packages/lib/server/getServerErrorFromUnknown.ts
+++ b/packages/lib/server/getServerErrorFromUnknown.ts
@@ -1,5 +1,5 @@
 import { HttpError } from "@documenso/lib/server";
-import { NotFoundError, PrismaClientKnownRequestError } from "@prisma/client/runtime";
+import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
 
 export function getServerErrorFromUnknown(cause: unknown): HttpError {
   // Error was manually thrown and does not need to be parsed.
@@ -18,7 +18,7 @@ export function getServerErrorFromUnknown(cause: unknown): HttpError {
     return new HttpError({ statusCode: 400, message: cause.message, cause });
   }
 
-  if (cause instanceof NotFoundError) {
+  if (cause instanceof PrismaClientKnownRequestError) {
     return new HttpError({ statusCode: 404, message: cause.message, cause });
   }
 

From 1e6f65f92d3f5cd32f711aabcbfe8d12c574b094 Mon Sep 17 00:00:00 2001
From: Lee Robinson <lrobinson2011@gmail.com>
Date: Mon, 29 May 2023 19:46:24 -0500
Subject: [PATCH 12/66] Explicit deps

---
 turbo.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/turbo.json b/turbo.json
index 3def58b36..d5daebec9 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,6 +1,26 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "globalDependencies": [".env"],
+  "globalEnv": [
+    "DATABASE_URL",
+    "NEXT_PUBLIC_WEBAPP_URL",
+    "NEXTAUTH_SECRET",
+    "NEXTAUTH_URL",
+    "CERT_FILE_PATH",
+    "CERT_PASSPHRASE",
+    "CERT_FILE_ENCODING",
+    "SENDGRID_API_KEY",
+    "SMTP_MAIL_HOST",
+    "SMTP_MAIL_PORT",
+    "SMTP_MAIL_USER",
+    "SMTP_MAIL_PASSWORD",
+    "MAIL_FROM",
+    "STRIPE_API_KEY",
+    "STRIPE_WEBHOOK_SECRET",
+    "NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID",
+    "NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID",
+    "NEXT_PUBLIC_ALLOW_SIGNUP",
+    "NEXT_PUBLIC_ALLOW_SUBSCRIPTIONS"
+  ],
   "pipeline": {
     "build": {
       "outputs": [".next/**", "!.next/cache/**"]

From 007fe44db80cc8b7ee39b8c3ad870cf5890ace9e Mon Sep 17 00:00:00 2001
From: Doug Andrade <contact@dougandrade.com>
Date: Mon, 29 May 2023 22:25:36 -0400
Subject: [PATCH 13/66] loading fonts with next/font

---
 apps/web/components/layout.tsx | 19 +++++++++++++++++--
 apps/web/styles/tailwind.css   | 32 --------------------------------
 apps/web/tailwind.config.js    |  4 ++--
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/apps/web/components/layout.tsx b/apps/web/components/layout.tsx
index 06a5bb2de..d9e8922e2 100644
--- a/apps/web/components/layout.tsx
+++ b/apps/web/components/layout.tsx
@@ -1,13 +1,28 @@
 import { useEffect } from "react";
+import { Montserrat, Qwigley } from "next/font/google";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib/constants";
 import { useSubscription } from "@documenso/lib/stripe";
+import { BillingWarning } from "./billing-warning";
 import Navigation from "./navigation";
 import { PaperAirplaneIcon } from "@heroicons/react/24/outline";
 import { SubscriptionStatus } from "@prisma/client";
 import { useSession } from "next-auth/react";
-import { BillingWarning } from "./billing-warning";
+
+const montserrat = Montserrat({
+  subsets: ["latin"],
+  weight: ["400", "700"],
+  display: "swap",
+  variable: "--font-sans",
+});
+
+const qwigley = Qwigley({
+  subsets: ["latin"],
+  weight: ["400"],
+  display: "swap",
+  variable: "--font-qwigley",
+});
 
 function useRedirectToLoginIfUnauthenticated() {
   const { data: session, status } = useSession();
@@ -39,7 +54,7 @@ export default function Layout({ children }: any) {
 
   return (
     <>
-      <div className="min-h-full">
+      <div className={`${montserrat.variable} min-h-full font-sans`}>
         <Navigation />
 
         <main>
diff --git a/apps/web/styles/tailwind.css b/apps/web/styles/tailwind.css
index 2ea56f9bf..fcae13ac3 100644
--- a/apps/web/styles/tailwind.css
+++ b/apps/web/styles/tailwind.css
@@ -6,35 +6,3 @@
   min-height: 100%;
 }
 
-html,
-body,
-:host {
-  font-family: montserrat;
-}
-
-@font-face {
-  font-family: "Qwigley";
-  src: url("/fonts/Qwigley-Regular.ttf");
-}
-
-/* latin */
-@font-face {
-  font-family: "Montserrat";
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url("/fonts/montserrat.woff2") format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F,
-    U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* latin */
-@font-face {
-  font-family: "Montserrat";
-  font-style: normal;
-  font-weight: 700;
-  font-display: swap;
-  src: url("/fonts/montserrat.woff2") format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F,
-    U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index bc846ebb5..ee8e474dc 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -12,8 +12,8 @@ module.exports = {
   theme: {
     extend: {
       fontFamily: {
-        monteserrat: ["Monteserrat", "serif"],
-        qwigley: ["Qwigley", "serif"],
+        sans: ["var(--font-sans)", ...defaultTheme.fontFamily.sans],
+        qwigley: ["var(--font-qwigley)", "serif"],
       },
       colors: {
         neon: {

From 3e944914744c3696d650295beac18a8703d0a846 Mon Sep 17 00:00:00 2001
From: Doug Andrade <contact@dougandrade.com>
Date: Tue, 30 May 2023 02:17:34 -0400
Subject: [PATCH 14/66] fixed next/font load on ALL pages and toast.

---
 apps/web/components/layout.tsx | 17 +----------------
 apps/web/pages/_app.tsx        | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/apps/web/components/layout.tsx b/apps/web/components/layout.tsx
index d9e8922e2..aa0fad8dc 100644
--- a/apps/web/components/layout.tsx
+++ b/apps/web/components/layout.tsx
@@ -1,5 +1,4 @@
 import { useEffect } from "react";
-import { Montserrat, Qwigley } from "next/font/google";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib/constants";
@@ -10,20 +9,6 @@ import { PaperAirplaneIcon } from "@heroicons/react/24/outline";
 import { SubscriptionStatus } from "@prisma/client";
 import { useSession } from "next-auth/react";
 
-const montserrat = Montserrat({
-  subsets: ["latin"],
-  weight: ["400", "700"],
-  display: "swap",
-  variable: "--font-sans",
-});
-
-const qwigley = Qwigley({
-  subsets: ["latin"],
-  weight: ["400"],
-  display: "swap",
-  variable: "--font-qwigley",
-});
-
 function useRedirectToLoginIfUnauthenticated() {
   const { data: session, status } = useSession();
   const loading = status === "loading";
@@ -54,7 +39,7 @@ export default function Layout({ children }: any) {
 
   return (
     <>
-      <div className={`${montserrat.variable} min-h-full font-sans`}>
+      <div className="min-h-full">
         <Navigation />
 
         <main>
diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx
index cd5541cbb..866b742c3 100644
--- a/apps/web/pages/_app.tsx
+++ b/apps/web/pages/_app.tsx
@@ -1,6 +1,7 @@
 import { ReactElement, ReactNode } from "react";
 import { NextPage } from "next";
 import type { AppProps } from "next/app";
+import { Montserrat, Qwigley } from "next/font/google";
 import { SubscriptionProvider } from "@documenso/lib/stripe/providers/subscription-provider";
 import "../../../node_modules/placeholder-loading/src/scss/placeholder-loading.scss";
 import "../../../node_modules/react-resizable/css/styles.css";
@@ -11,6 +12,20 @@ import "react-tooltip/dist/react-tooltip.css";
 
 export { coloredConsole } from "@documenso/lib";
 
+const montserrat = Montserrat({
+  subsets: ["latin"],
+  weight: ["400", "700"],
+  display: "swap",
+  variable: "--font-sans",
+});
+
+const qwigley = Qwigley({
+  subsets: ["latin"],
+  weight: ["400"],
+  display: "swap",
+  variable: "--font-qwigley",
+});
+
 export type NextPageWithLayout<P = {}, IP = P> = NextPage<P, IP> & {
   getLayout?: (page: ReactElement) => ReactNode;
 };
@@ -27,8 +42,10 @@ export default function App({
   return (
     <SessionProvider session={session}>
       <SubscriptionProvider initialSubscription={initialSubscription}>
-        <Toaster position="top-center" />
-        {getLayout(<Component {...pageProps} />)}
+        <div className={`${montserrat.variable} font-sans`}>
+          <Toaster position="top-center" />
+          {getLayout(<Component {...pageProps} />)}
+        </div>
       </SubscriptionProvider>
     </SessionProvider>
   );

From 307b0cc9d9cb2b82e18f508868e744d26cf1cf3f Mon Sep 17 00:00:00 2001
From: Doug Andrade <contact@dougandrade.com>
Date: Tue, 30 May 2023 02:36:43 -0400
Subject: [PATCH 15/66] fixed height on login/signup pages

---
 apps/web/pages/_app.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx
index 866b742c3..a1193a681 100644
--- a/apps/web/pages/_app.tsx
+++ b/apps/web/pages/_app.tsx
@@ -42,10 +42,10 @@ export default function App({
   return (
     <SessionProvider session={session}>
       <SubscriptionProvider initialSubscription={initialSubscription}>
-        <div className={`${montserrat.variable} font-sans`}>
+        <main className={`${montserrat.variable} h-full font-sans`}>
           <Toaster position="top-center" />
           {getLayout(<Component {...pageProps} />)}
-        </div>
+        </main>
       </SubscriptionProvider>
     </SessionProvider>
   );

From d8ad4b4b2b5ddaccbcb461eb91baf94ae1b0b74f Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Tue, 30 May 2023 18:56:41 +1000
Subject: [PATCH 16/66] fix: add turbo dep and start command

---
 package-lock.json | 153 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |   1 +
 turbo.json        |   5 ++
 3 files changed, 159 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 3294ac71b..4e56abc72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,6 +40,7 @@
         "npm-run-all": "^4.1.5",
         "prettier": "^2.8.7",
         "prettier-plugin-tailwindcss": "^0.2.5",
+        "turbo": "^1.9.9",
         "typescript": "4.8.4"
       }
     },
@@ -7665,6 +7666,102 @@
         "node": "*"
       }
     },
+    "node_modules/turbo": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.9.9.tgz",
+      "integrity": "sha512-+ZS66LOT7ahKHxh6XrIdcmf2Yk9mNpAbPEj4iF2cs0cAeaDU3xLVPZFF0HbSho89Uxwhx7b5HBgPbdcjQTwQkg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "turbo": "bin/turbo"
+      },
+      "optionalDependencies": {
+        "turbo-darwin-64": "1.9.9",
+        "turbo-darwin-arm64": "1.9.9",
+        "turbo-linux-64": "1.9.9",
+        "turbo-linux-arm64": "1.9.9",
+        "turbo-windows-64": "1.9.9",
+        "turbo-windows-arm64": "1.9.9"
+      }
+    },
+    "node_modules/turbo-darwin-64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.9.9.tgz",
+      "integrity": "sha512-UDGM9E21eCDzF5t1F4rzrjwWutcup33e7ZjNJcW/mJDPorazZzqXGKEPIy9kXwKhamUUXfC7668r6ZuA1WXF2Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/turbo-darwin-arm64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.9.9.tgz",
+      "integrity": "sha512-VyfkXzTJpYLTAQ9krq2myyEq7RPObilpS04lgJ4OO1piq76RNmSpX9F/t9JCaY9Pj/4TL7i0d8PM7NGhwEA5Ag==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/turbo-linux-64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.9.9.tgz",
+      "integrity": "sha512-Fu1MY29Odg8dHOqXcpIIGC3T63XLOGgnGfbobXMKdrC7JQDvtJv8TUCYciRsyknZYjyyKK1z6zKuYIiDjf3KeQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/turbo-linux-arm64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.9.9.tgz",
+      "integrity": "sha512-50LI8NafPuJxdnMCBeDdzgyt1cgjQG7FwkyY336v4e95WJPUVjrHdrKH6jYXhOUyrv9+jCJxwX1Yrg02t5yJ1g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/turbo-windows-64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.9.9.tgz",
+      "integrity": "sha512-9IsTReoLmQl1IRsy3WExe2j2RKWXQyXujfJ4fXF+jp08KxjVF4/tYP2CIRJx/A7UP/7keBta27bZqzAjsmbSTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/turbo-windows-arm64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.9.9.tgz",
+      "integrity": "sha512-CUu4hpeQo68JjDr0V0ygTQRLbS+/sNfdqEVV+Xz9136vpKn2WMQLAuUBVZV0Sp0S/7i+zGnplskT0fED+W46wQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
@@ -13859,6 +13956,62 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "turbo": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.9.9.tgz",
+      "integrity": "sha512-+ZS66LOT7ahKHxh6XrIdcmf2Yk9mNpAbPEj4iF2cs0cAeaDU3xLVPZFF0HbSho89Uxwhx7b5HBgPbdcjQTwQkg==",
+      "dev": true,
+      "requires": {
+        "turbo-darwin-64": "1.9.9",
+        "turbo-darwin-arm64": "1.9.9",
+        "turbo-linux-64": "1.9.9",
+        "turbo-linux-arm64": "1.9.9",
+        "turbo-windows-64": "1.9.9",
+        "turbo-windows-arm64": "1.9.9"
+      }
+    },
+    "turbo-darwin-64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.9.9.tgz",
+      "integrity": "sha512-UDGM9E21eCDzF5t1F4rzrjwWutcup33e7ZjNJcW/mJDPorazZzqXGKEPIy9kXwKhamUUXfC7668r6ZuA1WXF2Q==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-darwin-arm64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.9.9.tgz",
+      "integrity": "sha512-VyfkXzTJpYLTAQ9krq2myyEq7RPObilpS04lgJ4OO1piq76RNmSpX9F/t9JCaY9Pj/4TL7i0d8PM7NGhwEA5Ag==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-linux-64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.9.9.tgz",
+      "integrity": "sha512-Fu1MY29Odg8dHOqXcpIIGC3T63XLOGgnGfbobXMKdrC7JQDvtJv8TUCYciRsyknZYjyyKK1z6zKuYIiDjf3KeQ==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-linux-arm64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.9.9.tgz",
+      "integrity": "sha512-50LI8NafPuJxdnMCBeDdzgyt1cgjQG7FwkyY336v4e95WJPUVjrHdrKH6jYXhOUyrv9+jCJxwX1Yrg02t5yJ1g==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-windows-64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.9.9.tgz",
+      "integrity": "sha512-9IsTReoLmQl1IRsy3WExe2j2RKWXQyXujfJ4fXF+jp08KxjVF4/tYP2CIRJx/A7UP/7keBta27bZqzAjsmbSTA==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-windows-arm64": {
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.9.9.tgz",
+      "integrity": "sha512-CUu4hpeQo68JjDr0V0ygTQRLbS+/sNfdqEVV+Xz9136vpKn2WMQLAuUBVZV0Sp0S/7i+zGnplskT0fED+W46wQ==",
+      "dev": true,
+      "optional": true
+    },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
diff --git a/package.json b/package.json
index 12d9db61c..d5790a9e7 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.7",
     "prettier-plugin-tailwindcss": "^0.2.5",
+    "turbo": "^1.9.9",
     "typescript": "4.8.4"
   }
 }
diff --git a/turbo.json b/turbo.json
index d5daebec9..ea51341b1 100644
--- a/turbo.json
+++ b/turbo.json
@@ -25,6 +25,11 @@
     "build": {
       "outputs": [".next/**", "!.next/cache/**"]
     },
+    "start": {
+      "dependsOn": ["build"],
+      "cache": false,
+      "persistent": true
+    },
     "dev": {
       "cache": false,
       "persistent": true

From b5e03359c1b31c25d5aa68299828b7499ba488e5 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Tue, 30 May 2023 20:11:23 +1000
Subject: [PATCH 17/66] fix: mark truncateTitle as optional

---
 package-lock.json                        | 356 -----------------------
 packages/ui/components/dialog/Dialog.tsx |   2 +-
 2 files changed, 1 insertion(+), 357 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e56abc72..3a7883179 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -93,7 +93,6 @@
         "eslint": "8.27.0",
         "eslint-config-next": "13.0.3",
         "file-loader": "^6.2.0",
-        "next-transpile-modules": "^10.0.0",
         "postcss": "^8.4.19",
         "sass": "^1.57.1",
         "stripe-cli": "^0.1.0",
@@ -634,36 +633,6 @@
         "glob": "7.1.7"
       }
     },
-    "node_modules/@next/swc-android-arm-eabi": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.2.4.tgz",
-      "integrity": "sha512-DWlalTSkLjDU11MY11jg17O1gGQzpRccM9Oes2yTqj2DpHndajrXHGxj9HGtJ+idq2k7ImUdJVWS2h2l/EDJOw==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-android-arm64": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.2.4.tgz",
-      "integrity": "sha512-sRavmUImUCf332Gy+PjIfLkMhiRX1Ez4SI+3vFDRs1N5eXp+uNzjFUK/oLMMOzk6KFSkbiK/3Wt8+dHQR/flNg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@next/swc-darwin-arm64": {
       "version": "13.2.4",
       "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.2.4.tgz",
@@ -679,156 +648,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.2.4.tgz",
-      "integrity": "sha512-a6LBuoYGcFOPGd4o8TPo7wmv5FnMr+Prz+vYHopEDuhDoMSHOnC+v+Ab4D7F0NMZkvQjEJQdJS3rqgFhlZmKlw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-freebsd-x64": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.2.4.tgz",
-      "integrity": "sha512-kkbzKVZGPaXRBPisoAQkh3xh22r+TD+5HwoC5bOkALraJ0dsOQgSMAvzMXKsN3tMzJUPS0tjtRf1cTzrQ0I5vQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm-gnueabihf": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.2.4.tgz",
-      "integrity": "sha512-7qA1++UY0fjprqtjBZaOA6cas/7GekpjVsZn/0uHvquuITFCdKGFCsKNBx3S0Rpxmx6WYo0GcmhNRM9ru08BGg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.2.4.tgz",
-      "integrity": "sha512-xzYZdAeq883MwXgcwc72hqo/F/dwUxCukpDOkx/j1HTq/J0wJthMGjinN9wH5bPR98Mfeh1MZJ91WWPnZOedOg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.2.4.tgz",
-      "integrity": "sha512-8rXr3WfmqSiYkb71qzuDP6I6R2T2tpkmf83elDN8z783N9nvTJf2E7eLx86wu2OJCi4T05nuxCsh4IOU3LQ5xw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.2.4.tgz",
-      "integrity": "sha512-Ngxh51zGSlYJ4EfpKG4LI6WfquulNdtmHg1yuOYlaAr33KyPJp4HeN/tivBnAHcZkoNy0hh/SbwDyCnz5PFJQQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.2.4.tgz",
-      "integrity": "sha512-gOvwIYoSxd+j14LOcvJr+ekd9fwYT1RyMAHOp7znA10+l40wkFiMONPLWiZuHxfRk+Dy7YdNdDh3ImumvL6VwA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.2.4.tgz",
-      "integrity": "sha512-q3NJzcfClgBm4HvdcnoEncmztxrA5GXqKeiZ/hADvC56pwNALt3ngDC6t6qr1YW9V/EPDxCYeaX4zYxHciW4Dw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.2.4.tgz",
-      "integrity": "sha512-/eZ5ncmHUYtD2fc6EUmAIZlAJnVT2YmxDsKs1Ourx0ttTtvtma/WKlMV5NoUsyOez0f9ExLyOpeCoz5aj+MPXw==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.2.4.tgz",
-      "integrity": "sha512-0MffFmyv7tBLlji01qc0IaPP/LVExzvj7/R5x1Jph1bTAIj4Vu81yFQWHHQAP6r4ff9Ukj1mBK6MDNVXm7Tcvw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3653,7 +3472,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -7684,19 +7502,6 @@
         "turbo-windows-arm64": "1.9.9"
       }
     },
-    "node_modules/turbo-darwin-64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.9.9.tgz",
-      "integrity": "sha512-UDGM9E21eCDzF5t1F4rzrjwWutcup33e7ZjNJcW/mJDPorazZzqXGKEPIy9kXwKhamUUXfC7668r6ZuA1WXF2Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
     "node_modules/turbo-darwin-arm64": {
       "version": "1.9.9",
       "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.9.9.tgz",
@@ -7710,58 +7515,6 @@
         "darwin"
       ]
     },
-    "node_modules/turbo-linux-64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.9.9.tgz",
-      "integrity": "sha512-Fu1MY29Odg8dHOqXcpIIGC3T63XLOGgnGfbobXMKdrC7JQDvtJv8TUCYciRsyknZYjyyKK1z6zKuYIiDjf3KeQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/turbo-linux-arm64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.9.9.tgz",
-      "integrity": "sha512-50LI8NafPuJxdnMCBeDdzgyt1cgjQG7FwkyY336v4e95WJPUVjrHdrKH6jYXhOUyrv9+jCJxwX1Yrg02t5yJ1g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/turbo-windows-64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.9.9.tgz",
-      "integrity": "sha512-9IsTReoLmQl1IRsy3WExe2j2RKWXQyXujfJ4fXF+jp08KxjVF4/tYP2CIRJx/A7UP/7keBta27bZqzAjsmbSTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/turbo-windows-arm64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.9.9.tgz",
-      "integrity": "sha512-CUu4hpeQo68JjDr0V0ygTQRLbS+/sNfdqEVV+Xz9136vpKn2WMQLAuUBVZV0Sp0S/7i+zGnplskT0fED+W46wQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
@@ -8614,7 +8367,6 @@
         "formidable": "^3.2.5",
         "next": "13.2.4",
         "next-auth": "^4.22.0",
-        "next-transpile-modules": "^10.0.0",
         "node-forge": "^1.3.1",
         "node-signpdf": "^1.5.0",
         "nodemailer": "^6.9.0",
@@ -8778,84 +8530,12 @@
         "glob": "7.1.7"
       }
     },
-    "@next/swc-android-arm-eabi": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.2.4.tgz",
-      "integrity": "sha512-DWlalTSkLjDU11MY11jg17O1gGQzpRccM9Oes2yTqj2DpHndajrXHGxj9HGtJ+idq2k7ImUdJVWS2h2l/EDJOw==",
-      "optional": true
-    },
-    "@next/swc-android-arm64": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.2.4.tgz",
-      "integrity": "sha512-sRavmUImUCf332Gy+PjIfLkMhiRX1Ez4SI+3vFDRs1N5eXp+uNzjFUK/oLMMOzk6KFSkbiK/3Wt8+dHQR/flNg==",
-      "optional": true
-    },
     "@next/swc-darwin-arm64": {
       "version": "13.2.4",
       "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.2.4.tgz",
       "integrity": "sha512-S6vBl+OrInP47TM3LlYx65betocKUUlTZDDKzTiRDbsRESeyIkBtZ6Qi5uT2zQs4imqllJznVjFd1bXLx3Aa6A==",
       "optional": true
     },
-    "@next/swc-darwin-x64": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.2.4.tgz",
-      "integrity": "sha512-a6LBuoYGcFOPGd4o8TPo7wmv5FnMr+Prz+vYHopEDuhDoMSHOnC+v+Ab4D7F0NMZkvQjEJQdJS3rqgFhlZmKlw==",
-      "optional": true
-    },
-    "@next/swc-freebsd-x64": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.2.4.tgz",
-      "integrity": "sha512-kkbzKVZGPaXRBPisoAQkh3xh22r+TD+5HwoC5bOkALraJ0dsOQgSMAvzMXKsN3tMzJUPS0tjtRf1cTzrQ0I5vQ==",
-      "optional": true
-    },
-    "@next/swc-linux-arm-gnueabihf": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.2.4.tgz",
-      "integrity": "sha512-7qA1++UY0fjprqtjBZaOA6cas/7GekpjVsZn/0uHvquuITFCdKGFCsKNBx3S0Rpxmx6WYo0GcmhNRM9ru08BGg==",
-      "optional": true
-    },
-    "@next/swc-linux-arm64-gnu": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.2.4.tgz",
-      "integrity": "sha512-xzYZdAeq883MwXgcwc72hqo/F/dwUxCukpDOkx/j1HTq/J0wJthMGjinN9wH5bPR98Mfeh1MZJ91WWPnZOedOg==",
-      "optional": true
-    },
-    "@next/swc-linux-arm64-musl": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.2.4.tgz",
-      "integrity": "sha512-8rXr3WfmqSiYkb71qzuDP6I6R2T2tpkmf83elDN8z783N9nvTJf2E7eLx86wu2OJCi4T05nuxCsh4IOU3LQ5xw==",
-      "optional": true
-    },
-    "@next/swc-linux-x64-gnu": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.2.4.tgz",
-      "integrity": "sha512-Ngxh51zGSlYJ4EfpKG4LI6WfquulNdtmHg1yuOYlaAr33KyPJp4HeN/tivBnAHcZkoNy0hh/SbwDyCnz5PFJQQ==",
-      "optional": true
-    },
-    "@next/swc-linux-x64-musl": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.2.4.tgz",
-      "integrity": "sha512-gOvwIYoSxd+j14LOcvJr+ekd9fwYT1RyMAHOp7znA10+l40wkFiMONPLWiZuHxfRk+Dy7YdNdDh3ImumvL6VwA==",
-      "optional": true
-    },
-    "@next/swc-win32-arm64-msvc": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.2.4.tgz",
-      "integrity": "sha512-q3NJzcfClgBm4HvdcnoEncmztxrA5GXqKeiZ/hADvC56pwNALt3ngDC6t6qr1YW9V/EPDxCYeaX4zYxHciW4Dw==",
-      "optional": true
-    },
-    "@next/swc-win32-ia32-msvc": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.2.4.tgz",
-      "integrity": "sha512-/eZ5ncmHUYtD2fc6EUmAIZlAJnVT2YmxDsKs1Ourx0ttTtvtma/WKlMV5NoUsyOez0f9ExLyOpeCoz5aj+MPXw==",
-      "optional": true
-    },
-    "@next/swc-win32-x64-msvc": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.2.4.tgz",
-      "integrity": "sha512-0MffFmyv7tBLlji01qc0IaPP/LVExzvj7/R5x1Jph1bTAIj4Vu81yFQWHHQAP6r4ff9Ukj1mBK6MDNVXm7Tcvw==",
-      "optional": true
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -11109,7 +10789,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "optional": true,
       "peer": true
     },
@@ -13970,13 +13649,6 @@
         "turbo-windows-arm64": "1.9.9"
       }
     },
-    "turbo-darwin-64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.9.9.tgz",
-      "integrity": "sha512-UDGM9E21eCDzF5t1F4rzrjwWutcup33e7ZjNJcW/mJDPorazZzqXGKEPIy9kXwKhamUUXfC7668r6ZuA1WXF2Q==",
-      "dev": true,
-      "optional": true
-    },
     "turbo-darwin-arm64": {
       "version": "1.9.9",
       "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.9.9.tgz",
@@ -13984,34 +13656,6 @@
       "dev": true,
       "optional": true
     },
-    "turbo-linux-64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.9.9.tgz",
-      "integrity": "sha512-Fu1MY29Odg8dHOqXcpIIGC3T63XLOGgnGfbobXMKdrC7JQDvtJv8TUCYciRsyknZYjyyKK1z6zKuYIiDjf3KeQ==",
-      "dev": true,
-      "optional": true
-    },
-    "turbo-linux-arm64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.9.9.tgz",
-      "integrity": "sha512-50LI8NafPuJxdnMCBeDdzgyt1cgjQG7FwkyY336v4e95WJPUVjrHdrKH6jYXhOUyrv9+jCJxwX1Yrg02t5yJ1g==",
-      "dev": true,
-      "optional": true
-    },
-    "turbo-windows-64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.9.9.tgz",
-      "integrity": "sha512-9IsTReoLmQl1IRsy3WExe2j2RKWXQyXujfJ4fXF+jp08KxjVF4/tYP2CIRJx/A7UP/7keBta27bZqzAjsmbSTA==",
-      "dev": true,
-      "optional": true
-    },
-    "turbo-windows-arm64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.9.9.tgz",
-      "integrity": "sha512-CUu4hpeQo68JjDr0V0ygTQRLbS+/sNfdqEVV+Xz9136vpKn2WMQLAuUBVZV0Sp0S/7i+zGnplskT0fED+W46wQ==",
-      "dev": true,
-      "optional": true
-    },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index 1e03135af..8f23ef8f4 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -20,7 +20,7 @@ type DialogProps = {
   formValues: FormValue[];
   setLoading: (loading: boolean) => void;
   icon: React.ReactNode;
-  truncateTitle: boolean;
+  truncateTitle?: boolean;
 };
 
 export function Dialog({

From 0a5de1823563b24edf447ea50c68a2627584318b Mon Sep 17 00:00:00 2001
From: Ansari <ansari_official@yahoo.com>
Date: Tue, 30 May 2023 15:43:58 +0530
Subject: [PATCH 18/66] minor script fix

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d5790a9e7..31b44e7ed 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "db-migrate:dev": "prisma migrate dev",
     "db-seed": "prisma db seed",
     "db-studio": "prisma studio",
-    "docker:compose": "docker-compose -f ./docker/compose-without-app.yml",
+    "docker:compose": "docker compose -f ./docker/compose-without-app.yml || docker-compose -f ./docker/compose-without-app.yml",
     "docker:compose-up": "npm run docker:compose -- up -d",
     "docker:compose-down": "npm run docker:compose -- down",
     "stripe:listen": "stripe listen --forward-to localhost:3000/api/stripe/webhook",
@@ -55,4 +55,4 @@
     "turbo": "^1.9.9",
     "typescript": "4.8.4"
   }
-}
+}
\ No newline at end of file

From 19e960f5932ce8066cd0abc555c7c38bdaa9a53f Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Wed, 31 May 2023 21:11:54 +1000
Subject: [PATCH 19/66] fix: improve stripe webhook endpoint

Improve the stripe webhook endpoint by checking for
subscriptions prior to performing an update to handle
cases where accounts have no created subscription.

This can happen in sitations such as when a checkout_session has been created but the payment fails.
---
 packages/lib/stripe/handlers/webhook.ts | 85 ++++++++++++++++++-------
 1 file changed, 61 insertions(+), 24 deletions(-)

diff --git a/packages/lib/stripe/handlers/webhook.ts b/packages/lib/stripe/handlers/webhook.ts
index 390fc21de..609e652fe 100644
--- a/packages/lib/stripe/handlers/webhook.ts
+++ b/packages/lib/stripe/handlers/webhook.ts
@@ -25,9 +25,7 @@ export const webhookHandler = async (req: NextApiRequest, res: NextApiResponse)
     });
   }
 
-  log("constructing body...")
   const body = await buffer(req);
-  log("constructed body")
 
   const event = stripe.webhooks.constructEvent(body, sig, process.env.STRIPE_WEBHOOK_SECRET!);
   log("event-type:", event.type);
@@ -70,23 +68,38 @@ export const webhookHandler = async (req: NextApiRequest, res: NextApiResponse)
   if (event.type === "invoice.payment_succeeded") {
     const invoice = event.data.object as Stripe.Invoice;
 
+    if (invoice.billing_reason !== "subscription_cycle") {
+      return res.status(200).json({
+        success: true,
+        message: "Webhook received",
+      });
+    }
+
     const customerId =
       typeof invoice.customer === "string" ? invoice.customer : invoice.customer?.id;
 
     const subscription = await stripe.subscriptions.retrieve(invoice.subscription as string);
 
-    await prisma.subscription.update({
+    const hasSubscription = await prisma.subscription.findFirst({
       where: {
         customerId,
       },
-      data: {
-        status: SubscriptionStatus.ACTIVE,
-        planId: subscription.id,
-        priceId: subscription.items.data[0].price.id,
-        periodEnd: new Date(subscription.current_period_end * 1000),
-      },
     });
 
+    if (hasSubscription) {
+      await prisma.subscription.update({
+        where: {
+          customerId,
+        },
+        data: {
+          status: SubscriptionStatus.ACTIVE,
+          planId: subscription.id,
+          priceId: subscription.items.data[0].price.id,
+          periodEnd: new Date(subscription.current_period_end * 1000),
+        },
+      });
+    }
+
     return res.status(200).json({
       success: true,
       message: "Webhook received",
@@ -98,15 +111,23 @@ export const webhookHandler = async (req: NextApiRequest, res: NextApiResponse)
 
     const customerId = failedInvoice.customer as string;
 
-    await prisma.subscription.update({
+    const hasSubscription = await prisma.subscription.findFirst({
       where: {
         customerId,
       },
-      data: {
-        status: SubscriptionStatus.PAST_DUE,
-      },
     });
 
+    if (hasSubscription) {
+      await prisma.subscription.update({
+        where: {
+          customerId,
+        },
+        data: {
+          status: SubscriptionStatus.PAST_DUE,
+        },
+      });
+    }
+
     return res.status(200).json({
       success: true,
       message: "Webhook received",
@@ -118,18 +139,26 @@ export const webhookHandler = async (req: NextApiRequest, res: NextApiResponse)
 
     const customerId = updatedSubscription.customer as string;
 
-    await prisma.subscription.update({
+    const hasSubscription = await prisma.subscription.findFirst({
       where: {
         customerId,
       },
-      data: {
-        status: SubscriptionStatus.ACTIVE,
-        planId: updatedSubscription.id,
-        priceId: updatedSubscription.items.data[0].price.id,
-        periodEnd: new Date(updatedSubscription.current_period_end * 1000),
-      },
     });
 
+    if (hasSubscription) {
+      await prisma.subscription.update({
+        where: {
+          customerId,
+        },
+        data: {
+          status: SubscriptionStatus.ACTIVE,
+          planId: updatedSubscription.id,
+          priceId: updatedSubscription.items.data[0].price.id,
+          periodEnd: new Date(updatedSubscription.current_period_end * 1000),
+        },
+      });
+    }
+
     return res.status(200).json({
       success: true,
       message: "Webhook received",
@@ -141,15 +170,23 @@ export const webhookHandler = async (req: NextApiRequest, res: NextApiResponse)
 
     const customerId = deletedSubscription.customer as string;
 
-    await prisma.subscription.update({
+    const hasSubscription = await prisma.subscription.findFirst({
       where: {
         customerId,
       },
-      data: {
-        status: SubscriptionStatus.INACTIVE,
-      },
     });
 
+    if (hasSubscription) {
+      await prisma.subscription.update({
+        where: {
+          customerId,
+        },
+        data: {
+          status: SubscriptionStatus.INACTIVE,
+        },
+      });
+    }
+
     return res.status(200).json({
       success: true,
       message: "Webhook received",

From dd4568b7fa34d122d10aae16e91fbe15a383228f Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Thu, 1 Jun 2023 13:58:18 +0700
Subject: [PATCH 20/66] typo: documentso >> documenso

---
 docker/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/build.sh b/docker/build.sh
index 9a1ed88fb..aa2068910 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -22,7 +22,7 @@ echo "Git SHA: $GIT_SHA"
 
 docker build -f "$SCRIPT_DIR/Dockerfile" \
     --progress=plain \
-    -t "documentso:latest" \
+    -t "documenso:latest" \
     -t "documenso:$GIT_SHA" \
     -t "documenso:$APP_VERSION" \
     "$MONOREPO_ROOT"

From 488cf58f0e7e166910cd8b3b66bcb0db0cf23ab3 Mon Sep 17 00:00:00 2001
From: Jonas Pardon <jonas@contractify.be>
Date: Thu, 1 Jun 2023 10:04:26 +0200
Subject: [PATCH 21/66] Fix typos in example env

Just noticed some typos while setting up a local copy and thought I'd fix them up real quick.
---
 .env.example | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index a1faef3f0..ab8d15b45 100644
--- a/.env.example
+++ b/.env.example
@@ -4,8 +4,8 @@
 # Option 3: Use the provided dx setup (RECOMMENDED)
 #   => postgres://documenso:password@127.0.0.1:54320/documenso
 #
-# ⚠ WARNING: The test database can be resetted or taken offline at any point.
-# ⚠ WARNING: Please be aware that nothing written to the test databae is private.
+# ⚠ WARNING: The test database can be reset or taken offline at any point.
+# ⚠ WARNING: Please be aware that nothing written to the test database is private.
 DATABASE_URL=''
 
 # URL
@@ -51,4 +51,4 @@ NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID=
 #FEATURE FLAGS
 # Allow users to register via the /signup page. Otherwise they will be redirect to the home page.
 NEXT_PUBLIC_ALLOW_SIGNUP=true
-NEXT_PUBLIC_ALLOW_SUBSCRIPTIONS=true
\ No newline at end of file
+NEXT_PUBLIC_ALLOW_SUBSCRIPTIONS=true

From 0a7ed0701cdf4ebe1846ec74679834dca6b66134 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Thu, 1 Jun 2023 23:25:49 +1000
Subject: [PATCH 22/66] fix: add turbo entries for other platforms to
 package-lock

Package managers such as NPM behave strangely when adding
packages such as swc and turborepo which contain platform
variants.

During a first time install they will include only the current
devices platform while a clean node_modules and package-lock
will result in all platforms being included.

This change adds those missed platforms by performing the above step and porting it back to our existing package-lock.
---
 package-lock.json | 150 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 126 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3a7883179..8d104b0d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3472,6 +3472,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -7485,27 +7486,40 @@
       }
     },
     "node_modules/turbo": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.9.9.tgz",
-      "integrity": "sha512-+ZS66LOT7ahKHxh6XrIdcmf2Yk9mNpAbPEj4iF2cs0cAeaDU3xLVPZFF0HbSho89Uxwhx7b5HBgPbdcjQTwQkg==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.10.1.tgz",
+      "integrity": "sha512-wq0YeSv6P/eEDXOL42jkMUr+T4z34dM8mdHu5u6C6OOAq8JuLJ72F/v4EVR1JmY8icyTkFz10ICLV0haUUYhbQ==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
         "turbo": "bin/turbo"
       },
       "optionalDependencies": {
-        "turbo-darwin-64": "1.9.9",
-        "turbo-darwin-arm64": "1.9.9",
-        "turbo-linux-64": "1.9.9",
-        "turbo-linux-arm64": "1.9.9",
-        "turbo-windows-64": "1.9.9",
-        "turbo-windows-arm64": "1.9.9"
+        "turbo-darwin-64": "1.10.1",
+        "turbo-darwin-arm64": "1.10.1",
+        "turbo-linux-64": "1.10.1",
+        "turbo-linux-arm64": "1.10.1",
+        "turbo-windows-64": "1.10.1",
+        "turbo-windows-arm64": "1.10.1"
       }
     },
+    "node_modules/turbo-darwin-64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.10.1.tgz",
+      "integrity": "sha512-isLLoPuAOMNsYovOq9BhuQOZWQuU13zYsW988KkkaA4OJqOn7qwa9V/KBYCJL8uVQqtG+/Y42J37lO8RJjyXuA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
     "node_modules/turbo-darwin-arm64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.9.9.tgz",
-      "integrity": "sha512-VyfkXzTJpYLTAQ9krq2myyEq7RPObilpS04lgJ4OO1piq76RNmSpX9F/t9JCaY9Pj/4TL7i0d8PM7NGhwEA5Ag==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.10.1.tgz",
+      "integrity": "sha512-x1nloPR10fLElNCv17BKr0kCx/O5gse/UXAcVscMZH2tvRUtXrdBmut62uw2YU3J9hli2fszYjUWXkulVpQvFA==",
       "cpu": [
         "arm64"
       ],
@@ -7515,6 +7529,58 @@
         "darwin"
       ]
     },
+    "node_modules/turbo-linux-64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.10.1.tgz",
+      "integrity": "sha512-abV+ODCeOlz0503OZlHhPWdy3VwJZc1jObf1VQj7uQM+JqJ/kXbMyqJIMQVz+m7QJUFdferYPRxGhYT/NbYK7Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/turbo-linux-arm64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.10.1.tgz",
+      "integrity": "sha512-zRC3nZbHQ63tofOmbuySzEn1ROISWTkemYYr1L98rpmT5aVa0kERlGiYcfDwZh3cBso/Ylg/wxexRAaPzcCJYQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/turbo-windows-64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.10.1.tgz",
+      "integrity": "sha512-Irqz8IU+o7Q/5V44qatZBTunk+FQAOII1hZTsEU54ah62f9Y297K6/LSp+yncmVQOZlFVccXb6MDqcETExIQtA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/turbo-windows-arm64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.10.1.tgz",
+      "integrity": "sha512-124IT15d2gyjC+NEn11pHOaVFvZDRHpxfF+LDUzV7YxfNIfV0mGkR3R/IyVXtQHOgqOdtQTbC4y411sm31+SEw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
@@ -10789,6 +10855,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "optional": true,
       "peer": true
     },
@@ -13636,23 +13703,58 @@
       }
     },
     "turbo": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.9.9.tgz",
-      "integrity": "sha512-+ZS66LOT7ahKHxh6XrIdcmf2Yk9mNpAbPEj4iF2cs0cAeaDU3xLVPZFF0HbSho89Uxwhx7b5HBgPbdcjQTwQkg==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.10.1.tgz",
+      "integrity": "sha512-wq0YeSv6P/eEDXOL42jkMUr+T4z34dM8mdHu5u6C6OOAq8JuLJ72F/v4EVR1JmY8icyTkFz10ICLV0haUUYhbQ==",
       "dev": true,
       "requires": {
-        "turbo-darwin-64": "1.9.9",
-        "turbo-darwin-arm64": "1.9.9",
-        "turbo-linux-64": "1.9.9",
-        "turbo-linux-arm64": "1.9.9",
-        "turbo-windows-64": "1.9.9",
-        "turbo-windows-arm64": "1.9.9"
+        "turbo-darwin-64": "1.10.1",
+        "turbo-darwin-arm64": "1.10.1",
+        "turbo-linux-64": "1.10.1",
+        "turbo-linux-arm64": "1.10.1",
+        "turbo-windows-64": "1.10.1",
+        "turbo-windows-arm64": "1.10.1"
       }
     },
+    "turbo-darwin-64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.10.1.tgz",
+      "integrity": "sha512-isLLoPuAOMNsYovOq9BhuQOZWQuU13zYsW988KkkaA4OJqOn7qwa9V/KBYCJL8uVQqtG+/Y42J37lO8RJjyXuA==",
+      "dev": true,
+      "optional": true
+    },
     "turbo-darwin-arm64": {
-      "version": "1.9.9",
-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.9.9.tgz",
-      "integrity": "sha512-VyfkXzTJpYLTAQ9krq2myyEq7RPObilpS04lgJ4OO1piq76RNmSpX9F/t9JCaY9Pj/4TL7i0d8PM7NGhwEA5Ag==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.10.1.tgz",
+      "integrity": "sha512-x1nloPR10fLElNCv17BKr0kCx/O5gse/UXAcVscMZH2tvRUtXrdBmut62uw2YU3J9hli2fszYjUWXkulVpQvFA==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-linux-64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.10.1.tgz",
+      "integrity": "sha512-abV+ODCeOlz0503OZlHhPWdy3VwJZc1jObf1VQj7uQM+JqJ/kXbMyqJIMQVz+m7QJUFdferYPRxGhYT/NbYK7Q==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-linux-arm64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.10.1.tgz",
+      "integrity": "sha512-zRC3nZbHQ63tofOmbuySzEn1ROISWTkemYYr1L98rpmT5aVa0kERlGiYcfDwZh3cBso/Ylg/wxexRAaPzcCJYQ==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-windows-64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.10.1.tgz",
+      "integrity": "sha512-Irqz8IU+o7Q/5V44qatZBTunk+FQAOII1hZTsEU54ah62f9Y297K6/LSp+yncmVQOZlFVccXb6MDqcETExIQtA==",
+      "dev": true,
+      "optional": true
+    },
+    "turbo-windows-arm64": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.10.1.tgz",
+      "integrity": "sha512-124IT15d2gyjC+NEn11pHOaVFvZDRHpxfF+LDUzV7YxfNIfV0mGkR3R/IyVXtQHOgqOdtQTbC4y411sm31+SEw==",
       "dev": true,
       "optional": true
     },

From 20b51198b402814de9e59c3ecb07df03fdf32d19 Mon Sep 17 00:00:00 2001
From: Robinhood <ansarithameem674@gmail.com>
Date: Thu, 1 Jun 2023 22:24:58 +0530
Subject: [PATCH 23/66] =?UTF-8?q?docker=20script=20updated=20=F0=9F=90=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 31b44e7ed..08d2a2788 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,8 @@
     "db-migrate:dev": "prisma migrate dev",
     "db-seed": "prisma db seed",
     "db-studio": "prisma studio",
-    "docker:compose": "docker compose -f ./docker/compose-without-app.yml || docker-compose -f ./docker/compose-without-app.yml",
-    "docker:compose-up": "npm run docker:compose -- up -d",
-    "docker:compose-down": "npm run docker:compose -- down",
+    "docker:compose-up": "docker compose -f ./docker/compose-without-app.yml up -d || docker-compose -f ./docker/compose-without-app.yml up -d",
+    "docker:compose-down": "docker compose -f ./docker/compose-without-app.yml down || docker-compose -f ./docker/compose-without-app.yml down",
     "stripe:listen": "stripe listen --forward-to localhost:3000/api/stripe/webhook",
     "dx": "npm install && run-s docker:compose-up db-migrate:dev",
     "d": "npm install && run-s docker:compose-up db-migrate:dev && npm run db-seed && npm run dev"

From 316fb49339e9fd1fa64ce6cc870c44c6bb147b24 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Fri, 2 Jun 2023 19:03:59 +1000
Subject: [PATCH 24/66] fix: disable subscriptions in example env

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index ab8d15b45..f5c2486fe 100644
--- a/.env.example
+++ b/.env.example
@@ -51,4 +51,4 @@ NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID=
 #FEATURE FLAGS
 # Allow users to register via the /signup page. Otherwise they will be redirect to the home page.
 NEXT_PUBLIC_ALLOW_SIGNUP=true
-NEXT_PUBLIC_ALLOW_SUBSCRIPTIONS=true
+NEXT_PUBLIC_ALLOW_SUBSCRIPTIONS=false

From a07febef4670133cfee2e64e7f91e396403dd8a1 Mon Sep 17 00:00:00 2001
From: AshutoshBhadauriya <ashutoshb455@gmail.com>
Date: Fri, 2 Jun 2023 15:06:26 +0530
Subject: [PATCH 25/66] Fix: alignment of div containing selecboxes in mobile
 and tab screens

---
 apps/web/pages/documents.tsx | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/web/pages/documents.tsx b/apps/web/pages/documents.tsx
index 905f59d09..e182ae89c 100644
--- a/apps/web/pages/documents.tsx
+++ b/apps/web/pages/documents.tsx
@@ -4,6 +4,7 @@ import Head from "next/head";
 import { useRouter } from "next/router";
 import { uploadDocument } from "@documenso/features";
 import { deleteDocument, getDocuments } from "@documenso/lib/api";
+import { useSubscription } from "@documenso/lib/stripe";
 import { Button, IconButton, SelectBox } from "@documenso/ui";
 import Layout from "../components/layout";
 import type { NextPageWithLayout } from "./_app";
@@ -20,7 +21,6 @@ import {
 } from "@heroicons/react/24/outline";
 import { DocumentStatus } from "@prisma/client";
 import { Tooltip as ReactTooltip } from "react-tooltip";
-import { useSubscription } from "@documenso/lib/stripe";
 
 const DocumentsPage: NextPageWithLayout = (props: any) => {
   const router = useRouter();
@@ -145,17 +145,7 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
             </Button>
           </div>
         </div>
-        <div className="mt-3 mb-12 flex flex-row-reverse items-center gap-x-4">
-          <div className="pt-5 block w-fit">
-            {filteredDocuments.length != 1 ? filteredDocuments.length + " Documents" : "1 Document"}
-          </div>
-          <SelectBox
-            className="block w-1/4"
-            label="Created"
-            options={createdFilter}
-            value={selectedCreatedFilter}
-            onChange={setSelectedCreatedFilter}
-          />
+        <div className="mt-3 mb-12 flex items-center justify-start gap-x-4 md:justify-end">
           <SelectBox
             className="block w-1/4"
             label="Status"
@@ -163,6 +153,16 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
             value={selectedStatusFilter}
             onChange={handleStatusFilterChange}
           />
+          <SelectBox
+            className="block w-1/4"
+            label="Created"
+            options={createdFilter}
+            value={selectedCreatedFilter}
+            onChange={setSelectedCreatedFilter}
+          />
+          <div className="block w-fit pt-5">
+            {filteredDocuments.length != 1 ? filteredDocuments.length + " Documents" : "1 Document"}
+          </div>
         </div>
         <div className="mt-8 max-w-[1100px]" hidden={!loading}>
           <div className="ph-item">
@@ -224,13 +224,13 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
                         <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
                           {document.title || "#" + document.id}
                         </td>
-                        <td className="whitespace-nowrap inline-flex py-3 gap-x-2 gap-y-1 flex-wrap max-w-[250px] text-sm text-gray-500">
+                        <td className="inline-flex max-w-[250px] flex-wrap gap-x-2 gap-y-1 whitespace-nowrap py-3 text-sm text-gray-500">
                           {document.Recipient.map((item: any) => (
                             <div key={item.id}>
                               {item.sendStatus === "NOT_SENT" ? (
                                 <span
                                   id="sent_icon"
-                                  className="flex-shrink-0 h-6 inline-flex items-center rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-800">
+                                  className="inline-flex h-6 flex-shrink-0 items-center rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-800">
                                   {item.name ? item.name + " <" + item.email + ">" : item.email}
                                 </span>
                               ) : (
@@ -240,7 +240,7 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
                                 <span id="sent_icon">
                                   <span
                                     id="sent_icon"
-                                    className="flex-shrink-0 h-6 inline-flex items-center rounded-full bg-yellow-200 px-2 py-0.5 text-xs font-medium text-yellow-800">
+                                    className="inline-flex h-6 flex-shrink-0 items-center rounded-full bg-yellow-200 px-2 py-0.5 text-xs font-medium text-yellow-800">
                                     <EnvelopeIcon className="mr-1 inline h-4"></EnvelopeIcon>
                                     {item.name ? item.name + " <" + item.email + ">" : item.email}
                                   </span>
@@ -253,7 +253,7 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
                                 <span id="read_icon">
                                   <span
                                     id="sent_icon"
-                                    className="flex-shrink-0 h-6 inline-flex items-center rounded-full bg-yellow-200 px-2 py-0.5 text-xs font-medium text-yellow-800">
+                                    className="inline-flex h-6 flex-shrink-0 items-center rounded-full bg-yellow-200 px-2 py-0.5 text-xs font-medium text-yellow-800">
                                     <CheckIcon className="-mr-2 inline h-4"></CheckIcon>
                                     <CheckIcon className="mr-1 inline h-4"></CheckIcon>
                                     {item.name ? item.name + " <" + item.email + ">" : item.email}
@@ -264,7 +264,7 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
                               )}
                               {item.signingStatus === "SIGNED" ? (
                                 <span id="signed_icon">
-                                  <span className="flex-shrink-0 h-6 inline-flex items-center rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-800">
+                                  <span className="inline-flex h-6 flex-shrink-0 items-center rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-800">
                                     <CheckBadgeIcon className="mr-1 inline h-5"></CheckBadgeIcon>{" "}
                                     {item.email}
                                   </span>

From 15b5f31a7494619bc88cd5715c2bbf1b46cffa83 Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Thu, 1 Jun 2023 23:54:27 +0700
Subject: [PATCH 26/66] fix: support ipv6 for nextjs

---
 apps/web/package.json         |  4 ++--
 apps/web/server/index.ts      | 22 ++++++++++++++++++++++
 apps/web/tsconfig.server.json | 11 +++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 apps/web/server/index.ts
 create mode 100644 apps/web/tsconfig.server.json

diff --git a/apps/web/package.json b/apps/web/package.json
index 349936c8a..41a6129f3 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build",
-    "start": "next start",
+    "build": "next build && tsc --project tsconfig.server.json",
+    "start": "node dist/index.js",
     "lint": "next lint",
     "db-studio": "prisma db studio",
     "stripe:listen": "stripe listen --forward-to localhost:3000/api/stripe/webhook"
diff --git a/apps/web/server/index.ts b/apps/web/server/index.ts
new file mode 100644
index 000000000..96c2a478c
--- /dev/null
+++ b/apps/web/server/index.ts
@@ -0,0 +1,22 @@
+import { createServer } from 'http';
+import next from 'next';
+import { parse } from 'url';
+
+const hostname = process.env.HOST || '[::]';
+const port = parseInt(process.env.PORT || '3000', 10);
+const dev = process.env.NODE_ENV !== 'production';
+const app = next({ dev, hostname, port });
+const handle = app.getRequestHandler();
+
+app.prepare().then(() => {
+  createServer((req, res) => {
+    const parsedUrl = parse(req.url!, true)
+    handle(req, res, parsedUrl)
+  }).listen(port);
+
+  // eslint-disable-next-line no-console
+  console.log(
+    `> Server listening at http://${hostname}:${port} as ${dev ? 'development' : process.env.NODE_ENV
+    }`
+  );
+});
diff --git a/apps/web/tsconfig.server.json b/apps/web/tsconfig.server.json
new file mode 100644
index 000000000..8cb34c903
--- /dev/null
+++ b/apps/web/tsconfig.server.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist",
+    "target": "es2017",
+    "isolatedModules": false,
+    "noEmit": false
+  },
+  "include": ["server/**/*.ts"]
+}

From 054480500f9d4f167d9ff0d4a0f960c201d6ee5c Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Fri, 2 Jun 2023 00:11:13 +0700
Subject: [PATCH 27/66] fix: custom nextjs server

---
 apps/web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/package.json b/apps/web/package.json
index 41a6129f3..235ee57d8 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build && tsc --project tsconfig.server.json",
-    "start": "node dist/index.js",
+    "start": "node ./dist/index.js",
     "lint": "next lint",
     "db-studio": "prisma db studio",
     "stripe:listen": "stripe listen --forward-to localhost:3000/api/stripe/webhook"

From bbedd6d3ded55100bca6d5aa6616fdf20264891f Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Fri, 2 Jun 2023 00:19:08 +0700
Subject: [PATCH 28/66] fix: add custom nextjs server to docker

---
 docker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5b19b2726..5ef51605c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -42,6 +42,7 @@ COPY --from=production_deps --chown=nextjs:nodejs /app/package-lock.json ./packa
 COPY --from=builder --chown=nextjs:nodejs /app/apps/web/package.json ./package.json
 COPY --from=builder --chown=nextjs:nodejs /app/apps/web/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/apps/web/.next ./.next
+COPY --from=builder --chown=nextjs:nodejs /app/apps/web/dist ./dist
 
 EXPOSE 3000
 

From 20b618c70f78fdd33c86494e4787fa586d63ec9c Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Fri, 2 Jun 2023 14:00:54 +0700
Subject: [PATCH 29/66] docs: update troubleshooting for IPv6

---
 README.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/README.md b/README.md
index 0861312fb..17e594ea1 100644
--- a/README.md
+++ b/README.md
@@ -198,3 +198,32 @@ Want to create a production ready docker image? Follow these steps:
 
 - Docker support
 - One-Click-Deploy on Render.com Deploy
+
+# Troubleshooting
+
+## Support IPv6
+
+In case you are deploying to a cluster that uses only IPv6. You can use a custom command to pass a parameter to the NextJS start command
+
+For local docker run
+
+```bash
+docker run -it documenso:latest npm run start -- -H ::
+```
+
+For k8s or docker-compose
+
+```yaml
+containers:
+  - name: documenso
+    image: documenso:latest
+    imagePullPolicy: IfNotPresent
+    command:
+      - npm
+    args:
+      - run
+      - start
+      - --
+      - -H
+      - '::'
+```

From 3caa01ab535f26f4425a464f3741aa27c3119f2a Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Fri, 2 Jun 2023 14:01:03 +0700
Subject: [PATCH 30/66] Revert "fix: add custom nextjs server to docker"

This reverts commit 5dbe7b26286234db542921d9ded000c522c9a31e.
---
 docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5ef51605c..5b19b2726 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -42,7 +42,6 @@ COPY --from=production_deps --chown=nextjs:nodejs /app/package-lock.json ./packa
 COPY --from=builder --chown=nextjs:nodejs /app/apps/web/package.json ./package.json
 COPY --from=builder --chown=nextjs:nodejs /app/apps/web/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/apps/web/.next ./.next
-COPY --from=builder --chown=nextjs:nodejs /app/apps/web/dist ./dist
 
 EXPOSE 3000
 

From db99bf3674691e4454937806b06b073a16b895d6 Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Fri, 2 Jun 2023 14:01:24 +0700
Subject: [PATCH 31/66] Revert "fix: custom nextjs server"

This reverts commit 8f9a5f4ec7d834970a3e2b0778ce94218c997a8f.
---
 apps/web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/package.json b/apps/web/package.json
index 235ee57d8..41a6129f3 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build && tsc --project tsconfig.server.json",
-    "start": "node ./dist/index.js",
+    "start": "node dist/index.js",
     "lint": "next lint",
     "db-studio": "prisma db studio",
     "stripe:listen": "stripe listen --forward-to localhost:3000/api/stripe/webhook"

From c41007e0265d02ef0868323ee96da016c19210c1 Mon Sep 17 00:00:00 2001
From: Thanh Vu <thanh@ahiho.com>
Date: Fri, 2 Jun 2023 14:01:40 +0700
Subject: [PATCH 32/66] Revert "fix: support ipv6 for nextjs"

This reverts commit f9de6671e0aa29e25e872a80aa334d3319e3e522.
---
 apps/web/package.json         |  4 ++--
 apps/web/server/index.ts      | 22 ----------------------
 apps/web/tsconfig.server.json | 11 -----------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 apps/web/server/index.ts
 delete mode 100644 apps/web/tsconfig.server.json

diff --git a/apps/web/package.json b/apps/web/package.json
index 41a6129f3..349936c8a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build && tsc --project tsconfig.server.json",
-    "start": "node dist/index.js",
+    "build": "next build",
+    "start": "next start",
     "lint": "next lint",
     "db-studio": "prisma db studio",
     "stripe:listen": "stripe listen --forward-to localhost:3000/api/stripe/webhook"
diff --git a/apps/web/server/index.ts b/apps/web/server/index.ts
deleted file mode 100644
index 96c2a478c..000000000
--- a/apps/web/server/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { createServer } from 'http';
-import next from 'next';
-import { parse } from 'url';
-
-const hostname = process.env.HOST || '[::]';
-const port = parseInt(process.env.PORT || '3000', 10);
-const dev = process.env.NODE_ENV !== 'production';
-const app = next({ dev, hostname, port });
-const handle = app.getRequestHandler();
-
-app.prepare().then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url!, true)
-    handle(req, res, parsedUrl)
-  }).listen(port);
-
-  // eslint-disable-next-line no-console
-  console.log(
-    `> Server listening at http://${hostname}:${port} as ${dev ? 'development' : process.env.NODE_ENV
-    }`
-  );
-});
diff --git a/apps/web/tsconfig.server.json b/apps/web/tsconfig.server.json
deleted file mode 100644
index 8cb34c903..000000000
--- a/apps/web/tsconfig.server.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "outDir": "dist",
-    "target": "es2017",
-    "isolatedModules": false,
-    "noEmit": false
-  },
-  "include": ["server/**/*.ts"]
-}

From 37c4e68aacded543d537cf769492f0477d63cc02 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Fri, 2 Jun 2023 20:01:10 +0000
Subject: [PATCH 33/66] Fix typo in contributing.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 46768040d..5aeb61c1b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ The development branch is <code>main</code>. All pull request should be made aga
    [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 2. Create a new branch:
 
-- Create a new branch (include the issue id and somthing readable):
+- Create a new branch (include the issue id and something readable):
 
   ```sh
   git checkout -b doc-999-my-feature-or-fix

From a1bb360b6f0a14d87866180051ae4ba859625a95 Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Sat, 3 Jun 2023 21:58:14 +0900
Subject: [PATCH 34/66] Fix typo in pdf-editor.tsx

postion -> position
---
 apps/web/components/editor/pdf-editor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/components/editor/pdf-editor.tsx b/apps/web/components/editor/pdf-editor.tsx
index dd9418a24..62fb9ade0 100644
--- a/apps/web/components/editor/pdf-editor.tsx
+++ b/apps/web/components/editor/pdf-editor.tsx
@@ -30,7 +30,7 @@ export default function PDFEditor(props: any) {
     movedField.positionY = position.y.toFixed(0);
     createOrUpdateField(props.document, movedField);
 
-    // no instant redraw neccessary, postion information for saving or later rerender is enough
+    // no instant redraw neccessary, position information for saving or later rerender is enough
     // setFields(newFields);
   }
 

From effe781ce7ae0cd0c886bbd35b40f521801cd0e2 Mon Sep 17 00:00:00 2001
From: Peer Richelsen <peeroke@gmail.com>
Date: Mon, 5 Jun 2023 12:33:08 +0100
Subject: [PATCH 35/66] chore: fix readme Product Hunt Badges

Product Hunt is over, its probably better to move it into its own section.

also added product of the day!
---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 17e594ea1..f99206c54 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,3 @@
-<div align="center" style="margin-top: 12px; margin-bottom: 3332px;">
-  <p>
-    We are LIVE on Product Hunt. Come say hi..
-  </p>
-<a href="https://www.producthunt.com/posts/documenso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=395047&theme=light" alt="Documenso - The&#0032;Open&#0032;Source&#0032;DocuSign&#0032;Alternative&#0046; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-</div>
-<br>
 <p align="center" style="margin-top: 120px">
   <a href="https://github.com/documenso/documenso.com">
    <img width="250px" src="https://github.com/documenso/documenso/assets/1309312/cd7823ec-4baa-40b9-be78-4acb3b1c73cb" alt="Documenso Logo">
@@ -63,6 +56,13 @@
 
 Signing documents digitally is fast, easy and should be best practice for every document signed worldwide. This is technically quite easy today, but it also introduces a new party to every signature: The signing tool providers. While this is not a problem in itself, it should make us think about how we want these providers of trust to work. Documenso aims to be the world's most trusted document signing tool. This trust is built by empowering you to self-host Documenso and review how it works under the hood. Join us in creating the next generation of open trust infrastructure.
 
+## Recognition
+
+
+<a href="https://www.producthunt.com/posts/documenso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=395047&theme=light&period=daily" alt="Documenso - The&#0032;open&#0032;source&#0032;DocuSign&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+<a href="https://www.producthunt.com/posts/documenso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=395047&theme=light" alt="Documenso - The&#0032;Open&#0032;Source&#0032;DocuSign&#0032;Alternative&#0046; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
+
 ## Community and Next Steps 🎯
 
 The current project goal is to <b>[release a production ready version](https://github.com/documenso/documenso/milestone/1)</b> for self-hosting as soon as possible. If you want to help making that happen you can:

From 447bf0cb76c543c0e1c598dac22eb0da3d0fe7ea Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 12:23:52 +0000
Subject: [PATCH 36/66] Add password reset to prisma schema

---
 .../migration.sql                             | 15 +++++++++
 packages/prisma/schema.prisma                 | 31 ++++++++++++-------
 2 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 packages/prisma/migrations/20230605122017_password_reset/migration.sql

diff --git a/packages/prisma/migrations/20230605122017_password_reset/migration.sql b/packages/prisma/migrations/20230605122017_password_reset/migration.sql
new file mode 100644
index 000000000..782a60880
--- /dev/null
+++ b/packages/prisma/migrations/20230605122017_password_reset/migration.sql
@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "PasswordResetToken" (
+    "id" SERIAL NOT NULL,
+    "token" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "userId" INTEGER NOT NULL,
+
+    CONSTRAINT "PasswordResetToken_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PasswordResetToken_token_key" ON "PasswordResetToken"("token");
+
+-- AddForeignKey
+ALTER TABLE "PasswordResetToken" ADD CONSTRAINT "PasswordResetToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 33fae736d..c702f244f 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -13,17 +13,18 @@ enum IdentityProvider {
 }
 
 model User {
-  id               Int              @id @default(autoincrement())
-  name             String?
-  email            String           @unique
-  emailVerified    DateTime?
-  password         String?
-  source           String?
-  identityProvider IdentityProvider @default(DOCUMENSO)
-  accounts         Account[]
-  sessions         Session[]
-  Document         Document[]
-  Subscription     Subscription[]
+  id                 Int                  @id @default(autoincrement())
+  name               String?
+  email              String               @unique
+  emailVerified      DateTime?
+  password           String?
+  source             String?
+  identityProvider   IdentityProvider     @default(DOCUMENSO)
+  accounts           Account[]
+  sessions           Session[]
+  Document           Document[]
+  Subscription       Subscription[]
+  PasswordResetToken PasswordResetToken[]
 }
 
 enum SubscriptionStatus {
@@ -158,3 +159,11 @@ model Signature {
   Recipient Recipient @relation(fields: [recipientId], references: [id], onDelete: Cascade)
   Field     Field     @relation(fields: [fieldId], references: [id], onDelete: Restrict)
 }
+
+model PasswordResetToken {
+  id        Int      @id @default(autoincrement())
+  token     String   @unique
+  createdAt DateTime @default(now())
+  userId    Int
+  User      User     @relation(fields: [userId], references: [id])
+}

From 002b22b1a88d52823ebea215ae074a6d6b9b8ff8 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 12:50:11 +0000
Subject: [PATCH 37/66] Add forgot password page

---
 apps/web/components/forgot-password.tsx | 77 +++++++++++++++++++++++++
 apps/web/components/login.tsx           |  6 +-
 apps/web/pages/forgot-password.tsx      | 34 +++++++++++
 3 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 apps/web/components/forgot-password.tsx
 create mode 100644 apps/web/pages/forgot-password.tsx

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
new file mode 100644
index 000000000..30a7eb036
--- /dev/null
+++ b/apps/web/components/forgot-password.tsx
@@ -0,0 +1,77 @@
+import Link from "next/link";
+import { Button } from "@documenso/ui";
+import Logo from "./logo";
+import { ArrowLeftIcon } from "@heroicons/react/24/outline";
+import { FormProvider, useForm } from "react-hook-form";
+
+interface IResetPassword {
+  email: string;
+}
+
+export default function ForgotPassword(props: any) {
+  const methods = useForm<IResetPassword>();
+  const { register, formState, resetField } = methods;
+
+  const onSubmit = async (values: IResetPassword) => {
+    resetField("email");
+
+    console.log(values);
+  };
+
+  return (
+    <>
+      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
+        <div className="w-full max-w-md space-y-8">
+          <div>
+            <Logo className="mx-auto h-20 w-auto"></Logo>
+            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
+              Forgot Password?
+            </h2>
+            <p className="mt-2 text-center text-sm text-gray-600">
+              No worries, we'll send you reset instructions.
+            </p>
+          </div>
+          <FormProvider {...methods}>
+            <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
+              <input type="hidden" name="remember" defaultValue="true" />
+              <div className="-space-y-px rounded-md shadow-sm">
+                <div>
+                  <label htmlFor="email-address" className="sr-only">
+                    Email
+                  </label>
+                  <input
+                    {...register("email")}
+                    id="email-address"
+                    name="email"
+                    type="email"
+                    autoComplete="email"
+                    required
+                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                    placeholder="Email"
+                  />
+                </div>
+              </div>
+
+              <div>
+                <Button
+                  type="submit"
+                  disabled={formState.isSubmitting}
+                  className="group relative flex w-full">
+                  Reset password
+                </Button>
+              </div>
+              <div>
+                <Link href="/login">
+                  <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
+                    <ArrowLeftIcon className="h-4 w-4" />
+                    Back to log in
+                  </div>
+                </Link>
+              </div>
+            </form>
+          </FormProvider>
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/apps/web/components/login.tsx b/apps/web/components/login.tsx
index 4f086a8e1..f78513d87 100644
--- a/apps/web/components/login.tsx
+++ b/apps/web/components/login.tsx
@@ -111,9 +111,11 @@ export default function Login(props: any) {
               </div>
               <div className="flex items-center justify-between">
                 <div className="text-sm">
-                  <a href="#" className="hover:text-neon-700 font-medium text-gray-500">
+                  <Link
+                    href="/forgot-password"
+                    className="hover:text-neon-700 font-medium text-gray-500">
                     Forgot your password?
-                  </a>
+                  </Link>
                 </div>
               </div>
               <div>
diff --git a/apps/web/pages/forgot-password.tsx b/apps/web/pages/forgot-password.tsx
new file mode 100644
index 000000000..ffcf6e470
--- /dev/null
+++ b/apps/web/pages/forgot-password.tsx
@@ -0,0 +1,34 @@
+import Head from "next/head";
+import { getUserFromToken } from "@documenso/lib/server";
+import ForgotPassword from "../components/forgot-password";
+
+export default function ForgotPasswordPage(props: any) {
+  return (
+    <>
+      <Head>
+        <title>Reset Password | Documenso</title>
+      </Head>
+      <ForgotPassword allowSignup={props.ALLOW_SIGNUP}></ForgotPassword>
+    </>
+  );
+}
+
+export async function getServerSideProps(context: any) {
+  const user = await getUserFromToken(context.req, context.res);
+  if (user)
+    return {
+      redirect: {
+        source: "/login",
+        destination: "/dashboard",
+        permanent: false,
+      },
+    };
+
+  const ALLOW_SIGNUP = process.env.NEXT_PUBLIC_ALLOW_SIGNUP === "true";
+
+  return {
+    props: {
+      ALLOW_SIGNUP,
+    },
+  };
+}

From 8293b5019530489044a0e53ff513fb32ba161b15 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 13:05:25 +0000
Subject: [PATCH 38/66] Create reset password token for user

---
 apps/web/components/forgot-password.tsx    | 16 ++++++++
 apps/web/pages/api/auth/forgot-password.ts | 43 ++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 apps/web/pages/api/auth/forgot-password.ts

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index 30a7eb036..503c7bbd1 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -3,6 +3,7 @@ import { Button } from "@documenso/ui";
 import Logo from "./logo";
 import { ArrowLeftIcon } from "@heroicons/react/24/outline";
 import { FormProvider, useForm } from "react-hook-form";
+import { toast } from "react-hot-toast";
 
 interface IResetPassword {
   email: string;
@@ -13,6 +14,21 @@ export default function ForgotPassword(props: any) {
   const { register, formState, resetField } = methods;
 
   const onSubmit = async (values: IResetPassword) => {
+    await toast.promise(
+      fetch(`/api/auth/forgot-password`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(values),
+      }),
+      {
+        loading: "Sending...",
+        success: `Reset link sent. `,
+        error: "Could not send reset link :/",
+      }
+    );
+
     resetField("email");
 
     console.log(values);
diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
new file mode 100644
index 000000000..1a861362f
--- /dev/null
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -0,0 +1,43 @@
+import { NextApiRequest, NextApiResponse } from "next";
+import { defaultHandler, defaultResponder } from "@documenso/lib/server";
+import prisma from "@documenso/prisma";
+import crypto from "crypto";
+
+async function postHandler(req: NextApiRequest, res: NextApiResponse) {
+  const { email } = req.body;
+  const cleanEmail = email.toLowerCase();
+
+  if (!cleanEmail || !cleanEmail.includes("@")) {
+    res.status(422).json({ message: "Invalid email" });
+    return;
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      email: cleanEmail,
+    },
+  });
+
+  if (!user) {
+    return res.status(400).json({ message: "No user found with this email." });
+  }
+
+  const token = crypto.randomBytes(64).toString("hex");
+
+  const passwordResetToken = await prisma.passwordResetToken.create({
+    data: {
+      token,
+      userId: user.id,
+    },
+  });
+
+  console.log(passwordResetToken);
+
+  // TODO: Send token to user via email
+
+  res.status(201).end();
+}
+
+export default defaultHandler({
+  POST: Promise.resolve({ default: defaultResponder(postHandler) }),
+});

From 66b529a841f2dda36cfc110b5730cea06a7c183d Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 13:44:22 +0000
Subject: [PATCH 39/66] feat: send reset password email

---
 apps/web/pages/api/auth/forgot-password.ts |  5 +--
 packages/lib/mail/baseTemplate.ts          |  3 +-
 packages/lib/mail/index.ts                 |  2 +
 packages/lib/mail/resetPasswordTemplate.ts | 46 ++++++++++++++++++++++
 packages/lib/mail/sendMail.ts              |  1 -
 packages/lib/mail/sendResetPassword.ts     | 17 ++++++++
 6 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 packages/lib/mail/resetPasswordTemplate.ts
 create mode 100644 packages/lib/mail/sendResetPassword.ts

diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 1a861362f..221be3d1c 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -1,4 +1,5 @@
 import { NextApiRequest, NextApiResponse } from "next";
+import { sendResetPassword } from "@documenso/lib/mail";
 import { defaultHandler, defaultResponder } from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
 import crypto from "crypto";
@@ -31,9 +32,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
     },
   });
 
-  console.log(passwordResetToken);
-
-  // TODO: Send token to user via email
+  await sendResetPassword(user, passwordResetToken.token);
 
   res.status(201).end();
 }
diff --git a/packages/lib/mail/baseTemplate.ts b/packages/lib/mail/baseTemplate.ts
index 6741a87b5..6e18c7114 100644
--- a/packages/lib/mail/baseTemplate.ts
+++ b/packages/lib/mail/baseTemplate.ts
@@ -1,10 +1,9 @@
 import { NEXT_PUBLIC_WEBAPP_URL } from "../constants";
-import { Document as PrismaDocument } from "@prisma/client";
 
 export const baseEmailTemplate = (message: string, content: string) => {
   const html = `
     <div style="background-color: #eaeaea; padding: 2%;">
-      <div style="text-align:center; margin: auto; font-size: 14px; font-color: #353434; max-width: 500px; border-radius: 0.375rem; background: white; padding: 50px">
+      <div style="text-align:center; margin: auto; font-size: 14px; color: #353434; max-width: 500px; border-radius: 0.375rem; background: white; padding: 50px">
         <img src="${NEXT_PUBLIC_WEBAPP_URL}/logo_h.png" alt="Documenso Logo" style="width: 180px; display: block; margin: auto; margin-bottom: 14px;">
         ${message} 
         ${content}
diff --git a/packages/lib/mail/index.ts b/packages/lib/mail/index.ts
index 6d49cdb6b..8388608c6 100644
--- a/packages/lib/mail/index.ts
+++ b/packages/lib/mail/index.ts
@@ -2,3 +2,5 @@ export { signingRequestTemplate } from "./signingRequestTemplate";
 export { signingCompleteTemplate } from "./signingCompleteTemplate";
 export { sendSigningRequest as sendSigningRequest } from "./sendSigningRequest";
 export { sendSigningDoneMail } from "./sendSigningDoneMail";
+export { resetPasswordTemplate } from "./resetPasswordTemplate";
+export { sendResetPassword } from "./sendResetPassword";
diff --git a/packages/lib/mail/resetPasswordTemplate.ts b/packages/lib/mail/resetPasswordTemplate.ts
new file mode 100644
index 000000000..b86b404fd
--- /dev/null
+++ b/packages/lib/mail/resetPasswordTemplate.ts
@@ -0,0 +1,46 @@
+import { NEXT_PUBLIC_WEBAPP_URL } from "../constants";
+
+export const resetPasswordTemplate = (ctaLink: string, ctaLabel: string) => {
+  const customContent = `
+  <h2 style="margin-top: 36px; font-size: 24px; font-weight: bold;">Forgot your password?</h2>
+  <p style="margin-top: 8px;">
+    That's okay, it happens! Click the button below to reset your password.
+  </p>
+  
+  <p style="margin: 30px 0px; text-align: center">
+    <a href="${ctaLink}" style="background-color: #37f095; white-space: nowrap; color: white; border-color: transparent; border-width: 1px; border-radius: 0.375rem; font-size: 18px; padding-left: 16px; padding-right: 16px; padding-top: 10px; padding-bottom: 10px; text-decoration: none; margin-top: 4px; margin-bottom: 4px;">
+      ${ctaLabel}
+    </a>
+  </p>
+  <p style="margin-top: 20px;">
+    <small>Want to send you own signing links? <a href="https://documenso.com">Hosted Documenso is here!</a>.</small>
+  </p>`;
+
+  const html = `
+  <div style="background-color: #eaeaea; padding: 2%;">
+    <div
+        style="text-align:center; margin: auto; font-size: 14px; color: #353434; max-width: 500px; border-radius: 0.375rem; background: white; padding: 50px">
+        <img src="${NEXT_PUBLIC_WEBAPP_URL}/logo_h.png" alt="Documenso Logo"
+            style="width: 180px; display: block; margin: auto; margin-bottom: 14px;" />
+        ${customContent}
+    </div>
+</div>
+    `;
+
+  const footer = `
+  <div style="text-align: left; line-height: 18px; color: #666666; margin: 24px">
+    <div style="margin-top: 12px">
+        <b>Need help?</b>
+        <br>
+        Contact us at <a href="mailto:hi@documenso.com">hi@documenso.com</a>
+    </div>
+    <hr size="1" style="height: 1px; border: none; color: #D8D8D8; background-color: #D8D8D8">
+    <div style="text-align: center">
+        <small>Easy and beautiful document signing by Documenso.</small>
+    </div>
+</div>`;
+
+  return html + footer;
+};
+
+export default resetPasswordTemplate;
diff --git a/packages/lib/mail/sendMail.ts b/packages/lib/mail/sendMail.ts
index 101981f12..fd7c6fb61 100644
--- a/packages/lib/mail/sendMail.ts
+++ b/packages/lib/mail/sendMail.ts
@@ -1,4 +1,3 @@
-import { ReadStream } from "fs";
 import nodemailer from "nodemailer";
 import nodemailerSendgrid from "nodemailer-sendgrid";
 
diff --git a/packages/lib/mail/sendResetPassword.ts b/packages/lib/mail/sendResetPassword.ts
new file mode 100644
index 000000000..fd918b470
--- /dev/null
+++ b/packages/lib/mail/sendResetPassword.ts
@@ -0,0 +1,17 @@
+import { resetPasswordTemplate } from "@documenso/lib/mail";
+import { NEXT_PUBLIC_WEBAPP_URL } from "../constants";
+import { sendMail } from "./sendMail";
+import { User } from "@prisma/client";
+
+export const sendResetPassword = async (user: User, token: string) => {
+  await sendMail(
+    user.email,
+    "Forgot password?",
+    resetPasswordTemplate(
+      `${NEXT_PUBLIC_WEBAPP_URL}/api/auth/reset/${token}`,
+      "Reset Your Password"
+    )
+  ).catch((err) => {
+    throw err;
+  });
+};

From 8dc9c9d72dfcc8c9833885312554fa524612df34 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 14:17:45 +0000
Subject: [PATCH 40/66] Add reset password page

---
 apps/web/components/forgot-password.tsx   |  6 +-
 apps/web/components/reset-password.tsx    | 93 +++++++++++++++++++++++
 apps/web/pages/api/auth/reset-password.ts | 42 ++++++++++
 apps/web/pages/auth/reset.tsx             | 34 +++++++++
 apps/web/pages/forgot-password.tsx        |  2 +-
 5 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 apps/web/components/reset-password.tsx
 create mode 100644 apps/web/pages/api/auth/reset-password.ts
 create mode 100644 apps/web/pages/auth/reset.tsx

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index 503c7bbd1..7a7ec0356 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -5,15 +5,15 @@ import { ArrowLeftIcon } from "@heroicons/react/24/outline";
 import { FormProvider, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 
-interface IResetPassword {
+interface IForgotPassword {
   email: string;
 }
 
 export default function ForgotPassword(props: any) {
-  const methods = useForm<IResetPassword>();
+  const methods = useForm<IForgotPassword>();
   const { register, formState, resetField } = methods;
 
-  const onSubmit = async (values: IResetPassword) => {
+  const onSubmit = async (values: IForgotPassword) => {
     await toast.promise(
       fetch(`/api/auth/forgot-password`, {
         method: "POST",
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
new file mode 100644
index 000000000..88f3cb4d0
--- /dev/null
+++ b/apps/web/components/reset-password.tsx
@@ -0,0 +1,93 @@
+import Link from "next/link";
+import { Button } from "@documenso/ui";
+import Logo from "./logo";
+import { ArrowLeftIcon } from "@heroicons/react/24/outline";
+import { FormProvider, useForm, useWatch } from "react-hook-form";
+import { toast } from "react-hot-toast";
+
+interface IResetPassword {
+  password: string;
+  confirmPassword: string;
+}
+
+export default function ResetPassword(props: any) {
+  const methods = useForm<IResetPassword>();
+  const { register, formState, watch } = methods;
+  const password = watch("password", "");
+
+  const onSubmit = async (values: IResetPassword) => {
+    console.log(values);
+  };
+
+  return (
+    <>
+      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
+        <div className="w-full max-w-md space-y-8">
+          <div>
+            <Logo className="mx-auto h-20 w-auto"></Logo>
+            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
+              Reset Password
+            </h2>
+            <p className="mt-2 text-center text-sm text-gray-600">Please chose your new password</p>
+          </div>
+          <FormProvider {...methods}>
+            <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
+              <input type="hidden" name="remember" defaultValue="true" />
+              <div className="-space-y-px rounded-md shadow-sm">
+                <div>
+                  <label htmlFor="password" className="sr-only">
+                    Password
+                  </label>
+                  <input
+                    {...register("password", { required: "Password is required" })}
+                    id="password"
+                    name="password"
+                    type="password"
+                    autoComplete="current-password"
+                    required
+                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-t-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                    placeholder="New password"
+                  />
+                </div>
+                <div>
+                  <label htmlFor="confirmPassword" className="sr-only">
+                    Password
+                  </label>
+                  <input
+                    {...register("confirmPassword", {
+                      required: "Please confirm password",
+                      validate: (value) => value === password || "The passwords do not match",
+                    })}
+                    id="confirmPassword"
+                    name="confirmPassword"
+                    type="password"
+                    required
+                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-b-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                    placeholder="Confirm new password"
+                  />
+                </div>
+              </div>
+
+              <div>
+                <Button
+                  type="submit"
+                  disabled={formState.isSubmitting}
+                  className="group relative flex w-full">
+                  Reset password
+                </Button>
+              </div>
+              <div>
+                <Link href="/login">
+                  <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
+                    <ArrowLeftIcon className="h-4 w-4" />
+                    Back to log in
+                  </div>
+                </Link>
+              </div>
+            </form>
+          </FormProvider>
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts
new file mode 100644
index 000000000..221be3d1c
--- /dev/null
+++ b/apps/web/pages/api/auth/reset-password.ts
@@ -0,0 +1,42 @@
+import { NextApiRequest, NextApiResponse } from "next";
+import { sendResetPassword } from "@documenso/lib/mail";
+import { defaultHandler, defaultResponder } from "@documenso/lib/server";
+import prisma from "@documenso/prisma";
+import crypto from "crypto";
+
+async function postHandler(req: NextApiRequest, res: NextApiResponse) {
+  const { email } = req.body;
+  const cleanEmail = email.toLowerCase();
+
+  if (!cleanEmail || !cleanEmail.includes("@")) {
+    res.status(422).json({ message: "Invalid email" });
+    return;
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      email: cleanEmail,
+    },
+  });
+
+  if (!user) {
+    return res.status(400).json({ message: "No user found with this email." });
+  }
+
+  const token = crypto.randomBytes(64).toString("hex");
+
+  const passwordResetToken = await prisma.passwordResetToken.create({
+    data: {
+      token,
+      userId: user.id,
+    },
+  });
+
+  await sendResetPassword(user, passwordResetToken.token);
+
+  res.status(201).end();
+}
+
+export default defaultHandler({
+  POST: Promise.resolve({ default: defaultResponder(postHandler) }),
+});
diff --git a/apps/web/pages/auth/reset.tsx b/apps/web/pages/auth/reset.tsx
new file mode 100644
index 000000000..efbb4372b
--- /dev/null
+++ b/apps/web/pages/auth/reset.tsx
@@ -0,0 +1,34 @@
+import Head from "next/head";
+import { getUserFromToken } from "@documenso/lib/server";
+import ResetPassword from "../../components/reset-password";
+
+export default function ResetPasswordPage(props: any) {
+  return (
+    <>
+      <Head>
+        <title>Reset Password | Documenso</title>
+      </Head>
+      <ResetPassword allowSignup={props.ALLOW_SIGNUP}></ResetPassword>
+    </>
+  );
+}
+
+export async function getServerSideProps(context: any) {
+  const user = await getUserFromToken(context.req, context.res);
+  if (user)
+    return {
+      redirect: {
+        source: "/login",
+        destination: "/dashboard",
+        permanent: false,
+      },
+    };
+
+  const ALLOW_SIGNUP = process.env.NEXT_PUBLIC_ALLOW_SIGNUP === "true";
+
+  return {
+    props: {
+      ALLOW_SIGNUP,
+    },
+  };
+}
diff --git a/apps/web/pages/forgot-password.tsx b/apps/web/pages/forgot-password.tsx
index ffcf6e470..7ecf29881 100644
--- a/apps/web/pages/forgot-password.tsx
+++ b/apps/web/pages/forgot-password.tsx
@@ -6,7 +6,7 @@ export default function ForgotPasswordPage(props: any) {
   return (
     <>
       <Head>
-        <title>Reset Password | Documenso</title>
+        <title>Forgot Password | Documenso</title>
       </Head>
       <ForgotPassword allowSignup={props.ALLOW_SIGNUP}></ForgotPassword>
     </>

From 6e2b05f8354eecc2a679240a6fd85d838d67c205 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 14:36:20 +0000
Subject: [PATCH 41/66] Change password in database to new reset password

---
 apps/web/components/reset-password.tsx        | 37 ++++++++++++++
 apps/web/pages/api/auth/forgot-password.ts    |  3 +-
 apps/web/pages/api/auth/reset-password.ts     | 49 ++++++++++++-------
 .../auth/{reset.tsx => reset/[token].tsx}     |  2 +-
 packages/lib/mail/sendResetPassword.ts        |  5 +-
 5 files changed, 71 insertions(+), 25 deletions(-)
 rename apps/web/pages/auth/{reset.tsx => reset/[token].tsx} (91%)

diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 88f3cb4d0..27e214574 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -1,4 +1,5 @@
 import Link from "next/link";
+import { useRouter } from "next/router";
 import { Button } from "@documenso/ui";
 import Logo from "./logo";
 import { ArrowLeftIcon } from "@heroicons/react/24/outline";
@@ -11,14 +12,50 @@ interface IResetPassword {
 }
 
 export default function ResetPassword(props: any) {
+  const router = useRouter();
+  const { token } = router.query;
+
   const methods = useForm<IResetPassword>();
   const { register, formState, watch } = methods;
   const password = watch("password", "");
 
   const onSubmit = async (values: IResetPassword) => {
+    await toast.promise(
+      fetch(`/api/auth/reset-password`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ password: values.password, token }),
+      }),
+      {
+        loading: "Resetting...",
+        success: `Reset password successful`,
+        error: "Could not reset password :/",
+      }
+    );
+
     console.log(values);
   };
 
+  if (!token) {
+    return (
+      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
+        <div className="w-full max-w-md space-y-8">
+          <div>
+            <Logo className="mx-auto h-20 w-auto"></Logo>
+            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
+              Reset Password
+            </h2>
+            <p className="mt-2 text-center text-sm text-gray-600">
+              The token you provided is invalid. Please try again.
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <>
       <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 221be3d1c..ef2b218d7 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -24,7 +24,6 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   }
 
   const token = crypto.randomBytes(64).toString("hex");
-
   const passwordResetToken = await prisma.passwordResetToken.create({
     data: {
       token,
@@ -34,7 +33,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
 
   await sendResetPassword(user, passwordResetToken.token);
 
-  res.status(201).end();
+  res.status(200).json({ message: "Password reset email sent." });
 }
 
 export default defaultHandler({
diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts
index 221be3d1c..ad6ef7a49 100644
--- a/apps/web/pages/api/auth/reset-password.ts
+++ b/apps/web/pages/api/auth/reset-password.ts
@@ -1,40 +1,53 @@
 import { NextApiRequest, NextApiResponse } from "next";
+import { hashPassword } from "@documenso/lib/auth";
 import { sendResetPassword } from "@documenso/lib/mail";
 import { defaultHandler, defaultResponder } from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
-import crypto from "crypto";
 
 async function postHandler(req: NextApiRequest, res: NextApiResponse) {
-  const { email } = req.body;
-  const cleanEmail = email.toLowerCase();
+  const { token, password } = req.body;
 
-  if (!cleanEmail || !cleanEmail.includes("@")) {
-    res.status(422).json({ message: "Invalid email" });
+  if (!token) {
+    res.status(422).json({ message: "Invalid token" });
     return;
   }
 
-  const user = await prisma.user.findFirst({
+  const foundToken = await prisma.passwordResetToken.findUnique({
     where: {
-      email: cleanEmail,
+      token,
+    },
+    include: {
+      User: true,
     },
   });
 
-  if (!user) {
-    return res.status(400).json({ message: "No user found with this email." });
+  if (!foundToken) {
+    return res.status(400).json({ message: "Invalid token." });
   }
 
-  const token = crypto.randomBytes(64).toString("hex");
+  const hashedPassword = await hashPassword(password);
 
-  const passwordResetToken = await prisma.passwordResetToken.create({
-    data: {
-      token,
-      userId: user.id,
-    },
-  });
+  const transaction = await prisma.$transaction([
+    prisma.user.update({
+      where: {
+        id: foundToken.userId,
+      },
+      data: {
+        password: hashedPassword,
+      },
+    }),
+    prisma.passwordResetToken.delete({
+      where: {
+        token,
+      },
+    }),
+  ]);
 
-  await sendResetPassword(user, passwordResetToken.token);
+  if (!transaction) {
+    return res.status(500).json({ message: "Error resetting password." });
+  }
 
-  res.status(201).end();
+  res.status(200).json({ message: "Password reset successful." });
 }
 
 export default defaultHandler({
diff --git a/apps/web/pages/auth/reset.tsx b/apps/web/pages/auth/reset/[token].tsx
similarity index 91%
rename from apps/web/pages/auth/reset.tsx
rename to apps/web/pages/auth/reset/[token].tsx
index efbb4372b..fffe7c3c7 100644
--- a/apps/web/pages/auth/reset.tsx
+++ b/apps/web/pages/auth/reset/[token].tsx
@@ -1,6 +1,6 @@
 import Head from "next/head";
 import { getUserFromToken } from "@documenso/lib/server";
-import ResetPassword from "../../components/reset-password";
+import ResetPassword from "../../../components/reset-password";
 
 export default function ResetPasswordPage(props: any) {
   return (
diff --git a/packages/lib/mail/sendResetPassword.ts b/packages/lib/mail/sendResetPassword.ts
index fd918b470..32e098a4c 100644
--- a/packages/lib/mail/sendResetPassword.ts
+++ b/packages/lib/mail/sendResetPassword.ts
@@ -7,10 +7,7 @@ export const sendResetPassword = async (user: User, token: string) => {
   await sendMail(
     user.email,
     "Forgot password?",
-    resetPasswordTemplate(
-      `${NEXT_PUBLIC_WEBAPP_URL}/api/auth/reset/${token}`,
-      "Reset Your Password"
-    )
+    resetPasswordTemplate(`${NEXT_PUBLIC_WEBAPP_URL}/auth/reset/${token}`, "Reset Your Password")
   ).catch((err) => {
     throw err;
   });

From 7c30ee0c3e1af084a877774d3429a0e27143bd97 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 14:47:10 +0000
Subject: [PATCH 42/66] Redirect to /login on password reset

---
 apps/web/components/reset-password.tsx | 28 ++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 27e214574..d4745ee24 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -1,3 +1,4 @@
+import { useState } from "react";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { Button } from "@documenso/ui";
@@ -19,8 +20,10 @@ export default function ResetPassword(props: any) {
   const { register, formState, watch } = methods;
   const password = watch("password", "");
 
+  const [resetSuccessful, setResetSuccessful] = useState(false);
+
   const onSubmit = async (values: IResetPassword) => {
-    await toast.promise(
+    const response = await toast.promise(
       fetch(`/api/auth/reset-password`, {
         method: "POST",
         headers: {
@@ -35,7 +38,12 @@ export default function ResetPassword(props: any) {
       }
     );
 
-    console.log(values);
+    if (response.ok) {
+      setResetSuccessful(true);
+      setTimeout(() => {
+        router.push("/login");
+      }, 2000);
+    }
   };
 
   if (!token) {
@@ -56,6 +64,22 @@ export default function ResetPassword(props: any) {
     );
   }
 
+  if (resetSuccessful) {
+    return (
+      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
+        <div className="w-full max-w-md space-y-8">
+          <div>
+            <Logo className="mx-auto h-20 w-auto"></Logo>
+            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
+              Reset Password
+            </h2>
+            <p className="mt-2 text-center text-sm text-gray-600">Your password has been reset.</p>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <>
       <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">

From c47e01b2b8d3b3236c456f07bfedef12829a9293 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 14:59:50 +0000
Subject: [PATCH 43/66] Display sucessful password reset request

---
 apps/web/components/forgot-password.tsx | 39 ++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index 7a7ec0356..bb55bfb66 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -1,3 +1,4 @@
+import { useState } from "react";
 import Link from "next/link";
 import { Button } from "@documenso/ui";
 import Logo from "./logo";
@@ -9,12 +10,14 @@ interface IForgotPassword {
   email: string;
 }
 
-export default function ForgotPassword(props: any) {
+export default function ForgotPassword() {
   const methods = useForm<IForgotPassword>();
   const { register, formState, resetField } = methods;
 
+  const [resetSuccessful, setResetSuccessful] = useState(false);
+
   const onSubmit = async (values: IForgotPassword) => {
-    await toast.promise(
+    const response = await toast.promise(
       fetch(`/api/auth/forgot-password`, {
         method: "POST",
         headers: {
@@ -29,11 +32,39 @@ export default function ForgotPassword(props: any) {
       }
     );
 
-    resetField("email");
+    if (response.ok) {
+      setResetSuccessful(true);
+    }
 
-    console.log(values);
+    resetField("email");
   };
 
+  if (resetSuccessful) {
+    return (
+      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
+        <div className="w-full max-w-md space-y-8">
+          <div>
+            <Logo className="mx-auto h-20 w-auto"></Logo>
+            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
+              Reset Password
+            </h2>
+            <p className="mt-2 text-center text-sm text-gray-600">
+              Please check your email for reset instructions.
+            </p>
+          </div>
+          <div>
+            <Link href="/login">
+              <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
+                <ArrowLeftIcon className="h-4 w-4" />
+                Back to log in
+              </div>
+            </Link>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <>
       <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">

From 5d2349086d3a90e47ba0f50dd9c289db7e3b225e Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 15:33:27 +0000
Subject: [PATCH 44/66] Send email on password reset complete

---
 apps/web/pages/api/auth/forgot-password.ts    |  2 +-
 apps/web/pages/api/auth/reset-password.ts     |  4 +-
 apps/web/pages/auth/reset.tsx                 |  0
 packages/lib/mail/index.ts                    |  2 +
 .../lib/mail/resetPasswordSuccessTemplate.ts  | 51 +++++++++++++++++++
 .../lib/mail/sendResetPasswordSuccessMail.ts  | 11 ++++
 packages/lib/mail/signingCompleteTemplate.ts  |  1 -
 7 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 apps/web/pages/auth/reset.tsx
 create mode 100644 packages/lib/mail/resetPasswordSuccessTemplate.ts
 create mode 100644 packages/lib/mail/sendResetPasswordSuccessMail.ts

diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index ef2b218d7..e30eeed36 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from "next";
-import { sendResetPassword } from "@documenso/lib/mail";
+import { sendResetPassword, sendResetPasswordSuccessMail } from "@documenso/lib/mail";
 import { defaultHandler, defaultResponder } from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
 import crypto from "crypto";
diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts
index ad6ef7a49..4bf2e5306 100644
--- a/apps/web/pages/api/auth/reset-password.ts
+++ b/apps/web/pages/api/auth/reset-password.ts
@@ -1,6 +1,6 @@
 import { NextApiRequest, NextApiResponse } from "next";
 import { hashPassword } from "@documenso/lib/auth";
-import { sendResetPassword } from "@documenso/lib/mail";
+import { sendResetPasswordSuccessMail } from "@documenso/lib/mail";
 import { defaultHandler, defaultResponder } from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
 
@@ -47,6 +47,8 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
     return res.status(500).json({ message: "Error resetting password." });
   }
 
+  await sendResetPasswordSuccessMail(foundToken.User);
+
   res.status(200).json({ message: "Password reset successful." });
 }
 
diff --git a/apps/web/pages/auth/reset.tsx b/apps/web/pages/auth/reset.tsx
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/lib/mail/index.ts b/packages/lib/mail/index.ts
index 8388608c6..e4d66dc44 100644
--- a/packages/lib/mail/index.ts
+++ b/packages/lib/mail/index.ts
@@ -4,3 +4,5 @@ export { sendSigningRequest as sendSigningRequest } from "./sendSigningRequest";
 export { sendSigningDoneMail } from "./sendSigningDoneMail";
 export { resetPasswordTemplate } from "./resetPasswordTemplate";
 export { sendResetPassword } from "./sendResetPassword";
+export { resetPasswordSuccessTemplate } from "./resetPasswordSuccessTemplate";
+export { sendResetPasswordSuccessMail } from "./sendResetPasswordSuccessMail";
diff --git a/packages/lib/mail/resetPasswordSuccessTemplate.ts b/packages/lib/mail/resetPasswordSuccessTemplate.ts
new file mode 100644
index 000000000..44afcc119
--- /dev/null
+++ b/packages/lib/mail/resetPasswordSuccessTemplate.ts
@@ -0,0 +1,51 @@
+import { NEXT_PUBLIC_WEBAPP_URL } from "../constants";
+import { User } from "@prisma/client";
+
+export const resetPasswordSuccessTemplate = (user: User) => {
+  return `
+  <div style="background-color: #eaeaea; padding: 2%;">
+    <div
+        style="text-align:left; margin: auto; font-size: 14px; color: #353434; max-width: 500px; border-radius: 0.375rem; background: white; padding: 50px">
+        <img src="${NEXT_PUBLIC_WEBAPP_URL}/logo_h.png" alt="Documenso Logo"
+            style="width: 180px; display: block; margin-bottom: 14px;" />
+        
+        <h2 style="text-align: left; margin-top: 20px; font-size: 24px; font-weight: bold">Password updated!</h2>
+        
+        <p style="margin-top: 15px">
+            Hi ${user.name ? user.name : user.email},
+        </p>
+
+        <p style="margin-top: 15px">
+            We've changed your password as you asked. You can now sign in with your new password.
+        </p>
+
+        <p style="margin-top: 15px">
+            If you did not ask to change your password we are here to help you secure your account, just <a href="https://documenso.com">contact us</a>.
+        </p>
+
+        <p style="margin-top: 15px">
+            <p style="font-weight: bold">
+                The Documenso Team
+            </p>
+        </p>
+
+        <p style="text-align:left; margin-top: 30px">
+            <small>Want to send you own signing links?
+                <a href="https://documenso.com">Hosted Documenso is here!</a>.</small>
+        </p>
+    </div>
+    </div>
+    <div style="text-align: left; line-height: 18px; color: #666666; margin: 24px">
+        <div style="margin-top: 12px">
+            <b>Need help?</b>
+            <br>
+            Contact us at <a href="mailto:hi@documenso.com">hi@documenso.com</a>
+        </div>
+        <hr size="1" style="height: 1px; border: none; color: #D8D8D8; background-color: #D8D8D8">
+        <div style="text-align: center">
+            <small>Easy and beautiful document signing by Documenso.</small>
+        </div>
+    </div>
+`;
+};
+export default resetPasswordSuccessTemplate;
diff --git a/packages/lib/mail/sendResetPasswordSuccessMail.ts b/packages/lib/mail/sendResetPasswordSuccessMail.ts
new file mode 100644
index 000000000..6877700fb
--- /dev/null
+++ b/packages/lib/mail/sendResetPasswordSuccessMail.ts
@@ -0,0 +1,11 @@
+import resetPasswordSuccessTemplate from "./resetPasswordSuccessTemplate";
+import { sendMail } from "./sendMail";
+import { User } from "@prisma/client";
+
+export const sendResetPasswordSuccessMail = async (user: User) => {
+  await sendMail(user.email, "Password Reset Success!", resetPasswordSuccessTemplate(user)).catch(
+    (err) => {
+      throw err;
+    }
+  );
+};
diff --git a/packages/lib/mail/signingCompleteTemplate.ts b/packages/lib/mail/signingCompleteTemplate.ts
index 212e1f8ea..e32162906 100644
--- a/packages/lib/mail/signingCompleteTemplate.ts
+++ b/packages/lib/mail/signingCompleteTemplate.ts
@@ -1,6 +1,5 @@
 import { NEXT_PUBLIC_WEBAPP_URL } from "../constants";
 import { baseEmailTemplate } from "./baseTemplate";
-import { Document as PrismaDocument } from "@prisma/client";
 
 export const signingCompleteTemplate = (message: string) => {
   const customContent = `

From e9cee23c15d509d2562748b1b40b7db445004a46 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 15:52:00 +0000
Subject: [PATCH 45/66] Error handling for invalid users

---
 apps/web/components/forgot-password.tsx    | 19 +++++++++++++++++++
 apps/web/pages/api/auth/forgot-password.ts | 21 ++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index bb55bfb66..40d0af98a 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -29,9 +29,28 @@ export default function ForgotPassword() {
         loading: "Sending...",
         success: `Reset link sent. `,
         error: "Could not send reset link :/",
+      },
+      {
+        style: {
+          minWidth: "200px",
+        },
       }
     );
 
+    if (!response.ok) {
+      toast.dismiss();
+
+      if (response.status == 400 || response.status == 404) {
+        toast.error("Email address not found.");
+      }
+
+      if (response.status == 500) {
+        toast.error("Something went wrong.");
+      }
+
+      return;
+    }
+
     if (response.ok) {
       setResetSuccessful(true);
     }
diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index e30eeed36..058a2d3b6 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -20,16 +20,23 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   });
 
   if (!user) {
-    return res.status(400).json({ message: "No user found with this email." });
+    return res.status(404).json({ message: "No user found with this email." });
   }
 
   const token = crypto.randomBytes(64).toString("hex");
-  const passwordResetToken = await prisma.passwordResetToken.create({
-    data: {
-      token,
-      userId: user.id,
-    },
-  });
+
+  let passwordResetToken;
+
+  try {
+    passwordResetToken = await prisma.passwordResetToken.create({
+      data: {
+        token,
+        userId: user.id,
+      },
+    });
+  } catch (error) {
+    return res.status(500).json({ message: "Error saving token." });
+  }
 
   await sendResetPassword(user, passwordResetToken.token);
 

From 4136811e32995eab97a5fb785f2190dfad9057c2 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 16:01:01 +0000
Subject: [PATCH 46/66] Avoid consecutive password reset requests

---
 apps/web/components/forgot-password.tsx    | 11 +++++------
 apps/web/components/reset-password.tsx     |  2 +-
 apps/web/pages/api/auth/forgot-password.ts | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index 40d0af98a..2f4250c05 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -29,21 +29,20 @@ export default function ForgotPassword() {
         loading: "Sending...",
         success: `Reset link sent. `,
         error: "Could not send reset link :/",
-      },
-      {
-        style: {
-          minWidth: "200px",
-        },
       }
     );
 
     if (!response.ok) {
       toast.dismiss();
 
-      if (response.status == 400 || response.status == 404) {
+      if (response.status == 404) {
         toast.error("Email address not found.");
       }
 
+      if (response.status == 400) {
+        toast.error("Password reset requested.");
+      }
+
       if (response.status == 500) {
         toast.error("Something went wrong.");
       }
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index d4745ee24..f55a7628c 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/router";
 import { Button } from "@documenso/ui";
 import Logo from "./logo";
 import { ArrowLeftIcon } from "@heroicons/react/24/outline";
-import { FormProvider, useForm, useWatch } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 
 interface IResetPassword {
diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 058a2d3b6..42d904fb7 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -23,10 +23,24 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
     return res.status(404).json({ message: "No user found with this email." });
   }
 
+  const existingToken = await prisma.passwordResetToken.findFirst({
+    where: {
+      userId: user.id,
+      createdAt: {
+        gte: new Date(Date.now() - 1000 * 60 * 60),
+      },
+    },
+  });
+
+  if (existingToken) {
+    return res
+      .status(400)
+      .json({ message: "A password reset has already been requested. Please check your email." });
+  }
+
   const token = crypto.randomBytes(64).toString("hex");
 
   let passwordResetToken;
-
   try {
     passwordResetToken = await prisma.passwordResetToken.create({
       data: {

From 2b9a2ff250626a1ddd76a77a132d483ed0899328 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 16:36:16 +0000
Subject: [PATCH 47/66] Avoid user from setting the same old password

---
 apps/web/components/reset-password.tsx     | 18 ++++++++++++++++++
 apps/web/pages/api/auth/forgot-password.ts |  2 +-
 apps/web/pages/api/auth/reset-password.ts  | 12 ++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index f55a7628c..7cc38ce42 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -38,6 +38,24 @@ export default function ResetPassword(props: any) {
       }
     );
 
+    if (!response.ok) {
+      toast.dismiss();
+
+      if (response.status == 404) {
+        toast.error("Invalid Token");
+      }
+
+      if (response.status == 400) {
+        toast.error("New password must be different");
+      }
+
+      if (response.status == 500) {
+        toast.error("Something went wrong.");
+      }
+
+      return;
+    }
+
     if (response.ok) {
       setResetSuccessful(true);
       setTimeout(() => {
diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 42d904fb7..7edab5aca 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from "next";
-import { sendResetPassword, sendResetPasswordSuccessMail } from "@documenso/lib/mail";
+import { sendResetPassword } from "@documenso/lib/mail";
 import { defaultHandler, defaultResponder } from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
 import crypto from "crypto";
diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts
index 4bf2e5306..c98de4809 100644
--- a/apps/web/pages/api/auth/reset-password.ts
+++ b/apps/web/pages/api/auth/reset-password.ts
@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from "next";
-import { hashPassword } from "@documenso/lib/auth";
+import { hashPassword, verifyPassword } from "@documenso/lib/auth";
 import { sendResetPasswordSuccessMail } from "@documenso/lib/mail";
 import { defaultHandler, defaultResponder } from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
@@ -22,7 +22,15 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   });
 
   if (!foundToken) {
-    return res.status(400).json({ message: "Invalid token." });
+    return res.status(404).json({ message: "Invalid token." });
+  }
+
+  const isSamePassword = await verifyPassword(password, foundToken.User.password!);
+
+  if (isSamePassword) {
+    return res
+      .status(400)
+      .json({ message: "New password must be different from the current password." });
   }
 
   const hashedPassword = await hashPassword(password);

From 3a0648c85d5e51a291393bfda9d63a8ea6d7fa95 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 16:54:12 +0000
Subject: [PATCH 48/66] Expire token after 1 hour

---
 apps/web/components/forgot-password.tsx          |  2 +-
 apps/web/components/reset-password.tsx           | 16 ++--------------
 apps/web/pages/api/auth/forgot-password.ts       | 11 ++++++-----
 apps/web/pages/api/auth/reset-password.ts        | 10 +++++++---
 .../migration.sql                                |  8 ++++++++
 packages/prisma/schema.prisma                    |  1 +
 6 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 packages/prisma/migrations/20230605164015_expire_password_reset_token/migration.sql

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index 2f4250c05..cd7e4a99c 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -27,7 +27,7 @@ export default function ForgotPassword() {
       }),
       {
         loading: "Sending...",
-        success: `Reset link sent. `,
+        success: "Reset link sent.",
         error: "Could not send reset link :/",
       }
     );
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 7cc38ce42..3bf4dcbcf 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -40,20 +40,8 @@ export default function ResetPassword(props: any) {
 
     if (!response.ok) {
       toast.dismiss();
-
-      if (response.status == 404) {
-        toast.error("Invalid Token");
-      }
-
-      if (response.status == 400) {
-        toast.error("New password must be different");
-      }
-
-      if (response.status == 500) {
-        toast.error("Something went wrong.");
-      }
-
-      return;
+      const error = await response.json();
+      toast.error(error.message);
     }
 
     if (response.ok) {
diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 7edab5aca..1c77c6df6 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -20,7 +20,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   });
 
   if (!user) {
-    return res.status(404).json({ message: "No user found with this email." });
+    return res.status(404).json({ message: "No user found with this email" });
   }
 
   const existingToken = await prisma.passwordResetToken.findFirst({
@@ -33,23 +33,24 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   });
 
   if (existingToken) {
-    return res
-      .status(400)
-      .json({ message: "A password reset has already been requested. Please check your email." });
+    return res.status(400).json({ message: "Password reset requested." });
   }
 
   const token = crypto.randomBytes(64).toString("hex");
+  const expiry = new Date();
+  expiry.setHours(expiry.getHours() + 1); // Set expiry to one hour from now
 
   let passwordResetToken;
   try {
     passwordResetToken = await prisma.passwordResetToken.create({
       data: {
         token,
+        expiry,
         userId: user.id,
       },
     });
   } catch (error) {
-    return res.status(500).json({ message: "Error saving token." });
+    return res.status(500).json({ message: "Something went wrong" });
   }
 
   await sendResetPassword(user, passwordResetToken.token);
diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts
index c98de4809..89ed6108c 100644
--- a/apps/web/pages/api/auth/reset-password.ts
+++ b/apps/web/pages/api/auth/reset-password.ts
@@ -25,12 +25,16 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
     return res.status(404).json({ message: "Invalid token." });
   }
 
+  const now = new Date();
+
+  if (now > foundToken.expiry) {
+    return res.status(400).json({ message: "Token has expired" });
+  }
+
   const isSamePassword = await verifyPassword(password, foundToken.User.password!);
 
   if (isSamePassword) {
-    return res
-      .status(400)
-      .json({ message: "New password must be different from the current password." });
+    return res.status(400).json({ message: "New password must be different" });
   }
 
   const hashedPassword = await hashPassword(password);
diff --git a/packages/prisma/migrations/20230605164015_expire_password_reset_token/migration.sql b/packages/prisma/migrations/20230605164015_expire_password_reset_token/migration.sql
new file mode 100644
index 000000000..a3a70e575
--- /dev/null
+++ b/packages/prisma/migrations/20230605164015_expire_password_reset_token/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `expiry` to the `PasswordResetToken` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "PasswordResetToken" ADD COLUMN     "expiry" TIMESTAMP(3) NOT NULL;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index c702f244f..fc8463c9b 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -164,6 +164,7 @@ model PasswordResetToken {
   id        Int      @id @default(autoincrement())
   token     String   @unique
   createdAt DateTime @default(now())
+  expiry    DateTime
   userId    Int
   User      User     @relation(fields: [userId], references: [id])
 }

From 79bd410687c286b95b4b970df2832bd498431a5d Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 17:15:41 +0000
Subject: [PATCH 49/66] Remove tokens on successful password reset

---
 apps/web/pages/api/auth/reset-password.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts
index 89ed6108c..bc42e2339 100644
--- a/apps/web/pages/api/auth/reset-password.ts
+++ b/apps/web/pages/api/auth/reset-password.ts
@@ -48,9 +48,9 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
         password: hashedPassword,
       },
     }),
-    prisma.passwordResetToken.delete({
+    prisma.passwordResetToken.deleteMany({
       where: {
-        token,
+        userId: foundToken.userId,
       },
     }),
   ]);

From 9ff85273361d7ad39c0d5d59a2928e8057452c54 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Mon, 5 Jun 2023 21:49:39 +0000
Subject: [PATCH 50/66] fix: expired slack link

---
 README.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f99206c54..8a3382929 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
     <a href="https://documenso.com"><strong>Learn more »</strong></a>
     <br />
     <br />
-    <a href="https://join.slack.com/t/documenso/shared_invite/zt-1qwxxsvli-nDyojjt~wakhgBGl9JRl2w">Slack</a>
+    <a href="https://join.slack.com/t/documenso/shared_invite/zt-1wrwmi601-Zcn1GpVOagcakE842fVCBQ">Slack</a>
     ·
     <a href="https://documenso.com">Website</a>
     ·
@@ -22,7 +22,7 @@
 </p>
 
 <p align="center">
-   <a href="https://join.slack.com/t/documenso/shared_invite/zt-1qwxxsvli-nDyojjt~wakhgBGl9JRl2w"><img src="https://img.shields.io/badge/Slack-documenso.slack.com-%234A154B" alt="Join Documenso on Slack"></a> 
+   <a href="https://join.slack.com/t/documenso/shared_invite/zt-1wrwmi601-Zcn1GpVOagcakE842fVCBQ"><img src="https://img.shields.io/badge/Slack-documenso.slack.com-%234A154B" alt="Join Documenso on Slack"></a> 
    <a href="https://github.com/documenso/documenso/stargazers"><img src="https://img.shields.io/github/stars/documenso/documenso" alt="Github Stars"></a>
    <a href="https://github.com/documenso/documenso/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3-purple" alt="License"></a>
    <a href="https://github.com/documenso/documenso/pulse"><img src="https://img.shields.io/github/commit-activity/m/documenso/documenso" alt="Commits-per-month"></a>
@@ -58,18 +58,16 @@ Signing documents digitally is fast, easy and should be best practice for every
 
 ## Recognition
 
-
 <a href="https://www.producthunt.com/posts/documenso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=395047&theme=light&period=daily" alt="Documenso - The&#0032;open&#0032;source&#0032;DocuSign&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 <a href="https://www.producthunt.com/posts/documenso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=395047&theme=light" alt="Documenso - The&#0032;Open&#0032;Source&#0032;DocuSign&#0032;Alternative&#0046; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
-
 ## Community and Next Steps 🎯
 
 The current project goal is to <b>[release a production ready version](https://github.com/documenso/documenso/milestone/1)</b> for self-hosting as soon as possible. If you want to help making that happen you can:
 
 - Check out the first source code release in this repository and test it
 - Tell us what you think in the current [Discussions](https://github.com/documenso/documenso/discussions)
-- Join the [Slack Channel](https://join.slack.com/t/documenso/shared_invite/zt-1qwxxsvli-nDyojjt~wakhgBGl9JRl2w) for any questions and getting to know to other community members
+- Join the [Slack Channel](https://join.slack.com/t/documenso/shared_invite/zt-1wrwmi601-Zcn1GpVOagcakE842fVCBQ) for any questions and getting to know to other community members
 - ⭐ the repository to help us raise awareness
 - Spread the word on Twitter, that Documenso is working towards a more open signing tool
 - Fix or create [issues](https://github.com/documenso/documenso/issues), that are needed for the first production release
@@ -225,5 +223,5 @@ containers:
       - start
       - --
       - -H
-      - '::'
+      - "::"
 ```

From 02f9c38e1e14eb0f6bb60fbf664a87b570f28561 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 09:59:40 +0000
Subject: [PATCH 51/66] Replace slack link with documen.so/slack

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8a3382929..c4daabec1 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
     <a href="https://documenso.com"><strong>Learn more »</strong></a>
     <br />
     <br />
-    <a href="https://join.slack.com/t/documenso/shared_invite/zt-1wrwmi601-Zcn1GpVOagcakE842fVCBQ">Slack</a>
+    <a href="https://documen.so/slack">Slack</a>
     ·
     <a href="https://documenso.com">Website</a>
     ·
@@ -22,7 +22,7 @@
 </p>
 
 <p align="center">
-   <a href="https://join.slack.com/t/documenso/shared_invite/zt-1wrwmi601-Zcn1GpVOagcakE842fVCBQ"><img src="https://img.shields.io/badge/Slack-documenso.slack.com-%234A154B" alt="Join Documenso on Slack"></a> 
+   <a href="https://documen.so/slack"><img src="https://img.shields.io/badge/Slack-documenso.slack.com-%234A154B" alt="Join Documenso on Slack"></a> 
    <a href="https://github.com/documenso/documenso/stargazers"><img src="https://img.shields.io/github/stars/documenso/documenso" alt="Github Stars"></a>
    <a href="https://github.com/documenso/documenso/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3-purple" alt="License"></a>
    <a href="https://github.com/documenso/documenso/pulse"><img src="https://img.shields.io/github/commit-activity/m/documenso/documenso" alt="Commits-per-month"></a>
@@ -67,7 +67,7 @@ The current project goal is to <b>[release a production ready version](https://g
 
 - Check out the first source code release in this repository and test it
 - Tell us what you think in the current [Discussions](https://github.com/documenso/documenso/discussions)
-- Join the [Slack Channel](https://join.slack.com/t/documenso/shared_invite/zt-1wrwmi601-Zcn1GpVOagcakE842fVCBQ) for any questions and getting to know to other community members
+- Join the [Slack Channel](https://documen.so/slack) for any questions and getting to know to other community members
 - ⭐ the repository to help us raise awareness
 - Spread the word on Twitter, that Documenso is working towards a more open signing tool
 - Fix or create [issues](https://github.com/documenso/documenso/issues), that are needed for the first production release

From 7184c47ac4ba50638b3e9f18ad58f22400dc1689 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 10:10:56 +0000
Subject: [PATCH 52/66] Rename component interfaces

---
 apps/web/components/forgot-password.tsx | 6 +++---
 apps/web/components/reset-password.tsx  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index cd7e4a99c..52dd96ce3 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -6,17 +6,17 @@ import { ArrowLeftIcon } from "@heroicons/react/24/outline";
 import { FormProvider, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 
-interface IForgotPassword {
+interface ForgotPasswordForm {
   email: string;
 }
 
 export default function ForgotPassword() {
-  const methods = useForm<IForgotPassword>();
+  const methods = useForm<ForgotPasswordForm>();
   const { register, formState, resetField } = methods;
 
   const [resetSuccessful, setResetSuccessful] = useState(false);
 
-  const onSubmit = async (values: IForgotPassword) => {
+  const onSubmit = async (values: ForgotPasswordForm) => {
     const response = await toast.promise(
       fetch(`/api/auth/forgot-password`, {
         method: "POST",
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 3bf4dcbcf..16276ed4d 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -7,7 +7,7 @@ import { ArrowLeftIcon } from "@heroicons/react/24/outline";
 import { FormProvider, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 
-interface IResetPassword {
+interface ForgotPasswordForm {
   password: string;
   confirmPassword: string;
 }
@@ -16,13 +16,13 @@ export default function ResetPassword(props: any) {
   const router = useRouter();
   const { token } = router.query;
 
-  const methods = useForm<IResetPassword>();
+  const methods = useForm<ForgotPasswordForm>();
   const { register, formState, watch } = methods;
   const password = watch("password", "");
 
   const [resetSuccessful, setResetSuccessful] = useState(false);
 
-  const onSubmit = async (values: IResetPassword) => {
+  const onSubmit = async (values: ForgotPasswordForm) => {
     const response = await toast.promise(
       fetch(`/api/auth/reset-password`, {
         method: "POST",

From f08836216ecb107ccc252eaafcb2ba6fb6ffc1f2 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 10:12:05 +0000
Subject: [PATCH 53/66] Remove unused input fields

---
 apps/web/components/forgot-password.tsx | 1 -
 apps/web/components/reset-password.tsx  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index 52dd96ce3..a0eee29f4 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -98,7 +98,6 @@ export default function ForgotPassword() {
           </div>
           <FormProvider {...methods}>
             <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
-              <input type="hidden" name="remember" defaultValue="true" />
               <div className="-space-y-px rounded-md shadow-sm">
                 <div>
                   <label htmlFor="email-address" className="sr-only">
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 16276ed4d..a1b240058 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -99,7 +99,6 @@ export default function ResetPassword(props: any) {
           </div>
           <FormProvider {...methods}>
             <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
-              <input type="hidden" name="remember" defaultValue="true" />
               <div className="-space-y-px rounded-md shadow-sm">
                 <div>
                   <label htmlFor="password" className="sr-only">

From 7cc1ae2de09dc0bd441eff82d2f0fb5dd433f6ad Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 10:33:05 +0000
Subject: [PATCH 54/66] Refactor forgot password and reset component

---
 apps/web/components/forgot-password.tsx |  98 ++++++---------
 apps/web/components/reset-password.tsx  | 152 ++++++++++--------------
 apps/web/pages/auth/reset.tsx           |   0
 apps/web/pages/auth/reset/index.tsx     |  20 ++++
 4 files changed, 119 insertions(+), 151 deletions(-)
 delete mode 100644 apps/web/pages/auth/reset.tsx
 create mode 100644 apps/web/pages/auth/reset/index.tsx

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index a0eee29f4..cafdd067e 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -57,19 +57,53 @@ export default function ForgotPassword() {
     resetField("email");
   };
 
-  if (resetSuccessful) {
-    return (
+  return (
+    <>
       <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
         <div className="w-full max-w-md space-y-8">
           <div>
             <Logo className="mx-auto h-20 w-auto"></Logo>
             <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
-              Reset Password
+              {resetSuccessful ? "Reset Password" : "Forgot Password?"}
             </h2>
             <p className="mt-2 text-center text-sm text-gray-600">
-              Please check your email for reset instructions.
+              {resetSuccessful
+                ? "Please check your email for reset instructions."
+                : "No worries, we'll send you reset instructions."}
             </p>
           </div>
+          {resetSuccessful ? null : (
+            <FormProvider {...methods}>
+              <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
+                <div className="-space-y-px rounded-md shadow-sm">
+                  <div>
+                    <label htmlFor="email-address" className="sr-only">
+                      Email
+                    </label>
+                    <input
+                      {...register("email")}
+                      id="email-address"
+                      name="email"
+                      type="email"
+                      autoComplete="email"
+                      required
+                      className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                      placeholder="Email"
+                    />
+                  </div>
+                </div>
+
+                <div>
+                  <Button
+                    type="submit"
+                    disabled={formState.isSubmitting}
+                    className="group relative flex w-full">
+                    Reset password
+                  </Button>
+                </div>
+              </form>
+            </FormProvider>
+          )}
           <div>
             <Link href="/login">
               <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
@@ -80,62 +114,6 @@ export default function ForgotPassword() {
           </div>
         </div>
       </div>
-    );
-  }
-
-  return (
-    <>
-      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
-        <div className="w-full max-w-md space-y-8">
-          <div>
-            <Logo className="mx-auto h-20 w-auto"></Logo>
-            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
-              Forgot Password?
-            </h2>
-            <p className="mt-2 text-center text-sm text-gray-600">
-              No worries, we'll send you reset instructions.
-            </p>
-          </div>
-          <FormProvider {...methods}>
-            <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
-              <div className="-space-y-px rounded-md shadow-sm">
-                <div>
-                  <label htmlFor="email-address" className="sr-only">
-                    Email
-                  </label>
-                  <input
-                    {...register("email")}
-                    id="email-address"
-                    name="email"
-                    type="email"
-                    autoComplete="email"
-                    required
-                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
-                    placeholder="Email"
-                  />
-                </div>
-              </div>
-
-              <div>
-                <Button
-                  type="submit"
-                  disabled={formState.isSubmitting}
-                  className="group relative flex w-full">
-                  Reset password
-                </Button>
-              </div>
-              <div>
-                <Link href="/login">
-                  <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
-                    <ArrowLeftIcon className="h-4 w-4" />
-                    Back to log in
-                  </div>
-                </Link>
-              </div>
-            </form>
-          </FormProvider>
-        </div>
-      </div>
     </>
   );
 }
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index a1b240058..3ac6c8b74 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -7,7 +7,7 @@ import { ArrowLeftIcon } from "@heroicons/react/24/outline";
 import { FormProvider, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 
-interface ForgotPasswordForm {
+interface ResetPasswordForm {
   password: string;
   confirmPassword: string;
 }
@@ -16,13 +16,13 @@ export default function ResetPassword(props: any) {
   const router = useRouter();
   const { token } = router.query;
 
-  const methods = useForm<ForgotPasswordForm>();
+  const methods = useForm<ResetPasswordForm>();
   const { register, formState, watch } = methods;
   const password = watch("password", "");
 
   const [resetSuccessful, setResetSuccessful] = useState(false);
 
-  const onSubmit = async (values: ForgotPasswordForm) => {
+  const onSubmit = async (values: ResetPasswordForm) => {
     const response = await toast.promise(
       fetch(`/api/auth/reset-password`, {
         method: "POST",
@@ -52,40 +52,6 @@ export default function ResetPassword(props: any) {
     }
   };
 
-  if (!token) {
-    return (
-      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
-        <div className="w-full max-w-md space-y-8">
-          <div>
-            <Logo className="mx-auto h-20 w-auto"></Logo>
-            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
-              Reset Password
-            </h2>
-            <p className="mt-2 text-center text-sm text-gray-600">
-              The token you provided is invalid. Please try again.
-            </p>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  if (resetSuccessful) {
-    return (
-      <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
-        <div className="w-full max-w-md space-y-8">
-          <div>
-            <Logo className="mx-auto h-20 w-auto"></Logo>
-            <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
-              Reset Password
-            </h2>
-            <p className="mt-2 text-center text-sm text-gray-600">Your password has been reset.</p>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <>
       <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
@@ -95,63 +61,67 @@ export default function ResetPassword(props: any) {
             <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
               Reset Password
             </h2>
-            <p className="mt-2 text-center text-sm text-gray-600">Please chose your new password</p>
+            <p className="mt-2 text-center text-sm text-gray-600">
+              {resetSuccessful ? "Your password has been reset." : "Please chose your new password"}
+            </p>
           </div>
-          <FormProvider {...methods}>
-            <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
-              <div className="-space-y-px rounded-md shadow-sm">
-                <div>
-                  <label htmlFor="password" className="sr-only">
-                    Password
-                  </label>
-                  <input
-                    {...register("password", { required: "Password is required" })}
-                    id="password"
-                    name="password"
-                    type="password"
-                    autoComplete="current-password"
-                    required
-                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-t-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
-                    placeholder="New password"
-                  />
-                </div>
-                <div>
-                  <label htmlFor="confirmPassword" className="sr-only">
-                    Password
-                  </label>
-                  <input
-                    {...register("confirmPassword", {
-                      required: "Please confirm password",
-                      validate: (value) => value === password || "The passwords do not match",
-                    })}
-                    id="confirmPassword"
-                    name="confirmPassword"
-                    type="password"
-                    required
-                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-b-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
-                    placeholder="Confirm new password"
-                  />
-                </div>
-              </div>
-
-              <div>
-                <Button
-                  type="submit"
-                  disabled={formState.isSubmitting}
-                  className="group relative flex w-full">
-                  Reset password
-                </Button>
-              </div>
-              <div>
-                <Link href="/login">
-                  <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
-                    <ArrowLeftIcon className="h-4 w-4" />
-                    Back to log in
+          {resetSuccessful ? null : (
+            <FormProvider {...methods}>
+              <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
+                <div className="-space-y-px rounded-md shadow-sm">
+                  <div>
+                    <label htmlFor="password" className="sr-only">
+                      Password
+                    </label>
+                    <input
+                      {...register("password", { required: "Password is required" })}
+                      id="password"
+                      name="password"
+                      type="password"
+                      autoComplete="current-password"
+                      required
+                      className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-t-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                      placeholder="New password"
+                    />
                   </div>
-                </Link>
+                  <div>
+                    <label htmlFor="confirmPassword" className="sr-only">
+                      Password
+                    </label>
+                    <input
+                      {...register("confirmPassword", {
+                        required: "Please confirm password",
+                        validate: (value) => value === password || "The passwords do not match",
+                      })}
+                      id="confirmPassword"
+                      name="confirmPassword"
+                      type="password"
+                      required
+                      className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-b-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                      placeholder="Confirm new password"
+                    />
+                  </div>
+                </div>
+
+                <div>
+                  <Button
+                    type="submit"
+                    disabled={formState.isSubmitting}
+                    className="group relative flex w-full">
+                    Reset password
+                  </Button>
+                </div>
+              </form>
+            </FormProvider>
+          )}
+          <div>
+            <Link href="/login">
+              <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
+                <ArrowLeftIcon className="h-4 w-4" />
+                Back to log in
               </div>
-            </form>
-          </FormProvider>
+            </Link>
+          </div>
         </div>
       </div>
     </>
diff --git a/apps/web/pages/auth/reset.tsx b/apps/web/pages/auth/reset.tsx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apps/web/pages/auth/reset/index.tsx b/apps/web/pages/auth/reset/index.tsx
new file mode 100644
index 000000000..f21145422
--- /dev/null
+++ b/apps/web/pages/auth/reset/index.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+import Logo from "../../../components/logo";
+
+export default function ResetPage() {
+  return (
+    <div className="flex min-h-full items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
+      <div className="w-full max-w-md space-y-8">
+        <div>
+          <Logo className="mx-auto h-20 w-auto"></Logo>
+          <h2 className="mt-6 text-center text-3xl font-bold tracking-tight text-gray-900">
+            Reset Password
+          </h2>
+          <p className="mt-2 text-center text-sm text-gray-600">
+            The token you provided is invalid. Please try again.
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+}

From 54a965e2b42cdde8f826ae0f13c020e0c0de6676 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 10:37:47 +0000
Subject: [PATCH 55/66] Remove unused props from components

---
 apps/web/components/reset-password.tsx |  4 ++--
 apps/web/pages/auth/reset/[token].tsx  | 10 +++-------
 apps/web/pages/forgot-password.tsx     | 10 +++-------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 3ac6c8b74..53ece210c 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -12,7 +12,7 @@ interface ResetPasswordForm {
   confirmPassword: string;
 }
 
-export default function ResetPassword(props: any) {
+export default function ResetPassword() {
   const router = useRouter();
   const { token } = router.query;
 
@@ -48,7 +48,7 @@ export default function ResetPassword(props: any) {
       setResetSuccessful(true);
       setTimeout(() => {
         router.push("/login");
-      }, 2000);
+      }, 3000);
     }
   };
 
diff --git a/apps/web/pages/auth/reset/[token].tsx b/apps/web/pages/auth/reset/[token].tsx
index fffe7c3c7..33868f762 100644
--- a/apps/web/pages/auth/reset/[token].tsx
+++ b/apps/web/pages/auth/reset/[token].tsx
@@ -2,13 +2,13 @@ import Head from "next/head";
 import { getUserFromToken } from "@documenso/lib/server";
 import ResetPassword from "../../../components/reset-password";
 
-export default function ResetPasswordPage(props: any) {
+export default function ResetPasswordPage() {
   return (
     <>
       <Head>
         <title>Reset Password | Documenso</title>
       </Head>
-      <ResetPassword allowSignup={props.ALLOW_SIGNUP}></ResetPassword>
+      <ResetPassword />
     </>
   );
 }
@@ -24,11 +24,7 @@ export async function getServerSideProps(context: any) {
       },
     };
 
-  const ALLOW_SIGNUP = process.env.NEXT_PUBLIC_ALLOW_SIGNUP === "true";
-
   return {
-    props: {
-      ALLOW_SIGNUP,
-    },
+    props: {},
   };
 }
diff --git a/apps/web/pages/forgot-password.tsx b/apps/web/pages/forgot-password.tsx
index 7ecf29881..b15bec499 100644
--- a/apps/web/pages/forgot-password.tsx
+++ b/apps/web/pages/forgot-password.tsx
@@ -2,13 +2,13 @@ import Head from "next/head";
 import { getUserFromToken } from "@documenso/lib/server";
 import ForgotPassword from "../components/forgot-password";
 
-export default function ForgotPasswordPage(props: any) {
+export default function ForgotPasswordPage() {
   return (
     <>
       <Head>
         <title>Forgot Password | Documenso</title>
       </Head>
-      <ForgotPassword allowSignup={props.ALLOW_SIGNUP}></ForgotPassword>
+      <ForgotPassword />
     </>
   );
 }
@@ -24,11 +24,7 @@ export async function getServerSideProps(context: any) {
       },
     };
 
-  const ALLOW_SIGNUP = process.env.NEXT_PUBLIC_ALLOW_SIGNUP === "true";
-
   return {
-    props: {
-      ALLOW_SIGNUP,
-    },
+    props: {},
   };
 }

From 9dd8c2842c7301aeaf77c7ad7d06b4940e9199ce Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 10:44:07 +0000
Subject: [PATCH 56/66] Match emails with regex

---
 apps/web/pages/api/auth/forgot-password.ts | 2 +-
 apps/web/pages/api/auth/signup.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 1c77c6df6..80aefe5a7 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -8,7 +8,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   const { email } = req.body;
   const cleanEmail = email.toLowerCase();
 
-  if (!cleanEmail || !cleanEmail.includes("@")) {
+  if (!cleanEmail || !/.+@.+/.test(cleanEmail)) {
     res.status(422).json({ message: "Invalid email" });
     return;
   }
diff --git a/apps/web/pages/api/auth/signup.ts b/apps/web/pages/api/auth/signup.ts
index b82bf5ea2..d8032ed95 100644
--- a/apps/web/pages/api/auth/signup.ts
+++ b/apps/web/pages/api/auth/signup.ts
@@ -8,7 +8,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   const { email, password, source } = req.body;
   const cleanEmail = email.toLowerCase();
 
-  if (!cleanEmail || !cleanEmail.includes("@")) {
+  if (!cleanEmail || !/.+@.+/.test(cleanEmail)) {
     res.status(422).json({ message: "Invalid email" });
     return;
   }

From 9cfbb1dec977dd81f5aaaa543be2cf184a3789dc Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 10:59:20 +0000
Subject: [PATCH 57/66] Avoid leaking that a user has an account

---
 apps/web/pages/api/auth/forgot-password.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 80aefe5a7..07d57dce7 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -20,7 +20,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   });
 
   if (!user) {
-    return res.status(404).json({ message: "No user found with this email" });
+    return res.status(200).json({ message: "A password reset email has been sent." });
   }
 
   const existingToken = await prisma.passwordResetToken.findFirst({
@@ -33,7 +33,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   });
 
   if (existingToken) {
-    return res.status(400).json({ message: "Password reset requested." });
+    return res.status(200).json({ message: "A password reset email has been sent." });
   }
 
   const token = crypto.randomBytes(64).toString("hex");
@@ -55,7 +55,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
 
   await sendResetPassword(user, passwordResetToken.token);
 
-  res.status(200).json({ message: "Password reset email sent." });
+  return res.status(200).json({ message: "A password reset email has been sent." });
 }
 
 export default defaultHandler({

From fe6561f596900db265cb630a9ec2e746948b01a1 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 11:02:50 +0000
Subject: [PATCH 58/66] Set reset token expiry to 24 hours

---
 apps/web/pages/api/auth/forgot-password.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 07d57dce7..9a17edd9f 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -38,7 +38,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
 
   const token = crypto.randomBytes(64).toString("hex");
   const expiry = new Date();
-  expiry.setHours(expiry.getHours() + 1); // Set expiry to one hour from now
+  expiry.setHours(expiry.getHours() + 24); // Set expiry to one hour from now
 
   let passwordResetToken;
   try {

From 13a840ff786b61a9d3151f1839b424fac7520a9a Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 7 Jun 2023 12:33:33 +0000
Subject: [PATCH 59/66] Password validation with zod

---
 apps/web/components/reset-password.tsx | 41 ++++++++++++++++++--------
 package-lock.json                      | 31 ++++++++++++++++++-
 package.json                           |  6 ++--
 3 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 53ece210c..03dc6df44 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -4,21 +4,35 @@ import { useRouter } from "next/router";
 import { Button } from "@documenso/ui";
 import Logo from "./logo";
 import { ArrowLeftIcon } from "@heroicons/react/24/outline";
+import { zodResolver } from "@hookform/resolvers/zod";
 import { FormProvider, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
+import * as z from "zod";
 
-interface ResetPasswordForm {
-  password: string;
-  confirmPassword: string;
-}
+const schema = z
+  .object({
+    password: z.string().min(8, { message: "Password must be at least 8 characters" }),
+    confirmPassword: z.string().min(8, { message: "Password must be at least 8 characters" }),
+  })
+  .refine((data) => data.password === data.confirmPassword, {
+    path: ["confirmPassword"],
+    message: "Password don't match",
+  });
+
+type ResetPasswordForm = z.infer<typeof schema>;
 
 export default function ResetPassword() {
   const router = useRouter();
   const { token } = router.query;
 
-  const methods = useForm<ResetPasswordForm>();
-  const { register, formState, watch } = methods;
-  const password = watch("password", "");
+  const methods = useForm<ResetPasswordForm>({
+    resolver: zodResolver(schema),
+  });
+  const {
+    register,
+    formState: { errors, isSubmitting },
+    handleSubmit,
+  } = methods;
 
   const [resetSuccessful, setResetSuccessful] = useState(false);
 
@@ -67,7 +81,7 @@ export default function ResetPassword() {
           </div>
           {resetSuccessful ? null : (
             <FormProvider {...methods}>
-              <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
+              <form className="mt-8 space-y-6" onSubmit={handleSubmit(onSubmit)}>
                 <div className="-space-y-px rounded-md shadow-sm">
                   <div>
                     <label htmlFor="password" className="sr-only">
@@ -89,10 +103,7 @@ export default function ResetPassword() {
                       Password
                     </label>
                     <input
-                      {...register("confirmPassword", {
-                        required: "Please confirm password",
-                        validate: (value) => value === password || "The passwords do not match",
-                      })}
+                      {...register("confirmPassword")}
                       id="confirmPassword"
                       name="confirmPassword"
                       type="password"
@@ -103,10 +114,14 @@ export default function ResetPassword() {
                   </div>
                 </div>
 
+                {errors && (
+                  <span className="text-xs text-red-500">{errors.confirmPassword?.message}</span>
+                )}
+
                 <div>
                   <Button
                     type="submit"
-                    disabled={formState.isSubmitting}
+                    disabled={isSubmitting}
                     className="group relative flex w-full">
                     Reset password
                   </Button>
diff --git a/package-lock.json b/package-lock.json
index 8d104b0d7..20c623d5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "@documenso/prisma": "*",
         "@headlessui/react": "^1.7.4",
         "@heroicons/react": "^2.0.13",
+        "@hookform/resolvers": "^3.1.0",
         "avatar-from-initials": "^1.0.3",
         "bcryptjs": "^2.4.3",
         "next": "13.2.4",
@@ -24,7 +25,8 @@
         "react-dom": "18.2.0",
         "react-hook-form": "^7.41.5",
         "react-hot-toast": "^2.4.0",
-        "react-signature-canvas": "^1.0.6"
+        "react-signature-canvas": "^1.0.6",
+        "zod": "^3.21.4"
       },
       "devDependencies": {
         "@tailwindcss/forms": "^0.5.3",
@@ -525,6 +527,14 @@
         "react": ">= 16"
       }
     },
+    "node_modules/@hookform/resolvers": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.1.0.tgz",
+      "integrity": "sha512-z0A8K+Nxq+f83Whm/ajlwE6VtQlp/yPHZnXw7XWVPIGm1Vx0QV8KThU3BpbBRfAZ7/dYqCKKBNnQh85BkmBKkA==",
+      "peerDependencies": {
+        "react-hook-form": "^7.0.0"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -8048,6 +8058,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/zod": {
+      "version": "3.21.4",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
+      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
     "packages/features": {
       "name": "@documenso/features",
       "version": "0.0.0"
@@ -8507,6 +8525,12 @@
       "integrity": "sha512-x89rFxH3SRdYaA+JCXwfe+RkE1SFTo9GcOkZettHer71Y3T7V+ogKmfw5CjTazgS3d0ClJ7p1NA+SP7VQLQcLw==",
       "requires": {}
     },
+    "@hookform/resolvers": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.1.0.tgz",
+      "integrity": "sha512-z0A8K+Nxq+f83Whm/ajlwE6VtQlp/yPHZnXw7XWVPIGm1Vx0QV8KThU3BpbBRfAZ7/dYqCKKBNnQh85BkmBKkA==",
+      "requires": {}
+    },
     "@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -14097,6 +14121,11 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
+    },
+    "zod": {
+      "version": "3.21.4",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
+      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
     }
   }
 }
diff --git a/package.json b/package.json
index 08d2a2788..9d333fa50 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "@documenso/prisma": "*",
     "@headlessui/react": "^1.7.4",
     "@heroicons/react": "^2.0.13",
+    "@hookform/resolvers": "^3.1.0",
     "avatar-from-initials": "^1.0.3",
     "bcryptjs": "^2.4.3",
     "next": "13.2.4",
@@ -35,7 +36,8 @@
     "react-dom": "18.2.0",
     "react-hook-form": "^7.41.5",
     "react-hot-toast": "^2.4.0",
-    "react-signature-canvas": "^1.0.6"
+    "react-signature-canvas": "^1.0.6",
+    "zod": "^3.21.4"
   },
   "devDependencies": {
     "@tailwindcss/forms": "^0.5.3",
@@ -54,4 +56,4 @@
     "turbo": "^1.9.9",
     "typescript": "4.8.4"
   }
-}
\ No newline at end of file
+}

From e3bc41934c69a904c85b054851def2f30e465046 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Fri, 9 Jun 2023 03:55:30 +0000
Subject: [PATCH 60/66] Fixes from code review

---
 apps/web/components/forgot-password.tsx   | 60 +++++++-------
 apps/web/components/reset-password.tsx    | 99 +++++++++++------------
 apps/web/pages/api/auth/reset-password.ts |  2 +-
 apps/web/pages/forgot-password.tsx        |  6 +-
 packages/lib/server/getUserFromToken.ts   | 17 ++--
 5 files changed, 86 insertions(+), 98 deletions(-)

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx
index cafdd067e..8235a80d9 100644
--- a/apps/web/components/forgot-password.tsx
+++ b/apps/web/components/forgot-password.tsx
@@ -11,9 +11,7 @@ interface ForgotPasswordForm {
 }
 
 export default function ForgotPassword() {
-  const methods = useForm<ForgotPasswordForm>();
-  const { register, formState, resetField } = methods;
-
+  const { register, formState, resetField, handleSubmit } = useForm<ForgotPasswordForm>();
   const [resetSuccessful, setResetSuccessful] = useState(false);
 
   const onSubmit = async (values: ForgotPasswordForm) => {
@@ -72,37 +70,35 @@ export default function ForgotPassword() {
                 : "No worries, we'll send you reset instructions."}
             </p>
           </div>
-          {resetSuccessful ? null : (
-            <FormProvider {...methods}>
-              <form className="mt-8 space-y-6" onSubmit={methods.handleSubmit(onSubmit)}>
-                <div className="-space-y-px rounded-md shadow-sm">
-                  <div>
-                    <label htmlFor="email-address" className="sr-only">
-                      Email
-                    </label>
-                    <input
-                      {...register("email")}
-                      id="email-address"
-                      name="email"
-                      type="email"
-                      autoComplete="email"
-                      required
-                      className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
-                      placeholder="Email"
-                    />
-                  </div>
-                </div>
-
+          {!resetSuccessful && (
+            <form className="mt-8 space-y-6" onSubmit={handleSubmit(onSubmit)}>
+              <div className="-space-y-px rounded-md shadow-sm">
                 <div>
-                  <Button
-                    type="submit"
-                    disabled={formState.isSubmitting}
-                    className="group relative flex w-full">
-                    Reset password
-                  </Button>
+                  <label htmlFor="email-address" className="sr-only">
+                    Email
+                  </label>
+                  <input
+                    {...register("email")}
+                    id="email-address"
+                    name="email"
+                    type="email"
+                    autoComplete="email"
+                    required
+                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                    placeholder="Email"
+                  />
                 </div>
-              </form>
-            </FormProvider>
+              </div>
+
+              <div>
+                <Button
+                  type="submit"
+                  disabled={formState.isSubmitting}
+                  className="group relative flex w-full">
+                  Reset password
+                </Button>
+              </div>
+            </form>
           )}
           <div>
             <Link href="/login">
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 03dc6df44..954a6b0da 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -25,14 +25,13 @@ export default function ResetPassword() {
   const router = useRouter();
   const { token } = router.query;
 
-  const methods = useForm<ResetPasswordForm>({
-    resolver: zodResolver(schema),
-  });
   const {
     register,
     formState: { errors, isSubmitting },
     handleSubmit,
-  } = methods;
+  } = useForm<ResetPasswordForm>({
+    resolver: zodResolver(schema),
+  });
 
   const [resetSuccessful, setResetSuccessful] = useState(false);
 
@@ -79,55 +78,53 @@ export default function ResetPassword() {
               {resetSuccessful ? "Your password has been reset." : "Please chose your new password"}
             </p>
           </div>
-          {resetSuccessful ? null : (
-            <FormProvider {...methods}>
-              <form className="mt-8 space-y-6" onSubmit={handleSubmit(onSubmit)}>
-                <div className="-space-y-px rounded-md shadow-sm">
-                  <div>
-                    <label htmlFor="password" className="sr-only">
-                      Password
-                    </label>
-                    <input
-                      {...register("password", { required: "Password is required" })}
-                      id="password"
-                      name="password"
-                      type="password"
-                      autoComplete="current-password"
-                      required
-                      className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-t-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
-                      placeholder="New password"
-                    />
-                  </div>
-                  <div>
-                    <label htmlFor="confirmPassword" className="sr-only">
-                      Password
-                    </label>
-                    <input
-                      {...register("confirmPassword")}
-                      id="confirmPassword"
-                      name="confirmPassword"
-                      type="password"
-                      required
-                      className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-b-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
-                      placeholder="Confirm new password"
-                    />
-                  </div>
-                </div>
-
-                {errors && (
-                  <span className="text-xs text-red-500">{errors.confirmPassword?.message}</span>
-                )}
-
+          {!resetSuccessful && (
+            <form className="mt-8 space-y-6" onSubmit={handleSubmit(onSubmit)}>
+              <div className="-space-y-px rounded-md shadow-sm">
                 <div>
-                  <Button
-                    type="submit"
-                    disabled={isSubmitting}
-                    className="group relative flex w-full">
-                    Reset password
-                  </Button>
+                  <label htmlFor="password" className="sr-only">
+                    Password
+                  </label>
+                  <input
+                    {...register("password", { required: "Password is required" })}
+                    id="password"
+                    name="password"
+                    type="password"
+                    autoComplete="current-password"
+                    required
+                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-t-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                    placeholder="New password"
+                  />
                 </div>
-              </form>
-            </FormProvider>
+                <div>
+                  <label htmlFor="confirmPassword" className="sr-only">
+                    Password
+                  </label>
+                  <input
+                    {...register("confirmPassword")}
+                    id="confirmPassword"
+                    name="confirmPassword"
+                    type="password"
+                    required
+                    className="focus:border-neon focus:ring-neon relative block w-full appearance-none rounded-none rounded-b-md border border-gray-300 px-3 py-2 text-gray-900 placeholder-gray-500 focus:z-10 focus:outline-none sm:text-sm"
+                    placeholder="Confirm new password"
+                  />
+                </div>
+              </div>
+
+              {errors && (
+                <span className="text-xs text-red-500">{errors.confirmPassword?.message}</span>
+              )}
+
+              <div>
+                <Button
+                  type="submit"
+                  disabled={isSubmitting}
+                  className="group relative flex w-full">
+                  Reset password
+                </Button>
+              </div>
+            </form>
           )}
           <div>
             <Link href="/login">
diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts
index bc42e2339..78a81b7d4 100644
--- a/apps/web/pages/api/auth/reset-password.ts
+++ b/apps/web/pages/api/auth/reset-password.ts
@@ -8,7 +8,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   const { token, password } = req.body;
 
   if (!token) {
-    res.status(422).json({ message: "Invalid token" });
+    res.status(400).json({ message: "Invalid token" });
     return;
   }
 
diff --git a/apps/web/pages/forgot-password.tsx b/apps/web/pages/forgot-password.tsx
index b15bec499..4591921a4 100644
--- a/apps/web/pages/forgot-password.tsx
+++ b/apps/web/pages/forgot-password.tsx
@@ -1,3 +1,4 @@
+import { GetServerSideProps, GetServerSidePropsContext } from "next";
 import Head from "next/head";
 import { getUserFromToken } from "@documenso/lib/server";
 import ForgotPassword from "../components/forgot-password";
@@ -13,8 +14,9 @@ export default function ForgotPasswordPage() {
   );
 }
 
-export async function getServerSideProps(context: any) {
-  const user = await getUserFromToken(context.req, context.res);
+export async function getServerSideProps({ req }: GetServerSidePropsContext) {
+  const user = await getUserFromToken(req);
+
   if (user)
     return {
       redirect: {
diff --git a/packages/lib/server/getUserFromToken.ts b/packages/lib/server/getUserFromToken.ts
index 0cb8b72bb..f38c4abd1 100644
--- a/packages/lib/server/getUserFromToken.ts
+++ b/packages/lib/server/getUserFromToken.ts
@@ -1,23 +1,17 @@
-import { NextApiRequest, NextApiResponse } from "next";
+import { GetServerSidePropsContext, NextApiRequest, NextApiResponse } from "next";
+import { NextRequest } from "next/server";
 import prisma from "@documenso/prisma";
 import { User as PrismaUser } from "@prisma/client";
 import { getToken } from "next-auth/jwt";
-import { signOut } from "next-auth/react";
 
 export async function getUserFromToken(
-  req: NextApiRequest,
-  res: NextApiResponse
+  req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
+  res?: NextApiResponse // TODO: Remove this optional parameter
 ): Promise<PrismaUser | null> {
   const token = await getToken({ req });
   const tokenEmail = token?.email?.toString();
 
-  if (!token) {
-    if (res.status) res.status(401).send("No session token found for request.");
-    return null;
-  }
-
-  if (!tokenEmail) {
-    res.status(400).send("No email found in session token.");
+  if (!token || !tokenEmail) {
     return null;
   }
 
@@ -26,7 +20,6 @@ export async function getUserFromToken(
   });
 
   if (!user) {
-    if (res && res.status) res.status(401).end();
     return null;
   }
 

From 3f14d8007ae4272f564c7b21d009a4fd61155536 Mon Sep 17 00:00:00 2001
From: Lucas Smith <me@lucasjamessmith.me>
Date: Thu, 15 Jun 2023 23:25:35 +1000
Subject: [PATCH 61/66] fix: don't double send error reponses when sending
 fails

---
 apps/web/pages/api/documents/[id]/send.ts | 81 +++++++++++++----------
 1 file changed, 47 insertions(+), 34 deletions(-)

diff --git a/apps/web/pages/api/documents/[id]/send.ts b/apps/web/pages/api/documents/[id]/send.ts
index 302e75001..aa93cab24 100644
--- a/apps/web/pages/api/documents/[id]/send.ts
+++ b/apps/web/pages/api/documents/[id]/send.ts
@@ -1,58 +1,71 @@
 import { NextApiRequest, NextApiResponse } from "next";
 import { sendSigningRequest } from "@documenso/lib/mail";
 import { getDocument } from "@documenso/lib/query";
-import { defaultHandler, defaultResponder, getUserFromToken } from "@documenso/lib/server";
+import {
+  defaultHandler,
+  defaultResponder,
+  getUserFromToken,
+} from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
 import { Document as PrismaDocument, SendStatus } from "@prisma/client";
 
 async function postHandler(req: NextApiRequest, res: NextApiResponse) {
-  const user = await getUserFromToken(req, res);
-  const { id: documentId } = req.query;
-  const { resendTo: resendTo = [] } = req.body;
+  try {
+    const user = await getUserFromToken(req, res);
+    const { id: documentId } = req.query;
+    const { resendTo: resendTo = [] } = req.body;
 
-  if (!user) return;
+    if (!user) {
+      return res.status(401).send("Unauthorized");
+    }
 
-  if (!documentId) {
-    res.status(400).send("Missing parameter documentId.");
-    return;
-  }
+    if (!documentId) {
+      return res.status(400).send("Missing parameter documentId.");
+    }
 
-  const document: PrismaDocument = await getDocument(+documentId, req, res);
+    const document: PrismaDocument = await getDocument(+documentId, req, res);
 
-  if (!document) res.status(404).end(`No document with id ${documentId} found.`);
+    if (!document) {
+      res.status(404).end(`No document with id ${documentId} found.`);
+    }
 
-  let recipientCondition: any = {
-    documentId: +documentId,
-    sendStatus: SendStatus.NOT_SENT,
-  };
-
-  if (resendTo.length) {
-    recipientCondition = {
+    let recipientCondition: any = {
       documentId: +documentId,
-      id: { in: resendTo },
+      sendStatus: SendStatus.NOT_SENT,
     };
-  }
 
-  const recipients = await prisma.recipient.findMany({
-    where: {
-      ...recipientCondition,
-    },
-  });
+    if (resendTo.length) {
+      recipientCondition = {
+        documentId: +documentId,
+        id: { in: resendTo },
+      };
+    }
 
-  if (!recipients.length) return res.status(200).send(recipients.length);
-
-  let sentRequests = 0;
-  recipients.forEach(async (recipient) => {
-    await sendSigningRequest(recipient, document, user).catch((err) => {
-      console.log(err);
-      return res.status(502).end("Coud not send request for signing.");
+    const recipients = await prisma.recipient.findMany({
+      where: {
+        ...recipientCondition,
+      },
+    });
+
+    if (!recipients.length) {
+      return res.status(200).send(recipients.length);
+    }
+
+    let sentRequests = 0;
+    recipients.forEach(async (recipient) => {
+      await sendSigningRequest(recipient, document, user);
+
+      sentRequests++;
     });
 
-    sentRequests++;
     if (sentRequests === recipients.length) {
       return res.status(200).send(recipients.length);
     }
-  });
+
+    return res.status(502).end("Coud not send request for signing.");
+  } catch (err) {
+    return res.status(502).end("Coud not send request for signing.");
+  }
 }
 
 export default defaultHandler({

From 9fd9bc28934b7eff51e1d03128bbd4368ed714af Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Fri, 16 Jun 2023 00:24:13 +1000
Subject: [PATCH 62/66] fix: reformat

---
 apps/web/pages/api/documents/[id]/send.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/web/pages/api/documents/[id]/send.ts b/apps/web/pages/api/documents/[id]/send.ts
index aa93cab24..ea3e91adc 100644
--- a/apps/web/pages/api/documents/[id]/send.ts
+++ b/apps/web/pages/api/documents/[id]/send.ts
@@ -1,11 +1,7 @@
 import { NextApiRequest, NextApiResponse } from "next";
 import { sendSigningRequest } from "@documenso/lib/mail";
 import { getDocument } from "@documenso/lib/query";
-import {
-  defaultHandler,
-  defaultResponder,
-  getUserFromToken,
-} from "@documenso/lib/server";
+import { defaultHandler, defaultResponder, getUserFromToken } from "@documenso/lib/server";
 import prisma from "@documenso/prisma";
 import { Document as PrismaDocument, SendStatus } from "@prisma/client";
 

From e34be16d3d26b8c4792f02459bf1bed9284aa87f Mon Sep 17 00:00:00 2001
From: danieltonel <danieltonel.xyz@gmail.com>
Date: Fri, 16 Jun 2023 10:44:23 +0300
Subject: [PATCH 63/66] fix: Docker Compose 'name' attribute causing invalid
 file issue

---
 docker/compose-without-app.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/compose-without-app.yml b/docker/compose-without-app.yml
index e0b566e96..8b781a9a7 100644
--- a/docker/compose-without-app.yml
+++ b/docker/compose-without-app.yml
@@ -1,4 +1,3 @@
-name: documenso
 services:
   database:
     image: postgres:15

From b05ab9fbb465f19ca0ba11fc1c43da75e9e1ee89 Mon Sep 17 00:00:00 2001
From: danieltonel <danieltonel.xyz@gmail.com>
Date: Fri, 16 Jun 2023 10:50:20 +0300
Subject: [PATCH 64/66] set name using docker compose

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 08d2a2788..14039e862 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "db-migrate:dev": "prisma migrate dev",
     "db-seed": "prisma db seed",
     "db-studio": "prisma studio",
-    "docker:compose-up": "docker compose -f ./docker/compose-without-app.yml up -d || docker-compose -f ./docker/compose-without-app.yml up -d",
-    "docker:compose-down": "docker compose -f ./docker/compose-without-app.yml down || docker-compose -f ./docker/compose-without-app.yml down",
+    "docker:compose-up": "docker compose -p documenso -f ./docker/compose-without-app.yml up -d || docker-compose -p documenso -f ./docker/compose-without-app.yml up -d",
+    "docker:compose-down": "docker compose -p documenso -f ./docker/compose-without-app.yml down || docker-compose -p documenso -f ./docker/compose-without-app.yml down",
     "stripe:listen": "stripe listen --forward-to localhost:3000/api/stripe/webhook",
     "dx": "npm install && run-s docker:compose-up db-migrate:dev",
     "d": "npm install && run-s docker:compose-up db-migrate:dev && npm run db-seed && npm run dev"
@@ -54,4 +54,4 @@
     "turbo": "^1.9.9",
     "typescript": "4.8.4"
   }
-}
\ No newline at end of file
+}

From d3f82e1eb0d7c858a59dcb76eea57384ff7d6f31 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Sat, 17 Jun 2023 11:44:34 +1000
Subject: [PATCH 65/66] fix: code style updates and email wording changes

---
 apps/web/components/reset-password.tsx           | 16 +++++++++-------
 apps/web/pages/api/auth/forgot-password.ts       |  2 +-
 apps/web/pages/api/auth/signup.ts                |  4 ++--
 .../lib/mail/resetPasswordSuccessTemplate.ts     |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx
index 954a6b0da..9f5f1d466 100644
--- a/apps/web/components/reset-password.tsx
+++ b/apps/web/components/reset-password.tsx
@@ -5,11 +5,11 @@ import { Button } from "@documenso/ui";
 import Logo from "./logo";
 import { ArrowLeftIcon } from "@heroicons/react/24/outline";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { FormProvider, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import * as z from "zod";
 
-const schema = z
+const ZResetPasswordFormSchema = z
   .object({
     password: z.string().min(8, { message: "Password must be at least 8 characters" }),
     confirmPassword: z.string().min(8, { message: "Password must be at least 8 characters" }),
@@ -19,7 +19,7 @@ const schema = z
     message: "Password don't match",
   });
 
-type ResetPasswordForm = z.infer<typeof schema>;
+type TResetPasswordFormSchema = z.infer<typeof ZResetPasswordFormSchema>;
 
 export default function ResetPassword() {
   const router = useRouter();
@@ -29,20 +29,20 @@ export default function ResetPassword() {
     register,
     formState: { errors, isSubmitting },
     handleSubmit,
-  } = useForm<ResetPasswordForm>({
-    resolver: zodResolver(schema),
+  } = useForm<TResetPasswordFormSchema>({
+    resolver: zodResolver(ZResetPasswordFormSchema),
   });
 
   const [resetSuccessful, setResetSuccessful] = useState(false);
 
-  const onSubmit = async (values: ResetPasswordForm) => {
+  const onSubmit = async ({ password }: TResetPasswordFormSchema) => {
     const response = await toast.promise(
       fetch(`/api/auth/reset-password`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify({ password: values.password, token }),
+        body: JSON.stringify({ password, token }),
       }),
       {
         loading: "Resetting...",
@@ -96,6 +96,7 @@ export default function ResetPassword() {
                     placeholder="New password"
                   />
                 </div>
+
                 <div>
                   <label htmlFor="confirmPassword" className="sr-only">
                     Password
@@ -126,6 +127,7 @@ export default function ResetPassword() {
               </div>
             </form>
           )}
+
           <div>
             <Link href="/login">
               <div className="relative mt-10 flex items-center justify-center gap-2 text-sm text-gray-500 hover:cursor-pointer hover:text-gray-900">
diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts
index 9a17edd9f..98e4a6676 100644
--- a/apps/web/pages/api/auth/forgot-password.ts
+++ b/apps/web/pages/api/auth/forgot-password.ts
@@ -9,7 +9,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   const cleanEmail = email.toLowerCase();
 
   if (!cleanEmail || !/.+@.+/.test(cleanEmail)) {
-    res.status(422).json({ message: "Invalid email" });
+    res.status(400).json({ message: "Invalid email" });
     return;
   }
 
diff --git a/apps/web/pages/api/auth/signup.ts b/apps/web/pages/api/auth/signup.ts
index d8032ed95..b67f1b50f 100644
--- a/apps/web/pages/api/auth/signup.ts
+++ b/apps/web/pages/api/auth/signup.ts
@@ -9,12 +9,12 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
   const cleanEmail = email.toLowerCase();
 
   if (!cleanEmail || !/.+@.+/.test(cleanEmail)) {
-    res.status(422).json({ message: "Invalid email" });
+    res.status(400).json({ message: "Invalid email" });
     return;
   }
 
   if (!password || password.trim().length < 7) {
-    return res.status(422).json({
+    return res.status(400).json({
       message: "Password should be at least 7 characters long.",
     });
   }
diff --git a/packages/lib/mail/resetPasswordSuccessTemplate.ts b/packages/lib/mail/resetPasswordSuccessTemplate.ts
index 44afcc119..25a0a9ff5 100644
--- a/packages/lib/mail/resetPasswordSuccessTemplate.ts
+++ b/packages/lib/mail/resetPasswordSuccessTemplate.ts
@@ -20,7 +20,7 @@ export const resetPasswordSuccessTemplate = (user: User) => {
         </p>
 
         <p style="margin-top: 15px">
-            If you did not ask to change your password we are here to help you secure your account, just <a href="https://documenso.com">contact us</a>.
+            Didn't request a password change? We are here to help you secure your account, just <a href="https://documenso.com">contact us</a>.
         </p>
 
         <p style="margin-top: 15px">

From 5063b60a8a35594de80d9fa5b64e62613a786a77 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Sat, 17 Jun 2023 11:53:04 +1000
Subject: [PATCH 66/66] fix: further style updates

---
 apps/web/pages/documents.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/pages/documents.tsx b/apps/web/pages/documents.tsx
index e182ae89c..cea08623c 100644
--- a/apps/web/pages/documents.tsx
+++ b/apps/web/pages/documents.tsx
@@ -145,16 +145,16 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
             </Button>
           </div>
         </div>
-        <div className="mt-3 mb-12 flex items-center justify-start gap-x-4 md:justify-end">
+        <div className="mt-3 mb-12 flex flex-wrap items-center justify-start gap-x-4 md:justify-end gap-y-4">
           <SelectBox
-            className="block w-1/4"
+            className="block flex-1 md:flex-none md:w-1/4"
             label="Status"
             options={statusFilters}
             value={selectedStatusFilter}
             onChange={handleStatusFilterChange}
           />
           <SelectBox
-            className="block w-1/4"
+            className="block flex-1 md:flex-none md:w-1/4"
             label="Created"
             options={createdFilter}
             value={selectedCreatedFilter}