chore: added form reset for onCancel

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

.devcontainer/on-create.sh

@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
+# Start the database and mailserver
+docker compose -f ./docker/compose-without-app.yml up -d
+
 # Install dependencies
 npm install
 
 # Copy the env file
 cp .env.example .env
 
-# Run the dev setup
-npm run dx
+# Run the migrations
+npm run prisma:migrate-dev

.env.example

@@ -22,33 +22,10 @@ NEXT_PRIVATE_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documen
 # Defines the URL to use for the database when running migrations and other commands that won't work with a connection pool.
 NEXT_PRIVATE_DIRECT_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documenso"
 
-# [[SIGNING]]
-# The transport to use for document signing. Available options: local (default) | gcloud-hsm
-NEXT_PRIVATE_SIGNING_TRANSPORT="local"
-# OPTIONAL: The passphrase to use for the local file-based signing transport.
-NEXT_PRIVATE_SIGNING_PASSPHRASE=
-# OPTIONAL: The local file path to the .p12 file to use for the local signing transport.
-NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=
-# OPTIONAL: The base64-encoded contents of the .p12 file to use for the local signing transport.
-NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS=
-# OPTIONAL: The path to the Google Cloud HSM key to use for the gcloud-hsm signing transport.
-NEXT_PRIVATE_SIGNING_GCLOUD_HSM_KEY_PATH=
-# OPTIONAL: The path to the Google Cloud HSM public certificate file to use for the gcloud-hsm signing transport.
-NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_PATH=
-# OPTIONAL: The base64-encoded contents of the Google Cloud HSM public certificate file to use for the gcloud-hsm signing transport.
-NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_CONTENTS=
-# OPTIONAL: The path to the Google Cloud Credentials file to use for the gcloud-hsm signing transport.
-NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS=
-
-# [[SIGNING]]
-# OPTIONAL: Defines the signing transport to use. Available options: local (default)
-NEXT_PRIVATE_SIGNING_TRANSPORT="local"
-# OPTIONAL: Defines the passphrase for the signing certificate.
-NEXT_PRIVATE_SIGNING_PASSPHRASE=
-# OPTIONAL: Defines the file contents for the signing certificate as a base64 encoded string.
-NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS=
-# OPTIONAL: Defines the file path for the signing certificate. defaults to ./example/cert.p12
-NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=
+# [[E2E Tests]]
+E2E_TEST_AUTHENTICATE_USERNAME="Test User"
+E2E_TEST_AUTHENTICATE_USER_EMAIL="testuser@mail.com"
+E2E_TEST_AUTHENTICATE_USER_PASSWORD="test_Password123"
 
 # [[STORAGE]]
 # OPTIONAL: Defines the storage transport to use. Available options: database (default) | s3
@@ -113,11 +90,6 @@ NEXT_PUBLIC_FEATURE_BILLING_ENABLED=
 # OPTIONAL: Leave blank to allow users to signup through /signup page.
 NEXT_PUBLIC_DISABLE_SIGNUP=
 
-# [[E2E Tests]]
-E2E_TEST_AUTHENTICATE_USERNAME="Test User"
-E2E_TEST_AUTHENTICATE_USER_EMAIL="testuser@mail.com"
-E2E_TEST_AUTHENTICATE_USER_PASSWORD="test_Password123"
-
 # This is only required for the marketing site
 # [[REDIS]]
 NEXT_PRIVATE_REDIS_URL=

.github/workflows/publish.yml

@@ -5,71 +5,27 @@ on:
     branches: ['release']
 
 jobs:
-  build_and_publish_platform_containers:
-    name: Build and publish platform containers
-    runs-on: ${{ matrix.os }}
+  build:
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - warp-ubuntu-latest-x64-4x
-          - warp-ubuntu-latest-arm64-4x
+        platform:
+          - linux/amd64
+          - linux/arm/v6
+          - linux/arm/v7
+          - linux/arm64
 
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-tags: true
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GH_TOKEN }}
-
-      - name: Build the docker image
-        env:
-          BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
-        run: |
-          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
-          GIT_SHA="$(git rev-parse HEAD)"
-
-          docker build \
-            -f ./docker/Dockerfile \
-            --progress=plain \
-            -t "documenso/documenso-$BUILD_PLATFORM:latest" \
-            -t "documenso/documenso-$BUILD_PLATFORM:$GIT_SHA" \
-            -t "documenso/documenso-$BUILD_PLATFORM:$APP_VERSION" \
-            -t "ghcr.io/documenso/documenso-$BUILD_PLATFORM:latest" \
-            -t "ghcr.io/documenso/documenso-$BUILD_PLATFORM:$GIT_SHA" \
-            -t "ghcr.io/documenso/documenso-$BUILD_PLATFORM:$APP_VERSION" \
-            .
-
-      - name: Push the docker image to DockerHub
-        run: docker push --all-tags "documenso/documenso-$BUILD_PLATFORM"
-        env:
-          BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
-
-      - name: Push the docker image to GitHub Container Registry
-        run: docker push --all-tags "ghcr.io/documenso/documenso-$BUILD_PLATFORM"
-        env:
-          BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
-
-  create_and_publish_manifest:
-    name: Create and publish manifest
-    runs-on: ubuntu-latest
-    needs: build_and_publish_platform_containers
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-tags: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -84,50 +40,7 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GH_TOKEN }}
 
-      - name: Create and push DockerHub manifest
-        run: |
-          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
-          GIT_SHA="$(git rev-parse HEAD)"
-
-          docker manifest create \
-            documenso/documenso:latest \
-            --amend documenso/documenso-amd64:latest \
-            --amend documenso/documenso-arm64:latest \
-
-          docker manifest create \
-            documenso/documenso:$GIT_SHA \
-            --amend documenso/documenso-amd64:$GIT_SHA \
-            --amend documenso/documenso-arm64:$GIT_SHA \
-
-          docker manifest create \
-            documenso/documenso:$APP_VERSION \
-            --amend documenso/documenso-amd64:$APP_VERSION \
-            --amend documenso/documenso-arm64:$APP_VERSION \
-
-          docker manifest push documenso/documenso:latest
-          docker manifest push documenso/documenso:$GIT_SHA
-          docker manifest push documenso/documenso:$APP_VERSION
-
-      - name: Create and push Github Container Registry manifest
-        run: |
-          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
-          GIT_SHA="$(git rev-parse HEAD)"
-
-          docker manifest create \
-            ghcr.io/documenso/documenso:latest \
-            --amend ghcr.io/documenso/documenso-amd64:latest \
-            --amend ghcr.io/documenso/documenso-arm64:latest \
-
-          docker manifest create \
-            ghcr.io/documenso/documenso:$GIT_SHA \
-            --amend ghcr.io/documenso/documenso-amd64:$GIT_SHA \
-            --amend ghcr.io/documenso/documenso-arm64:$GIT_SHA \
-
-          docker manifest create \
-            ghcr.io/documenso/documenso:$APP_VERSION \
-            --amend ghcr.io/documenso/documenso-amd64:$APP_VERSION \
-            --amend ghcr.io/documenso/documenso-arm64:$APP_VERSION \
-
-          docker manifest push ghcr.io/documenso/documenso:latest
-          docker manifest push ghcr.io/documenso/documenso:$GIT_SHA
-          docker manifest push ghcr.io/documenso/documenso:$APP_VERSION
+      - name: Build and push the docker image
+        run: ./docker/buildx-and-push.sh
+        env:
+          PLATFORM: ${{ matrix.platform }}

.vscode/settings.json

@@ -1,9 +1,7 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll": "explicit"
+    "source.fixAll.eslint": "explicit"
   },
   "eslint.validate": ["typescript", "typescriptreact", "javascript", "javascriptreact"],
   "javascript.preferences.importModuleSpecifier": "non-relative",

README.md

@@ -27,11 +27,20 @@
    <a href="https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/documenso/documenso">
    <img alt="open in devcontainer" src="https://img.shields.io/static/v1?label=Dev%20Containers&message=Enabled&color=blue&logo=visualstudiocode" />
    </a>
-   <a href="CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg" alt="Contributor Covenant"></a>
+   <a href="code_of_conduct.md"><img src="https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg" alt="Contributor Covenant"></a>
 </p>
 
-<div align="center">
-  <img src="https://github.com/documenso/documenso/assets/13398220/d96ed533-6f34-4a97-be9b-442bdb189c69" style="width: 80%;" />
+<div>
+  <img style="display: block; height: 120px; width: 24%"
+    src="https://github.com/documenso/documenso/assets/1309312/67e08c98-c153-4115-aa2d-77979bb12c94)">
+  <img style="display: block; height: 120px; width: 24%"
+    src="https://github.com/documenso/documenso/assets/1309312/040cfbae-3438-4ca3-87f2-ce52c793dcaf">
+  <img style="display: block; height: 120px; width: 24%"
+    src="https://github.com/documenso/documenso/assets/1309312/72d445be-41e5-4936-bdba-87ef8e70fa09">
+  <img style="display: block; height: 120px; width: 24%"
+    src="https://github.com/documenso/documenso/assets/1309312/d7b86c0f-a755-4476-a022-a608db2c4633">
+  <img style="display: block; height: 120px; width: 24%"
+    src=https://github.com/documenso/documenso/assets/1309312/c0f55116-ab82-433f-a266-f3fc8571d69f">
 </div>
 
 ## About this project
@@ -198,16 +207,7 @@ If you're a visual learner and prefer to watch a video walkthrough of setting up
 
 ## Docker
 
-We provide a Docker container for Documenso, which is published on both DockerHub and GitHub Container Registry.
-
-- DockerHub: [https://hub.docker.com/r/documenso/documenso](https://hub.docker.com/r/documenso/documenso)
-- GitHub Container Registry: [https://ghcr.io/documenso/documenso](https://ghcr.io/documenso/documenso)
-
-You can pull the Docker image from either of these registries and run it with your preferred container hosting provider.
-
-Please note that you will need to provide environment variables for connecting to the database, mailserver, and so forth.
-
-For detailed instructions on how to configure and run the Docker container, please refer to the [Docker README](./docker/README.md) in the `docker` directory.
+🚧 Docker containers and images are current in progress. We are actively working on bringing a simple Docker build and publish pipeline for Documenso.
 
 ## Self Hosting
 

apps/marketing/content/blog/public-api.mdx

@@ -1,292 +0,0 @@
----
-title: 'Building the Documenso Public API - The Why and How'
-description: 'This article talks about the need for the public API and the process of building it. It also discusses the requirements we had to meet and the constraints we had to work within.'
-authorName: 'Catalin'
-authorImage: '/blog/blog-author-catalin.webp'
-authorRole: 'I like to code and write'
-date: 2024-03-08
-tags:
-  - Development
-  - API
----
-
-This article covers the process of building the public API for Documenso. It starts by explaining why the API was needed for a digital document signing company in the first place. Then, it'll dive into the steps we took to build it. Lastly, it'll present the requirements we had to meet and the constraints we had to work within.
-
-## Why the public API
-
-We decided to build the public API to open a new way of interacting with Documenso. While the web app does the job well, there are use cases where it's not enough. In those cases, the users might want to interact with the platform programmatically. Usually, that's for integrating Documenso with other applications.
-
-With the new public API that's now possible. You can integrate Documenso's functionalities within other applications to automate tasks, create custom solutions, and build custom workflows, to name just a few.
-
-The API provides 12 endpoints at the time of writing this article:
-
-- (GET) `/api/v1/documents` - retrieve all the documents
-- (POST) `/api/v1/documents` - upload a new document and getting a presigned URL
-- (GET) `/api/v1/documents/{id}` - fetch a specific document
-- (DELETE) `/api/v1/documents/{id}` - delete a specific document
-- (POST) `/api/v1/templates/{templateId}/create-document` - create a new document from an existing template
-- (POST) `/api/v1/documents/{id}/send` - send a document for signing
-- (POST) `/api/v1/documents/{id}/recipients` - create a document recipient
-- (PATCH) `/api/v1/documents/{id}/recipients/{recipientId}` - update the details of a document recipient
-- (DELETE) `/api/v1/documents/{id}/recipients/{recipientId}` - delete a specific recipient from a document
-- (POST) `/api/v1/documents/{id}/fields` - create a field for a document
-- (PATCH) `/api/v1/documents/{id}/fields` - update the details of a document field
-- (DELETE) `/api/v1/documents/{id}/fields` - delete a field from a document
-
-> Check out the [API documentation](https://app.documenso.com/api/v1/openapi).
-
-Moreover, it also enables us to enhance the platform by bringing other integrations to Documenso, such as Zapier.
-
-In conclusion, the new public API extends Documenso's capabilities, provides more flexibility for users, and opens up a broader world of possibilities.
-
-## Picking the right approach & tech
-
-Once we decided to build the API, we had to choose the approach and technologies to use. There were 2 options:
-
-1. Build an additional application
-2. Launch the API in the existing codebase
-
-### 1. Build an additional application
-
-That would mean creating a new codebase and building the API from scratch. Having a separate app for the API would result in benefits such as:
-
-- lower latency responses
-- supporting larger field uploads
-- separation between the apps (Documenso and the API)
-- customizability and flexibility
-- easier testing and debugging
-
-This approach has significant benefits. However, one major drawback is that it requires additional resources.
-
-We'd have to spend a lot of time just on the core stuff, such as building and configuring the basic server. After that, we'd spend time implementing the endpoints and authorization, among other things. When the building is done, there will be another application to deploy and manage. All of this would stretch our already limited resources.
-
-So, we asked ourselves if there is another way of doing it without sacrificing the API quality and the developer experience.
-
-### 2. Launch the API in the existing codebase
-
-The other option was to launch the API in the existing codebase. Rather than writing everything from scratch, we could use most of our existing code.
-
-Since we're using tRPC for our internal API (backend), we looked for solutions that work well with tRPC. We narrowed down the choices to:
-
-- [trpc-openapi](https://github.com/jlalmes/trpc-openapi)
-- [ts-rest](https://ts-rest.com/)
-
-Both technologies allow you to build public APIs. The `trpc-openapi` technology allows you to easily turn tRPC procedures into REST endpoints. It's more like a plugin for tRPC.
-
-On the other hand, `ts-rest` is more of a standalone solution. `ts-rest` enables you to create a contract for the API, which can be used both on the client and server. You can consume and implement the contract in your application, thus providing end-to-end type safety and RPC-like client.
-
-> You can see a [comparison between trpc-openapi and ts-rest](https://catalins.tech/public-api-trpc/) here.
-
-So, the main difference between the 2 is that `trpc-openapi` is like a plugin that extends tRPC's capabilities, whereas `ts-rest` provides the tools for building a standalone API.
-
-### Our choice
-
-After analyzing and comparing the 2 options, we decided to go with `ts-rest` because of its benefits. Here's a paragraph from the `ts-rest` documentation that hits the nail on the head:
-
-> tRPC has many plugins to solve this issue by mapping the API implementation to a REST-like API, however, these approaches are often a bit clunky and reduce the safety of the system overall, ts-rest does this heavy lifting in the client and server implementations rather than requiring a second layer of abstraction and API endpoint(s) to be defined.
-
-## API Requirements
-
-We defined the following requirements for the API:
-
-- The API should use path-based versioning (e.g. `/v1`)
-- The system should use bearer tokens for API authentication
-  - The API token should be a random string of 32 to 40 characters
-- The system should hash the token and store the hashed value
-- The system should only display the API token when it's created
-- The API should have self-generated documentation like Swagger
-- Users should be able to create an API key
-  - Users should be able to choose a token name
-  - Users should be able to choose an expiration date for the token
-    - User should be able to choose between 7 days, 1 month, 3 months, 6 months, 12 months, never
-- System should display all the user's tokens in the settings page
-  - System should display the token name, creation date, expiration date and a delete button
-- Users should be able to delete an API key
-- Users should be able to retrieve all the documents from their account
-- Users should be able to upload a new document
-  - Users should receive an S3 pre-signed URL after a successful upload
-- Users should be able to retrieve a specific document from their account by its id
-- Users should be able to delete a specific document from their account by its id
-- Users should be able to create a new document from an existing document template
-- Users should be able to send a document for signing to 1 or more recipients
-- Users should be able to create a recipient for a document
-- Users should be able to update the details of a recipient
-- Users should be able to delete a recipient from a document
-- Users should be able to create a field (e.g. signature, email, name, date) for a document
-- Users should be able to update a field for a document
-- Users should be able to delete a field from a document
-
-## Constraints
-
-We also faced the following constraints while developing the API:
-
-**1. Resources**
-
-Limited resources were one of the main constraints. We're a new startup with a relatively small team. Building and maintaining an additional application would strain our limited resources.
-
-**2. Technology stack**
-
-Another constraint was the technology stack. Our tech stack includes TypeScript, Prisma, and tRPC, among others. We also use Vercel for hosting.
-
-As a result, we wanted to use technologies we are comfortable with. This allowed us to leverage our existing knowledge and ensured consistency across our applications.
-
-Using familiar technologies also meant we could develop the API faster, as we didn't have to spend time learning new technologies. We could also leverage existing code and tools used in our main application.
-
-It's worth mentioning that this is not a permanent decision. We're open to moving the API to another codebase/tech stack when it makes sense (e.g. API is heavily used and needs better performance).
-
-**3. File uploads**
-
-Due to our current architecture, we support file uploads with a maximum size of 50 MB. To circumvent this, we created an additional step for uploading documents.
-
-Users make a POST request to the `/api/v1/documents` endpoint and the API responds with an S3 pre-signed URL. The users then make a 2nd request to the pre-signed URL with their document.
-
-## How we built the API
-
-![API package diagram](api-package.webp)
-
-Our codebase is a monorepo, so we created a new API package in the `packages` directory. It contains both the API implementation and its documentation. The main 2 blocks of the implementation consist of the API contract and the code for the API endpoints.
-
-![API implementation diagram](api-implementation.webp)
-
-In a few words, the API contract defines the API structure, the format of the requests and responses, how to authenticate API calls, the available endpoints and their associated HTTP verbs. You can explore the [API contract](https://github.com/documenso/documenso/blob/main/packages/api/v1/contract.ts) on GitHub.
-
-Then, there's the implementation part, which is the actual code for each endpoint defined in the API contract. The implementation is where the API contract is brought to life and made functional.
-
-Let's take the endpoint `/api/v1/documents` as an example.
-
-```ts
-export const ApiContractV1 = c.router(
-  {
-    getDocuments: {
-      method: 'GET',
-      path: '/api/v1/documents',
-      query: ZGetDocumentsQuerySchema,
-      responses: {
-        200: ZSuccessfulResponseSchema,
-        401: ZUnsuccessfulResponseSchema,
-        404: ZUnsuccessfulResponseSchema,
-      },
-      summary: 'Get all documents',
-    },
-    ...
-  }
-);
-```
-
-The API contract specifies the following things for `getDocuments`:
-
-- the allowed HTTP request method is GET, so trying to make a POST request, for example, results in an error
-- the path is `/api/v1/documents`
-- the query parameters the user can pass with the request
-  - in this case - `page` and `perPage`
-- the allowed responses and their schema
-  - `200` returns an object containing an array of all documents and a field `totalPages`, which is self-explanatory
-  - `401` returns an object with a message such as "Unauthorized"
-  - `404` returns an object with a message such as "Not found"
-
-The implementation of this endpoint needs to match the contract completely; otherwise, `ts-rest` will complain, and your API might not work as intended.
-
-The `getDocuments` function from the `implementation.ts` file runs when the user hits the endpoint.
-
-```ts
-export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
-  getDocuments: authenticatedMiddleware(async (args, user, team) => {
-    const page = Number(args.query.page) || 1;
-    const perPage = Number(args.query.perPage) || 10;
-
-    const { data: documents, totalPages } = await findDocuments({
-      page,
-      perPage,
-      userId: user.id,
-      teamId: team?.id,
-    });
-
-    return {
-      status: 200,
-      body: {
-        documents,
-        totalPages,
-      },
-    };
-  }),
-  ...
-});
-```
-
-There is a middleware, too, `authenticatedMiddleware`, that handles the authentication for API requests. It ensures that the API token exists and the token used has the appropriate privileges for the resource it accesses.
-
-That's how the other endpoints work as well. The code differs, but the principles are the same. You can explore the [API implementation](https://github.com/documenso/documenso/blob/main/packages/api/v1/implementation.ts) and the [middleware code](https://github.com/documenso/documenso/blob/main/packages/api/v1/middleware/authenticated.ts) on GitHub.
-
-### Documentation
-
-For the documentation, we decided to use Swagger UI, which automatically generates the documentation from the OpenAPI specification.
-
-The OpenAPI specification describes an API containing the available endpoints and their HTTP request methods, authentication methods, and so on. Its purpose is to help both machines and humans understand the API without having to look at the code.
-The Documenso OpenAPI specification is live [here](https://documenso.com/api/v1/openapi.json).
-
-Thankfully, `ts-rest` makes it seamless to generate the OpenAPI specification.
-
-```ts
-import { generateOpenApi } from '@ts-rest/open-api';
-
-import { ApiContractV1 } from './contract';
-
-export const OpenAPIV1 = generateOpenApi(
-  ApiContractV1,
-  {
-    info: {
-      title: 'Documenso API',
-      version: '1.0.0',
-      description: 'The Documenso API for retrieving, creating, updating and deleting documents.',
-    },
-  },
-  {
-    setOperationId: true,
-  },
-);
-```
-
-Then, the Swagger UI takes the OpenAPI specification as a prop and generates the documentation. The code below shows the component responsible for generating the documentation.
-
-```ts
-'use client';
-
-import SwaggerUI from 'swagger-ui-react';
-import 'swagger-ui-react/swagger-ui.css';
-
-import { OpenAPIV1 } from '@documenso/api/v1/openapi';
-
-export const OpenApiDocsPage = () => {
-  return <SwaggerUI spec={OpenAPIV1} displayOperationId={true} />;
-};
-
-export default OpenApiDocsPage;
-```
-
-Lastly, we create an API endpoint to display the Swagger documentation. The code below dynamically imports the `OpenApiDocsPage` component and displays it.
-
-```ts
-'use client';
-
-import dynamic from 'next/dynamic';
-
-const Docs = dynamic(async () => import('@documenso/api/v1/api-documentation'), {
-  ssr: false,
-});
-
-export default function OpenApiDocsPage() {
-  return <Docs />;
-}
-```
-
-You can access and play around with the documentation at [documenso.com/api/v1/openapi](https://documenso.com/api/v1/openapi). You should see a page like the one shown in the screenshot below.
-
-![The documentation for the Documenso API](docs.webp)
-
-> This article shows how to [generate Swagger documentation for a Next.js API](https://catalins.tech/generate-swagger-documentation-next-js-api/).
-
-So, that's how we went about building the first iteration of the public API after taking into consideration all the constraints and the current needs. The [GitHub pull request for the API](https://github.com/documenso/documenso/pull/674) is publicly available on GitHub. You can go through it at your own pace.
-
-## Conclusion
-
-The current architecture and approach work well for our current stage and needs. However, as we continue to grow and evolve, our architecture and approach will likely need to adapt. We monitor API usage and performance regularly and collect feedback from users. This enables us to find areas for improvement, understand our users' needs, and make informed decisions about the next steps.

apps/marketing/content/blog/removing-server-actions.mdx

@@ -1,56 +0,0 @@
----
-title: 'Embracing the Future and Moving Back Again: From Server Actions to tRPC'
-description: 'This article talks about the need for the public API and the process of building it. It also talks about the requirements, constraints, challenges and lessons learnt from building it.'
-authorName: 'Lucas Smith'
-authorImage: '/blog/blog-author-lucas.png'
-authorRole: 'Co-Founder'
-date: 2024-03-07
-tags:
-  - Development
----
-
-On October 26, 2022, during the Next.js Conf, Vercel unveiled Next.js 13, introducing a bunch of new features and a whole new paradigm shift for creating Next.js apps.
-
-React Server Components (RSCs) have been known for some time but haven't yet been implemented in a React meta-framework. With Next.js now adding them, the world of server-side rendering React applications was about to change.
-
-## The promise of React Server Components
-
-Described by Vercel as a tool for writing UIs rendered or optionally cached on the server, RSC promised direct integration with databases and server-specific capabilities, a departure from the typical React and SSR models.
-
-This feature initially appeared as a game-changer, promising simpler data fetching and routing, thanks to async server components and additional nested layout support.
-
-After experimenting with it for about six months on other projects, I came to the conclusion that while it was a little rough at the edges, it was indeed a game changer and something that should be adopted in Next.js projects moving forward.
-
-## A new new paradigm: Server Actions
-
-Vercel didn't stop at adding Server Components. A short while after the initial Next.js 13 release, they introduced "Server Actions." Server Actions allow for the calling of server-side functions without API routes, reducing the amount of ceremony required for adding a new mutation or event to your application.
-
-## Betting on new technology
-
-Following the release of both Server Actions and Server Components, we at Documenso embarked on a rewrite of the application. We had accumulated a bit of technical debt from the initial MVP, which was best shed as we also improved the design with help from our new designer.
-
-Having had much success with Server Components on other projects, I opted to go all in on both Server Components and Server Actions for the new version of the application. I was excited to see how much simpler and more efficient the application would be with these new technologies.
-
-Following our relaunch, we felt quite happy with our choices of server actions, which even let us cocktail certain client—and server-side logic into a single component without needing a bunch of effort on our end.
-
-## Navigating challenges with Server Actions
-
-While initially successful, we soon encountered issues with Server Actions, particularly when monitoring the application. Unfortunately, server actions make it much harder to monitor network requests and identify failed server actions since they use the route that they are currently on.
-
-Despite this issue, things were manageable; however, a critical issue arose when the usage of server actions caused bundle corruption, resulting in a top-level await insertion that would cause builds and tests to fail.
-
-This last issue was a deal breaker since it highlighted how much magic we were relying on with server actions. I like to avoid adding more magic where possible since, with bundlers and meta-frameworks, we are already handing off a lot of heavy lifting and getting a lot of magic in return.
-
-## Going all in on tRPC
-
-My quick and final solution to the issues we were facing was to fully embrace [tRPC](https://trpc.io/), which we already used in other app areas. The migration took less than a day and resolved all our issues while adding a lot more visibility to failing actions since they now had a dedicated API route.
-
-For those unfamiliar with tRPC, it is a framework for building end-to-end typesafe APIs with TypeScript and Next.js. It's an awesome library that lets you call your defined API safely within the client, causing build time errors when things inevitably drift.
-
-I've been a big fan of tRPC for some time now, so the decision to drop server actions and instead use more of tRPC was easy for me.
-
-## Lessons learned and the future
-
-While I believe server actions are a great idea, and I'm sure they will be improved in the future, I've relearned the lesson that it's best to avoid magic where possible.
-
-This doesn't mean we won't consider moving certain things back to server actions in the future. But for now, we will wait and watch how others use them and how they evolve.

apps/marketing/contentlayer.config.ts

@@ -12,7 +12,6 @@ export const BlogPost = defineDocumentType(() => ({
     authorName: { type: 'string', required: true },
     authorImage: { type: 'string', required: false },
     authorRole: { type: 'string', required: true },
-    cta: { type: 'boolean', required: false, default: true },
   },
   computedFields: {
     href: { type: 'string', resolve: (post) => `/${post._raw.flattenedPath}` },

apps/marketing/next.config.js

@@ -21,7 +21,6 @@ const FONT_CAVEAT_BYTES = fs.readFileSync(
 const config = {
   experimental: {
     outputFileTracingRoot: path.join(__dirname, '../../'),
-    serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign'],
     serverActions: {
       bodySizeLimit: '50mb',
     },

apps/marketing/package.json

@@ -36,7 +36,7 @@
     "react-hook-form": "^7.43.9",
     "react-icons": "^4.11.0",
     "recharts": "^2.7.2",
-    "sharp": "^0.33.1",
+    "sharp": "0.33.1",
     "typescript": "5.2.2",
     "zod": "^3.22.4"
   },

apps/marketing/src/app/(marketing)/blog/[post]/opengraph-image.tsx

@@ -1,21 +1,25 @@
 import { ImageResponse } from 'next/og';
-import { NextResponse } from 'next/server';
+
+import { allBlogPosts } from 'contentlayer/generated';
 
 export const runtime = 'edge';
 
-const IMAGE_SIZE = {
+export const contentType = 'image/png';
+
+export const IMAGE_SIZE = {
   width: 1200,
   height: 630,
 };
 
-export async function GET(_request: Request) {
-  const url = new URL(_request.url);
+type BlogPostOpenGraphImageProps = {
+  params: { post: string };
+};
 
-  const title = url.searchParams.get('title');
-  const author = url.searchParams.get('author');
+export default async function BlogPostOpenGraphImage({ params }: BlogPostOpenGraphImageProps) {
+  const blogPost = allBlogPosts.find((post) => post._raw.flattenedPath === `blog/${params.post}`);
 
-  if (!title || !author) {
-    return NextResponse.json({ error: 'Not found' }, { status: 404 });
+  if (!blogPost) {
+    return null;
   }
 
   // The long urls are needed for a compiler optimisation on the Next.js side, lifting this up
@@ -45,10 +49,10 @@ export async function GET(_request: Request) {
         <img src={logoImage} alt="logo" tw="h-8" />
 
         <h1 tw="mt-8 text-6xl text-center flex items-center justify-center w-full max-w-[800px] font-bold text-center mx-auto">
-          {title}
+          {blogPost.title}
         </h1>
 
-        <p tw="font-normal">Written by {author}</p>
+        <p tw="font-normal">Written by {blogPost.authorName}</p>
       </div>
     ),
     {

apps/marketing/src/app/(marketing)/blog/[post]/page.tsx

@@ -7,8 +7,6 @@ import { ChevronLeft } from 'lucide-react';
 import type { MDXComponents } from 'mdx/types';
 import { useMDXComponent } from 'next-contentlayer/hooks';
 
-import { CallToAction } from '~/components/(marketing)/call-to-action';
-
 export const dynamic = 'force-dynamic';
 
 export const generateMetadata = ({ params }: { params: { post: string } }) => {
@@ -20,23 +18,11 @@ export const generateMetadata = ({ params }: { params: { post: string } }) => {
     };
   }
 
-  // Use the url constructor to ensure that things are escaped as they should be
-  const searchParams = new URLSearchParams({
-    title: blogPost.title,
-    author: blogPost.authorName,
-  });
-
   return {
     title: {
       absolute: `${blogPost.title} - Documenso Blog`,
     },
     description: blogPost.description,
-    openGraph: {
-      images: [`${blogPost.href}/opengraph?${searchParams.toString()}`],
-    },
-    twitter: {
-      images: [`${blogPost.href}/opengraph?${searchParams.toString()}`],
-    },
   };
 };
 
@@ -56,57 +42,53 @@ export default function BlogPostPage({ params }: { params: { post: string } }) {
   const MDXContent = useMDXComponent(post.body.code);
 
   return (
-    <div>
-      <article className="prose dark:prose-invert mx-auto py-8">
-        <div className="mb-6 text-center">
-          <time dateTime={post.date} className="text-muted-foreground mb-1 text-xs">
-            {new Date(post.date).toLocaleDateString()}
-          </time>
+    <article className="prose dark:prose-invert mx-auto py-8">
+      <div className="mb-6 text-center">
+        <time dateTime={post.date} className="text-muted-foreground mb-1 text-xs">
+          {new Date(post.date).toLocaleDateString()}
+        </time>
 
-          <h1 className="text-3xl font-bold">{post.title}</h1>
+        <h1 className="text-3xl font-bold">{post.title}</h1>
 
-          <div className="not-prose relative -mt-2 flex items-center gap-x-4 border-b border-t py-4">
-            <div className="bg-foreground h-10 w-10 rounded-full">
-              {post.authorImage && (
-                <img
-                  src={post.authorImage}
-                  alt={`Image of ${post.authorName}`}
-                  className="bg-foreground/10 h-10 w-10 rounded-full"
-                />
-              )}
-            </div>
+        <div className="not-prose relative -mt-2 flex items-center gap-x-4 border-b border-t py-4">
+          <div className="bg-foreground h-10 w-10 rounded-full">
+            {post.authorImage && (
+              <img
+                src={post.authorImage}
+                alt={`Image of ${post.authorName}`}
+                className="bg-foreground/10 h-10 w-10 rounded-full"
+              />
+            )}
+          </div>
 
-            <div className="text-sm leading-6">
-              <p className="text-foreground text-left font-semibold">{post.authorName}</p>
-              <p className="text-muted-foreground">{post.authorRole}</p>
-            </div>
+          <div className="text-sm leading-6">
+            <p className="text-foreground text-left font-semibold">{post.authorName}</p>
+            <p className="text-muted-foreground">{post.authorRole}</p>
           </div>
         </div>
+      </div>
 
-        <MDXContent components={mdxComponents} />
+      <MDXContent components={mdxComponents} />
 
-        {post.tags.length > 0 && (
-          <ul className="not-prose flex list-none flex-row space-x-2 px-0">
-            {post.tags.map((tag, i) => (
-              <li
-                key={`tag-${i}`}
-                className="bg-muted hover:bg-muted/60 text-foreground relative z-10 whitespace-nowrap rounded-full px-3 py-1.5 text-sm font-medium"
-              >
-                {tag}
-              </li>
-            ))}
-          </ul>
-        )}
+      {post.tags.length > 0 && (
+        <ul className="not-prose flex list-none flex-row space-x-2 px-0">
+          {post.tags.map((tag, i) => (
+            <li
+              key={`tag-${i}`}
+              className="bg-muted hover:bg-muted/60 text-foreground relative z-10 whitespace-nowrap rounded-full px-3 py-1.5 text-sm font-medium"
+            >
+              {tag}
+            </li>
+          ))}
+        </ul>
+      )}
 
-        <hr />
+      <hr />
 
-        <Link href="/blog" className="text-muted-foreground flex items-center hover:opacity-60">
-          <ChevronLeft className="mr-2 h-6 w-6" />
-          Back to all posts
-        </Link>
-      </article>
-
-      {post.cta && <CallToAction className="mt-8" utmSource={`blog_${params.post}`} />}
-    </div>
+      <Link href="/blog" className="text-muted-foreground flex items-center hover:opacity-60">
+        <ChevronLeft className="mr-2 h-6 w-6" />
+        Back to all posts
+      </Link>
+    </article>
   );
 }

apps/marketing/src/app/(marketing)/layout.tsx

@@ -38,8 +38,7 @@ export default function MarketingLayout({ children }: MarketingLayoutProps) {
   return (
     <div
       className={cn('relative flex min-h-[100vh] max-w-[100vw] flex-col pt-20 md:pt-28', {
-        'overflow-y-auto overflow-x-hidden':
-          pathname && !['/singleplayer', '/pricing'].includes(pathname),
+        'overflow-y-auto overflow-x-hidden': pathname !== '/singleplayer',
       })}
     >
       <div

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

@@ -1,10 +1,11 @@
 'use client';
 
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import { formatMonth } from '@documenso/lib/client-only/format-month';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type BarMetricProps<T extends Record<string, unknown>> = HTMLAttributes<HTMLDivElement> & {
   data: T;
@@ -33,13 +34,13 @@ export const BarMetric = <T extends Record<string, Record<keyof T[string], unkno
     .reverse();
 
   return (
-    <div className={className} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">{title}</h3>
-          <span>{extraInfo}</span>
-        </div>
+    <div className={cn('flex flex-col', className)} {...props}>
+      <div className="flex items-center px-4">
+        <h3 className="text-lg font-semibold">{title}</h3>
+        <span>{extraInfo}</span>
+      </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={chartHeight}>
           <BarChart data={formattedData}>
             <XAxis dataKey="month" />

apps/marketing/src/app/(marketing)/open/cap-table.tsx

@@ -5,6 +5,8 @@ import { useEffect, useState } from 'react';
 
 import { Cell, Legend, Pie, PieChart, Tooltip } from 'recharts';
 
+import { cn } from '@documenso/ui/lib/utils';
+
 import { CAP_TABLE } from './data';
 
 const COLORS = ['#7fd843', '#a2e771', '#c6f2a4'];
@@ -47,12 +49,10 @@ export const CapTable = ({ className, ...props }: CapTableProps) => {
     setIsSSR(false);
   }, []);
   return (
-    <div className={className} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Cap Table</h3>
-        </div>
+    <div className={cn('flex flex-col', className)} {...props}>
+      <h3 className="px-4 text-lg font-semibold">Cap Table</h3>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border shadow-sm hover:shadow">
         {!isSSR && (
           <PieChart width={400} height={400}>
             <Pie

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

@@ -1,10 +1,11 @@
 'use client';
 
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import { formatMonth } from '@documenso/lib/client-only/format-month';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type FundingRaisedProps = HTMLAttributes<HTMLDivElement> & {
   data: Record<string, string | number>[];
@@ -17,12 +18,10 @@ export const FundingRaised = ({ className, data, ...props }: FundingRaisedProps)
   }));
 
   return (
-    <div className={className} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Total Funding Raised</h3>
-        </div>
+    <div className={cn('flex flex-col', className)} {...props}>
+      <h3 className="px-4 text-lg font-semibold">Total Funding Raised</h3>
 
+      <div className="border-border mt-2.5 flex flex-1 flex-col items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData} margin={{ top: 40, right: 40, bottom: 20, left: 40 }}>
             <XAxis dataKey="date" />

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

@@ -1,56 +0,0 @@
-'use client';
-
-import { DateTime } from 'luxon';
-import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
-
-import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
-
-export type MonthlyCompletedDocumentsChartProps = {
-  className?: string;
-  data: GetUserMonthlyGrowthResult;
-};
-
-export const MonthlyCompletedDocumentsChart = ({
-  className,
-  data,
-}: MonthlyCompletedDocumentsChartProps) => {
-  const formattedData = [...data].reverse().map(({ month, count }) => {
-    return {
-      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('LLLL'),
-      count: Number(count),
-    };
-  });
-
-  return (
-    <div className={className}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Completed Documents per Month</h3>
-        </div>
-
-        <ResponsiveContainer width="100%" height={400}>
-          <BarChart data={formattedData}>
-            <XAxis dataKey="month" />
-            <YAxis />
-
-            <Tooltip
-              labelStyle={{
-                color: 'hsl(var(--primary-foreground))',
-              }}
-              formatter={(value) => [Number(value).toLocaleString('en-US'), 'Completed Documents']}
-              cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
-            />
-
-            <Bar
-              dataKey="count"
-              fill="hsl(var(--primary))"
-              radius={[4, 4, 0, 0]}
-              maxBarSize={60}
-              label="Completed Documents"
-            />
-          </BarChart>
-        </ResponsiveContainer>
-      </div>
-    </div>
-  );
-};

apps/marketing/src/app/(marketing)/open/monthly-new-users-chart.tsx

@@ -4,6 +4,7 @@ import { DateTime } from 'luxon';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type MonthlyNewUsersChartProps = {
   className?: string;
@@ -19,12 +20,12 @@ export const MonthlyNewUsersChart = ({ className, data }: MonthlyNewUsersChartPr
   });
 
   return (
-    <div className={className}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">New Users</h3>
-        </div>
+    <div className={cn('flex flex-col', className)}>
+      <div className="flex items-center px-4">
+        <h3 className="text-lg font-semibold">New Users</h3>
+      </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData}>
             <XAxis dataKey="month" />

apps/marketing/src/app/(marketing)/open/monthly-total-users-chart.tsx

@@ -4,6 +4,7 @@ import { DateTime } from 'luxon';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type MonthlyTotalUsersChartProps = {
   className?: string;
@@ -19,12 +20,12 @@ export const MonthlyTotalUsersChart = ({ className, data }: MonthlyTotalUsersCha
   });
 
   return (
-    <div className={className}>
-      <div className="border-border flex flex-1 flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Total Users</h3>
-        </div>
+    <div className={cn('flex flex-col', className)}>
+      <div className="flex items-center px-4">
+        <h3 className="text-lg font-semibold">Total Users</h3>
+      </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData}>
             <XAxis dataKey="month" />

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

@@ -2,23 +2,19 @@ import type { Metadata } from 'next';
 
 import { z } from 'zod';
 
-import { getCompletedDocumentsMonthly } from '@documenso/lib/server-only/user/get-monthly-completed-document';
 import { getUserMonthlyGrowth } from '@documenso/lib/server-only/user/get-user-monthly-growth';
 
 import { FUNDING_RAISED } from '~/app/(marketing)/open/data';
-import { CallToAction } from '~/components/(marketing)/call-to-action';
+import { MetricCard } from '~/app/(marketing)/open/metric-card';
+import { SalaryBands } from '~/app/(marketing)/open/salary-bands';
 
 import { BarMetric } from './bar-metrics';
 import { CapTable } from './cap-table';
 import { FundingRaised } from './funding-raised';
-import { MetricCard } from './metric-card';
-import { MonthlyCompletedDocumentsChart } from './monthly-completed-documents-chart';
 import { MonthlyNewUsersChart } from './monthly-new-users-chart';
 import { MonthlyTotalUsersChart } from './monthly-total-users-chart';
-import { SalaryBands } from './salary-bands';
 import { TeamMembers } from './team-members';
 import { OpenPageTooltip } from './tooltip';
-import { TotalSignedDocumentsChart } from './total-signed-documents-chart';
 import { Typefully } from './typefully';
 
 export const metadata: Metadata = {
@@ -134,149 +130,125 @@ export default async function OpenPage() {
     { total_count: mergedPullRequests },
     STARGAZERS_DATA,
     EARLY_ADOPTERS_DATA,
-    MONTHLY_USERS,
-    MONTHLY_COMPLETED_DOCUMENTS,
   ] = await Promise.all([
     fetchGithubStats(),
     fetchOpenIssues(),
     fetchMergedPullRequests(),
     fetchStargazers(),
     fetchEarlyAdopters(),
-    getUserMonthlyGrowth(),
-    getCompletedDocumentsMonthly(),
   ]);
 
+  const MONTHLY_USERS = await getUserMonthlyGrowth();
+
   return (
-    <div>
-      <div className="mx-auto mt-6 max-w-screen-lg sm:mt-12">
-        <div className="flex flex-col items-center justify-center">
-          <h1 className="text-3xl font-bold lg:text-5xl">Open Startup</h1>
+    <div className="mx-auto mt-6 max-w-screen-lg sm:mt-12">
+      <div className="flex flex-col items-center justify-center">
+        <h1 className="text-3xl font-bold lg:text-5xl">Open Startup</h1>
 
-          <p className="text-muted-foreground mt-4 max-w-[60ch] text-center text-lg leading-normal">
-            All our metrics, finances, and learnings are public. We believe in transparency and want
-            to share our journey with you. You can read more about why here:{' '}
-            <a
-              className="font-bold"
-              href="https://documenso.com/blog/pre-seed"
-              target="_blank"
-              rel="noreferrer"
-            >
-              Announcing Open Metrics
-            </a>
-          </p>
-        </div>
-
-        <div className="my-12 grid grid-cols-12 gap-8">
-          <div className="col-span-12 grid grid-cols-4 gap-4">
-            <MetricCard
-              className="col-span-2 lg:col-span-1"
-              title="Stargazers"
-              value={stargazersCount.toLocaleString('en-US')}
-            />
-            <MetricCard
-              className="col-span-2 lg:col-span-1"
-              title="Forks"
-              value={forksCount.toLocaleString('en-US')}
-            />
-            <MetricCard
-              className="col-span-2 lg:col-span-1"
-              title="Open Issues"
-              value={openIssues.toLocaleString('en-US')}
-            />
-            <MetricCard
-              className="col-span-2 lg:col-span-1"
-              title="Merged PR's"
-              value={mergedPullRequests.toLocaleString('en-US')}
-            />
-          </div>
-
-          <TeamMembers className="col-span-12" />
-
-          <SalaryBands className="col-span-12" />
-        </div>
-
-        <h2 className="px-4 text-2xl font-semibold">Finances</h2>
-        <div className="mb-12 mt-4 grid grid-cols-12 gap-8">
-          <FundingRaised data={FUNDING_RAISED} className="col-span-12 lg:col-span-6" />
-
-          <CapTable className="col-span-12 lg:col-span-6" />
-        </div>
-
-        <h2 className="px-4 text-2xl font-semibold">Community</h2>
-        <div className="mb-12 mt-4 grid grid-cols-12 gap-8">
-          <BarMetric<StargazersType>
-            data={STARGAZERS_DATA}
-            metricKey="stars"
-            title="GitHub: Total Stars"
-            label="Stars"
-            className="col-span-12 lg:col-span-6"
-          />
-
-          <BarMetric<StargazersType>
-            data={STARGAZERS_DATA}
-            metricKey="mergedPRs"
-            title="GitHub: Total Merged PRs"
-            label="Merged PRs"
-            chartHeight={400}
-            className="col-span-12 lg:col-span-6"
-          />
-
-          <BarMetric<StargazersType>
-            data={STARGAZERS_DATA}
-            metricKey="forks"
-            title="GitHub: Total Forks"
-            label="Forks"
-            chartHeight={400}
-            className="col-span-12 lg:col-span-6"
-          />
-
-          <BarMetric<StargazersType>
-            data={STARGAZERS_DATA}
-            metricKey="openIssues"
-            title="GitHub: Total Open Issues"
-            label="Open Issues"
-            chartHeight={400}
-            className="col-span-12 lg:col-span-6"
-          />
-
-          <Typefully className="col-span-12 lg:col-span-6" />
-        </div>
-
-        <h2 className="px-4 text-2xl font-semibold">Growth</h2>
-        <div className="mb-12 mt-4 grid grid-cols-12 gap-8">
-          <BarMetric<EarlyAdoptersType>
-            data={EARLY_ADOPTERS_DATA}
-            metricKey="earlyAdopters"
-            title="Early Adopters"
-            label="Early Adopters"
-            className="col-span-12 lg:col-span-6"
-            extraInfo={<OpenPageTooltip />}
-          />
-
-          <MonthlyTotalUsersChart data={MONTHLY_USERS} className="col-span-12 lg:col-span-6" />
-          <MonthlyNewUsersChart data={MONTHLY_USERS} className="col-span-12 lg:col-span-6" />
-
-          <MonthlyCompletedDocumentsChart
-            data={MONTHLY_COMPLETED_DOCUMENTS}
-            className="col-span-12 lg:col-span-6"
-          />
-          <TotalSignedDocumentsChart
-            data={MONTHLY_COMPLETED_DOCUMENTS}
-            className="col-span-12 lg:col-span-6"
-          />
-        </div>
-      </div>
-
-      <div className="col-span-12 mt-12 flex flex-col items-center justify-center">
-        <h2 className="text-2xl font-bold">Is there more?</h2>
-
-        <p className="text-muted-foreground mt-4 max-w-[55ch] text-center text-lg leading-normal">
-          This page is evolving as we learn what makes a great signing company. We'll update it when
-          we have more to share.
+        <p className="text-muted-foreground mt-4 max-w-[60ch] text-center text-lg leading-normal">
+          All our metrics, finances, and learnings are public. We believe in transparency and want
+          to share our journey with you. You can read more about why here:{' '}
+          <a
+            className="font-bold"
+            href="https://documenso.com/blog/pre-seed"
+            target="_blank"
+            rel="noreferrer"
+          >
+            Announcing Open Metrics
+          </a>
         </p>
       </div>
 
-      <CallToAction className="mt-12" utmSource="open-page" />
+      <div className="mt-12 grid grid-cols-12 gap-8">
+        <div className="col-span-12 grid grid-cols-4 gap-4">
+          <MetricCard
+            className="col-span-2 lg:col-span-1"
+            title="Stargazers"
+            value={stargazersCount.toLocaleString('en-US')}
+          />
+          <MetricCard
+            className="col-span-2 lg:col-span-1"
+            title="Forks"
+            value={forksCount.toLocaleString('en-US')}
+          />
+          <MetricCard
+            className="col-span-2 lg:col-span-1"
+            title="Open Issues"
+            value={openIssues.toLocaleString('en-US')}
+          />
+          <MetricCard
+            className="col-span-2 lg:col-span-1"
+            title="Merged PR's"
+            value={mergedPullRequests.toLocaleString('en-US')}
+          />
+        </div>
+
+        <TeamMembers className="col-span-12" />
+
+        <SalaryBands className="col-span-12" />
+
+        <FundingRaised data={FUNDING_RAISED} className="col-span-12 lg:col-span-6" />
+
+        <CapTable className="col-span-12 lg:col-span-6" />
+
+        <BarMetric<EarlyAdoptersType>
+          data={EARLY_ADOPTERS_DATA}
+          metricKey="earlyAdopters"
+          title="Early Adopters"
+          label="Early Adopters"
+          className="col-span-12 lg:col-span-6"
+          extraInfo={<OpenPageTooltip />}
+        />
+
+        <BarMetric<StargazersType>
+          data={STARGAZERS_DATA}
+          metricKey="stars"
+          title="Github: Total Stars"
+          label="Stars"
+          className="col-span-12 lg:col-span-6"
+        />
+
+        <BarMetric<StargazersType>
+          data={STARGAZERS_DATA}
+          metricKey="mergedPRs"
+          title="Github: Total Merged PRs"
+          label="Merged PRs"
+          chartHeight={300}
+          className="col-span-12 lg:col-span-6"
+        />
+
+        <BarMetric<StargazersType>
+          data={STARGAZERS_DATA}
+          metricKey="forks"
+          title="Github: Total Forks"
+          label="Forks"
+          chartHeight={300}
+          className="col-span-12 lg:col-span-6"
+        />
+
+        <BarMetric<StargazersType>
+          data={STARGAZERS_DATA}
+          metricKey="openIssues"
+          title="Github: Total Open Issues"
+          label="Open Issues"
+          chartHeight={300}
+          className="col-span-12 lg:col-span-6"
+        />
+
+        <MonthlyTotalUsersChart data={MONTHLY_USERS} className="col-span-12 lg:col-span-6" />
+        <MonthlyNewUsersChart data={MONTHLY_USERS} className="col-span-12 lg:col-span-6" />
+
+        <Typefully className="col-span-12 lg:col-span-6" />
+
+        <div className="col-span-12 mt-12 flex flex-col items-center justify-center">
+          <h2 className="text-2xl font-bold">Where's the rest?</h2>
+
+          <p className="text-muted-foreground mt-4 max-w-[55ch] text-center text-lg leading-normal">
+            We're still working on getting all our metrics together. We'll update this page as soon
+            as we have more to share.
+          </p>
+        </div>
+      </div>
     </div>
   );
 }

apps/marketing/src/app/(marketing)/open/team-members.tsx

@@ -1,4 +1,4 @@
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import { cn } from '@documenso/ui/lib/utils';
 import {

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

@@ -1,56 +0,0 @@
-'use client';
-
-import { DateTime } from 'luxon';
-import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
-
-import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
-
-export type TotalSignedDocumentsChartProps = {
-  className?: string;
-  data: GetUserMonthlyGrowthResult;
-};
-
-export const TotalSignedDocumentsChart = ({ className, data }: TotalSignedDocumentsChartProps) => {
-  const formattedData = [...data].reverse().map(({ month, cume_count: count }) => {
-    return {
-      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('LLLL'),
-      count: Number(count),
-    };
-  });
-
-  return (
-    <div className={className}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Total Completed Documents</h3>
-        </div>
-
-        <ResponsiveContainer width="100%" height={400}>
-          <BarChart data={formattedData}>
-            <XAxis dataKey="month" />
-            <YAxis />
-
-            <Tooltip
-              labelStyle={{
-                color: 'hsl(var(--primary-foreground))',
-              }}
-              formatter={(value) => [
-                Number(value).toLocaleString('en-US'),
-                'Total Completed Documents',
-              ]}
-              cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
-            />
-
-            <Bar
-              dataKey="count"
-              fill="hsl(var(--primary))"
-              radius={[4, 4, 0, 0]}
-              maxBarSize={60}
-              label="Total Completed Documents"
-            />
-          </BarChart>
-        </ResponsiveContainer>
-      </div>
-    </div>
-  );
-};

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

@@ -6,19 +6,18 @@ import Link from 'next/link';
 
 import { FaXTwitter } from 'react-icons/fa6';
 
+import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
 export type TypefullyProps = HTMLAttributes<HTMLDivElement>;
 
 export const Typefully = ({ className, ...props }: TypefullyProps) => {
   return (
-    <div className={className} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Twitter Stats</h3>
-        </div>
+    <div className={cn('flex flex-col', className)} {...props}>
+      <h3 className="px-4 text-lg font-semibold">Twitter Stats</h3>
 
-        <div className="my-12 flex flex-col items-center gap-y-4 text-center">
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border py-8 shadow-sm hover:shadow">
+        <div className="flex flex-col items-center gap-y-4 text-center">
           <FaXTwitter className="h-12 w-12" />
           <Link href="https://typefully.com/documenso/stats" target="_blank">
             <h1>Documenso on X</h1>

apps/marketing/src/components/(marketing)/call-to-action.tsx

@@ -1,31 +0,0 @@
-import Link from 'next/link';
-
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-
-type CallToActionProps = {
-  className?: string;
-  utmSource?: string;
-};
-
-export const CallToAction = ({ className, utmSource = 'generic-cta' }: CallToActionProps) => {
-  return (
-    <Card spotlight className={className}>
-      <CardContent className="flex flex-col items-center justify-center p-12">
-        <h2 className="text-center text-2xl font-bold">Join the Open Signing Movement</h2>
-
-        <p className="text-muted-foreground mt-4 max-w-[55ch] text-center leading-normal">
-          Create your account and start using state-of-the-art document signing. Open and beautiful
-          signing is within your grasp.
-        </p>
-
-        <Button className="mt-8 rounded-full no-underline" size="lg" asChild>
-          <Link href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup?utm_source=${utmSource}`} target="_blank">
-            Get started
-          </Link>
-        </Button>
-      </CardContent>
-    </Card>
-  );
-};

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

@@ -53,7 +53,7 @@ export const Callout = ({ starCount }: CalloutProps) => {
       >
         <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
           <LuGithub className="mr-2 h-5 w-5" />
-          Star on GitHub
+          Star on Github
           {starCount && starCount > 0 && (
             <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">
               {starCount.toLocaleString('en-US')}

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

@@ -123,7 +123,7 @@ export const Hero = ({ className, ...props }: HeroProps) => {
           <Link href="https://github.com/documenso/documenso" onClick={() => event('view-github')}>
             <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
               <LuGithub className="mr-2 h-5 w-5" />
-              Star on GitHub
+              Star on Github
             </Button>
           </Link>
         </motion.div>

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

@@ -23,7 +23,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
 
   return (
     <div className={cn('', className)} {...props}>
-      <div className="bg-background sticky top-32 flex items-center justify-end gap-x-6 shadow-[-1px_-5px_2px_6px_hsl(var(--background))] md:top-[7.5rem] lg:static lg:justify-center">
+      <div className="flex items-center justify-center gap-x-6">
         <AnimatePresence>
           <motion.button
             key="MONTHLY"
@@ -40,7 +40,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
             {period === 'MONTHLY' && (
               <motion.div
                 layoutId={SELECTED_PLAN_BAR_LAYOUT_ID}
-                className="bg-foreground lg:bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
+                className="bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
               />
             )}
           </motion.button>
@@ -63,7 +63,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
             {period === 'YEARLY' && (
               <motion.div
                 layoutId={SELECTED_PLAN_BAR_LAYOUT_ID}
-                className="bg-foreground lg:bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
+                className="bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
               />
             )}
           </motion.button>

apps/web/next.config.js

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const { withAxiom } = require('next-axiom');
 const fs = require('fs');
 const path = require('path');
 const { version } = require('./package.json');
@@ -23,7 +22,6 @@ const config = {
   output: process.env.DOCKER_OUTPUT ? 'standalone' : undefined,
   experimental: {
     outputFileTracingRoot: path.join(__dirname, '../../'),
-    serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign'],
     serverActions: {
       bodySizeLimit: '50mb',
     },
@@ -92,4 +90,4 @@ const config = {
   },
 };
 
-module.exports = withAxiom(config);
+module.exports = config;

apps/web/package.json

@@ -22,10 +22,7 @@
     "@documenso/trpc": "*",
     "@documenso/ui": "*",
     "@hookform/resolvers": "^3.1.0",
-    "@simplewebauthn/browser": "^9.0.1",
-    "@simplewebauthn/server": "^9.0.3",
     "@tanstack/react-query": "^4.29.5",
-    "cookie-es": "^1.0.0",
     "formidable": "^2.1.1",
     "framer-motion": "^10.12.8",
     "lucide-react": "^0.279.0",
@@ -33,7 +30,6 @@
     "micro": "^10.0.1",
     "next": "14.0.3",
     "next-auth": "4.24.5",
-    "next-axiom": "^1.1.1",
     "next-plausible": "^3.10.1",
     "next-themes": "^0.2.1",
     "perfect-freehand": "^1.2.0",
@@ -47,7 +43,7 @@
     "react-icons": "^4.11.0",
     "react-rnd": "^10.4.1",
     "remeda": "^1.27.1",
-    "sharp": "^0.33.1",
+    "sharp": "0.33.1",
     "ts-pattern": "^5.0.5",
     "ua-parser-js": "^1.0.37",
     "uqr": "^0.1.2",
@@ -55,7 +51,6 @@
   },
   "devDependencies": {
     "@documenso/tailwind-config": "*",
-    "@simplewebauthn/types": "^9.0.1",
     "@types/formidable": "^2.0.6",
     "@types/luxon": "^3.3.1",
     "@types/node": "20.1.0",

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

@@ -1,15 +1,18 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 import { useRouter, useSearchParams } from 'next/navigation';
 
 import {
-  DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-  SKIP_QUERY_BATCH_META,
-} from '@documenso/lib/constants/trpc';
-import { DocumentStatus } from '@documenso/prisma/client';
-import type { DocumentWithDetails } from '@documenso/prisma/types/document';
+  type DocumentData,
+  type DocumentMeta,
+  DocumentStatus,
+  type Field,
+  type Recipient,
+  type User,
+} from '@documenso/prisma/client';
+import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@@ -31,7 +34,12 @@ import { useOptionalCurrentTeam } from '~/providers/team';
 
 export type EditDocumentFormProps = {
   className?: string;
-  initialDocument: DocumentWithDetails;
+  user: User;
+  document: DocumentWithData;
+  recipients: Recipient[];
+  documentMeta: DocumentMeta | null;
+  fields: Field[];
+  documentData: DocumentData;
   documentRootPath: string;
 };
 
@@ -40,7 +48,12 @@ const EditDocumentSteps: EditDocumentStep[] = ['title', 'signers', 'fields', 'su
 
 export const EditDocumentForm = ({
   className,
-  initialDocument,
+  document,
+  recipients,
+  fields,
+  documentMeta,
+  user: _user,
+  documentData,
   documentRootPath,
 }: EditDocumentFormProps) => {
   const { toast } = useToast();
@@ -49,74 +62,10 @@ export const EditDocumentForm = ({
   const searchParams = useSearchParams();
   const team = useOptionalCurrentTeam();
 
-  const utils = trpc.useUtils();
-
-  const { data: document, refetch: refetchDocument } =
-    trpc.document.getDocumentWithDetailsById.useQuery(
-      {
-        id: initialDocument.id,
-        teamId: team?.id,
-      },
-      {
-        initialData: initialDocument,
-        ...SKIP_QUERY_BATCH_META,
-      },
-    );
-
-  const { Recipient: recipients, Field: fields } = document;
-
-  const { mutateAsync: addTitle } = trpc.document.setTitleForDocument.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), ...newData }),
-      );
-    },
-  });
-
-  const { mutateAsync: addFields } = trpc.field.addFields.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newFields) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), Field: newFields }),
-      );
-    },
-  });
-
-  const { mutateAsync: addSigners } = trpc.recipient.addSigners.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newRecipients) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), Recipient: newRecipients }),
-      );
-    },
-  });
-
-  const { mutateAsync: sendDocument } = trpc.document.sendDocument.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), ...newData }),
-      );
-    },
-  });
-
+  const { mutateAsync: addTitle } = trpc.document.setTitleForDocument.useMutation();
+  const { mutateAsync: addFields } = trpc.field.addFields.useMutation();
+  const { mutateAsync: addSigners } = trpc.recipient.addSigners.useMutation();
+  const { mutateAsync: sendDocument } = trpc.document.sendDocument.useMutation();
   const { mutateAsync: setPasswordForDocument } =
     trpc.document.setPasswordForDocument.useMutation();
 
@@ -163,13 +112,13 @@ export const EditDocumentForm = ({
 
   const onAddTitleFormSubmit = async (data: TAddTitleFormSchema) => {
     try {
+      // Custom invocation server action
       await addTitle({
         documentId: document.id,
         teamId: team?.id,
         title: data.title,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
 
       setStep('signers');
@@ -186,15 +135,14 @@ export const EditDocumentForm = ({
 
   const onAddSignersFormSubmit = async (data: TAddSignersFormSchema) => {
     try {
+      // Custom invocation server action
       await addSigners({
         documentId: document.id,
         teamId: team?.id,
         signers: data.signers,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
-
       setStep('fields');
     } catch (err) {
       console.error(err);
@@ -209,14 +157,13 @@ export const EditDocumentForm = ({
 
   const onAddFieldsFormSubmit = async (data: TAddFieldsFormSchema) => {
     try {
+      // Custom invocation server action
       await addFields({
         documentId: document.id,
         fields: data.fields,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
-
       setStep('subject');
     } catch (err) {
       console.error(err);
@@ -272,15 +219,6 @@ export const EditDocumentForm = ({
 
   const currentDocumentFlow = documentFlow[step];
 
-  /**
-   * Refresh the data in the background when steps change.
-   */
-  useEffect(() => {
-    void refetchDocument();
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [step]);
-
   return (
     <div className={cn('grid w-full grid-cols-12 gap-8', className)}>
       <Card
@@ -289,10 +227,10 @@ export const EditDocumentForm = ({
       >
         <CardContent className="p-2">
           <LazyPDFViewer
-            key={document.documentData.id}
-            documentData={document.documentData}
+            key={documentData.id}
+            documentData={documentData}
             document={document}
-            password={document.documentMeta?.password}
+            password={documentMeta?.password}
             onPasswordSubmit={onPasswordSubmit}
           />
         </CardContent>

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

@@ -5,7 +5,9 @@ import { ChevronLeft, Users2 } from 'lucide-react';
 
 import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
+import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
+import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
+import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import type { Team } from '@documenso/prisma/client';
@@ -35,13 +37,13 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
 
   const { user } = await getRequiredServerComponentSession();
 
-  const document = await getDocumentWithDetailsById({
+  const document = await getDocumentById({
     id: documentId,
     userId: user.id,
     teamId: team?.id,
   }).catch(() => null);
 
-  if (!document) {
+  if (!document || !document.documentData) {
     redirect(documentRootPath);
   }
 
@@ -49,7 +51,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
     redirect(`${documentRootPath}/${documentId}`);
   }
 
-  const { documentMeta, Recipient: recipients } = document;
+  const { documentData, documentMeta } = document;
 
   if (documentMeta?.password) {
     const key = DOCUMENSO_ENCRYPTION_KEY;
@@ -68,6 +70,18 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
     documentMeta.password = securePassword;
   }
 
+  const [recipients, fields] = await Promise.all([
+    getRecipientsForDocument({
+      documentId,
+      userId: user.id,
+      teamId: team?.id,
+    }),
+    getFieldsForDocument({
+      documentId,
+      userId: user.id,
+    }),
+  ]);
+
   return (
     <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
       <Link href={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
@@ -95,7 +109,12 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
 
       <EditDocumentForm
         className="mt-8"
-        initialDocument={document}
+        document={document}
+        user={user}
+        documentMeta={documentMeta}
+        recipients={recipients}
+        fields={fields}
+        documentData={documentData}
         documentRootPath={documentRootPath}
       />
     </div>

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

@@ -76,13 +76,14 @@ export const DocumentsDataTable = ({
           {
             header: 'Recipient',
             accessorKey: 'recipient',
-            cell: ({ row }) => <StackAvatarsWithTooltip recipients={row.original.Recipient} />,
+            cell: ({ row }) => {
+              return <StackAvatarsWithTooltip recipients={row.original.Recipient} />;
+            },
           },
           {
             header: 'Status',
             accessorKey: 'status',
             cell: ({ row }) => <DocumentStatus status={row.getValue('status')} />,
-            size: 140,
           },
           {
             header: 'Actions',

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

@@ -2,6 +2,7 @@
 
 import { useMemo, useState } from 'react';
 
+import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
@@ -138,6 +139,27 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
           <Loader className="text-muted-foreground h-12 w-12 animate-spin" />
         </div>
       )}
+
+      {team?.id === undefined && remaining.documents === 0 && (
+        <div className="bg-background/60 absolute inset-0 flex items-center justify-center rounded-lg backdrop-blur-sm">
+          <div className="text-center">
+            <h2 className="text-muted-foreground/80 text-xl font-semibold">
+              You have reached your document limit.
+            </h2>
+
+            <p className="text-muted-foreground/60 mt-2 text-sm">
+              You can upload up to {quota.documents} documents per month on your current plan.
+            </p>
+
+            <Link
+              className="text-primary hover:text-primary/80 mt-6 block font-medium"
+              href="/settings/billing"
+            >
+              Upgrade your account to upload more documents.
+            </Link>
+          </div>
+        </div>
+      )}
     </div>
   );
 };

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

@@ -1,7 +1,5 @@
 'use client';
 
-import { useState } from 'react';
-
 import { signOut } from 'next-auth/react';
 
 import type { User } from '@documenso/prisma/client';
@@ -18,8 +16,6 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
-import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DeleteAccountDialogProps = {
@@ -32,8 +28,6 @@ export const DeleteAccountDialog = ({ className, user }: DeleteAccountDialogProp
 
   const hasTwoFactorAuthentication = user.twoFactorEnabled;
 
-  const [enteredEmail, setEnteredEmail] = useState<string>('');
-
   const { mutateAsync: deleteAccount, isLoading: isDeletingAccount } =
     trpc.profile.deleteAccount.useMutation();
 
@@ -82,11 +76,10 @@ export const DeleteAccountDialog = ({ className, user }: DeleteAccountDialogProp
         </div>
 
         <div className="flex-shrink-0">
-          <Dialog onOpenChange={() => setEnteredEmail('')}>
+          <Dialog>
             <DialogTrigger asChild>
               <Button variant="destructive">Delete Account</Button>
             </DialogTrigger>
-
             <DialogContent>
               <DialogHeader className="space-y-4">
                 <DialogTitle>Delete Account</DialogTitle>
@@ -112,31 +105,14 @@ export const DeleteAccountDialog = ({ className, user }: DeleteAccountDialogProp
                 </DialogDescription>
               </DialogHeader>
 
-              {!hasTwoFactorAuthentication && (
-                <div className="mt-4">
-                  <Label>
-                    Please type{' '}
-                    <span className="text-muted-foreground font-semibold">{user.email}</span> to
-                    confirm.
-                  </Label>
-
-                  <Input
-                    type="text"
-                    className="mt-2"
-                    aria-label="Confirm Email"
-                    value={enteredEmail}
-                    onChange={(e) => setEnteredEmail(e.target.value)}
-                  />
-                </div>
-              )}
               <DialogFooter>
                 <Button
                   onClick={onDeleteAccount}
                   loading={isDeletingAccount}
                   variant="destructive"
-                  disabled={hasTwoFactorAuthentication || enteredEmail !== user.email}
+                  disabled={hasTwoFactorAuthentication}
                 >
-                  {isDeletingAccount ? 'Deleting account...' : 'Confirm Deletion'}
+                  {isDeletingAccount ? 'Deleting account...' : 'Delete Account'}
                 </Button>
               </DialogFooter>
             </DialogContent>

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

@@ -15,14 +15,15 @@ export default function SettingsSecurityActivityPage() {
       <SettingsHeader
         title="Security activity"
         subtitle="View all recent security activity related to your account."
-        hideDivider={true}
       >
-        <ActivityPageBackButton />
+        <div>
+          <ActivityPageBackButton />
+        </div>
       </SettingsHeader>
 
-      <div className="mt-4">
-        <UserSecurityActivityDataTable />
-      </div>
+      <hr className="my-4" />
+
+      <UserSecurityActivityDataTable />
     </div>
   );
 }

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

@@ -1,15 +1,14 @@
 import type { Metadata } from 'next';
 import Link from 'next/link';
 
+import { IDENTITY_PROVIDER_NAME } from '@documenso/lib/constants/auth';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 
 import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header';
-import { DisableAuthenticatorAppDialog } from '~/components/forms/2fa/disable-authenticator-app-dialog';
-import { EnableAuthenticatorAppDialog } from '~/components/forms/2fa/enable-authenticator-app-dialog';
-import { ViewRecoveryCodesDialog } from '~/components/forms/2fa/view-recovery-codes-dialog';
+import { AuthenticatorApp } from '~/components/forms/2fa/authenticator-app';
+import { RecoveryCodes } from '~/components/forms/2fa/recovery-codes';
 import { PasswordForm } from '~/components/forms/password';
 
 export const metadata: Metadata = {
@@ -19,8 +18,6 @@ export const metadata: Metadata = {
 export default async function SecuritySettingsPage() {
   const { user } = await getRequiredServerComponentSession();
 
-  const isPasskeyEnabled = await getServerComponentFlag('app_passkey');
-
   return (
     <div>
       <SettingsHeader
@@ -28,70 +25,57 @@ export default async function SecuritySettingsPage() {
         subtitle="Here you can manage your password and security settings."
       />
 
-      {user.identityProvider === 'DOCUMENSO' && (
-        <>
+      {user.identityProvider === 'DOCUMENSO' ? (
+        <div>
           <PasswordForm user={user} />
 
           <hr className="border-border/50 mt-6" />
-        </>
-      )}
 
-      <Alert
-        className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-        variant="neutral"
-      >
-        <div className="mb-4 sm:mb-0">
-          <AlertTitle>Two factor authentication</AlertTitle>
+          <Alert
+            className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+            variant="neutral"
+          >
+            <div className="mb-4 sm:mb-0">
+              <AlertTitle>Two factor authentication</AlertTitle>
 
-          <AlertDescription className="mr-4">
-            Add an authenticator to serve as a secondary authentication method{' '}
-            {user.identityProvider === 'DOCUMENSO'
-              ? 'when signing in, or when signing documents.'
-              : 'for signing documents.'}
-          </AlertDescription>
+              <AlertDescription className="mr-4">
+                Create one-time passwords that serve as a secondary authentication method for
+                confirming your identity when requested during the sign-in process.
+              </AlertDescription>
+            </div>
+
+            <AuthenticatorApp isTwoFactorEnabled={user.twoFactorEnabled} />
+          </Alert>
+
+          {user.twoFactorEnabled && (
+            <Alert
+              className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+              variant="neutral"
+            >
+              <div className="mb-4 sm:mb-0">
+                <AlertTitle>Recovery codes</AlertTitle>
+
+                <AlertDescription className="mr-4">
+                  Two factor authentication recovery codes are used to access your account in the
+                  event that you lose access to your authenticator app.
+                </AlertDescription>
+              </div>
+
+              <RecoveryCodes isTwoFactorEnabled={user.twoFactorEnabled} />
+            </Alert>
+          )}
         </div>
+      ) : (
+        <Alert className="p-6" variant="neutral">
+          <AlertTitle>
+            Your account is managed by {IDENTITY_PROVIDER_NAME[user.identityProvider]}
+          </AlertTitle>
 
-        {user.twoFactorEnabled ? (
-          <DisableAuthenticatorAppDialog />
-        ) : (
-          <EnableAuthenticatorAppDialog />
-        )}
-      </Alert>
-
-      {user.twoFactorEnabled && (
-        <Alert
-          className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-          variant="neutral"
-        >
-          <div className="mb-4 sm:mb-0">
-            <AlertTitle>Recovery codes</AlertTitle>
-
-            <AlertDescription className="mr-4">
-              Two factor authentication recovery codes are used to access your account in the event
-              that you lose access to your authenticator app.
-            </AlertDescription>
-          </div>
-
-          <ViewRecoveryCodesDialog />
-        </Alert>
-      )}
-
-      {isPasskeyEnabled && (
-        <Alert
-          className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-          variant="neutral"
-        >
-          <div className="mb-4 sm:mb-0">
-            <AlertTitle>Passkeys</AlertTitle>
-
-            <AlertDescription className="mr-4">
-              Allows authenticating using biometrics, password managers, hardware keys, etc.
-            </AlertDescription>
-          </div>
-
-          <Button asChild variant="outline" className="bg-background">
-            <Link href="/settings/security/passkeys">Manage passkeys</Link>
-          </Button>
+          <AlertDescription>
+            To update your password, enable two-factor authentication, and manage other security
+            settings, please go to your {IDENTITY_PROVIDER_NAME[user.identityProvider]} account
+            settings.
+          </AlertDescription>
         </Alert>
       )}
 
@@ -107,7 +91,7 @@ export default async function SecuritySettingsPage() {
           </AlertDescription>
         </div>
 
-        <Button asChild variant="outline" className="bg-background">
+        <Button asChild>
           <Link href="/settings/security/activity">View activity</Link>
         </Button>
       </Alert>

apps/web/src/app/(dashboard)/settings/security/passkeys/create-passkey-dialog.tsx

@@ -1,235 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { startRegistration } from '@simplewebauthn/browser';
-import { KeyRoundIcon } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
-import { UAParser } from 'ua-parser-js';
-import { z } from 'zod';
-
-import { MAXIMUM_PASSKEYS } from '@documenso/lib/constants/auth';
-import { AppError } from '@documenso/lib/errors/app-error';
-import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type CreatePasskeyDialogProps = {
-  trigger?: React.ReactNode;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-const ZCreatePasskeyFormSchema = z.object({
-  passkeyName: z.string().min(3),
-});
-
-type TCreatePasskeyFormSchema = z.infer<typeof ZCreatePasskeyFormSchema>;
-
-const parser = new UAParser();
-
-export const CreatePasskeyDialog = ({ trigger, ...props }: CreatePasskeyDialogProps) => {
-  const [open, setOpen] = useState(false);
-  const [formError, setFormError] = useState<string | null>(null);
-
-  const { toast } = useToast();
-
-  const form = useForm<TCreatePasskeyFormSchema>({
-    resolver: zodResolver(ZCreatePasskeyFormSchema),
-    defaultValues: {
-      passkeyName: '',
-    },
-  });
-
-  const { mutateAsync: createPasskeyRegistrationOptions, isLoading } =
-    trpc.auth.createPasskeyRegistrationOptions.useMutation();
-
-  const { mutateAsync: createPasskey } = trpc.auth.createPasskey.useMutation();
-
-  const onFormSubmit = async ({ passkeyName }: TCreatePasskeyFormSchema) => {
-    setFormError(null);
-
-    try {
-      const passkeyRegistrationOptions = await createPasskeyRegistrationOptions();
-
-      const registrationResult = await startRegistration(passkeyRegistrationOptions);
-
-      await createPasskey({
-        passkeyName,
-        verificationResponse: registrationResult,
-      });
-
-      toast({
-        description: 'Successfully created passkey',
-        duration: 5000,
-      });
-
-      setOpen(false);
-    } catch (err) {
-      if (err.name === 'NotAllowedError') {
-        return;
-      }
-
-      const error = AppError.parseError(err);
-
-      setFormError(err.code || error.code);
-    }
-  };
-
-  const extractDefaultPasskeyName = () => {
-    if (!window || !window.navigator) {
-      return;
-    }
-
-    parser.setUA(window.navigator.userAgent);
-
-    const result = parser.getResult();
-    const operatingSystem = result.os.name;
-    const browser = result.browser.name;
-
-    let passkeyName = '';
-
-    if (operatingSystem && browser) {
-      passkeyName = `${browser} (${operatingSystem})`;
-    }
-
-    return passkeyName;
-  };
-
-  useEffect(() => {
-    if (!open) {
-      const defaultPasskeyName = extractDefaultPasskeyName();
-
-      form.reset({
-        passkeyName: defaultPasskeyName,
-      });
-
-      setFormError(null);
-    }
-  }, [open, form]);
-
-  return (
-    <Dialog
-      {...props}
-      open={open}
-      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
-    >
-      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
-        {trigger ?? (
-          <Button variant="secondary" loading={isLoading}>
-            <KeyRoundIcon className="-ml-1 mr-1 h-5 w-5" />
-            Add passkey
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent position="center">
-        <DialogHeader>
-          <DialogTitle>Add passkey</DialogTitle>
-
-          <DialogDescription className="mt-4">
-            Passkeys allow you to sign in and authenticate using biometrics, password managers, etc.
-          </DialogDescription>
-        </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onFormSubmit)}>
-            <fieldset
-              className="flex h-full flex-col space-y-4"
-              disabled={form.formState.isSubmitting}
-            >
-              <FormField
-                control={form.control}
-                name="passkeyName"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel required>Passkey name</FormLabel>
-                    <FormControl>
-                      <Input className="bg-background" placeholder="eg. Mac" {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <Alert variant="neutral">
-                <AlertDescription>
-                  When you click continue, you will be prompted to add the first available
-                  authenticator on your system.
-                </AlertDescription>
-
-                <AlertDescription className="mt-2">
-                  If you do not want to use the authenticator prompted, you can close it, which will
-                  then display the next available authenticator.
-                </AlertDescription>
-              </Alert>
-
-              {formError && (
-                <Alert variant="destructive">
-                  {match(formError)
-                    .with('ERROR_AUTHENTICATOR_PREVIOUSLY_REGISTERED', () => (
-                      <AlertDescription>This passkey has already been registered.</AlertDescription>
-                    ))
-                    .with('TOO_MANY_PASSKEYS', () => (
-                      <AlertDescription>
-                        You cannot have more than {MAXIMUM_PASSKEYS} passkeys.
-                      </AlertDescription>
-                    ))
-                    .with('InvalidStateError', () => (
-                      <>
-                        <AlertTitle className="text-sm">
-                          Passkey creation cancelled due to one of the following reasons:
-                        </AlertTitle>
-                        <AlertDescription>
-                          <ul className="mt-1 list-inside list-disc">
-                            <li>Cancelled by user</li>
-                            <li>Passkey already exists for the provided authenticator</li>
-                            <li>Exceeded timeout</li>
-                          </ul>
-                        </AlertDescription>
-                      </>
-                    ))
-                    .otherwise(() => (
-                      <AlertDescription>
-                        Something went wrong. Please try again or contact support.
-                      </AlertDescription>
-                    ))}
-                </Alert>
-              )}
-
-              <DialogFooter>
-                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-                  Cancel
-                </Button>
-
-                <Button type="submit" loading={form.formState.isSubmitting}>
-                  Continue
-                </Button>
-              </DialogFooter>
-            </fieldset>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};

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

@@ -1,33 +0,0 @@
-import type { Metadata } from 'next';
-import { redirect } from 'next/navigation';
-
-import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
-
-import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header';
-
-import { CreatePasskeyDialog } from './create-passkey-dialog';
-import { UserPasskeysDataTable } from './user-passkeys-data-table';
-
-export const metadata: Metadata = {
-  title: 'Manage passkeys',
-};
-
-export default async function SettingsManagePasskeysPage() {
-  const isPasskeyEnabled = await getServerComponentFlag('app_passkey');
-
-  if (!isPasskeyEnabled) {
-    redirect('/settings/security');
-  }
-
-  return (
-    <div>
-      <SettingsHeader title="Passkeys" subtitle="Manage your passkeys." hideDivider={true}>
-        <CreatePasskeyDialog />
-      </SettingsHeader>
-
-      <div className="mt-4">
-        <UserPasskeysDataTable />
-      </div>
-    </div>
-  );
-}

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

@@ -1,200 +0,0 @@
-import { useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type UserPasskeysDataTableActionsProps = {
-  className?: string;
-  passkeyId: string;
-  passkeyName: string;
-};
-
-const ZUpdatePasskeySchema = z.object({
-  name: z.string(),
-});
-
-type TUpdatePasskeySchema = z.infer<typeof ZUpdatePasskeySchema>;
-
-export const UserPasskeysDataTableActions = ({
-  className,
-  passkeyId,
-  passkeyName,
-}: UserPasskeysDataTableActionsProps) => {
-  const { toast } = useToast();
-
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
-  const [isUpdateDialogOpen, setIsUpdateDialogOpen] = useState(false);
-
-  const form = useForm<TUpdatePasskeySchema>({
-    resolver: zodResolver(ZUpdatePasskeySchema),
-    defaultValues: {
-      name: passkeyName,
-    },
-  });
-
-  const { mutateAsync: updatePasskey, isLoading: isUpdatingPasskey } =
-    trpc.auth.updatePasskey.useMutation({
-      onSuccess: () => {
-        toast({
-          title: 'Success',
-          description: 'Passkey has been updated',
-        });
-      },
-      onError: () => {
-        toast({
-          title: 'Something went wrong',
-          description:
-            'We are unable to update this passkey at the moment. Please try again later.',
-          duration: 10000,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  const { mutateAsync: deletePasskey, isLoading: isDeletingPasskey } =
-    trpc.auth.deletePasskey.useMutation({
-      onSuccess: () => {
-        toast({
-          title: 'Success',
-          description: 'Passkey has been removed',
-        });
-      },
-      onError: () => {
-        toast({
-          title: 'Something went wrong',
-          description:
-            'We are unable to remove this passkey at the moment. Please try again later.',
-          duration: 10000,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  return (
-    <div className={cn('flex justify-end space-x-2', className)}>
-      <Dialog
-        open={isUpdateDialogOpen}
-        onOpenChange={(value) => !isUpdatingPasskey && setIsUpdateDialogOpen(value)}
-      >
-        <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
-          <Button variant="outline">Edit</Button>
-        </DialogTrigger>
-
-        <DialogContent position="center">
-          <DialogHeader>
-            <DialogTitle>Update passkey</DialogTitle>
-
-            <DialogDescription className="mt-4">
-              You are currently updating the <strong>{passkeyName}</strong> passkey.
-            </DialogDescription>
-          </DialogHeader>
-
-          <Form {...form}>
-            <form
-              onSubmit={form.handleSubmit(async ({ name }) =>
-                updatePasskey({
-                  passkeyId,
-                  name,
-                }),
-              )}
-            >
-              <fieldset className="flex h-full flex-col" disabled={isUpdatingPasskey}>
-                <FormField
-                  control={form.control}
-                  name="name"
-                  render={({ field }) => (
-                    <FormItem className="w-full">
-                      <FormLabel required>Name</FormLabel>
-                      <FormControl>
-                        <Input {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <DialogFooter className="mt-4">
-                  <DialogClose asChild>
-                    <Button type="button" variant="secondary">
-                      Cancel
-                    </Button>
-                  </DialogClose>
-
-                  <Button type="submit" loading={isUpdatingPasskey}>
-                    Update
-                  </Button>
-                </DialogFooter>
-              </fieldset>
-            </form>
-          </Form>
-        </DialogContent>
-      </Dialog>
-
-      <Dialog
-        open={isDeleteDialogOpen}
-        onOpenChange={(value) => !isDeletingPasskey && setIsDeleteDialogOpen(value)}
-      >
-        <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
-          <Button variant="destructive">Delete</Button>
-        </DialogTrigger>
-
-        <DialogContent position="center">
-          <DialogHeader>
-            <DialogTitle>Delete passkey</DialogTitle>
-
-            <DialogDescription className="mt-4">
-              Are you sure you want to remove the <strong>{passkeyName}</strong> passkey.
-            </DialogDescription>
-          </DialogHeader>
-
-          <fieldset disabled={isDeletingPasskey}>
-            <DialogFooter>
-              <DialogClose asChild>
-                <Button type="button" variant="secondary">
-                  Cancel
-                </Button>
-              </DialogClose>
-
-              <Button
-                onClick={async () =>
-                  deletePasskey({
-                    passkeyId,
-                  })
-                }
-                variant="destructive"
-                loading={isDeletingPasskey}
-              >
-                Delete
-              </Button>
-            </DialogFooter>
-          </fieldset>
-        </DialogContent>
-      </Dialog>
-    </div>
-  );
-};

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

@@ -1,120 +0,0 @@
-'use client';
-
-import { usePathname, useRouter, useSearchParams } from 'next/navigation';
-
-import { DateTime } from 'luxon';
-
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
-import { trpc } from '@documenso/trpc/react';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Skeleton } from '@documenso/ui/primitives/skeleton';
-import { TableCell } from '@documenso/ui/primitives/table';
-
-import { UserPasskeysDataTableActions } from './user-passkeys-data-table-actions';
-
-export const UserPasskeysDataTable = () => {
-  const pathname = usePathname();
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const updateSearchParams = useUpdateSearchParams();
-
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
-
-  const { data, isLoading, isInitialLoading, isLoadingError } = trpc.auth.findPasskeys.useQuery(
-    {
-      page: parsedSearchParams.page,
-      perPage: parsedSearchParams.perPage,
-    },
-    {
-      keepPreviousData: true,
-    },
-  );
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    updateSearchParams({
-      page,
-      perPage,
-    });
-  };
-
-  const results = data ?? {
-    data: [],
-    perPage: 10,
-    currentPage: 1,
-    totalPages: 1,
-  };
-
-  return (
-    <DataTable
-      columns={[
-        {
-          header: 'Name',
-          accessorKey: 'name',
-        },
-        {
-          header: 'Created',
-          accessorKey: 'createdAt',
-          cell: ({ row }) => DateTime.fromJSDate(row.original.createdAt).toRelative(),
-        },
-
-        {
-          header: 'Last used',
-          accessorKey: 'updatedAt',
-          cell: ({ row }) =>
-            row.original.lastUsedAt
-              ? DateTime.fromJSDate(row.original.lastUsedAt).toRelative()
-              : 'Never',
-        },
-        {
-          id: 'actions',
-          cell: ({ row }) => (
-            <UserPasskeysDataTableActions
-              className="justify-end"
-              passkeyId={row.original.id}
-              passkeyName={row.original.name}
-            />
-          ),
-        },
-      ]}
-      data={results.data}
-      perPage={results.perPage}
-      currentPage={results.currentPage}
-      totalPages={results.totalPages}
-      onPaginationChange={onPaginationChange}
-      hasFilters={parsedSearchParams.page !== undefined || parsedSearchParams.perPage !== undefined}
-      onClearFilters={() => router.push(pathname ?? '/')}
-      error={{
-        enable: isLoadingError,
-      }}
-      skeleton={{
-        enable: isLoading && isInitialLoading,
-        rows: 3,
-        component: (
-          <>
-            <TableCell>
-              <Skeleton className="h-4 w-20 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <Skeleton className="h-4 w-12 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <Skeleton className="h-4 w-12 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <div className="flex flex-row space-x-2">
-                <Skeleton className="h-8 w-16 rounded" />
-                <Skeleton className="h-8 w-16 rounded" />
-              </div>
-            </TableCell>
-          </>
-        ),
-      }}
-    >
-      {(table) => <DataTablePagination table={table} />}
-    </DataTable>
-  );
-};

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

@@ -25,11 +25,7 @@ type TemplateWithRecipient = Template & {
 };
 
 type TemplatesDataTableProps = {
-  templates: Array<
-    TemplateWithRecipient & {
-      team: { id: number; url: string } | null;
-    }
-  >;
+  templates: TemplateWithRecipient[];
   perPage: number;
   page: number;
   totalPages: number;

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

@@ -1,35 +1,23 @@
-'use client';
-
 import Link from 'next/link';
 
 import { useSession } from 'next-auth/react';
 
-import { formatTemplatesPath } from '@documenso/lib/utils/teams';
-import type { Template } from '@documenso/prisma/client';
-
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { Template } from '@documenso/prisma/client';
 
 export type DataTableTitleProps = {
-  row: Template & {
-    team: { id: number; url: string } | null;
-  };
+  row: Template;
 };
 
 export const DataTableTitle = ({ row }: DataTableTitleProps) => {
   const { data: session } = useSession();
-  const team = useOptionalCurrentTeam();
 
   if (!session) {
     return null;
   }
 
-  const isCurrentTeamTemplate = team?.url && row.team?.url === team?.url;
-
-  const templatesPath = formatTemplatesPath(isCurrentTeamTemplate ? team?.url : undefined);
-
   return (
     <Link
-      href={`${templatesPath}/${row.id}`}
+      href={`/templates/${row.id}`}
       className="block max-w-[10rem] cursor-pointer truncate font-medium hover:underline md:max-w-[20rem]"
     >
       {row.title}

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

@@ -11,7 +11,6 @@ import {
   convertToLocalSystemFormat,
 } from '@documenso/lib/constants/date-formats';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
-import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
@@ -39,12 +38,12 @@ export const DateField = ({
   const [isPending, startTransition] = useTransition();
 
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
-    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+    trpc.field.signFieldWithToken.useMutation();
 
   const {
     mutateAsync: removeSignedFieldWithToken,
     isLoading: isRemoveSignedFieldWithTokenLoading,
-  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  } = trpc.field.removeSignedFieldWithToken.useMutation();
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 

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

@@ -6,7 +6,6 @@ import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
 
-import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
@@ -30,12 +29,12 @@ export const EmailField = ({ field, recipient }: EmailFieldProps) => {
   const [isPending, startTransition] = useTransition();
 
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
-    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+    trpc.field.signFieldWithToken.useMutation();
 
   const {
     mutateAsync: removeSignedFieldWithToken,
     isLoading: isRemoveSignedFieldWithTokenLoading,
-  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  } = trpc.field.removeSignedFieldWithToken.useMutation();
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 

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

@@ -6,7 +6,6 @@ import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
 
-import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
@@ -35,12 +34,12 @@ export const NameField = ({ field, recipient }: NameFieldProps) => {
   const [isPending, startTransition] = useTransition();
 
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
-    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+    trpc.field.signFieldWithToken.useMutation();
 
   const {
     mutateAsync: removeSignedFieldWithToken,
     isLoading: isRemoveSignedFieldWithTokenLoading,
-  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  } = trpc.field.removeSignedFieldWithToken.useMutation();
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 

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

@@ -6,7 +6,6 @@ import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
 
-import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
@@ -36,12 +35,12 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
   const [isPending, startTransition] = useTransition();
 
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
-    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+    trpc.field.signFieldWithToken.useMutation();
 
   const {
     mutateAsync: removeSignedFieldWithToken,
     isLoading: isRemoveSignedFieldWithTokenLoading,
-  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  } = trpc.field.removeSignedFieldWithToken.useMutation();
 
   const { Signature: signature } = field;
 

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

@@ -6,7 +6,6 @@ import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
 
-import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
@@ -31,12 +30,12 @@ export const TextField = ({ field, recipient }: TextFieldProps) => {
   const [isPending, startTransition] = useTransition();
 
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
-    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+    trpc.field.signFieldWithToken.useMutation();
 
   const {
     mutateAsync: removeSignedFieldWithToken,
     isLoading: isRemoveSignedFieldWithTokenLoading,
-  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  } = trpc.field.removeSignedFieldWithToken.useMutation();
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 

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

@@ -10,7 +10,7 @@ type UnauthenticatedLayoutProps = {
 
 export default function UnauthenticatedLayout({ children }: UnauthenticatedLayoutProps) {
   return (
-    <main className="relative flex min-h-screen flex-col items-center justify-center overflow-hidden px-4 py-12 md:p-12 lg:p-24">
+    <main className="relative flex min-h-screen flex-col items-center justify-center overflow-hidden  px-4 py-12 md:p-12 lg:p-24">
       <div>
         <div className="absolute -inset-[min(600px,max(400px,60vw))] -z-[1] flex items-center justify-center opacity-70">
           <Image

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

@@ -34,7 +34,7 @@ export default function SignUpPage({ searchParams }: SignUpPageProps) {
 
   return (
     <SignUpFormV2
-      className="w-screen max-w-screen-2xl px-4 md:px-16 lg:-my-16"
+      className="w-screen max-w-screen-2xl px-4 md:px-16"
       initialEmail={email || undefined}
       isGoogleSSOEnabled={IS_GOOGLE_SSO_ENABLED}
     />

apps/web/src/app/layout.tsx

@@ -2,7 +2,6 @@ import { Suspense } from 'react';
 
 import { Caveat, Inter } from 'next/font/google';
 
-import { AxiomWebVitals } from 'next-axiom';
 import { PublicEnvScript } from 'next-runtime-env';
 
 import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag';
@@ -72,8 +71,6 @@ export default async function RootLayout({ children }: { children: React.ReactNo
         <PublicEnvScript />
       </head>
 
-      <AxiomWebVitals />
-
       <Suspense>
         <PostHogPageview />
       </Suspense>

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

@@ -1,12 +1,13 @@
-'use client';
-
-import { useRef, useState } from 'react';
-
 import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
 import type { Recipient } from '@documenso/prisma/client';
-import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@documenso/ui/primitives/tooltip';
 
 import { AvatarWithRecipient } from './avatar-with-recipient';
 import { StackAvatar } from './stack-avatar';
@@ -23,11 +24,6 @@ export const StackAvatarsWithTooltip = ({
   position,
   children,
 }: StackAvatarsWithTooltipProps) => {
-  const [open, setOpen] = useState(false);
-
-  const isControlled = useRef(false);
-  const isMouseOverTimeout = useRef<NodeJS.Timeout | null>(null);
-
   const waitingRecipients = recipients.filter(
     (recipient) => getRecipientType(recipient) === 'waiting',
   );
@@ -44,105 +40,66 @@ export const StackAvatarsWithTooltip = ({
     (recipient) => getRecipientType(recipient) === 'unsigned',
   );
 
-  const onMouseEnter = () => {
-    if (isMouseOverTimeout.current) {
-      clearTimeout(isMouseOverTimeout.current);
-    }
-
-    if (isControlled.current) {
-      return;
-    }
-
-    isMouseOverTimeout.current = setTimeout(() => {
-      setOpen((o) => (!o ? true : o));
-    }, 200);
-  };
-
-  const onMouseLeave = () => {
-    if (isMouseOverTimeout.current) {
-      clearTimeout(isMouseOverTimeout.current);
-    }
-
-    if (isControlled.current) {
-      return;
-    }
-
-    setTimeout(() => {
-      setOpen((o) => (o ? false : o));
-    }, 200);
-  };
-
-  const onOpenChange = (newOpen: boolean) => {
-    isControlled.current = newOpen;
-
-    setOpen(newOpen);
-  };
-
   return (
-    <Popover open={open} onOpenChange={onOpenChange}>
-      <PopoverTrigger
-        className="flex cursor-pointer"
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
-      >
-        {children || <StackAvatars recipients={recipients} />}
-      </PopoverTrigger>
+    <TooltipProvider>
+      <Tooltip delayDuration={200}>
+        <TooltipTrigger className="flex cursor-pointer">
+          {children || <StackAvatars recipients={recipients} />}
+        </TooltipTrigger>
 
-      <PopoverContent
-        side={position}
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
-        className="flex flex-col gap-y-5 py-2"
-      >
-        {completedRecipients.length > 0 && (
-          <div>
-            <h1 className="text-base font-medium">Completed</h1>
-            {completedRecipients.map((recipient: Recipient) => (
-              <div key={recipient.id} className="my-1 flex items-center gap-2">
-                <StackAvatar
-                  first={true}
-                  key={recipient.id}
-                  type={getRecipientType(recipient)}
-                  fallbackText={recipientAbbreviation(recipient)}
-                />
-                <div className="">
-                  <p className="text-muted-foreground text-sm">{recipient.email}</p>
-                  <p className="text-muted-foreground/70 text-xs">
-                    {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName}
-                  </p>
-                </div>
+        <TooltipContent side={position}>
+          <div className="flex flex-col gap-y-5 p-1">
+            {completedRecipients.length > 0 && (
+              <div>
+                <h1 className="text-base font-medium">Completed</h1>
+                {completedRecipients.map((recipient: Recipient) => (
+                  <div key={recipient.id} className="my-1 flex items-center gap-2">
+                    <StackAvatar
+                      first={true}
+                      key={recipient.id}
+                      type={getRecipientType(recipient)}
+                      fallbackText={recipientAbbreviation(recipient)}
+                    />
+                    <div className="">
+                      <p className="text-muted-foreground text-sm">{recipient.email}</p>
+                      <p className="text-muted-foreground/70 text-xs">
+                        {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName}
+                      </p>
+                    </div>
+                  </div>
+                ))}
               </div>
-            ))}
-          </div>
-        )}
+            )}
 
-        {waitingRecipients.length > 0 && (
-          <div>
-            <h1 className="text-base font-medium">Waiting</h1>
-            {waitingRecipients.map((recipient: Recipient) => (
-              <AvatarWithRecipient key={recipient.id} recipient={recipient} />
-            ))}
-          </div>
-        )}
+            {waitingRecipients.length > 0 && (
+              <div>
+                <h1 className="text-base font-medium">Waiting</h1>
+                {waitingRecipients.map((recipient: Recipient) => (
+                  <AvatarWithRecipient key={recipient.id} recipient={recipient} />
+                ))}
+              </div>
+            )}
 
-        {openedRecipients.length > 0 && (
-          <div>
-            <h1 className="text-base font-medium">Opened</h1>
-            {openedRecipients.map((recipient: Recipient) => (
-              <AvatarWithRecipient key={recipient.id} recipient={recipient} />
-            ))}
-          </div>
-        )}
+            {openedRecipients.length > 0 && (
+              <div>
+                <h1 className="text-base font-medium">Opened</h1>
+                {openedRecipients.map((recipient: Recipient) => (
+                  <AvatarWithRecipient key={recipient.id} recipient={recipient} />
+                ))}
+              </div>
+            )}
 
-        {uncompletedRecipients.length > 0 && (
-          <div>
-            <h1 className="text-base font-medium">Uncompleted</h1>
-            {uncompletedRecipients.map((recipient: Recipient) => (
-              <AvatarWithRecipient key={recipient.id} recipient={recipient} />
-            ))}
+            {uncompletedRecipients.length > 0 && (
+              <div>
+                <h1 className="text-base font-medium">Uncompleted</h1>
+                {uncompletedRecipients.map((recipient: Recipient) => (
+                  <AvatarWithRecipient key={recipient.id} recipient={recipient} />
+                ))}
+              </div>
+            )}
           </div>
-        )}
-      </PopoverContent>
-    </Popover>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
   );
 };

apps/web/src/components/(dashboard)/common/command-menu.tsx

@@ -14,10 +14,6 @@ import {
   SETTINGS_PAGE_SHORTCUT,
   TEMPLATES_PAGE_SHORTCUT,
 } from '@documenso/lib/constants/keyboard-shortcuts';
-import {
-  DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-  SKIP_QUERY_BATCH_META,
-} from '@documenso/lib/constants/trpc';
 import type { Document, Recipient } from '@documenso/prisma/client';
 import { trpc as trpcReact } from '@documenso/trpc/react';
 import {
@@ -86,10 +82,6 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
       },
       {
         keepPreviousData: true,
-        // Do not batch this due to relatively long request time compared to
-        // other queries which are generally batched with this.
-        ...SKIP_QUERY_BATCH_META,
-        ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
       },
     );
 

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

@@ -93,7 +93,7 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
         <Button
           data-testid="menu-switcher"
           variant="none"
-          className="relative flex h-12 flex-row items-center px-2 py-2 ring-0 focus:outline-none focus-visible:border-0 focus-visible:ring-0 focus-visible:ring-transparent"
+          className="relative flex h-12 flex-row items-center px-2 py-2 ring-0 focus-visible:border-0 focus-visible:ring-0"
         >
           <AvatarWithText
             avatarFallback={formatAvatarFallback(selectedTeam?.name)}

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

@@ -5,18 +5,11 @@ import { cn } from '@documenso/ui/lib/utils';
 export type SettingsHeaderProps = {
   title: string;
   subtitle: string;
-  hideDivider?: boolean;
   children?: React.ReactNode;
   className?: string;
 };
 
-export const SettingsHeader = ({
-  children,
-  title,
-  subtitle,
-  className,
-  hideDivider,
-}: SettingsHeaderProps) => {
+export const SettingsHeader = ({ children, title, subtitle, className }: SettingsHeaderProps) => {
   return (
     <>
       <div className={cn('flex flex-row items-center justify-between', className)}>
@@ -29,7 +22,7 @@ export const SettingsHeader = ({
         {children}
       </div>
 
-      {!hideDivider && <hr className="my-4" />}
+      <hr className="my-4" />
     </>
   );
 };

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

@@ -0,0 +1,43 @@
+'use client';
+
+import { useState } from 'react';
+
+import { Button } from '@documenso/ui/primitives/button';
+
+import { DisableAuthenticatorAppDialog } from './disable-authenticator-app-dialog';
+import { EnableAuthenticatorAppDialog } from './enable-authenticator-app-dialog';
+
+type AuthenticatorAppProps = {
+  isTwoFactorEnabled: boolean;
+};
+
+export const AuthenticatorApp = ({ isTwoFactorEnabled }: AuthenticatorAppProps) => {
+  const [modalState, setModalState] = useState<'enable' | 'disable' | null>(null);
+
+  const isEnableDialogOpen = modalState === 'enable';
+  const isDisableDialogOpen = modalState === 'disable';
+
+  return (
+    <>
+      <div className="flex-shrink-0">
+        {isTwoFactorEnabled ? (
+          <Button variant="destructive" onClick={() => setModalState('disable')}>
+            Disable 2FA
+          </Button>
+        ) : (
+          <Button onClick={() => setModalState('enable')}>Enable 2FA</Button>
+        )}
+      </div>
+
+      <EnableAuthenticatorAppDialog
+        open={isEnableDialogOpen}
+        onOpenChange={(open) => !open && setModalState(null)}
+      />
+
+      <DisableAuthenticatorAppDialog
+        open={isDisableDialogOpen}
+        onOpenChange={(open) => !open && setModalState(null)}
+      />
+    </>
+  );
+};

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

@@ -1,7 +1,3 @@
-'use client';
-
-import { useState } from 'react';
-
 import { useRouter } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -13,51 +9,65 @@ import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Dialog,
-  DialogClose,
   DialogContent,
   DialogDescription,
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
 import {
   Form,
   FormControl,
   FormField,
   FormItem,
+  FormLabel,
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
+import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-export const ZDisable2FAForm = z.object({
-  token: z.string(),
+export const ZDisableTwoFactorAuthenticationForm = z.object({
+  password: z.string().min(6).max(72),
+  backupCode: z.string(),
 });
 
-export type TDisable2FAForm = z.infer<typeof ZDisable2FAForm>;
+export type TDisableTwoFactorAuthenticationForm = z.infer<
+  typeof ZDisableTwoFactorAuthenticationForm
+>;
 
-export const DisableAuthenticatorAppDialog = () => {
+export type DisableAuthenticatorAppDialogProps = {
+  open: boolean;
+  onOpenChange: (_open: boolean) => void;
+};
+
+export const DisableAuthenticatorAppDialog = ({
+  open,
+  onOpenChange,
+}: DisableAuthenticatorAppDialogProps) => {
   const router = useRouter();
-
   const { toast } = useToast();
 
-  const [isOpen, setIsOpen] = useState(false);
+  const { mutateAsync: disableTwoFactorAuthentication } =
+    trpc.twoFactorAuthentication.disable.useMutation();
 
-  const { mutateAsync: disable2FA } = trpc.twoFactorAuthentication.disable.useMutation();
-
-  const disable2FAForm = useForm<TDisable2FAForm>({
+  const disableTwoFactorAuthenticationForm = useForm<TDisableTwoFactorAuthenticationForm>({
     defaultValues: {
-      token: '',
+      password: '',
+      backupCode: '',
     },
-    resolver: zodResolver(ZDisable2FAForm),
+    resolver: zodResolver(ZDisableTwoFactorAuthenticationForm),
   });
 
-  const { isSubmitting: isDisable2FASubmitting } = disable2FAForm.formState;
+  const { isSubmitting: isDisableTwoFactorAuthenticationSubmitting } =
+    disableTwoFactorAuthenticationForm.formState;
 
-  const onDisable2FAFormSubmit = async ({ token }: TDisable2FAForm) => {
+  const onDisableTwoFactorAuthenticationFormSubmit = async ({
+    password,
+    backupCode,
+  }: TDisableTwoFactorAuthenticationForm) => {
     try {
-      await disable2FA({ token });
+      await disableTwoFactorAuthentication({ password, backupCode });
 
       toast({
         title: 'Two-factor authentication disabled',
@@ -66,7 +76,7 @@ export const DisableAuthenticatorAppDialog = () => {
       });
 
       flushSync(() => {
-        setIsOpen(false);
+        onOpenChange(false);
       });
 
       router.refresh();
@@ -81,51 +91,74 @@ export const DisableAuthenticatorAppDialog = () => {
   };
 
   return (
-    <Dialog open={isOpen} onOpenChange={setIsOpen}>
-      <DialogTrigger asChild={true}>
-        <Button className="flex-shrink-0" variant="destructive">
-          Disable 2FA
-        </Button>
-      </DialogTrigger>
-
-      <DialogContent position="center">
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="w-full max-w-xl md:max-w-xl lg:max-w-xl">
         <DialogHeader>
-          <DialogTitle>Disable 2FA</DialogTitle>
+          <DialogTitle>Disable Authenticator App</DialogTitle>
 
           <DialogDescription>
-            Please provide a token from the authenticator, or a backup code. If you do not have a
-            backup code available, please contact support.
+            To disable the Authenticator App for your account, please enter your password and a
+            backup code. If you do not have a backup code available, please contact support.
           </DialogDescription>
         </DialogHeader>
 
-        <Form {...disable2FAForm}>
-          <form onSubmit={disable2FAForm.handleSubmit(onDisable2FAFormSubmit)}>
-            <fieldset className="flex flex-col gap-y-4" disabled={isDisable2FASubmitting}>
+        <Form {...disableTwoFactorAuthenticationForm}>
+          <form
+            onSubmit={disableTwoFactorAuthenticationForm.handleSubmit(
+              onDisableTwoFactorAuthenticationFormSubmit,
+            )}
+            className="flex flex-col gap-y-4"
+          >
+            <fieldset
+              className="flex flex-col gap-y-4"
+              disabled={isDisableTwoFactorAuthenticationSubmitting}
+            >
               <FormField
-                name="token"
-                control={disable2FAForm.control}
+                name="password"
+                control={disableTwoFactorAuthenticationForm.control}
                 render={({ field }) => (
                   <FormItem>
+                    <FormLabel className="text-muted-foreground">Password</FormLabel>
                     <FormControl>
-                      <Input {...field} placeholder="Token" />
+                      <PasswordInput
+                        {...field}
+                        autoComplete="current-password"
+                        value={field.value ?? ''}
+                      />
                     </FormControl>
                     <FormMessage />
                   </FormItem>
                 )}
               />
 
-              <DialogFooter>
-                <DialogClose asChild>
-                  <Button type="button" variant="secondary">
-                    Cancel
-                  </Button>
-                </DialogClose>
-
-                <Button type="submit" variant="destructive" loading={isDisable2FASubmitting}>
-                  Disable 2FA
-                </Button>
-              </DialogFooter>
+              <FormField
+                name="backupCode"
+                control={disableTwoFactorAuthenticationForm.control}
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel className="text-muted-foreground">Backup Code</FormLabel>
+                    <FormControl>
+                      <Input {...field} type="text" value={field.value ?? ''} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
             </fieldset>
+
+            <DialogFooter>
+              <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
+                Cancel
+              </Button>
+
+              <Button
+                type="submit"
+                variant="destructive"
+                loading={isDisableTwoFactorAuthenticationSubmitting}
+              >
+                Disable 2FA
+              </Button>
+            </DialogFooter>
           </form>
         </Form>
       </DialogContent>

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

@@ -1,11 +1,8 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-
-import { useRouter } from 'next/navigation';
+import { useMemo } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
+import { match } from 'ts-pattern';
 import { renderSVG } from 'uqr';
 import { z } from 'zod';
 
@@ -14,13 +11,11 @@ import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Dialog,
-  DialogClose,
   DialogContent,
   DialogDescription,
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
 import {
   Form,
@@ -31,60 +26,85 @@ import {
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
+import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { RecoveryCodeList } from './recovery-code-list';
 
-export const ZEnable2FAForm = z.object({
+export const ZSetupTwoFactorAuthenticationForm = z.object({
+  password: z.string().min(6).max(72),
+});
+
+export type TSetupTwoFactorAuthenticationForm = z.infer<typeof ZSetupTwoFactorAuthenticationForm>;
+
+export const ZEnableTwoFactorAuthenticationForm = z.object({
   token: z.string(),
 });
 
-export type TEnable2FAForm = z.infer<typeof ZEnable2FAForm>;
+export type TEnableTwoFactorAuthenticationForm = z.infer<typeof ZEnableTwoFactorAuthenticationForm>;
 
-export const EnableAuthenticatorAppDialog = () => {
+export type EnableAuthenticatorAppDialogProps = {
+  open: boolean;
+  onOpenChange: (_open: boolean) => void;
+};
+
+export const EnableAuthenticatorAppDialog = ({
+  open,
+  onOpenChange,
+}: EnableAuthenticatorAppDialogProps) => {
   const { toast } = useToast();
-  const router = useRouter();
 
-  const [isOpen, setIsOpen] = useState(false);
-  const [recoveryCodes, setRecoveryCodes] = useState<string[] | null>(null);
-
-  const { mutateAsync: enable2FA } = trpc.twoFactorAuthentication.enable.useMutation();
+  const { mutateAsync: setupTwoFactorAuthentication, data: setupTwoFactorAuthenticationData } =
+    trpc.twoFactorAuthentication.setup.useMutation();
 
   const {
-    mutateAsync: setup2FA,
-    data: setup2FAData,
-    isLoading: isSettingUp2FA,
-  } = trpc.twoFactorAuthentication.setup.useMutation({
-    onError: () => {
-      toast({
-        title: 'Unable to setup two-factor authentication',
-        description:
-          'We were unable to setup two-factor authentication for your account. Please ensure that you have entered your code correctly and try again.',
-        variant: 'destructive',
-      });
+    mutateAsync: enableTwoFactorAuthentication,
+    data: enableTwoFactorAuthenticationData,
+    isLoading: isEnableTwoFactorAuthenticationDataLoading,
+  } = trpc.twoFactorAuthentication.enable.useMutation();
+
+  const setupTwoFactorAuthenticationForm = useForm<TSetupTwoFactorAuthenticationForm>({
+    defaultValues: {
+      password: '',
     },
+    resolver: zodResolver(ZSetupTwoFactorAuthenticationForm),
   });
 
-  const enable2FAForm = useForm<TEnable2FAForm>({
+  const { isSubmitting: isSetupTwoFactorAuthenticationSubmitting } =
+    setupTwoFactorAuthenticationForm.formState;
+
+  const enableTwoFactorAuthenticationForm = useForm<TEnableTwoFactorAuthenticationForm>({
     defaultValues: {
       token: '',
     },
-    resolver: zodResolver(ZEnable2FAForm),
+    resolver: zodResolver(ZEnableTwoFactorAuthenticationForm),
   });
 
-  const { isSubmitting: isEnabling2FA } = enable2FAForm.formState;
+  const { isSubmitting: isEnableTwoFactorAuthenticationSubmitting } =
+    enableTwoFactorAuthenticationForm.formState;
 
-  const onEnable2FAFormSubmit = async ({ token }: TEnable2FAForm) => {
+  const step = useMemo(() => {
+    if (!setupTwoFactorAuthenticationData || isSetupTwoFactorAuthenticationSubmitting) {
+      return 'setup';
+    }
+
+    if (!enableTwoFactorAuthenticationData || isEnableTwoFactorAuthenticationSubmitting) {
+      return 'enable';
+    }
+
+    return 'view';
+  }, [
+    setupTwoFactorAuthenticationData,
+    isSetupTwoFactorAuthenticationSubmitting,
+    enableTwoFactorAuthenticationData,
+    isEnableTwoFactorAuthenticationSubmitting,
+  ]);
+
+  const onSetupTwoFactorAuthenticationFormSubmit = async ({
+    password,
+  }: TSetupTwoFactorAuthenticationForm) => {
     try {
-      const data = await enable2FA({ code: token });
-
-      setRecoveryCodes(data.recoveryCodes);
-
-      toast({
-        title: 'Two-factor authentication enabled',
-        description:
-          'You will now be required to enter a code from your authenticator app when signing in.',
-      });
+      await setupTwoFactorAuthentication({ password });
     } catch (_err) {
       toast({
         title: 'Unable to setup two-factor authentication',
@@ -96,8 +116,8 @@ export const EnableAuthenticatorAppDialog = () => {
   };
 
   const downloadRecoveryCodes = () => {
-    if (recoveryCodes) {
-      const blob = new Blob([recoveryCodes.join('\n')], {
+    if (enableTwoFactorAuthenticationData && enableTwoFactorAuthenticationData.recoveryCodes) {
+      const blob = new Blob([enableTwoFactorAuthenticationData.recoveryCodes.join('\n')], {
         type: 'text/plain',
       });
 
@@ -108,126 +128,177 @@ export const EnableAuthenticatorAppDialog = () => {
     }
   };
 
-  const handleEnable2FA = async () => {
-    if (!setup2FAData) {
-      await setup2FA();
-    }
+  const onEnableTwoFactorAuthenticationFormSubmit = async ({
+    token,
+  }: TEnableTwoFactorAuthenticationForm) => {
+    try {
+      await enableTwoFactorAuthentication({ code: token });
 
-    setIsOpen(true);
+      toast({
+        title: 'Two-factor authentication enabled',
+        description:
+          'Two-factor authentication has been enabled for your account. You will now be required to enter a code from your authenticator app when signing in.',
+      });
+    } catch (_err) {
+      toast({
+        title: 'Unable to setup two-factor authentication',
+        description:
+          'We were unable to setup two-factor authentication for your account. Please ensure that you have entered your password correctly and try again.',
+        variant: 'destructive',
+      });
+    }
   };
 
-  useEffect(() => {
-    enable2FAForm.reset();
-
-    if (!isOpen && recoveryCodes && recoveryCodes.length > 0) {
-      setRecoveryCodes(null);
-      router.refresh();
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isOpen]);
-
   return (
-    <Dialog open={isOpen} onOpenChange={setIsOpen}>
-      <DialogTrigger asChild={true}>
-        <Button
-          className="flex-shrink-0"
-          loading={isSettingUp2FA}
-          onClick={(e) => {
-            e.preventDefault();
-            void handleEnable2FA();
-          }}
-        >
-          Enable 2FA
-        </Button>
-      </DialogTrigger>
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="w-full max-w-xl md:max-w-xl lg:max-w-xl">
+        <DialogHeader>
+          <DialogTitle>Enable Authenticator App</DialogTitle>
 
-      <DialogContent position="center">
-        {setup2FAData && (
-          <>
-            {recoveryCodes ? (
-              <div>
-                <DialogHeader>
-                  <DialogTitle>Backup codes</DialogTitle>
-                  <DialogDescription>
-                    Your recovery codes are listed below. Please store them in a safe place.
-                  </DialogDescription>
-                </DialogHeader>
+          {step === 'setup' && (
+            <DialogDescription>
+              To enable two-factor authentication, please enter your password below.
+            </DialogDescription>
+          )}
 
-                <div className="mt-4">
-                  <RecoveryCodeList recoveryCodes={recoveryCodes} />
-                </div>
+          {step === 'view' && (
+            <DialogDescription>
+              Your recovery codes are listed below. Please store them in a safe place.
+            </DialogDescription>
+          )}
+        </DialogHeader>
 
-                <DialogFooter className="mt-4">
-                  <DialogClose asChild>
-                    <Button variant="secondary">Close</Button>
-                  </DialogClose>
+        {match(step)
+          .with('setup', () => {
+            return (
+              <Form {...setupTwoFactorAuthenticationForm}>
+                <form
+                  onSubmit={setupTwoFactorAuthenticationForm.handleSubmit(
+                    onSetupTwoFactorAuthenticationFormSubmit,
+                  )}
+                  className="flex flex-col gap-y-4"
+                >
+                  <FormField
+                    name="password"
+                    control={setupTwoFactorAuthenticationForm.control}
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel className="text-muted-foreground">Password</FormLabel>
+                        <FormControl>
+                          <PasswordInput
+                            {...field}
+                            autoComplete="current-password"
+                            value={field.value ?? ''}
+                          />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
 
-                  <Button onClick={downloadRecoveryCodes}>Download</Button>
-                </DialogFooter>
-              </div>
-            ) : (
-              <Form {...enable2FAForm}>
-                <form onSubmit={enable2FAForm.handleSubmit(onEnable2FAFormSubmit)}>
-                  <DialogHeader>
-                    <DialogTitle>Enable Authenticator App</DialogTitle>
-                    <DialogDescription>
-                      To enable two-factor authentication, scan the following QR code using your
-                      authenticator app.
-                    </DialogDescription>
-                  </DialogHeader>
-
-                  <fieldset disabled={isEnabling2FA} className="mt-4 flex flex-col gap-y-4">
-                    <div
-                      className="flex h-36 justify-center"
-                      dangerouslySetInnerHTML={{
-                        __html: renderSVG(setup2FAData?.uri ?? ''),
+                  <DialogFooter>
+                    <Button
+                      type="button"
+                      variant="secondary"
+                      onClick={() => {
+                        setupTwoFactorAuthenticationForm.reset({
+                          password: '',
+                        });
+                        onOpenChange(false);
                       }}
-                    />
+                    >
+                      Cancel
+                    </Button>
 
-                    <p className="text-muted-foreground text-sm">
-                      If your authenticator app does not support QR codes, you can use the following
-                      code instead:
-                    </p>
-
-                    <p className="bg-muted/60 text-muted-foreground rounded-lg p-2 text-center font-mono tracking-widest">
-                      {setup2FAData?.secret}
-                    </p>
-
-                    <p className="text-muted-foreground text-sm">
-                      Once you have scanned the QR code or entered the code manually, enter the code
-                      provided by your authenticator app below.
-                    </p>
-
-                    <FormField
-                      name="token"
-                      control={enable2FAForm.control}
-                      render={({ field }) => (
-                        <FormItem>
-                          <FormLabel className="text-muted-foreground">Token</FormLabel>
-                          <FormControl>
-                            <Input {...field} type="text" value={field.value ?? ''} />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
-
-                    <DialogFooter>
-                      <DialogClose asChild>
-                        <Button variant="secondary">Cancel</Button>
-                      </DialogClose>
-
-                      <Button type="submit" loading={isEnabling2FA}>
-                        Enable 2FA
-                      </Button>
-                    </DialogFooter>
-                  </fieldset>
+                    <Button type="submit" loading={isSetupTwoFactorAuthenticationSubmitting}>
+                      Continue
+                    </Button>
+                  </DialogFooter>
                 </form>
               </Form>
-            )}
-          </>
-        )}
+            );
+          })
+          .with('enable', () => (
+            <Form {...enableTwoFactorAuthenticationForm}>
+              <form
+                onSubmit={enableTwoFactorAuthenticationForm.handleSubmit(
+                  onEnableTwoFactorAuthenticationFormSubmit,
+                )}
+                className="flex flex-col gap-y-4"
+              >
+                <p className="text-muted-foreground text-sm">
+                  To enable two-factor authentication, scan the following QR code using your
+                  authenticator app.
+                </p>
+
+                <div
+                  className="flex h-36 justify-center"
+                  dangerouslySetInnerHTML={{
+                    __html: renderSVG(setupTwoFactorAuthenticationData?.uri ?? ''),
+                  }}
+                />
+
+                <p className="text-muted-foreground text-sm">
+                  If your authenticator app does not support QR codes, you can use the following
+                  code instead:
+                </p>
+
+                <p className="bg-muted/60 text-muted-foreground rounded-lg p-2 text-center font-mono tracking-widest">
+                  {setupTwoFactorAuthenticationData?.secret}
+                </p>
+
+                <p className="text-muted-foreground text-sm">
+                  Once you have scanned the QR code or entered the code manually, enter the code
+                  provided by your authenticator app below.
+                </p>
+
+                <FormField
+                  name="token"
+                  control={enableTwoFactorAuthenticationForm.control}
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel className="text-muted-foreground">Token</FormLabel>
+                      <FormControl>
+                        <Input {...field} type="text" value={field.value ?? ''} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <DialogFooter>
+                  <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
+                    Cancel
+                  </Button>
+
+                  <Button type="submit" loading={isEnableTwoFactorAuthenticationSubmitting}>
+                    Enable 2FA
+                  </Button>
+                </DialogFooter>
+              </form>
+            </Form>
+          ))
+          .with('view', () => (
+            <div>
+              {enableTwoFactorAuthenticationData?.recoveryCodes && (
+                <RecoveryCodeList recoveryCodes={enableTwoFactorAuthenticationData.recoveryCodes} />
+              )}
+
+              <div className="mt-4 flex flex-row-reverse items-center gap-2">
+                <Button onClick={() => onOpenChange(false)}>Complete</Button>
+
+                <Button
+                  variant="secondary"
+                  onClick={downloadRecoveryCodes}
+                  disabled={!enableTwoFactorAuthenticationData?.recoveryCodes}
+                  loading={isEnableTwoFactorAuthenticationDataLoading}
+                >
+                  Download
+                </Button>
+              </div>
+            </div>
+          ))
+          .exhaustive()}
       </DialogContent>
     </Dialog>
   );

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

@@ -0,0 +1,33 @@
+'use client';
+
+import { useState } from 'react';
+
+import { Button } from '@documenso/ui/primitives/button';
+
+import { ViewRecoveryCodesDialog } from './view-recovery-codes-dialog';
+
+type RecoveryCodesProps = {
+  isTwoFactorEnabled: boolean;
+};
+
+export const RecoveryCodes = ({ isTwoFactorEnabled }: RecoveryCodesProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <>
+      <Button
+        className="flex-shrink-0"
+        onClick={() => setIsOpen(true)}
+        disabled={!isTwoFactorEnabled}
+      >
+        View Codes
+      </Button>
+
+      <ViewRecoveryCodesDialog
+        key={isOpen ? 'open' : 'closed'}
+        open={isOpen}
+        onOpenChange={setIsOpen}
+      />
+    </>
+  );
+};

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

@@ -1,6 +1,4 @@
-'use client';
-
-import { useState } from 'react';
+import { useMemo } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
@@ -8,61 +6,69 @@ import { match } from 'ts-pattern';
 import { z } from 'zod';
 
 import { downloadFile } from '@documenso/lib/client-only/download-file';
-import { AppError } from '@documenso/lib/errors/app-error';
-import { ErrorCode } from '@documenso/lib/next-auth/error-codes';
 import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Dialog,
-  DialogClose,
   DialogContent,
   DialogDescription,
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
 import {
   Form,
   FormControl,
   FormField,
   FormItem,
+  FormLabel,
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
+import { PasswordInput } from '@documenso/ui/primitives/password-input';
+import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { RecoveryCodeList } from './recovery-code-list';
 
 export const ZViewRecoveryCodesForm = z.object({
-  token: z.string().min(1, { message: 'Token is required' }),
+  password: z.string().min(6).max(72),
 });
 
 export type TViewRecoveryCodesForm = z.infer<typeof ZViewRecoveryCodesForm>;
 
-export const ViewRecoveryCodesDialog = () => {
-  const [isOpen, setIsOpen] = useState(false);
+export type ViewRecoveryCodesDialogProps = {
+  open: boolean;
+  onOpenChange: (_open: boolean) => void;
+};
+
+export const ViewRecoveryCodesDialog = ({ open, onOpenChange }: ViewRecoveryCodesDialogProps) => {
+  const { toast } = useToast();
 
   const {
-    data: recoveryCodes,
-    mutate,
-    isLoading,
-    isError,
-    error,
+    mutateAsync: viewRecoveryCodes,
+    data: viewRecoveryCodesData,
+    isLoading: isViewRecoveryCodesDataLoading,
   } = trpc.twoFactorAuthentication.viewRecoveryCodes.useMutation();
 
-  // error?.data?.code
-
   const viewRecoveryCodesForm = useForm<TViewRecoveryCodesForm>({
     defaultValues: {
-      token: '',
+      password: '',
     },
     resolver: zodResolver(ZViewRecoveryCodesForm),
   });
 
+  const { isSubmitting: isViewRecoveryCodesSubmitting } = viewRecoveryCodesForm.formState;
+
+  const step = useMemo(() => {
+    if (!viewRecoveryCodesData || isViewRecoveryCodesSubmitting) {
+      return 'authenticate';
+    }
+
+    return 'view';
+  }, [viewRecoveryCodesData, isViewRecoveryCodesSubmitting]);
+
   const downloadRecoveryCodes = () => {
-    if (recoveryCodes) {
-      const blob = new Blob([recoveryCodes.join('\n')], {
+    if (viewRecoveryCodesData && viewRecoveryCodesData.recoveryCodes) {
+      const blob = new Blob([viewRecoveryCodesData.recoveryCodes.join('\n')], {
         type: 'text/plain',
       });
 
@@ -73,88 +79,107 @@ export const ViewRecoveryCodesDialog = () => {
     }
   };
 
+  const onViewRecoveryCodesFormSubmit = async ({ password }: TViewRecoveryCodesForm) => {
+    try {
+      await viewRecoveryCodes({ password });
+    } catch (_err) {
+      toast({
+        title: 'Unable to view recovery codes',
+        description:
+          'We were unable to view your recovery codes. Please ensure that you have entered your password correctly and try again.',
+        variant: 'destructive',
+      });
+    }
+  };
+
   return (
-    <Dialog open={isOpen} onOpenChange={setIsOpen}>
-      <DialogTrigger asChild>
-        <Button className="flex-shrink-0">View Codes</Button>
-      </DialogTrigger>
-
+    <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent className="w-full max-w-xl md:max-w-xl lg:max-w-xl">
-        {recoveryCodes ? (
-          <div>
-            <DialogHeader className="mb-4">
-              <DialogTitle>View Recovery Codes</DialogTitle>
+        <DialogHeader>
+          <DialogTitle>View Recovery Codes</DialogTitle>
 
-              <DialogDescription>
-                Your recovery codes are listed below. Please store them in a safe place.
-              </DialogDescription>
-            </DialogHeader>
+          {step === 'authenticate' && (
+            <DialogDescription>
+              To view your recovery codes, please enter your password below.
+            </DialogDescription>
+          )}
 
-            <RecoveryCodeList recoveryCodes={recoveryCodes} />
+          {step === 'view' && (
+            <DialogDescription>
+              Your recovery codes are listed below. Please store them in a safe place.
+            </DialogDescription>
+          )}
+        </DialogHeader>
 
-            <DialogFooter className="mt-4">
-              <DialogClose asChild>
-                <Button variant="secondary">Close</Button>
-              </DialogClose>
+        {match(step)
+          .with('authenticate', () => {
+            return (
+              <Form {...viewRecoveryCodesForm}>
+                <form
+                  onSubmit={viewRecoveryCodesForm.handleSubmit(onViewRecoveryCodesFormSubmit)}
+                  className="flex flex-col gap-y-4"
+                >
+                  <FormField
+                    name="password"
+                    control={viewRecoveryCodesForm.control}
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel className="text-muted-foreground">Password</FormLabel>
+                        <FormControl>
+                          <PasswordInput
+                            {...field}
+                            autoComplete="current-password"
+                            value={field.value ?? ''}
+                          />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
 
-              <Button onClick={downloadRecoveryCodes}>Download</Button>
-            </DialogFooter>
-          </div>
-        ) : (
-          <Form {...viewRecoveryCodesForm}>
-            <form onSubmit={viewRecoveryCodesForm.handleSubmit((value) => mutate(value))}>
-              <DialogHeader className="mb-4">
-                <DialogTitle>View Recovery Codes</DialogTitle>
-
-                <DialogDescription>
-                  Please provide a token from your authenticator, or a backup code.
-                </DialogDescription>
-              </DialogHeader>
-
-              <fieldset className="flex flex-col space-y-4" disabled={isLoading}>
-                <FormField
-                  name="token"
-                  control={viewRecoveryCodesForm.control}
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormControl>
-                        <Input {...field} placeholder="Token" />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                {error && (
-                  <Alert variant="destructive">
-                    <AlertDescription>
-                      {match(AppError.parseError(error).message)
-                        .with(
-                          ErrorCode.INCORRECT_TWO_FACTOR_CODE,
-                          () => 'Invalid code. Please try again.',
-                        )
-                        .otherwise(
-                          () => 'Something went wrong. Please try again or contact support.',
-                        )}
-                    </AlertDescription>
-                  </Alert>
-                )}
-
-                <DialogFooter>
-                  <DialogClose asChild>
-                    <Button type="button" variant="secondary">
+                  <DialogFooter>
+                    <Button
+                      type="button"
+                      variant="secondary"
+                      onClick={() => {
+                        viewRecoveryCodesForm.reset({
+                          password: '',
+                        });
+                        onOpenChange(false);
+                      }}
+                    >
                       Cancel
                     </Button>
-                  </DialogClose>
 
-                  <Button type="submit" loading={isLoading}>
-                    View
-                  </Button>
-                </DialogFooter>
-              </fieldset>
-            </form>
-          </Form>
-        )}
+                    <Button type="submit" loading={isViewRecoveryCodesSubmitting}>
+                      Continue
+                    </Button>
+                  </DialogFooter>
+                </form>
+              </Form>
+            );
+          })
+          .with('view', () => (
+            <div>
+              {viewRecoveryCodesData?.recoveryCodes && (
+                <RecoveryCodeList recoveryCodes={viewRecoveryCodesData.recoveryCodes} />
+              )}
+
+              <div className="mt-4 flex flex-row-reverse items-center gap-2">
+                <Button onClick={() => onOpenChange(false)}>Complete</Button>
+
+                <Button
+                  variant="secondary"
+                  disabled={!viewRecoveryCodesData?.recoveryCodes}
+                  loading={isViewRecoveryCodesDataLoading}
+                  onClick={downloadRecoveryCodes}
+                >
+                  Download
+                </Button>
+              </div>
+            </div>
+          ))
+          .exhaustive()}
       </DialogContent>
     </Dialog>
   );

apps/web/src/components/forms/public-profile-claim-dialog.tsx

@@ -154,7 +154,7 @@ export const ClaimPublicProfileDialogForm = ({
 
                         <FormMessage />
 
-                        <div className="bg-muted/50 text-muted-foreground mt-2 inline-block max-w-[29rem] truncate rounded-md px-2 py-1 text-sm lowercase">
+                        <div className="bg-muted/50 text-muted-foreground mt-2 inline-block truncate rounded-md px-2 py-1 text-sm">
                           {baseUrl.host}/u/{field.value || '<username>'}
                         </div>
                       </FormItem>

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

@@ -6,18 +6,12 @@ import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { browserSupportsWebAuthn, startAuthentication } from '@simplewebauthn/browser';
-import { KeyRoundIcon } from 'lucide-react';
 import { signIn } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 import { FcGoogle } from 'react-icons/fc';
-import { match } from 'ts-pattern';
 import { z } from 'zod';
 
-import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { ErrorCode, isErrorCode } from '@documenso/lib/next-auth/error-codes';
-import { trpc } from '@documenso/trpc/react';
 import { ZCurrentPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -72,24 +66,14 @@ export type SignInFormProps = {
 
 export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: SignInFormProps) => {
   const { toast } = useToast();
-  const { getFlag } = useFeatureFlags();
-
-  const router = useRouter();
-
   const [isTwoFactorAuthenticationDialogOpen, setIsTwoFactorAuthenticationDialogOpen] =
     useState(false);
+  const router = useRouter();
 
   const [twoFactorAuthenticationMethod, setTwoFactorAuthenticationMethod] = useState<
     'totp' | 'backup'
   >('totp');
 
-  const [isPasskeyLoading, setIsPasskeyLoading] = useState(false);
-
-  const isPasskeyEnabled = getFlag('app_passkey');
-
-  const { mutateAsync: createPasskeySigninOptions } =
-    trpc.auth.createPasskeySigninOptions.useMutation();
-
   const form = useForm<TSignInFormSchema>({
     values: {
       email: initialEmail ?? '',
@@ -123,63 +107,6 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
     setTwoFactorAuthenticationMethod(method);
   };
 
-  const onSignInWithPasskey = async () => {
-    if (!browserSupportsWebAuthn) {
-      toast({
-        title: 'Not supported',
-        description: 'Passkeys are not supported on this browser',
-        duration: 10000,
-        variant: 'destructive',
-      });
-
-      return;
-    }
-
-    try {
-      setIsPasskeyLoading(true);
-
-      const options = await createPasskeySigninOptions();
-
-      const credential = await startAuthentication(options);
-
-      const result = await signIn('webauthn', {
-        credential: JSON.stringify(credential),
-        callbackUrl: LOGIN_REDIRECT_PATH,
-        redirect: false,
-      });
-
-      if (!result?.url || result.error) {
-        throw new AppError(result?.error ?? '');
-      }
-
-      window.location.href = result.url;
-    } catch (err) {
-      setIsPasskeyLoading(false);
-
-      if (err.name === 'NotAllowedError') {
-        return;
-      }
-
-      const error = AppError.parseError(err);
-
-      const errorMessage = match(error.code)
-        .with(
-          AppErrorCode.NOT_SETUP,
-          () =>
-            'This passkey is not configured for this application. Please login and add one in the user settings.',
-        )
-        .with(AppErrorCode.EXPIRED_CODE, () => 'This session has expired. Please try again.')
-        .otherwise(() => 'Please try again later or login using your normal details');
-
-      toast({
-        title: 'Something went wrong',
-        description: errorMessage,
-        duration: 10000,
-        variant: 'destructive',
-      });
-    }
-  };
-
   const onFormSubmit = async ({ email, password, totpCode, backupCode }: TSignInFormSchema) => {
     try {
       const credentials: Record<string, string> = {
@@ -262,10 +189,7 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
         className={cn('flex w-full flex-col gap-y-4', className)}
         onSubmit={form.handleSubmit(onFormSubmit)}
       >
-        <fieldset
-          className="flex w-full flex-col gap-y-4"
-          disabled={isSubmitting || isPasskeyLoading}
-        >
+        <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
           <FormField
             control={form.control}
             name="email"
@@ -293,8 +217,6 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
                   <PasswordInput {...field} />
                 </FormControl>
 
-                <FormMessage />
-
                 <p className="mt-2 text-right">
                   <Link
                     href="/forgot-password"
@@ -303,28 +225,29 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
                     Forgot your password?
                   </Link>
                 </p>
+                <FormMessage />
               </FormItem>
             )}
           />
+        </fieldset>
 
-          <Button
-            type="submit"
-            size="lg"
-            loading={isSubmitting}
-            className="dark:bg-documenso dark:hover:opacity-90"
-          >
-            {isSubmitting ? 'Signing in...' : 'Sign In'}
-          </Button>
+        <Button
+          type="submit"
+          size="lg"
+          loading={isSubmitting}
+          className="dark:bg-documenso dark:hover:opacity-90"
+        >
+          {isSubmitting ? 'Signing in...' : 'Sign In'}
+        </Button>
 
-          {(isGoogleSSOEnabled || isPasskeyEnabled) && (
+        {isGoogleSSOEnabled && (
+          <>
             <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
               <div className="bg-border h-px flex-1" />
               <span className="text-muted-foreground bg-transparent">Or continue with</span>
               <div className="bg-border h-px flex-1" />
             </div>
-          )}
 
-          {isGoogleSSOEnabled && (
             <Button
               type="button"
               size="lg"
@@ -336,23 +259,8 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
               <FcGoogle className="mr-2 h-5 w-5" />
               Google
             </Button>
-          )}
-
-          {isPasskeyEnabled && (
-            <Button
-              type="button"
-              size="lg"
-              variant="outline"
-              disabled={isSubmitting}
-              loading={isPasskeyLoading}
-              className="bg-background text-muted-foreground border"
-              onClick={onSignInWithPasskey}
-            >
-              {!isPasskeyLoading && <KeyRoundIcon className="-ml-1 mr-1 h-5 w-5" />}
-              Passkey
-            </Button>
-          )}
-        </fieldset>
+          </>
+        )}
       </form>
 
       <Dialog

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

@@ -108,6 +108,17 @@ export const SignUpFormV2 = ({
   const name = form.watch('name');
   const url = form.watch('url');
 
+  // To continue we need to make sure name, email, password and signature are valid
+  const canContinue =
+    form.formState.dirtyFields.name &&
+    form.formState.errors.name === undefined &&
+    form.formState.dirtyFields.email &&
+    form.formState.errors.email === undefined &&
+    form.formState.dirtyFields.password &&
+    form.formState.errors.password === undefined &&
+    form.formState.dirtyFields.signature &&
+    form.formState.errors.signature === undefined;
+
   const { mutateAsync: signup } = trpc.auth.signup.useMutation();
 
   const onFormSubmit = async ({ name, email, password, signature, url }: TSignUpFormV2Schema) => {
@@ -158,14 +169,6 @@ export const SignUpFormV2 = ({
     }
   };
 
-  const onNextClick = async () => {
-    const valid = await form.trigger(['name', 'email', 'password', 'signature']);
-
-    if (valid) {
-      setStep('CLAIM_USERNAME');
-    }
-  };
-
   const onSignUpWithGoogleClick = async () => {
     try {
       await signIn('google', { callbackUrl: SIGN_UP_REDIRECT_PATH });
@@ -221,12 +224,12 @@ export const SignUpFormV2 = ({
         </div>
       </div>
 
-      <div className="border-border dark:bg-background relative z-10 flex min-h-[min(850px,80vh)] w-full max-w-lg flex-col rounded-xl border bg-neutral-100 p-6">
+      <div className="border-border dark:bg-background relative z-10 flex min-h-[min(800px,80vh)] w-full max-w-lg flex-col rounded-xl border bg-neutral-100 p-6">
         {step === 'BASIC_DETAILS' && (
           <div className="h-20">
-            <h1 className="text-xl font-semibold md:text-2xl">Create a new account</h1>
+            <h1 className="text-2xl font-semibold">Create a new account</h1>
 
-            <p className="text-muted-foreground mt-2 text-xs md:text-sm">
+            <p className="text-muted-foreground mt-2 text-sm">
               Create your account and start using state-of-the-art document signing. Open and
               beautiful signing is within your grasp.
             </p>
@@ -235,9 +238,9 @@ export const SignUpFormV2 = ({
 
         {step === 'CLAIM_USERNAME' && (
           <div className="h-20">
-            <h1 className="text-xl font-semibold md:text-2xl">Claim your username now</h1>
+            <h1 className="text-2xl font-semibold">Claim your username now</h1>
 
-            <p className="text-muted-foreground mt-2 text-xs md:text-sm">
+            <p className="text-muted-foreground mt-2 text-sm">
               You will get notified & be able to set up your documenso public profile when we launch
               the feature.
             </p>
@@ -254,8 +257,8 @@ export const SignUpFormV2 = ({
             {step === 'BASIC_DETAILS' && (
               <fieldset
                 className={cn(
-                  'flex h-[550px] w-full flex-col gap-y-4',
-                  isGoogleSSOEnabled && 'h-[650px]',
+                  'flex h-[500px] w-full flex-col gap-y-4',
+                  isGoogleSSOEnabled && 'h-[600px]',
                 )}
                 disabled={isSubmitting}
               >
@@ -357,8 +360,8 @@ export const SignUpFormV2 = ({
             {step === 'CLAIM_USERNAME' && (
               <fieldset
                 className={cn(
-                  'flex h-[550px] w-full flex-col gap-y-4',
-                  isGoogleSSOEnabled && 'h-[650px]',
+                  'flex h-[500px] w-full flex-col gap-y-4',
+                  isGoogleSSOEnabled && 'h-[600px]',
                 )}
                 disabled={isSubmitting}
               >
@@ -375,7 +378,7 @@ export const SignUpFormV2 = ({
 
                       <FormMessage />
 
-                      <div className="bg-muted/50 border-border text-muted-foreground mt-2 inline-block max-w-[16rem] truncate rounded-md border px-2 py-1 text-sm lowercase">
+                      <div className="bg-muted/50 border-border text-muted-foreground mt-2 inline-block truncate rounded-md border px-2 py-1 text-sm lowercase">
                         {baseUrl.host}/u/{field.value || '<username>'}
                       </div>
                     </FormItem>
@@ -428,8 +431,9 @@ export const SignUpFormV2 = ({
                   type="button"
                   size="lg"
                   className="flex-1 disabled:cursor-not-allowed"
+                  disabled={!canContinue}
                   loading={form.formState.isSubmitting}
-                  onClick={onNextClick}
+                  onClick={() => setStep('CLAIM_USERNAME')}
                 >
                   Next
                 </Button>

apps/web/src/components/ui/user-profile-skeleton.tsx

@@ -24,8 +24,9 @@ export const UserProfileSkeleton = ({ className, user, rows = 2 }: UserProfileSk
         className,
       )}
     >
-      <div className="border-border bg-background text-muted-foreground inline-block max-w-full truncate rounded-md border px-2.5 py-1.5 text-sm">
-        {baseUrl.host}/u/{user.url}
+      <div className="border-border bg-background text-muted-foreground inline-flex items-center rounded-md border px-2.5 py-1.5 text-sm">
+        <span>{baseUrl.host}/u/</span>
+        <span className="inline-block max-w-[8rem] truncate lowercase">{user.url}</span>
       </div>
 
       <div className="mt-4">

apps/web/src/components/ui/user-profile-timur.tsx

@@ -25,7 +25,7 @@ export const UserProfileTimur = ({ className, rows = 2 }: UserProfileTimurProps)
         className,
       )}
     >
-      <div className="border-border bg-background text-muted-foreground inline-block max-w-full truncate rounded-md border px-2.5 py-1.5 text-sm">
+      <div className="border-border bg-background text-muted-foreground inline-block rounded-md border px-2.5 py-1.5 text-sm">
         {baseUrl.host}/u/timur
       </div>
 

docker/README.md

@@ -29,16 +29,7 @@ NEXT_PRIVATE_SMTP_USERNAME="<your-username>"
 NEXT_PRIVATE_SMTP_PASSWORD="<your-password>"
 ```
 
-4. Update the volume binding for the cert file in the `compose.yml` file to point to your own key file:
-
-Since the `cert.p12` file is required for signing and encrypting documents, you will need to provide your own key file. Update the volume binding in the `compose.yml` file to point to your key file:
-
-```yaml
-volumes:
-  - /path/to/your/keyfile.p12:/opt/documenso/cert.p12
-```
-
-1. Run the following command to start the containers:
+4. Run the following command to start the containers:
 
 ```
 docker-compose --env-file ./.env -d up
@@ -69,17 +60,18 @@ docker pull ghcr.io/documenso/documenso
 ```
 docker run -d \
   -p 3000:3000 \
+  -e POSTGRES_USER="<your-postgres-user>"
+  -e POSTGRES_PASSWORD="<your-postgres-password>"
+  -e POSTGRES_DB="<your-postgres-db>"
   -e NEXTAUTH_URL="<your-nextauth-url>"
   -e NEXTAUTH_SECRET="<your-nextauth-secret>"
   -e NEXT_PRIVATE_ENCRYPTION_KEY="<your-next-private-encryption-key>"
   -e NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY="<your-next-private-encryption-secondary-key>"
   -e NEXT_PUBLIC_WEBAPP_URL="<your-next-public-webapp-url>"
   -e NEXT_PRIVATE_DATABASE_URL="<your-next-private-database-url>"
-  -e NEXT_PRIVATE_DIRECT_DATABASE_URL="<your-next-private-database-url>"
   -e NEXT_PRIVATE_SMTP_TRANSPORT="<your-next-private-smtp-transport>"
   -e NEXT_PRIVATE_SMTP_FROM_NAME="<your-next-private-smtp-from-name>"
   -e NEXT_PRIVATE_SMTP_FROM_ADDRESS="<your-next-private-smtp-from-address>"
-  -v /path/to/your/keyfile.p12:/opt/documenso/cert.p12
   documenso/documenso
 ```
 
@@ -109,10 +101,6 @@ Here's a markdown table documenting all the provided environment variables:
 | `NEXT_PUBLIC_WEBAPP_URL`                     | The URL for the web application.                                                                    |
 | `NEXT_PRIVATE_DATABASE_URL`                  | The URL for the primary database connection (with connection pooling).                              |
 | `NEXT_PRIVATE_DIRECT_DATABASE_URL`           | The URL for the direct database connection (without connection pooling).                            |
-| `NEXT_PRIVATE_SIGNING_TRANSPORT`             | The signing transport to use. Available options: local (default)                                    |
-| `NEXT_PRIVATE_SIGNING_PASSPHRASE`            | The passphrase for the key file.                                                                    |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`   | The base64-encoded contents of the key file, will be used instead of file path.                     |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`       | The path to the key file, default `/opt/documenso/cert.p12`.                                        |
 | `NEXT_PUBLIC_UPLOAD_TRANSPORT`               | The transport to use for file uploads (database or s3).                                             |
 | `NEXT_PRIVATE_UPLOAD_ENDPOINT`               | The endpoint for the S3 storage transport (for third-party S3-compatible providers).                |
 | `NEXT_PRIVATE_UPLOAD_REGION`                 | The region for the S3 storage transport (defaults to us-east-1).                                    |

docker/buildx.sh

@@ -8,12 +8,6 @@ command -v docker >/dev/null 2>&1 || {
 SCRIPT_DIR="$(readlink -f "$(dirname "$0")")"
 MONOREPO_ROOT="$(readlink -f "$SCRIPT_DIR/../")"
 
-# Get the platform from environment variable or set to linux/amd64 if not set
-# quote the string to prevent word splitting
-if [ -z "$PLATFORM" ]; then
-    PLATFORM="linux/amd64"
-fi
-
 APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
 GIT_SHA="$(git rev-parse HEAD)"
 
@@ -23,7 +17,7 @@ echo "Git SHA: $GIT_SHA"
 
 docker buildx build \
     -f "$SCRIPT_DIR/Dockerfile" \
-    --platform=$PLATFORM \
+    --platform linux/amd64,linux/arm64 \
     --progress=plain \
     -t "documenso/documenso:latest" \
     -t "documenso/documenso:$GIT_SHA" \

docker/production/compose.yml

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

docker/testing/compose.yml

@@ -47,8 +47,5 @@ services:
       - NEXT_PRIVATE_SMTP_PASSWORD=password
       - NEXT_PRIVATE_SMTP_FROM_NAME="No Reply @ Documenso"
       - NEXT_PRIVATE_SMTP_FROM_ADDRESS=noreply@documenso.com
-      - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=/opt/documenso/cert.p12
     ports:
       - 3000:3000
-    volumes:
-      - ../../apps/web/example/cert.p12:/opt/documenso/cert.p12

lint-staged.config.cjs

@@ -1,15 +1,7 @@
-const path = require('path');
-
-const eslint = (filenames) =>
-  `eslint --fix ${filenames.map((f) => `"${path.relative(process.cwd(), f)}"`).join(' ')}`;
-
-const prettier = (filenames) =>
-  `prettier --write ${filenames.map((f) => `"${path.relative(process.cwd(), f)}"`).join(' ')}`;
-
 /** @type {import('lint-staged').Config} */
 module.exports = {
-  '**/*.{ts,tsx,cts,mts}': [eslint, prettier],
-  '**/*.{js,jsx,cjs,mjs}': [prettier],
-  '**/*.{yml,mdx}': [prettier],
+  '**/*.{ts,tsx,cts,mts}': (files) => files.map((file) => `eslint --fix ${file}`),
+  '**/*.{js,jsx,cjs,mjs}': (files) => files.map((file) => `prettier --write ${file}`),
+  '**/*.{yml,mdx}': (files) => files.map((file) => `prettier --write ${file}`),
   '**/*/package.json': 'npm run precommit',
 };

package.json

@@ -12,7 +12,7 @@
     "commitlint": "commitlint --edit",
     "clean": "turbo run clean && rimraf node_modules",
     "d": "npm run dx && npm run dev",
-    "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev && npm run prisma:seed",
+    "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev",
     "dx:up": "docker compose -f docker/development/compose.yml up -d",
     "dx:down": "docker compose -f docker/development/compose.yml down",
     "ci": "turbo run test:e2e",
@@ -20,7 +20,7 @@
     "prisma:migrate-dev": "npm run with:env -- npm run prisma:migrate-dev -w @documenso/prisma",
     "prisma:migrate-deploy": "npm run with:env -- npm run prisma:migrate-deploy -w @documenso/prisma",
     "prisma:seed": "npm run with:env -- npm run prisma:seed -w @documenso/prisma",
-    "prisma:studio": "npm run with:env -- npm run prisma:studio -w @documenso/prisma",
+    "prisma:studio": "npm run with:env -- npx prisma studio --schema packages/prisma/schema.prisma",
     "with:env": "dotenv -e .env -e .env.local --",
     "reset:hard": "npm run clean && npm i && npm run prisma:generate",
     "precommit": "npm install && git add package.json package-lock.json"
@@ -36,8 +36,8 @@
     "dotenv-cli": "^7.3.0",
     "eslint": "^8.40.0",
     "eslint-config-custom": "*",
-    "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
+    "husky": "^8.0.0",
+    "lint-staged": "^14.0.0",
     "prettier": "^2.5.1",
     "rimraf": "^5.0.1",
     "turbo": "^1.9.3"
@@ -48,7 +48,6 @@
     "packages/*"
   ],
   "dependencies": {
-    "@documenso/pdf-sign": "^0.1.0",
     "next-runtime-env": "^3.2.0"
   },
   "overrides": {

packages/api/v1/api-documentation.tsx

@@ -1,30 +1,11 @@
 'use client';
 
-import { useEffect } from 'react';
-
-import { useTheme } from 'next-themes';
 import SwaggerUI from 'swagger-ui-react';
 import 'swagger-ui-react/swagger-ui.css';
 
 import { OpenAPIV1 } from '@documenso/api/v1/openapi';
 
 export const OpenApiDocsPage = () => {
-  const { resolvedTheme } = useTheme();
-
-  useEffect(() => {
-    const body = document.body;
-
-    if (resolvedTheme === 'dark') {
-      body.classList.add('swagger-dark-theme');
-    } else {
-      body.classList.remove('swagger-dark-theme');
-    }
-
-    return () => {
-      body.classList.remove('swagger-dark-theme');
-    };
-  }, [resolvedTheme]);
-
   return <SwaggerUI spec={OpenAPIV1} displayOperationId={true} />;
 };
 

packages/app-tests/e2e/pr-718-add-stepper-component.spec.ts

@@ -1,9 +1,6 @@
 import { expect, test } from '@playwright/test';
 import path from 'node:path';
 
-import { getDocumentByToken } from '@documenso/lib/server-only/document/get-document-by-token';
-import { getRecipientByEmail } from '@documenso/lib/server-only/recipient/get-recipient-by-email';
-import { DocumentStatus } from '@documenso/prisma/client';
 import { TEST_USER } from '@documenso/prisma/seed/pr-718-add-stepper-component';
 
 test(`[PR-718]: should be able to create a document`, async ({ page }) => {
@@ -76,264 +73,3 @@ test(`[PR-718]: should be able to create a document`, async ({ page }) => {
   // Assert document was created
   await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
 });
-
-test('should be able to create a document with multiple recipients', async ({ page }) => {
-  await page.goto('/signin');
-
-  const documentTitle = `example-${Date.now()}.pdf`;
-
-  // Sign in
-  await page.getByLabel('Email').fill(TEST_USER.email);
-  await page.getByLabel('Password', { exact: true }).fill(TEST_USER.password);
-  await page.getByRole('button', { name: 'Sign In' }).click();
-
-  // Upload document
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.locator('input[type=file]').evaluate((e) => {
-      if (e instanceof HTMLInputElement) {
-        e.click();
-      }
-    }),
-  ]);
-
-  await fileChooser.setFiles(path.join(__dirname, '../../../assets/example.pdf'));
-
-  // Wait to be redirected to the edit page
-  await page.waitForURL(/\/documents\/\d+/);
-
-  // Set title
-  await expect(page.getByRole('heading', { name: 'Add Title' })).toBeVisible();
-
-  await page.getByLabel('Title').fill(documentTitle);
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add signers
-  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-  await page.getByLabel('Email*').fill('user1@example.com');
-  await page.getByLabel('Name').fill('User 1');
-
-  await page.getByRole('button', { name: 'Add Signer' }).click();
-
-  await page.getByLabel('Email*').nth(1).fill('user2@example.com');
-  await page.getByLabel('Name').nth(1).fill('User 2');
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add fields
-  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-  await page.getByRole('button', { name: 'User 1 Signature' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 100,
-      y: 100,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Email Email' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 100,
-      y: 200,
-    },
-  });
-
-  await page.getByText('User 1 (user1@example.com)').click();
-  await page.getByText('User 2 (user2@example.com)').click();
-
-  await page.getByRole('button', { name: 'User 2 Signature' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 500,
-      y: 100,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Email Email' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 500,
-      y: 200,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add subject and send
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
-  await page.getByRole('button', { name: 'Send' }).click();
-
-  await page.waitForURL('/documents');
-
-  // Assert document was created
-  await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
-});
-
-test('should be able to create, send and sign a document', async ({ page }) => {
-  await page.goto('/signin');
-
-  const documentTitle = `example-${Date.now()}.pdf`;
-
-  // Sign in
-  await page.getByLabel('Email').fill(TEST_USER.email);
-  await page.getByLabel('Password', { exact: true }).fill(TEST_USER.password);
-  await page.getByRole('button', { name: 'Sign In' }).click();
-
-  // Upload document
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.locator('input[type=file]').evaluate((e) => {
-      if (e instanceof HTMLInputElement) {
-        e.click();
-      }
-    }),
-  ]);
-
-  await fileChooser.setFiles(path.join(__dirname, '../../../assets/example.pdf'));
-
-  // Wait to be redirected to the edit page
-  await page.waitForURL(/\/documents\/\d+/);
-
-  // Set title
-  await expect(page.getByRole('heading', { name: 'Add Title' })).toBeVisible();
-
-  await page.getByLabel('Title').fill(documentTitle);
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add signers
-  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-  await page.getByLabel('Email*').fill('user1@example.com');
-  await page.getByLabel('Name').fill('User 1');
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add fields
-  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add subject and send
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
-  await page.getByRole('button', { name: 'Send' }).click();
-
-  await page.waitForURL('/documents');
-
-  // Assert document was created
-  await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
-  await page.getByRole('link', { name: documentTitle }).click();
-
-  const url = await page.url().split('/');
-  const documentId = url[url.length - 1];
-
-  const { token } = await getRecipientByEmail({
-    email: 'user1@example.com',
-    documentId: Number(documentId),
-  });
-
-  await page.goto(`/sign/${token}`);
-  await page.waitForURL(`/sign/${token}`);
-
-  // Check if document has been viewed
-  const { status } = await getDocumentByToken({ token });
-  expect(status).toBe(DocumentStatus.PENDING);
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await expect(page.getByRole('dialog').getByText('Sign Document')).toBeVisible();
-  await page.getByRole('button', { name: 'Sign' }).click();
-
-  await page.waitForURL(`/sign/${token}/complete`);
-  await expect(page.getByText('You have signed')).toBeVisible();
-
-  // Check if document has been signed
-  const { status: completedStatus } = await getDocumentByToken({ token });
-  expect(completedStatus).toBe(DocumentStatus.COMPLETED);
-});
-
-test('should be able to create, send with redirect url, sign a document and redirect to redirect url', async ({
-  page,
-}) => {
-  await page.goto('/signin');
-
-  const documentTitle = `example-${Date.now()}.pdf`;
-
-  // Sign in
-  await page.getByLabel('Email').fill(TEST_USER.email);
-  await page.getByLabel('Password', { exact: true }).fill(TEST_USER.password);
-  await page.getByRole('button', { name: 'Sign In' }).click();
-
-  // Upload document
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.locator('input[type=file]').evaluate((e) => {
-      if (e instanceof HTMLInputElement) {
-        e.click();
-      }
-    }),
-  ]);
-
-  await fileChooser.setFiles(path.join(__dirname, '../../../assets/example.pdf'));
-
-  // Wait to be redirected to the edit page
-  await page.waitForURL(/\/documents\/\d+/);
-
-  // Set title
-  await expect(page.getByRole('heading', { name: 'Add Title' })).toBeVisible();
-
-  await page.getByLabel('Title').fill(documentTitle);
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add signers
-  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-  await page.getByLabel('Email*').fill('user1@example.com');
-  await page.getByLabel('Name').fill('User 1');
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add fields
-  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  // Add subject and send
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
-  await page.getByRole('button', { name: 'Advanced Options' }).click();
-  await page.getByLabel('Redirect URL').fill('https://documenso.com');
-
-  await page.getByRole('button', { name: 'Send' }).click();
-
-  await page.waitForURL('/documents');
-
-  // Assert document was created
-  await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
-  await page.getByRole('link', { name: documentTitle }).click();
-
-  const url = await page.url().split('/');
-  const documentId = url[url.length - 1];
-
-  const { token } = await getRecipientByEmail({
-    email: 'user1@example.com',
-    documentId: Number(documentId),
-  });
-
-  await page.goto(`/sign/${token}`);
-  await page.waitForURL(`/sign/${token}`);
-
-  // Check if document has been viewed
-  const { status } = await getDocumentByToken({ token });
-  expect(status).toBe(DocumentStatus.PENDING);
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await expect(page.getByRole('dialog').getByText('Sign Document')).toBeVisible();
-  await page.getByRole('button', { name: 'Sign' }).click();
-
-  await page.waitForURL('https://documenso.com');
-
-  // Check if document has been signed
-  const { status: completedStatus } = await getDocumentByToken({ token });
-  expect(completedStatus).toBe(DocumentStatus.COMPLETED);
-});

packages/app-tests/e2e/test-delete-user.spec.ts

@@ -1,27 +0,0 @@
-import { expect, test } from '@playwright/test';
-
-import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
-import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { manualLogin } from './fixtures/authentication';
-
-test('delete user', async ({ page }) => {
-  const user = await seedUser();
-
-  await manualLogin({
-    page,
-    email: user.email,
-    redirectPath: '/settings',
-  });
-
-  await page.getByRole('button', { name: 'Delete Account' }).click();
-  await page.getByLabel('Confirm Email').fill(user.email);
-  await expect(page.getByRole('button', { name: 'Confirm Deletion' })).not.toBeDisabled();
-  await page.getByRole('button', { name: 'Confirm Deletion' }).click();
-
-  await page.waitForURL(`${WEBAPP_BASE_URL}/signin`);
-
-  // Verify that the user no longer exists in the database
-  await expect(getUserByEmail({ email: user.email })).rejects.toThrow();
-});

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

@@ -1,37 +0,0 @@
-import { expect, test } from '@playwright/test';
-
-import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { manualLogin } from './fixtures/authentication';
-
-test('update user name', async ({ page }) => {
-  const user = await seedUser();
-
-  await manualLogin({
-    page,
-    email: user.email,
-    redirectPath: '/settings/profile',
-  });
-
-  await page.getByLabel('Full Name').fill('John Doe');
-
-  const canvas = page.locator('canvas');
-  const box = await canvas.boundingBox();
-
-  if (box) {
-    await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
-    await page.mouse.down();
-    await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
-    await page.mouse.up();
-  }
-
-  await page.getByRole('button', { name: 'Update profile' }).click();
-
-  // wait for it to finish
-  await expect(page.getByText('Profile updated', { exact: true })).toBeVisible();
-
-  await page.waitForURL('/settings/profile');
-
-  expect((await getUserByEmail({ email: user.email })).name).toEqual('John Doe');
-});

packages/app-tests/package.json

@@ -6,7 +6,6 @@
   "main": "index.js",
   "scripts": {
     "test:dev": "playwright test",
-    "test-ui:dev": "playwright test --ui",
     "test:e2e": "start-server-and-test \"npm run start -w @documenso/web\" http://localhost:3000 \"playwright test\""
   },
   "keywords": [],

packages/eslint-config/index.cjs

@@ -4,22 +4,23 @@ module.exports = {
     'turbo',
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
     'plugin:package-json/recommended',
   ],
 
-  plugins: ['package-json', 'unused-imports'],
+  plugins: ['prettier', 'package-json', 'unused-imports'],
 
   env: {
-    es2022: true,
     node: true,
     browser: true,
+    es6: true,
   },
 
   parser: '@typescript-eslint/parser',
 
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: ['../../tsconfig.eslint.json'],
+    project: ['../../apps/*/tsconfig.json', '../../packages/*/tsconfig.json'],
     ecmaVersion: 2022,
     ecmaFeatures: {
       jsx: true,

packages/eslint-config/package.json

@@ -7,14 +7,16 @@
     "clean": "rimraf node_modules"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^14.1.3",
-    "eslint-config-turbo": "^1.12.5",
-    "eslint-plugin-package-json": "^0.10.4",
-    "eslint-plugin-react": "^7.34.0",
-    "eslint-plugin-unused-imports": "^3.1.0",
+    "@typescript-eslint/eslint-plugin": "6.8.0",
+    "@typescript-eslint/parser": "6.8.0",
+    "eslint": "^8.40.0",
+    "eslint-config-next": "13.4.19",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-turbo": "^1.9.3",
+    "eslint-plugin-package-json": "^0.2.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-unused-imports": "^3.0.0",
     "typescript": "5.2.2"
   }
 }

packages/lib/constants/auth.ts

@@ -16,24 +16,10 @@ export const USER_SECURITY_AUDIT_LOG_MAP: { [key in UserSecurityAuditLogType]: s
   [UserSecurityAuditLogType.ACCOUNT_PROFILE_UPDATE]: 'Profile updated',
   [UserSecurityAuditLogType.AUTH_2FA_DISABLE]: '2FA Disabled',
   [UserSecurityAuditLogType.AUTH_2FA_ENABLE]: '2FA Enabled',
-  [UserSecurityAuditLogType.PASSKEY_CREATED]: 'Passkey created',
-  [UserSecurityAuditLogType.PASSKEY_DELETED]: 'Passkey deleted',
-  [UserSecurityAuditLogType.PASSKEY_UPDATED]: 'Passkey updated',
   [UserSecurityAuditLogType.PASSWORD_RESET]: 'Password reset',
   [UserSecurityAuditLogType.PASSWORD_UPDATE]: 'Password updated',
   [UserSecurityAuditLogType.SIGN_OUT]: 'Signed Out',
   [UserSecurityAuditLogType.SIGN_IN]: 'Signed In',
   [UserSecurityAuditLogType.SIGN_IN_FAIL]: 'Sign in attempt failed',
-  [UserSecurityAuditLogType.SIGN_IN_PASSKEY_FAIL]: 'Passkey sign in failed',
   [UserSecurityAuditLogType.SIGN_IN_2FA_FAIL]: 'Sign in 2FA attempt failed',
 };
-
-/**
- * The duration to wait for a passkey to be verified in MS.
- */
-export const PASSKEY_TIMEOUT = 60000;
-
-/**
- * The maximum number of passkeys are user can have.
- */
-export const MAXIMUM_PASSKEYS = 50;

packages/lib/constants/date-formats.ts

@@ -13,7 +13,7 @@ export const DATE_FORMATS = [
   {
     key: 'YYYYMMDD',
     label: 'YYYY-MM-DD',
-    value: 'yyyy-MM-dd',
+    value: 'YYYY-MM-DD',
   },
   {
     key: 'DDMMYYYY',

packages/lib/constants/feature-flags.ts

@@ -1,6 +1,6 @@
 import { env } from 'next-runtime-env';
 
-import { APP_BASE_URL, WEBAPP_BASE_URL } from './app';
+import { APP_BASE_URL } from './app';
 
 const NEXT_PUBLIC_FEATURE_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED');
 const NEXT_PUBLIC_POSTHOG_KEY = () => env('NEXT_PUBLIC_POSTHOG_KEY');
@@ -23,7 +23,6 @@ export const FEATURE_FLAG_POLL_INTERVAL = 30000;
 export const LOCAL_FEATURE_FLAGS: Record<string, boolean> = {
   app_billing: NEXT_PUBLIC_FEATURE_BILLING_ENABLED() === 'true',
   app_document_page_view_history_sheet: false,
-  app_passkey: WEBAPP_BASE_URL === 'http://localhost:3000', // Temp feature flag.
   marketing_header_single_player_mode: false,
   marketing_profiles_announcement_bar: true,
 } as const;

packages/lib/constants/trpc.ts

@@ -1,25 +0,0 @@
-/**
- * For TRPC useQueries that should not be batched with other queries.
- */
-export const SKIP_QUERY_BATCH_META = {
-  trpc: {
-    context: {
-      skipBatch: true,
-    },
-  },
-};
-
-/**
- * For TRPC useQueries and useMutations to adjust the logic on when query invalidation
- * should occur.
- *
- * When used in:
- * - useQuery: Will not invalidate the given query when a mutation occurs.
- * - useMutation: Will not trigger invalidation on all queries when mutation succeeds.
- *
- */
-export const DO_NOT_INVALIDATE_QUERY_ON_MUTATION = {
-  meta: {
-    doNotInvalidateQueryOnMutation: true,
-  },
-};

packages/lib/constants/url-regex.ts

@@ -1,2 +1,2 @@
 export const URL_REGEX =
-  /^(https?):\/\/(?:www\.)?(?:[a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z0-9()]{2,}(?:\/[a-zA-Z0-9-._?&=/]*)?$/i;
+  /^(https?):\/\/(?:www\.)?[a-zA-Z0-9-]+\.[a-zA-Z0-9()]{2,}(?:\/[a-zA-Z0-9-._?&=/]*)?$/i;

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

@@ -1,7 +1,6 @@
 /// <reference types="../types/next-auth.d.ts" />
 import { PrismaAdapter } from '@next-auth/prisma-adapter';
-import { compare } from '@node-rs/bcrypt';
-import { verifyAuthenticationResponse } from '@simplewebauthn/server';
+import { compare } from 'bcrypt';
 import { DateTime } from 'luxon';
 import type { AuthOptions, Session, User } from 'next-auth';
 import type { JWT } from 'next-auth/jwt';
@@ -13,16 +12,12 @@ import { env } from 'next-runtime-env';
 import { prisma } from '@documenso/prisma';
 import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/client';
 
-import { AppError, AppErrorCode } from '../errors/app-error';
 import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble';
 import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa';
 import { getMostRecentVerificationTokenByUserId } from '../server-only/user/get-most-recent-verification-token-by-user-id';
 import { getUserByEmail } from '../server-only/user/get-user-by-email';
 import { sendConfirmationToken } from '../server-only/user/send-confirmation-token';
-import type { TAuthenticationResponseJSONSchema } from '../types/webauthn';
-import { ZAuthenticationResponseJSONSchema } from '../types/webauthn';
 import { extractNextAuthRequestMetadata } from '../universal/extract-request-metadata';
-import { getAuthenticatorRegistrationOptions } from '../utils/authenticator';
 import { ErrorCode } from './error-codes';
 
 export const NEXT_AUTH_OPTIONS: AuthOptions = {
@@ -136,113 +131,6 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
         };
       },
     }),
-    CredentialsProvider({
-      id: 'webauthn',
-      name: 'Keypass',
-      credentials: {
-        csrfToken: { label: 'csrfToken', type: 'csrfToken' },
-      },
-      async authorize(credentials, req) {
-        const csrfToken = credentials?.csrfToken;
-
-        if (typeof csrfToken !== 'string' || csrfToken.length === 0) {
-          throw new AppError(AppErrorCode.INVALID_REQUEST);
-        }
-
-        let requestBodyCrediential: TAuthenticationResponseJSONSchema | null = null;
-
-        try {
-          const parsedBodyCredential = JSON.parse(req.body?.credential);
-          requestBodyCrediential = ZAuthenticationResponseJSONSchema.parse(parsedBodyCredential);
-        } catch {
-          throw new AppError(AppErrorCode.INVALID_REQUEST);
-        }
-
-        const challengeToken = await prisma.anonymousVerificationToken
-          .delete({
-            where: {
-              id: csrfToken,
-            },
-          })
-          .catch(() => null);
-
-        if (!challengeToken) {
-          return null;
-        }
-
-        if (challengeToken.expiresAt < new Date()) {
-          throw new AppError(AppErrorCode.EXPIRED_CODE);
-        }
-
-        const passkey = await prisma.passkey.findFirst({
-          where: {
-            credentialId: Buffer.from(requestBodyCrediential.id, 'base64'),
-          },
-          include: {
-            User: {
-              select: {
-                id: true,
-                email: true,
-                name: true,
-                emailVerified: true,
-              },
-            },
-          },
-        });
-
-        if (!passkey) {
-          throw new AppError(AppErrorCode.NOT_SETUP);
-        }
-
-        const user = passkey.User;
-
-        const { rpId, origin } = getAuthenticatorRegistrationOptions();
-
-        const verification = await verifyAuthenticationResponse({
-          response: requestBodyCrediential,
-          expectedChallenge: challengeToken.token,
-          expectedOrigin: origin,
-          expectedRPID: rpId,
-          authenticator: {
-            credentialID: new Uint8Array(Array.from(passkey.credentialId)),
-            credentialPublicKey: new Uint8Array(passkey.credentialPublicKey),
-            counter: Number(passkey.counter),
-          },
-        }).catch(() => null);
-
-        const requestMetadata = extractNextAuthRequestMetadata(req);
-
-        if (!verification?.verified) {
-          await prisma.userSecurityAuditLog.create({
-            data: {
-              userId: user.id,
-              ipAddress: requestMetadata.ipAddress,
-              userAgent: requestMetadata.userAgent,
-              type: UserSecurityAuditLogType.SIGN_IN_PASSKEY_FAIL,
-            },
-          });
-
-          return null;
-        }
-
-        await prisma.passkey.update({
-          where: {
-            id: passkey.id,
-          },
-          data: {
-            lastUsedAt: new Date(),
-            counter: verification.authenticationInfo.newCounter,
-          },
-        });
-
-        return {
-          id: Number(user.id),
-          email: user.email,
-          name: user.name,
-          emailVerified: user.emailVerified?.toISOString() ?? null,
-        } satisfies User;
-      },
-    }),
   ],
   callbacks: {
     async jwt({ token, user, trigger, account }) {

packages/lib/package.json

@@ -32,7 +32,7 @@
     "@sindresorhus/slugify": "^2.2.1",
     "@upstash/redis": "^1.20.6",
     "@vvo/tzdb": "^6.117.0",
-    "@node-rs/bcrypt": "^1.10.0",
+    "bcrypt": "^5.1.0",
     "luxon": "^3.4.0",
     "nanoid": "^4.0.2",
     "next": "14.0.3",
@@ -46,6 +46,7 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
+    "@types/bcrypt": "^5.0.0",
     "@types/luxon": "^3.3.1"
   }
 }

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

@@ -1,30 +1,40 @@
+import { compare } from 'bcrypt';
+
 import { prisma } from '@documenso/prisma';
 import type { User } from '@documenso/prisma/client';
 import { UserSecurityAuditLogType } from '@documenso/prisma/client';
 
-import { AppError } from '../../errors/app-error';
+import { ErrorCode } from '../../next-auth/error-codes';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { validateTwoFactorAuthentication } from './validate-2fa';
 
 type DisableTwoFactorAuthenticationOptions = {
   user: User;
-  token: string;
+  backupCode: string;
+  password: string;
   requestMetadata?: RequestMetadata;
 };
 
 export const disableTwoFactorAuthentication = async ({
-  token,
+  backupCode,
   user,
+  password,
   requestMetadata,
 }: DisableTwoFactorAuthenticationOptions) => {
-  let isValid = await validateTwoFactorAuthentication({ totpCode: token, user });
-
-  if (!isValid) {
-    isValid = await validateTwoFactorAuthentication({ backupCode: token, user });
+  if (!user.password) {
+    throw new Error(ErrorCode.USER_MISSING_PASSWORD);
   }
 
+  const isCorrectPassword = await compare(password, user.password);
+
+  if (!isCorrectPassword) {
+    throw new Error(ErrorCode.INCORRECT_PASSWORD);
+  }
+
+  const isValid = await validateTwoFactorAuthentication({ backupCode, user });
+
   if (!isValid) {
-    throw new AppError('INCORRECT_TWO_FACTOR_CODE');
+    throw new Error(ErrorCode.INCORRECT_TWO_FACTOR_BACKUP_CODE);
   }
 
   await prisma.$transaction(async (tx) => {

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

@@ -1,7 +1,7 @@
+import { ErrorCode } from '@documenso/lib/next-auth/error-codes';
 import { prisma } from '@documenso/prisma';
 import { type User, UserSecurityAuditLogType } from '@documenso/prisma/client';
 
-import { AppError } from '../../errors/app-error';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { getBackupCodes } from './get-backup-code';
 import { verifyTwoFactorAuthenticationToken } from './verify-2fa-token';
@@ -17,38 +17,25 @@ export const enableTwoFactorAuthentication = async ({
   code,
   requestMetadata,
 }: EnableTwoFactorAuthenticationOptions) => {
+  if (user.identityProvider !== 'DOCUMENSO') {
+    throw new Error(ErrorCode.INCORRECT_IDENTITY_PROVIDER);
+  }
+
   if (user.twoFactorEnabled) {
-    throw new AppError('TWO_FACTOR_ALREADY_ENABLED');
+    throw new Error(ErrorCode.TWO_FACTOR_ALREADY_ENABLED);
   }
 
   if (!user.twoFactorSecret) {
-    throw new AppError('TWO_FACTOR_SETUP_REQUIRED');
+    throw new Error(ErrorCode.TWO_FACTOR_SETUP_REQUIRED);
   }
 
   const isValidToken = await verifyTwoFactorAuthenticationToken({ user, totpCode: code });
 
   if (!isValidToken) {
-    throw new AppError('INCORRECT_TWO_FACTOR_CODE');
+    throw new Error(ErrorCode.INCORRECT_TWO_FACTOR_CODE);
   }
 
-  let recoveryCodes: string[] = [];
-
-  await prisma.$transaction(async (tx) => {
-    const updatedUser = await tx.user.update({
-      where: {
-        id: user.id,
-      },
-      data: {
-        twoFactorEnabled: true,
-      },
-    });
-
-    recoveryCodes = getBackupCodes({ user: updatedUser }) ?? [];
-
-    if (recoveryCodes.length === 0) {
-      throw new AppError('MISSING_BACKUP_CODE');
-    }
-
+  const updatedUser = await prisma.$transaction(async (tx) => {
     await tx.userSecurityAuditLog.create({
       data: {
         userId: user.id,
@@ -57,7 +44,18 @@ export const enableTwoFactorAuthentication = async ({
         ipAddress: requestMetadata?.ipAddress,
       },
     });
+
+    return await tx.user.update({
+      where: {
+        id: user.id,
+      },
+      data: {
+        twoFactorEnabled: true,
+      },
+    });
   });
 
+  const recoveryCodes = getBackupCodes({ user: updatedUser });
+
   return { recoveryCodes };
 };

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

@@ -1,4 +1,5 @@
 import { base32 } from '@scure/base';
+import { compare } from 'bcrypt';
 import crypto from 'crypto';
 import { createTOTPKeyURI } from 'oslo/otp';
 
@@ -11,12 +12,14 @@ import { symmetricEncrypt } from '../../universal/crypto';
 
 type SetupTwoFactorAuthenticationOptions = {
   user: User;
+  password: string;
 };
 
 const ISSUER = 'Documenso';
 
 export const setupTwoFactorAuthentication = async ({
   user,
+  password,
 }: SetupTwoFactorAuthenticationOptions) => {
   const key = DOCUMENSO_ENCRYPTION_KEY;
 
@@ -24,6 +27,20 @@ export const setupTwoFactorAuthentication = async ({
     throw new Error(ErrorCode.MISSING_ENCRYPTION_KEY);
   }
 
+  if (user.identityProvider !== 'DOCUMENSO') {
+    throw new Error(ErrorCode.INCORRECT_IDENTITY_PROVIDER);
+  }
+
+  if (!user.password) {
+    throw new Error(ErrorCode.USER_MISSING_PASSWORD);
+  }
+
+  const isCorrectPassword = await compare(password, user.password);
+
+  if (!isCorrectPassword) {
+    throw new Error(ErrorCode.INCORRECT_PASSWORD);
+  }
+
   const secret = crypto.randomBytes(10);
 
   const backupCodes = Array.from({ length: 10 })

packages/lib/server-only/2fa/view-backup-codes.ts

@@ -1,30 +0,0 @@
-import type { User } from '@documenso/prisma/client';
-
-import { AppError } from '../../errors/app-error';
-import { getBackupCodes } from './get-backup-code';
-import { validateTwoFactorAuthentication } from './validate-2fa';
-
-type ViewBackupCodesOptions = {
-  user: User;
-  token: string;
-};
-
-export const viewBackupCodes = async ({ token, user }: ViewBackupCodesOptions) => {
-  let isValid = await validateTwoFactorAuthentication({ totpCode: token, user });
-
-  if (!isValid) {
-    isValid = await validateTwoFactorAuthentication({ backupCode: token, user });
-  }
-
-  if (!isValid) {
-    throw new AppError('INCORRECT_TWO_FACTOR_CODE');
-  }
-
-  const backupCodes = getBackupCodes({ user });
-
-  if (!backupCodes) {
-    throw new AppError('MISSING_BACKUP_CODE');
-  }
-
-  return backupCodes;
-};

packages/lib/server-only/auth/create-passkey-registration-options.ts

@@ -1,58 +0,0 @@
-import { generateRegistrationOptions } from '@simplewebauthn/server';
-import type { AuthenticatorTransportFuture } from '@simplewebauthn/types';
-import { DateTime } from 'luxon';
-
-import { prisma } from '@documenso/prisma';
-
-import { PASSKEY_TIMEOUT } from '../../constants/auth';
-import { getAuthenticatorRegistrationOptions } from '../../utils/authenticator';
-
-type CreatePasskeyRegistrationOptions = {
-  userId: number;
-};
-
-export const createPasskeyRegistrationOptions = async ({
-  userId,
-}: CreatePasskeyRegistrationOptions) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    select: {
-      name: true,
-      email: true,
-      passkeys: true,
-    },
-  });
-
-  const { passkeys } = user;
-
-  const { rpName, rpId: rpID } = getAuthenticatorRegistrationOptions();
-
-  const options = await generateRegistrationOptions({
-    rpName,
-    rpID,
-    userID: userId.toString(),
-    userName: user.email,
-    userDisplayName: user.name ?? undefined,
-    timeout: PASSKEY_TIMEOUT,
-    attestationType: 'none',
-    excludeCredentials: passkeys.map((passkey) => ({
-      id: passkey.credentialId,
-      type: 'public-key',
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      transports: passkey.transports as AuthenticatorTransportFuture[],
-    })),
-  });
-
-  await prisma.verificationToken.create({
-    data: {
-      userId,
-      token: options.challenge,
-      expires: DateTime.now().plus({ minutes: 2 }).toJSDate(),
-      identifier: 'PASSKEY_CHALLENGE',
-    },
-  });
-
-  return options;
-};

packages/lib/server-only/auth/create-passkey-signin-options.ts

@@ -1,41 +0,0 @@
-import { generateAuthenticationOptions } from '@simplewebauthn/server';
-import { DateTime } from 'luxon';
-
-import { prisma } from '@documenso/prisma';
-
-import { getAuthenticatorRegistrationOptions } from '../../utils/authenticator';
-
-type CreatePasskeySigninOptions = {
-  sessionId: string;
-};
-
-export const createPasskeySigninOptions = async ({ sessionId }: CreatePasskeySigninOptions) => {
-  const { rpId, timeout } = getAuthenticatorRegistrationOptions();
-
-  const options = await generateAuthenticationOptions({
-    rpID: rpId,
-    userVerification: 'preferred',
-    timeout,
-  });
-
-  const { challenge } = options;
-
-  await prisma.anonymousVerificationToken.upsert({
-    where: {
-      id: sessionId,
-    },
-    update: {
-      token: challenge,
-      expiresAt: DateTime.now().plus({ minutes: 2 }).toJSDate(),
-      createdAt: new Date(),
-    },
-    create: {
-      id: sessionId,
-      token: challenge,
-      expiresAt: DateTime.now().plus({ minutes: 2 }).toJSDate(),
-      createdAt: new Date(),
-    },
-  });
-
-  return options;
-};

packages/lib/server-only/auth/create-passkey.ts

@@ -1,106 +0,0 @@
-import { verifyRegistrationResponse } from '@simplewebauthn/server';
-import type { RegistrationResponseJSON } from '@simplewebauthn/types';
-
-import { prisma } from '@documenso/prisma';
-import { UserSecurityAuditLogType } from '@documenso/prisma/client';
-
-import { MAXIMUM_PASSKEYS } from '../../constants/auth';
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import type { RequestMetadata } from '../../universal/extract-request-metadata';
-import { getAuthenticatorRegistrationOptions } from '../../utils/authenticator';
-
-type CreatePasskeyOptions = {
-  userId: number;
-  passkeyName: string;
-  verificationResponse: RegistrationResponseJSON;
-  requestMetadata?: RequestMetadata;
-};
-
-export const createPasskey = async ({
-  userId,
-  passkeyName,
-  verificationResponse,
-  requestMetadata,
-}: CreatePasskeyOptions) => {
-  const { _count } = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    include: {
-      _count: {
-        select: {
-          passkeys: true,
-        },
-      },
-    },
-  });
-
-  if (_count.passkeys >= MAXIMUM_PASSKEYS) {
-    throw new AppError('TOO_MANY_PASSKEYS');
-  }
-
-  const verificationToken = await prisma.verificationToken.findFirst({
-    where: {
-      userId,
-      identifier: 'PASSKEY_CHALLENGE',
-    },
-    orderBy: {
-      createdAt: 'desc',
-    },
-  });
-
-  if (!verificationToken) {
-    throw new AppError(AppErrorCode.NOT_FOUND, 'Challenge token not found');
-  }
-
-  await prisma.verificationToken.deleteMany({
-    where: {
-      userId,
-      identifier: 'PASSKEY_CHALLENGE',
-    },
-  });
-
-  if (verificationToken.expires < new Date()) {
-    throw new AppError(AppErrorCode.EXPIRED_CODE, 'Challenge token expired');
-  }
-
-  const { rpId: expectedRPID, origin: expectedOrigin } = getAuthenticatorRegistrationOptions();
-
-  const verification = await verifyRegistrationResponse({
-    response: verificationResponse,
-    expectedChallenge: verificationToken.token,
-    expectedOrigin,
-    expectedRPID,
-  });
-
-  if (!verification.verified || !verification.registrationInfo) {
-    throw new AppError(AppErrorCode.UNAUTHORIZED, 'Verification failed');
-  }
-
-  const { credentialPublicKey, credentialID, counter, credentialDeviceType, credentialBackedUp } =
-    verification.registrationInfo;
-
-  await prisma.$transaction(async (tx) => {
-    await tx.passkey.create({
-      data: {
-        userId,
-        name: passkeyName,
-        credentialId: Buffer.from(credentialID),
-        credentialPublicKey: Buffer.from(credentialPublicKey),
-        counter,
-        credentialDeviceType,
-        credentialBackedUp,
-        transports: verificationResponse.response.transports,
-      },
-    });
-
-    await tx.userSecurityAuditLog.create({
-      data: {
-        userId,
-        type: UserSecurityAuditLogType.PASSKEY_CREATED,
-        userAgent: requestMetadata?.userAgent,
-        ipAddress: requestMetadata?.ipAddress,
-      },
-    });
-  });
-};

packages/lib/server-only/auth/delete-passkey.ts

@@ -1,41 +0,0 @@
-import { prisma } from '@documenso/prisma';
-import { UserSecurityAuditLogType } from '@documenso/prisma/client';
-
-import type { RequestMetadata } from '../../universal/extract-request-metadata';
-
-export interface DeletePasskeyOptions {
-  userId: number;
-  passkeyId: string;
-  requestMetadata?: RequestMetadata;
-}
-
-export const deletePasskey = async ({
-  userId,
-  passkeyId,
-  requestMetadata,
-}: DeletePasskeyOptions) => {
-  await prisma.passkey.findFirstOrThrow({
-    where: {
-      id: passkeyId,
-      userId,
-    },
-  });
-
-  await prisma.$transaction(async (tx) => {
-    await tx.passkey.delete({
-      where: {
-        id: passkeyId,
-        userId,
-      },
-    });
-
-    await tx.userSecurityAuditLog.create({
-      data: {
-        userId,
-        type: UserSecurityAuditLogType.PASSKEY_DELETED,
-        userAgent: requestMetadata?.userAgent,
-        ipAddress: requestMetadata?.ipAddress,
-      },
-    });
-  });
-};

packages/lib/server-only/auth/find-passkeys.ts

@@ -1,71 +0,0 @@
-import type { FindResultSet } from '@documenso/lib/types/find-result-set';
-import { prisma } from '@documenso/prisma';
-import type { Passkey } from '@documenso/prisma/client';
-import { Prisma } from '@documenso/prisma/client';
-
-export interface FindPasskeysOptions {
-  userId: number;
-  term?: string;
-  page?: number;
-  perPage?: number;
-  orderBy?: {
-    column: keyof Passkey;
-    direction: 'asc' | 'desc';
-  };
-}
-
-export const findPasskeys = async ({
-  userId,
-  term = '',
-  page = 1,
-  perPage = 10,
-  orderBy,
-}: FindPasskeysOptions) => {
-  const orderByColumn = orderBy?.column ?? 'name';
-  const orderByDirection = orderBy?.direction ?? 'desc';
-
-  const whereClause: Prisma.PasskeyWhereInput = {
-    userId,
-  };
-
-  if (term.length > 0) {
-    whereClause.name = {
-      contains: term,
-      mode: Prisma.QueryMode.insensitive,
-    };
-  }
-
-  const [data, count] = await Promise.all([
-    prisma.passkey.findMany({
-      where: whereClause,
-      skip: Math.max(page - 1, 0) * perPage,
-      take: perPage,
-      orderBy: {
-        [orderByColumn]: orderByDirection,
-      },
-      select: {
-        id: true,
-        userId: true,
-        name: true,
-        createdAt: true,
-        updatedAt: true,
-        lastUsedAt: true,
-        counter: true,
-        credentialDeviceType: true,
-        credentialBackedUp: true,
-        transports: true,
-      },
-    }),
-    prisma.passkey.count({
-      where: whereClause,
-    }),
-  ]);
-
-  return {
-    data,
-    count,
-    currentPage: Math.max(page, 1),
-    perPage,
-    totalPages: Math.ceil(count / perPage),
-  } satisfies FindResultSet<typeof data>;
-};

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

@@ -1,4 +1,4 @@
-import { compareSync as bcryptCompareSync, hashSync as bcryptHashSync } from '@node-rs/bcrypt';
+import { compareSync as bcryptCompareSync, hashSync as bcryptHashSync } from 'bcrypt';
 import crypto from 'crypto';
 
 import { SALT_ROUNDS } from '../../constants/auth';