From 24d9906557ed7ed5644f4069da591c1b143a24a7 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Wed, 22 Nov 2023 15:03:15 +0200 Subject: [PATCH 001/311] feat: public api start --- package-lock.json | 226 +++++++++++++++++++++++++ packages/trpc/api-contract/contract.ts | 32 ++++ packages/trpc/package.json | 2 + packages/trpc/tsconfig.json | 5 +- 4 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 packages/trpc/api-contract/contract.ts diff --git a/package-lock.json b/package-lock.json index f7d0e2a5d..f1078e528 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5988,6 +5988,19 @@ "https://trpc.io/sponsor" ] }, + "node_modules/@ts-rest/core": { + "version": "3.30.5", + "resolved": "https://registry.npmjs.org/@ts-rest/core/-/core-3.30.5.tgz", + "integrity": "sha512-j2sgvk3x8wZiCyhB3ij0I287FgkngCGRHXFBxQ9HtZ9mxQuIIDfibi1yD/ydNvNif0pA6BDdASGQY1WjfqUC3g==", + "peerDependencies": { + "zod": "^3.22.3" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -19825,10 +19838,223 @@ "@trpc/next": "^10.36.0", "@trpc/react-query": "^10.36.0", "@trpc/server": "^10.36.0", + "@ts-rest/core": "^3.30.5", + "@ts-rest/next": "^3.30.5", "superjson": "^1.13.1", "zod": "^3.22.4" } }, + "packages/trpc/node_modules/@next/env": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", + "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==", + "peer": true + }, + "packages/trpc/node_modules/@next/swc-darwin-arm64": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz", + "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-darwin-x64": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz", + "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-linux-arm64-gnu": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz", + "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-linux-arm64-musl": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz", + "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-linux-x64-gnu": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz", + "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-linux-x64-musl": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz", + "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-win32-arm64-msvc": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz", + "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-win32-ia32-msvc": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz", + "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@next/swc-win32-x64-msvc": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz", + "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/trpc/node_modules/@ts-rest/next": { + "version": "3.30.5", + "resolved": "https://registry.npmjs.org/@ts-rest/next/-/next-3.30.5.tgz", + "integrity": "sha512-NasfUN7SnwcjJNbxvvcemC4fOv4f4IF5I14wVqQODN0HWPokkrta6XLuv0eKQJYdB32AS7VINQhls8Sj1AIN0g==", + "peerDependencies": { + "@ts-rest/core": "3.30.5", + "next": "^12.0.0 || ^13.0.0", + "zod": "^3.22.3" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, + "packages/trpc/node_modules/next": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", + "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==", + "peer": true, + "dependencies": { + "@next/env": "13.5.6", + "@swc/helpers": "0.5.2", + "busboy": "1.6.0", + "caniuse-lite": "^1.0.30001406", + "postcss": "8.4.31", + "styled-jsx": "5.1.1", + "watchpack": "2.4.0" + }, + "bin": { + "next": "dist/bin/next" + }, + "engines": { + "node": ">=16.14.0" + }, + "optionalDependencies": { + "@next/swc-darwin-arm64": "13.5.6", + "@next/swc-darwin-x64": "13.5.6", + "@next/swc-linux-arm64-gnu": "13.5.6", + "@next/swc-linux-arm64-musl": "13.5.6", + "@next/swc-linux-x64-gnu": "13.5.6", + "@next/swc-linux-x64-musl": "13.5.6", + "@next/swc-win32-arm64-msvc": "13.5.6", + "@next/swc-win32-ia32-msvc": "13.5.6", + "@next/swc-win32-x64-msvc": "13.5.6" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "sass": "^1.3.0" + }, + "peerDependenciesMeta": { + "@opentelemetry/api": { + "optional": true + }, + "sass": { + "optional": true + } + } + }, "packages/tsconfig": { "name": "@documenso/tsconfig", "version": "0.0.0", diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts new file mode 100644 index 000000000..194b663f7 --- /dev/null +++ b/packages/trpc/api-contract/contract.ts @@ -0,0 +1,32 @@ +import { initContract } from '@ts-rest/core'; +import { z } from 'zod'; + +const c = initContract(); + +const GetDocumentsQuery = z.object({ + take: z.string().default('10'), + skip: z.string().default('0'), +}); + +const DocumentSchema = z.object({ + id: z.string(), + userId: z.number(), + title: z.string(), + status: z.string(), + documentDataId: z.string(), + createdAt: z.string(), + updatedAt: z.string(), + completedAt: z.string(), +}); + +export const contract = c.router({ + getDocuments: { + method: 'GET', + path: '/documents', + query: GetDocumentsQuery, + responses: { + 200: DocumentSchema.array(), + }, + summary: 'Get all documents for a user', + }, +}); diff --git a/packages/trpc/package.json b/packages/trpc/package.json index b003509aa..f92b04e4c 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -17,6 +17,8 @@ "@trpc/next": "^10.36.0", "@trpc/react-query": "^10.36.0", "@trpc/server": "^10.36.0", + "@ts-rest/core": "^3.30.5", + "@ts-rest/next": "^3.30.5", "superjson": "^1.13.1", "zod": "^3.22.4" } diff --git a/packages/trpc/tsconfig.json b/packages/trpc/tsconfig.json index 4aefcb98c..dc21318a7 100644 --- a/packages/trpc/tsconfig.json +++ b/packages/trpc/tsconfig.json @@ -1,5 +1,8 @@ { "extends": "@documenso/tsconfig/react-library.json", "include": ["."], - "exclude": ["dist", "build", "node_modules"] + "exclude": ["dist", "build", "node_modules"], + "compilerOptions": { + "strict": true, + } } From 4a6b3edc05bf66b809395fc085de215c0364eefc Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Wed, 22 Nov 2023 15:44:49 +0200 Subject: [PATCH 002/311] feat: get documents api route with pagination --- apps/web/src/pages/api/v1/[...ts-rest].tsx | 28 +++++++++++++++++++ .../server-only/public-api/get-documents.ts | 21 ++++++++++++++ packages/trpc/api-contract/contract.ts | 12 ++++---- packages/trpc/server/public-api/ts-rest.ts | 3 ++ 4 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 apps/web/src/pages/api/v1/[...ts-rest].tsx create mode 100644 packages/lib/server-only/public-api/get-documents.ts create mode 100644 packages/trpc/server/public-api/ts-rest.ts diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx new file mode 100644 index 000000000..872d68e28 --- /dev/null +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -0,0 +1,28 @@ +import type { NextApiRequest, NextApiResponse } from 'next'; + +import { getDocuments } from '@documenso/lib/server-only/public-api/get-documents'; +import { contract } from '@documenso/trpc/api-contract/contract'; +import { createNextRoute, createNextRouter } from '@documenso/trpc/server/public-api/ts-rest'; + +const router = createNextRoute(contract, { + getDocuments: async (args) => { + const page = Number(args.query.page) || 1; + const perPage = Number(args.query.perPage) || 10; + + const { documents, totalPages } = await getDocuments({ page, perPage }); + + return { + status: 200, + body: { + documents, + totalPages, + }, + }; + }, +}); + +const nextRouter = createNextRouter(contract, router); + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + await nextRouter(req, res); +} diff --git a/packages/lib/server-only/public-api/get-documents.ts b/packages/lib/server-only/public-api/get-documents.ts new file mode 100644 index 000000000..bbc3ab14c --- /dev/null +++ b/packages/lib/server-only/public-api/get-documents.ts @@ -0,0 +1,21 @@ +import { prisma } from '@documenso/prisma'; + +type GetDocumentsProps = { + page: number; + perPage: number; +}; + +export const getDocuments = async ({ page = 1, perPage = 10 }: GetDocumentsProps) => { + const [documents, count] = await Promise.all([ + await prisma.document.findMany({ + take: perPage, + skip: Math.max(page - 1, 0) * perPage, + }), + await prisma.document.count(), + ]); + + return { + documents, + totalPages: Math.ceil(count / perPage), + }; +}; diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts index 194b663f7..95362c809 100644 --- a/packages/trpc/api-contract/contract.ts +++ b/packages/trpc/api-contract/contract.ts @@ -4,19 +4,19 @@ import { z } from 'zod'; const c = initContract(); const GetDocumentsQuery = z.object({ - take: z.string().default('10'), - skip: z.string().default('0'), + page: z.string().optional(), + perPage: z.string().optional(), }); const DocumentSchema = z.object({ - id: z.string(), + id: z.number(), userId: z.number(), title: z.string(), status: z.string(), documentDataId: z.string(), - createdAt: z.string(), - updatedAt: z.string(), - completedAt: z.string(), + createdAt: z.date(), + updatedAt: z.date(), + completedAt: z.date().nullable(), }); export const contract = c.router({ diff --git a/packages/trpc/server/public-api/ts-rest.ts b/packages/trpc/server/public-api/ts-rest.ts new file mode 100644 index 000000000..0d66cda1f --- /dev/null +++ b/packages/trpc/server/public-api/ts-rest.ts @@ -0,0 +1,3 @@ +import { createNextRoute, createNextRouter } from '@ts-rest/next'; + +export { createNextRoute, createNextRouter }; From 6d6c93539f05f05d463f5ced57e7b234b78822d5 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Wed, 22 Nov 2023 15:51:04 +0200 Subject: [PATCH 003/311] feat: update contract --- packages/trpc/api-contract/contract.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts index 95362c809..976dce5fc 100644 --- a/packages/trpc/api-contract/contract.ts +++ b/packages/trpc/api-contract/contract.ts @@ -19,13 +19,18 @@ const DocumentSchema = z.object({ completedAt: z.date().nullable(), }); +const SuccessfulResponse = z.object({ + documents: DocumentSchema.array(), + totalPages: z.number(), +}); + export const contract = c.router({ getDocuments: { method: 'GET', path: '/documents', query: GetDocumentsQuery, responses: { - 200: DocumentSchema.array(), + 200: SuccessfulResponse, }, summary: 'Get all documents for a user', }, From b3008fb272349a4a40ccd56427d69f315c3dd9df Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Thu, 23 Nov 2023 10:02:22 +0200 Subject: [PATCH 004/311] feat: add route for retrieving a single document by id --- apps/web/src/pages/api/v1/[...ts-rest].tsx | 9 ++++++ packages/trpc/api-contract/contract.ts | 33 ++++++++++++++++------ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx index 872d68e28..27429bdc9 100644 --- a/apps/web/src/pages/api/v1/[...ts-rest].tsx +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -1,5 +1,6 @@ import type { NextApiRequest, NextApiResponse } from 'next'; +import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; import { getDocuments } from '@documenso/lib/server-only/public-api/get-documents'; import { contract } from '@documenso/trpc/api-contract/contract'; import { createNextRoute, createNextRouter } from '@documenso/trpc/server/public-api/ts-rest'; @@ -19,6 +20,14 @@ const router = createNextRoute(contract, { }, }; }, + getDocument: async (args) => { + const document = await getDocumentById(args.params.id); + + return { + status: 200, + body: document, + }; + }, }); const nextRouter = createNextRouter(contract, router); diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts index 976dce5fc..5357e67fa 100644 --- a/packages/trpc/api-contract/contract.ts +++ b/packages/trpc/api-contract/contract.ts @@ -24,14 +24,29 @@ const SuccessfulResponse = z.object({ totalPages: z.number(), }); -export const contract = c.router({ - getDocuments: { - method: 'GET', - path: '/documents', - query: GetDocumentsQuery, - responses: { - 200: SuccessfulResponse, +export const contract = c.router( + { + getDocuments: { + method: 'GET', + path: '/documents', + query: GetDocumentsQuery, + responses: { + 200: SuccessfulResponse, + }, + summary: 'Get all documents', + }, + getDocument: { + method: 'GET', + path: `/documents/:id`, + responses: { + 200: DocumentSchema, + }, + summary: 'Get a single document', }, - summary: 'Get all documents for a user', }, -}); + { + baseHeaders: z.object({ + authorization: z.string(), + }), + }, +); From 309b56168a2da1f8c4304c7b4de7345257a04c20 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Thu, 23 Nov 2023 15:21:13 +0200 Subject: [PATCH 005/311] feat: create the model for the api token --- .../migration.sql | 21 +++++++++++++++++++ packages/prisma/schema.prisma | 18 +++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 packages/prisma/migrations/20231123132053_public_api_api_token/migration.sql diff --git a/packages/prisma/migrations/20231123132053_public_api_api_token/migration.sql b/packages/prisma/migrations/20231123132053_public_api_api_token/migration.sql new file mode 100644 index 000000000..d3c9106c4 --- /dev/null +++ b/packages/prisma/migrations/20231123132053_public_api_api_token/migration.sql @@ -0,0 +1,21 @@ +-- CreateEnum +CREATE TYPE "ApiTokenAlgorithm" AS ENUM ('SHA512'); + +-- CreateTable +CREATE TABLE "ApiToken" ( + "id" SERIAL NOT NULL, + "name" TEXT NOT NULL, + "token" TEXT NOT NULL, + "algorithm" "ApiTokenAlgorithm" NOT NULL DEFAULT 'SHA512', + "expires" TIMESTAMP(3) NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "userId" INTEGER NOT NULL, + + CONSTRAINT "ApiToken_pkey" PRIMARY KEY ("id") +); + +-- CreateIndex +CREATE UNIQUE INDEX "ApiToken_token_key" ON "ApiToken"("token"); + +-- AddForeignKey +ALTER TABLE "ApiToken" ADD CONSTRAINT "ApiToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 02807e4a0..8e073829b 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -37,7 +37,8 @@ model User { Subscription Subscription? PasswordResetToken PasswordResetToken[] VerificationToken VerificationToken[] - + ApiToken ApiToken[] + @@index([email]) } @@ -60,6 +61,21 @@ model VerificationToken { user User @relation(fields: [userId], references: [id]) } +enum ApiTokenAlgorithm { + SHA512 +} + +model ApiToken { + id Int @id @default(autoincrement()) + name String + token String @unique + algorithm ApiTokenAlgorithm @default(SHA512) + expires DateTime + createdAt DateTime @default(now()) + userId Int + user User @relation(fields: [userId], references: [id]) +} + enum SubscriptionStatus { ACTIVE PAST_DUE From 2ccede72eaea0f70caa998404bffe36683e5fdc9 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Thu, 23 Nov 2023 15:23:47 +0200 Subject: [PATCH 006/311] chore: update the contract to add deleteDocument route --- packages/trpc/api-contract/contract.ts | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts index 5357e67fa..2a002db45 100644 --- a/packages/trpc/api-contract/contract.ts +++ b/packages/trpc/api-contract/contract.ts @@ -3,7 +3,11 @@ import { z } from 'zod'; const c = initContract(); -const GetDocumentsQuery = z.object({ +/* + These schemas should be moved from here probably. + It grows quickly. +*/ +const GetDocumentsQuerySchema = z.object({ page: z.string().optional(), perPage: z.string().optional(), }); @@ -19,19 +23,23 @@ const DocumentSchema = z.object({ completedAt: z.date().nullable(), }); -const SuccessfulResponse = z.object({ +const SuccessfulResponseSchema = z.object({ documents: DocumentSchema.array(), totalPages: z.number(), }); +const UnsuccessfulResponseSchema = z.object({ + message: z.string(), +}); + export const contract = c.router( { getDocuments: { method: 'GET', path: '/documents', - query: GetDocumentsQuery, + query: GetDocumentsQuerySchema, responses: { - 200: SuccessfulResponse, + 200: SuccessfulResponseSchema, }, summary: 'Get all documents', }, @@ -43,6 +51,16 @@ export const contract = c.router( }, summary: 'Get a single document', }, + deleteDocument: { + method: 'DELETE', + path: `/documents/:id`, + body: z.string(), + responses: { + 200: DocumentSchema, + 404: UnsuccessfulResponseSchema, + }, + summary: 'Delete a document', + }, }, { baseHeaders: z.object({ From 80fe7ccdf5f0e66764671ec7f2d3bb22e10f506d Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Fri, 24 Nov 2023 13:59:33 +0200 Subject: [PATCH 007/311] feat: api token page in the settings --- .../app/(dashboard)/settings/token/page.tsx | 21 ++++++ .../settings/layout/desktop-nav.tsx | 17 ++++- .../settings/layout/mobile-nav.tsx | 17 ++++- .../trpc/server/api-token-router/router.ts | 65 +++++++++++++++++++ .../trpc/server/api-token-router/schema.ts | 13 ++++ packages/trpc/server/router.ts | 2 + 6 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 apps/web/src/app/(dashboard)/settings/token/page.tsx create mode 100644 packages/trpc/server/api-token-router/router.ts create mode 100644 packages/trpc/server/api-token-router/schema.ts diff --git a/apps/web/src/app/(dashboard)/settings/token/page.tsx b/apps/web/src/app/(dashboard)/settings/token/page.tsx new file mode 100644 index 000000000..e868df47d --- /dev/null +++ b/apps/web/src/app/(dashboard)/settings/token/page.tsx @@ -0,0 +1,21 @@ +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; + +import { ApiTokenForm } from '~/components/forms/token'; + +export default async function ApiToken() { + const { user } = await getRequiredServerComponentSession(); + + return ( +
+

API Token

+ +

+ On this page, you can create new API tokens and manage the existing ones. +

+ +
+ + +
+ ); +} diff --git a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx index 901c6a5ae..89bcabf60 100644 --- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx @@ -1,11 +1,11 @@ 'use client'; -import { HTMLAttributes } from 'react'; +import type { HTMLAttributes } from 'react'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; -import { CreditCard, Key, User } from 'lucide-react'; +import { Braces, CreditCard, Key, User } from 'lucide-react'; import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag'; import { cn } from '@documenso/ui/lib/utils'; @@ -48,6 +48,19 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { + + + + {isBillingEnabled && ( + + + + {isBillingEnabled && ( + + + + ))} + +

Create a new token

+
+ +
+ ( + + Token Name + + + + + + )} + /> + +
+ +
+
+
+ + + ); +}; diff --git a/packages/lib/server-only/public-api/get-all-user-tokens.ts b/packages/lib/server-only/public-api/get-all-user-tokens.ts new file mode 100644 index 000000000..c6c7a7d94 --- /dev/null +++ b/packages/lib/server-only/public-api/get-all-user-tokens.ts @@ -0,0 +1,13 @@ +import { prisma } from '@documenso/prisma'; + +export type GetUserTokensOptions = { + userId: number; +}; + +export const getUserTokens = async ({ userId }: GetUserTokensOptions) => { + return prisma.apiToken.findMany({ + where: { + userId, + }, + }); +}; diff --git a/packages/trpc/server/api-token-router/router.ts b/packages/trpc/server/api-token-router/router.ts index 88f3ad9d0..49dac8809 100644 --- a/packages/trpc/server/api-token-router/router.ts +++ b/packages/trpc/server/api-token-router/router.ts @@ -2,6 +2,7 @@ import { TRPCError } from '@trpc/server'; import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token'; import { deleteApiTokenById } from '@documenso/lib/server-only/public-api/delete-api-token-by-id'; +import { getUserTokens } from '@documenso/lib/server-only/public-api/get-all-user-tokens'; import { getApiTokenById } from '@documenso/lib/server-only/public-api/get-api-token-by-id'; import { authenticatedProcedure, router } from '../trpc'; @@ -12,6 +13,16 @@ import { } from './schema'; export const apiTokenRouter = router({ + getTokens: authenticatedProcedure.query(async ({ ctx }) => { + try { + return await getUserTokens({ userId: ctx.user.id }); + } catch (e) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to find your API tokens. Please try again.', + }); + } + }), getTokenById: authenticatedProcedure .input(ZGetApiTokenByIdQuerySchema) .query(async ({ input, ctx }) => { From 13997d3dca9c6e7730db54536bd184f25258b51f Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Mon, 27 Nov 2023 16:29:24 +0200 Subject: [PATCH 010/311] feat: add delete and copy token on token page --- .../app/(dashboard)/settings/token/page.tsx | 8 +- apps/web/src/components/forms/token.tsx | 93 ++++++++++++++++--- .../trpc/server/api-token-router/router.ts | 4 +- 3 files changed, 86 insertions(+), 19 deletions(-) diff --git a/apps/web/src/app/(dashboard)/settings/token/page.tsx b/apps/web/src/app/(dashboard)/settings/token/page.tsx index e868df47d..ab4992f14 100644 --- a/apps/web/src/app/(dashboard)/settings/token/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/token/page.tsx @@ -1,10 +1,6 @@ -import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; - import { ApiTokenForm } from '~/components/forms/token'; -export default async function ApiToken() { - const { user } = await getRequiredServerComponentSession(); - +export default function ApiToken() { return (

API Token

@@ -15,7 +11,7 @@ export default async function ApiToken() {
- +
); } diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index 8e9d9d2b6..0daacf060 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -1,17 +1,27 @@ 'use client'; +import { useState } from 'react'; + import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; import type { z } from 'zod'; -import type { User } from '@documenso/prisma/client'; +import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard'; import { TRPCClientError } from '@documenso/trpc/client'; import { trpc } from '@documenso/trpc/react'; import { ZCreateTokenMutationSchema } from '@documenso/trpc/server/api-token-router/schema'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, +} from '@documenso/ui/primitives/dialog'; import { Form, FormControl, @@ -24,19 +34,21 @@ import { Input } from '@documenso/ui/primitives/input'; import { useToast } from '@documenso/ui/primitives/use-toast'; export type ApiTokenFormProps = { - user: User; className?: string; }; type TCreateTokenMutationSchema = z.infer; -export const ApiTokenForm = ({ user, className }: ApiTokenFormProps) => { +export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { const router = useRouter(); - + const [, copy] = useCopyToClipboard(); const { toast } = useToast(); + const [isOpen, setIsOpen] = useState(false); + const [tokenIdToDelete, setTokenIdToDelete] = useState(0); const { data: tokens } = trpc.apiToken.getTokens.useQuery(); const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation(); + const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation(); const form = useForm({ resolver: zodResolver(ZCreateTokenMutationSchema), @@ -45,12 +57,32 @@ export const ApiTokenForm = ({ user, className }: ApiTokenFormProps) => { }, }); - const deleteToken = () => { - console.log('deleted'); + const deleteToken = async (id: number) => { + try { + await deleteTokenMutation({ + id, + }); + + toast({ + title: 'Token deleted', + description: 'The token was deleted successfully.', + duration: 5000, + }); + + setIsOpen(false); + router.refresh(); + } catch (error) { + console.error(error); + } }; - const copyToken = () => { - console.log('copied'); + const copyToken = (token: string) => { + void copy(token).then(() => { + toast({ + title: 'Token copied to clipboard', + description: 'The token was copied to your clipboard.', + }); + }); }; const onSubmit = async ({ tokenName }: TCreateTokenMutationSchema) => { @@ -86,10 +118,42 @@ export const ApiTokenForm = ({ user, className }: ApiTokenFormProps) => { return (
+ + + + Are you sure you want to delete this token? + + + Please note that this action is irreversible. Once confirmed, your token will be + permanently deleted. + + + + +
+ + + +
+
+
+

Your existing tokens

    {tokens?.map((token) => ( -
  • +
  • {token.name} ({token.algorithm}) @@ -117,10 +181,17 @@ export const ApiTokenForm = ({ user, className }: ApiTokenFormProps) => { }) : 'N/A'}

    - -
    diff --git a/packages/trpc/server/api-token-router/router.ts b/packages/trpc/server/api-token-router/router.ts index 49dac8809..266c045d0 100644 --- a/packages/trpc/server/api-token-router/router.ts +++ b/packages/trpc/server/api-token-router/router.ts @@ -1,7 +1,7 @@ import { TRPCError } from '@trpc/server'; import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token'; -import { deleteApiTokenById } from '@documenso/lib/server-only/public-api/delete-api-token-by-id'; +import { deleteTokenById } from '@documenso/lib/server-only/public-api/delete-api-token-by-id'; import { getUserTokens } from '@documenso/lib/server-only/public-api/get-all-user-tokens'; import { getApiTokenById } from '@documenso/lib/server-only/public-api/get-api-token-by-id'; @@ -62,7 +62,7 @@ export const apiTokenRouter = router({ try { const { id } = input; - return await deleteApiTokenById({ + return await deleteTokenById({ id, userId: ctx.user.id, }); From 6a5fc7a5fb89a7df84e0a743fe3a7a37fc551f30 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Tue, 28 Nov 2023 12:37:01 +0200 Subject: [PATCH 011/311] feat: confirm to delete dialog --- .../settings/token/delete-token-dialog.tsx | 167 ++++++++++++++++++ apps/web/src/components/forms/token.tsx | 82 ++------- 2 files changed, 177 insertions(+), 72 deletions(-) create mode 100644 apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx diff --git a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx new file mode 100644 index 000000000..d73a3a786 --- /dev/null +++ b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx @@ -0,0 +1,167 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { useRouter } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import { trpc } from '@documenso/trpc/react'; +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 DeleteTokenDialogProps = { + trigger?: React.ReactNode; + tokenId: number; + tokenName: string; +}; + +export default function DeleteTokenDialog({ trigger, tokenId, tokenName }: DeleteTokenDialogProps) { + const router = useRouter(); + const { toast } = useToast(); + const [isOpen, setIsOpen] = useState(false); + + const deleteMessage = `delete ${tokenName}`; + + const ZDeleteTokenDialogSchema = z.object({ + tokenName: z.literal(deleteMessage, { + errorMap: () => ({ message: `You must enter '${deleteMessage}' to proceed` }), + }), + }); + + type TDeleteTokenByIdMutationSchema = z.infer; + + const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation(); + + const form = useForm({ + resolver: zodResolver(ZDeleteTokenDialogSchema), + values: { + tokenName: '', + }, + }); + + const onSubmit = async () => { + try { + await deleteTokenMutation({ + id: tokenId, + }); + + toast({ + title: 'Token deleted', + description: 'The token was deleted successfully.', + duration: 5000, + }); + + setIsOpen(false); + router.push('/settings/token'); + } catch (error) { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + duration: 5000, + description: + 'We encountered an unknown error while attempting to delete this team. Please try again later.', + }); + } + }; + + useEffect(() => { + if (!open) { + form.reset(); + } + }, [open, form]); + + return ( + !form.formState.isSubmitting && setIsOpen(value)} + > + + {trigger ?? ( + + )} + + + + Are you sure you want to delete this token? + + + Please note that this action is irreversible. Once confirmed, your token will be + permanently deleted. + + + +
    + +
    + ( + + + Confirm by typing + + {deleteMessage} + + + + + + + + )} + /> + +
    + + + +
    +
    +
    +
    + +
    +
    + ); +} diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index 0daacf060..131e90a7d 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -1,7 +1,5 @@ 'use client'; -import { useState } from 'react'; - import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; @@ -14,14 +12,6 @@ import { trpc } from '@documenso/trpc/react'; import { ZCreateTokenMutationSchema } from '@documenso/trpc/server/api-token-router/schema'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; -import { - Dialog, - DialogContent, - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, -} from '@documenso/ui/primitives/dialog'; import { Form, FormControl, @@ -33,6 +23,8 @@ import { import { Input } from '@documenso/ui/primitives/input'; import { useToast } from '@documenso/ui/primitives/use-toast'; +import DeleteTokenDialog from '~/components/(dashboard)/settings/token/delete-token-dialog'; + export type ApiTokenFormProps = { className?: string; }; @@ -43,12 +35,9 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { const router = useRouter(); const [, copy] = useCopyToClipboard(); const { toast } = useToast(); - const [isOpen, setIsOpen] = useState(false); - const [tokenIdToDelete, setTokenIdToDelete] = useState(0); const { data: tokens } = trpc.apiToken.getTokens.useQuery(); const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation(); - const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation(); const form = useForm({ resolver: zodResolver(ZCreateTokenMutationSchema), @@ -57,25 +46,6 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { }, }); - const deleteToken = async (id: number) => { - try { - await deleteTokenMutation({ - id, - }); - - toast({ - title: 'Token deleted', - description: 'The token was deleted successfully.', - duration: 5000, - }); - - setIsOpen(false); - router.refresh(); - } catch (error) { - console.error(error); - } - }; - const copyToken = (token: string) => { void copy(token).then(() => { toast({ @@ -97,6 +67,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { duration: 5000, }); + form.reset(); router.refresh(); } catch (error) { if (error instanceof TRPCClientError && error.data?.code === 'BAD_REQUEST') { @@ -109,6 +80,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { toast({ title: 'An unknown error occurred', variant: 'destructive', + duration: 5000, description: 'We encountered an unknown error while attempting create the new token. Please try again later.', }); @@ -118,35 +90,6 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { return (
    - - - - Are you sure you want to delete this token? - - - Please note that this action is irreversible. Once confirmed, your token will be - permanently deleted. - - - - -
    - - - -
    -
    -
    -

    Your existing tokens

      {tokens?.map((token) => ( @@ -181,16 +124,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { }) : 'N/A'}

      - + @@ -217,7 +151,11 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { />
      -
      From e1732de81d64a157e258f4e2350a40d61bdc9293 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Tue, 28 Nov 2023 15:49:46 +0200 Subject: [PATCH 012/311] feat: show newly created token --- .../settings/token/delete-token-dialog.tsx | 4 +- apps/web/src/components/forms/token.tsx | 112 +++++++++++------- .../public-api/get-all-user-tokens.ts | 7 ++ 3 files changed, 78 insertions(+), 45 deletions(-) diff --git a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx index d73a3a786..9a60bd60b 100644 --- a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx @@ -125,8 +125,8 @@ export default function DeleteTokenDialog({ trigger, tokenId, tokenName }: Delet render={({ field }) => ( - Confirm by typing - + Confirm by typing:{' '} + {deleteMessage} diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index 131e90a7d..a92321e6b 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -1,8 +1,11 @@ 'use client'; +import { useState } from 'react'; + import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; +import { Loader } from 'lucide-react'; import { useForm } from 'react-hook-form'; import type { z } from 'zod'; @@ -35,9 +38,14 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { const router = useRouter(); const [, copy] = useCopyToClipboard(); const { toast } = useToast(); + const [newlyCreatedToken, setNewlyCreatedToken] = useState(''); - const { data: tokens } = trpc.apiToken.getTokens.useQuery(); - const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation(); + const { data: tokens, isLoading: isTokensLoading } = trpc.apiToken.getTokens.useQuery(); + const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation({ + onSuccess(data) { + setNewlyCreatedToken(data.token); + }, + }); const form = useForm({ resolver: zodResolver(ZCreateTokenMutationSchema), @@ -91,48 +99,66 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { return (

      Your existing tokens

      -
        - {tokens?.map((token) => ( -
      • -
        -

        - {token.name} ({token.algorithm}) -

        -

        {token.token}

        -

        - Created:{' '} - {token.createdAt - ? new Date(token.createdAt).toLocaleDateString(undefined, { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }) - : 'N/A'} -

        -

        - Expires:{' '} - {token.expires - ? new Date(token.expires).toLocaleDateString(undefined, { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }) - : 'N/A'} -

        - - -
        -
      • - ))} -
      + {!tokens && isTokensLoading ? ( +
      + +
      + ) : ( +
        + {tokens?.map((token) => ( +
      • +
        +

        + {token.name} ({token.algorithm}) +

        + {/*

        {token.token}

        */} +

        + Created:{' '} + {token.createdAt + ? new Date(token.createdAt).toLocaleDateString(undefined, { + weekday: 'long', + year: 'numeric', + month: 'long', + day: 'numeric', + }) + : 'N/A'} +

        +

        + Expires:{' '} + {token.expires + ? new Date(token.expires).toLocaleDateString(undefined, { + weekday: 'long', + year: 'numeric', + month: 'long', + day: 'numeric', + }) + : 'N/A'} +

        + +
        +
      • + ))} +
      + )} + {newlyCreatedToken && ( +
      +

      + Your token was created successfully! Make sure to copy it because you won't be able to + see it again! +

      +

      {newlyCreatedToken}

      + +
      + )}

      Create a new token

      +

      + Enter a representative name for your new token. +

      diff --git a/packages/lib/server-only/public-api/get-all-user-tokens.ts b/packages/lib/server-only/public-api/get-all-user-tokens.ts index c6c7a7d94..d64562b83 100644 --- a/packages/lib/server-only/public-api/get-all-user-tokens.ts +++ b/packages/lib/server-only/public-api/get-all-user-tokens.ts @@ -9,5 +9,12 @@ export const getUserTokens = async ({ userId }: GetUserTokensOptions) => { where: { userId, }, + select: { + id: true, + name: true, + algorithm: true, + createdAt: true, + expires: true, + }, }); }; From d43d40fd6b1c3239b72f1b3a10d8283a8dd44b8c Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Wed, 29 Nov 2023 14:43:26 +0200 Subject: [PATCH 013/311] feat: improvements to the newly created token message --- .../settings/token/delete-token-dialog.tsx | 16 +++++++--- apps/web/src/components/forms/token.tsx | 29 ++++++++++++++----- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx index 9a60bd60b..f847cd793 100644 --- a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx @@ -1,5 +1,3 @@ -'use client'; - import { useEffect, useState } from 'react'; import { useRouter } from 'next/navigation'; @@ -34,9 +32,15 @@ export type DeleteTokenDialogProps = { trigger?: React.ReactNode; tokenId: number; tokenName: string; + onDelete: () => void; }; -export default function DeleteTokenDialog({ trigger, tokenId, tokenName }: DeleteTokenDialogProps) { +export default function DeleteTokenDialog({ + trigger, + tokenId, + tokenName, + onDelete, +}: DeleteTokenDialogProps) { const router = useRouter(); const { toast } = useToast(); const [isOpen, setIsOpen] = useState(false); @@ -51,7 +55,11 @@ export default function DeleteTokenDialog({ trigger, tokenId, tokenName }: Delet type TDeleteTokenByIdMutationSchema = z.infer; - const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation(); + const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation({ + onSuccess() { + onDelete(); + }, + }); const form = useForm({ resolver: zodResolver(ZDeleteTokenDialogSchema), diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index a92321e6b..85d6cc038 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -38,12 +38,13 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { const router = useRouter(); const [, copy] = useCopyToClipboard(); const { toast } = useToast(); - const [newlyCreatedToken, setNewlyCreatedToken] = useState(''); + const [newlyCreatedToken, setNewlyCreatedToken] = useState({ id: 0, token: '' }); + const [showNewToken, setShowNewToken] = useState(false); const { data: tokens, isLoading: isTokensLoading } = trpc.apiToken.getTokens.useQuery(); const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation({ onSuccess(data) { - setNewlyCreatedToken(data.token); + setNewlyCreatedToken({ id: data.id, token: data.token }); }, }); @@ -54,6 +55,12 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { }, }); + const onDelete = (tokenId: number) => { + if (tokenId === newlyCreatedToken.id) { + setShowNewToken((prev) => !prev); + } + }; + const copyToken = (token: string) => { void copy(token).then(() => { toast({ @@ -75,6 +82,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { duration: 5000, }); + setShowNewToken(true); form.reset(); router.refresh(); } catch (error) { @@ -114,7 +122,6 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => {

      {token.name} ({token.algorithm})

      - {/*

      {token.token}

      */}

      Created:{' '} {token.createdAt @@ -137,20 +144,28 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { }) : 'N/A'}

      - + onDelete(token.id)} + />
      ))}
    )} - {newlyCreatedToken && ( + {newlyCreatedToken.token && showNewToken && (

    Your token was created successfully! Make sure to copy it because you won't be able to see it again!

    -

    {newlyCreatedToken}

    -
    From 76800674ee7314fd5e3c39ba3ff515184c754999 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Wed, 29 Nov 2023 14:57:27 +0200 Subject: [PATCH 014/311] feat: improve messaging --- apps/web/src/components/forms/token.tsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index 85d6cc038..954d4dd2e 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -55,6 +55,11 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { }, }); + /* + This method is called in "delete-token-dialog.tsx" after a successful mutation + to avoid deleting the snippet with the newly created token from the screen + when users delete any of their tokens except the newly created one. + */ const onDelete = (tokenId: number) => { if (tokenId === newlyCreatedToken.id) { setShowNewToken((prev) => !prev); @@ -107,6 +112,15 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { return (

    Your existing tokens

    + {tokens?.length === 0 ? ( +
    +

    + Your tokens will be shown here once you create them. +

    +
    + ) : ( +
    + )} {!tokens && isTokensLoading ? (
    From 6be4b7ae904b9ad657852f233b58a62a03c30f4b Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Thu, 30 Nov 2023 14:39:31 +0200 Subject: [PATCH 015/311] feat: add authorization for api calls --- apps/web/src/pages/api/v1/[...ts-rest].tsx | 88 +++++++++++++++++-- .../server-only/public-api/get-documents.ts | 6 +- .../public-api/get-user-by-token.ts | 15 ++++ packages/trpc/api-contract/contract.ts | 5 ++ 4 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 packages/lib/server-only/public-api/get-user-by-token.ts diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx index 27429bdc9..ee2e5b934 100644 --- a/apps/web/src/pages/api/v1/[...ts-rest].tsx +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -1,16 +1,38 @@ import type { NextApiRequest, NextApiResponse } from 'next'; +import { deleteDraftDocument } from '@documenso/lib/server-only/document/delete-draft-document'; import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; import { getDocuments } from '@documenso/lib/server-only/public-api/get-documents'; +import { checkUserFromToken } from '@documenso/lib/server-only/public-api/get-user-by-token'; import { contract } from '@documenso/trpc/api-contract/contract'; import { createNextRoute, createNextRouter } from '@documenso/trpc/server/public-api/ts-rest'; +const validateUserToken = async (token: string) => { + try { + return await checkUserFromToken({ token }); + } catch (e) { + return null; + } +}; + const router = createNextRoute(contract, { getDocuments: async (args) => { const page = Number(args.query.page) || 1; const perPage = Number(args.query.perPage) || 10; + const { authorization } = args.headers; - const { documents, totalPages } = await getDocuments({ page, perPage }); + const user = await validateUserToken(authorization); + + if (!user) { + return { + status: 401, + body: { + message: 'Unauthorized', + }, + }; + } + + const { documents, totalPages } = await getDocuments({ page, perPage, userId: user.id }); return { status: 200, @@ -21,12 +43,66 @@ const router = createNextRoute(contract, { }; }, getDocument: async (args) => { - const document = await getDocumentById(args.params.id); + const { id: documentId } = args.params; + const { authorization } = args.headers; - return { - status: 200, - body: document, - }; + const user = await validateUserToken(authorization); + + if (!user) { + return { + status: 401, + body: { + message: 'Unauthorized', + }, + }; + } + + try { + const document = await getDocumentById({ id: Number(documentId), userId: user.id }); + + return { + status: 200, + body: document, + }; + } catch (e) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + }, + deleteDocument: async (args) => { + const { id: documentId } = args.params; + const { authorization } = args.headers; + + const user = await validateUserToken(authorization); + + if (!user) { + return { + status: 401, + body: { + message: 'Unauthorized', + }, + }; + } + + try { + const document = await deleteDraftDocument({ id: Number(documentId), userId: user.id }); + + return { + status: 200, + body: document, + }; + } catch (e) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } }, }); diff --git a/packages/lib/server-only/public-api/get-documents.ts b/packages/lib/server-only/public-api/get-documents.ts index bbc3ab14c..deea612e8 100644 --- a/packages/lib/server-only/public-api/get-documents.ts +++ b/packages/lib/server-only/public-api/get-documents.ts @@ -3,11 +3,15 @@ import { prisma } from '@documenso/prisma'; type GetDocumentsProps = { page: number; perPage: number; + userId: number; }; -export const getDocuments = async ({ page = 1, perPage = 10 }: GetDocumentsProps) => { +export const getDocuments = async ({ page = 1, perPage = 10, userId }: GetDocumentsProps) => { const [documents, count] = await Promise.all([ await prisma.document.findMany({ + where: { + userId, + }, take: perPage, skip: Math.max(page - 1, 0) * perPage, }), diff --git a/packages/lib/server-only/public-api/get-user-by-token.ts b/packages/lib/server-only/public-api/get-user-by-token.ts new file mode 100644 index 000000000..3092deaa7 --- /dev/null +++ b/packages/lib/server-only/public-api/get-user-by-token.ts @@ -0,0 +1,15 @@ +import { prisma } from '@documenso/prisma'; + +export const checkUserFromToken = async ({ token }: { token: string }) => { + const user = await prisma.user.findFirstOrThrow({ + where: { + ApiToken: { + some: { + token: token, + }, + }, + }, + }); + + return user; +}; diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts index 2a002db45..1a15e5fd0 100644 --- a/packages/trpc/api-contract/contract.ts +++ b/packages/trpc/api-contract/contract.ts @@ -40,6 +40,8 @@ export const contract = c.router( query: GetDocumentsQuerySchema, responses: { 200: SuccessfulResponseSchema, + 401: UnsuccessfulResponseSchema, + 404: UnsuccessfulResponseSchema, }, summary: 'Get all documents', }, @@ -48,6 +50,8 @@ export const contract = c.router( path: `/documents/:id`, responses: { 200: DocumentSchema, + 401: UnsuccessfulResponseSchema, + 404: UnsuccessfulResponseSchema, }, summary: 'Get a single document', }, @@ -57,6 +61,7 @@ export const contract = c.router( body: z.string(), responses: { 200: DocumentSchema, + 401: UnsuccessfulResponseSchema, 404: UnsuccessfulResponseSchema, }, summary: 'Delete a document', From 6c5526dd49a4777483a0101b8fe0e13368c64254 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Wed, 6 Dec 2023 15:27:30 +0000 Subject: [PATCH 016/311] chore: update routes trying to add the route for creating documents --- apps/web/src/pages/api/v1/[...ts-rest].tsx | 73 +++++++++++++++++++++- package-lock.json | 50 +++++++++++++++ package.json | 1 - packages/trpc/api-contract/contract.ts | 24 +++++++ packages/trpc/package.json | 1 + 5 files changed, 145 insertions(+), 4 deletions(-) diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx index ee2e5b934..1c915da30 100644 --- a/apps/web/src/pages/api/v1/[...ts-rest].tsx +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -1,9 +1,12 @@ import type { NextApiRequest, NextApiResponse } from 'next'; -import { deleteDraftDocument } from '@documenso/lib/server-only/document/delete-draft-document'; +import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data'; +import { createDocument } from '@documenso/lib/server-only/document/create-document'; +import { deleteDocument } from '@documenso/lib/server-only/document/delete-document'; import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; import { getDocuments } from '@documenso/lib/server-only/public-api/get-documents'; import { checkUserFromToken } from '@documenso/lib/server-only/public-api/get-user-by-token'; +import { putFile } from '@documenso/lib/universal/upload/put-file'; import { contract } from '@documenso/trpc/api-contract/contract'; import { createNextRoute, createNextRouter } from '@documenso/trpc/server/public-api/ts-rest'; @@ -89,11 +92,17 @@ const router = createNextRoute(contract, { } try { - const document = await deleteDraftDocument({ id: Number(documentId), userId: user.id }); + const document = await getDocumentById({ id: Number(documentId), userId: user.id }); + + const deletedDocument = await deleteDocument({ + id: Number(documentId), + userId: user.id, + status: document.status, + }); return { status: 200, - body: document, + body: deletedDocument, }; } catch (e) { return { @@ -104,6 +113,64 @@ const router = createNextRoute(contract, { }; } }, + createDocument: async (args) => { + const { authorization } = args.headers; + const { body } = args; + + const user = await validateUserToken(authorization); + + if (!user) { + return { + status: 401, + body: { + message: 'Unauthorized', + }, + }; + } + + try { + const regexPattern = /filename="(.+?)"/; + const match = body.toString().match(regexPattern); + const documentTitle = match?.[1] ?? 'Untitled document'; + + console.log(body.toString()); + + const file = new Blob([body.toString()], { + type: 'application/pdf', + }); + + const { type, data } = await putFile(file); + + const { id: documentDataId } = await createDocumentData({ + type, + data, + }); + + const { id } = await createDocument({ + title: documentTitle, + documentDataId, + userId: user.id, + }); + + return { + status: 200, + body: { + uploadedFile: { + id, + message: 'Document uploaded successfuly', + }, + }, + }; + } catch (e) { + console.error(e); + return { + status: 500, + body: { + message: 'An error occurred while uploading your document.', + }, + }; + } + }, }); const nextRouter = createNextRouter(contract, router); diff --git a/package-lock.json b/package-lock.json index 72bca2771..f54eb40ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -167,6 +167,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@anatine/zod-openapi": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/@anatine/zod-openapi/-/zod-openapi-1.14.2.tgz", + "integrity": "sha512-q0qHfnuNYVKu0Swrnnvfj9971AEyW7c8v9jCOZGCl5ZbyGMNG4RPyJkRcMi/JC8CRfdOe0IDfNm1nNsi2avprg==", + "dependencies": { + "ts-deepmerge": "^6.0.3" + }, + "peerDependencies": { + "openapi3-ts": "^2.0.0 || ^3.0.0", + "zod": "^3.20.0" + } + }, "node_modules/@aws-crypto/crc32": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", @@ -5989,6 +6001,19 @@ } } }, + "node_modules/@ts-rest/open-api": { + "version": "3.30.5", + "resolved": "https://registry.npmjs.org/@ts-rest/open-api/-/open-api-3.30.5.tgz", + "integrity": "sha512-FOq6afvj6VCLMSQEO8J0B2YuZ2BfvQrscMy9i5rinI4sJO2/q17fdUqOoT9AI6n4coHCOFpcRUOz2xks7Nn5fA==", + "dependencies": { + "@anatine/zod-openapi": "^1.12.0", + "openapi3-ts": "^2.0.2" + }, + "peerDependencies": { + "@ts-rest/core": "3.30.5", + "zod": "^3.22.3" + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -14367,6 +14392,22 @@ "node": ">= 14.17.0" } }, + "node_modules/openapi3-ts": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-2.0.2.tgz", + "integrity": "sha512-TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw==", + "dependencies": { + "yaml": "^1.10.2" + } + }, + "node_modules/openapi3-ts/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "engines": { + "node": ">= 6" + } + }, "node_modules/openid-client": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.6.1.tgz", @@ -17830,6 +17871,14 @@ "typescript": ">=4.2.0" } }, + "node_modules/ts-deepmerge": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ts-deepmerge/-/ts-deepmerge-6.2.0.tgz", + "integrity": "sha512-2qxI/FZVDPbzh63GwWIZYE7daWKtwXZYuyc8YNq0iTmMUwn4mL0jRLsp6hfFlgbdRSR4x2ppe+E86FnvEpN7Nw==", + "engines": { + "node": ">=14.13.1" + } + }, "node_modules/ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", @@ -19490,6 +19539,7 @@ "@trpc/server": "^10.36.0", "@ts-rest/core": "^3.30.5", "@ts-rest/next": "^3.30.5", + "@ts-rest/open-api": "^3.30.5", "luxon": "^3.4.0", "superjson": "^1.13.1", "ts-pattern": "^5.0.5", diff --git a/package.json b/package.json index 2e708363f..3f1806988 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ "apps/*", "packages/*" ], - "dependencies": {}, "overrides": { "next-auth": { "next": "14.0.3" diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts index 1a15e5fd0..3dd5142cb 100644 --- a/packages/trpc/api-contract/contract.ts +++ b/packages/trpc/api-contract/contract.ts @@ -23,6 +23,18 @@ const DocumentSchema = z.object({ completedAt: z.date().nullable(), }); +const SendDocumentForSigningMutationSchema = z.object({ + signerEmail: z.string(), + signerName: z.string().optional(), +}); + +const UploadDocumentSuccessfulSchema = z.object({ + uploadedFile: z.object({ + id: z.number(), + message: z.string(), + }), +}); + const SuccessfulResponseSchema = z.object({ documents: DocumentSchema.array(), totalPages: z.number(), @@ -66,6 +78,18 @@ export const contract = c.router( }, summary: 'Delete a document', }, + createDocument: { + method: 'POST', + path: '/documents', + contentType: 'multipart/form-data', + body: c.type<{ file: File }>(), + responses: { + 200: UploadDocumentSuccessfulSchema, + 401: UnsuccessfulResponseSchema, + 500: UnsuccessfulResponseSchema, + }, + summary: 'Upload a new document', + }, }, { baseHeaders: z.object({ diff --git a/packages/trpc/package.json b/packages/trpc/package.json index fb32bcdf3..69aba9116 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -20,6 +20,7 @@ "@ts-rest/core": "^3.30.5", "@ts-rest/next": "^3.30.5", "luxon": "^3.4.0", + "@ts-rest/open-api": "^3.30.5", "superjson": "^1.13.1", "ts-pattern": "^5.0.5", "zod": "^3.22.4" From 11ae6d3c16a2d7f728c929e26fb9a2eee69b144a Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Wed, 6 Dec 2023 16:53:34 +0000 Subject: [PATCH 017/311] chore: small changes --- apps/web/src/pages/api/v1/[...ts-rest].tsx | 4 +--- package-lock.json | 14 -------------- packages/trpc/package.json | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx index 1c915da30..b8e36340b 100644 --- a/apps/web/src/pages/api/v1/[...ts-rest].tsx +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -133,9 +133,7 @@ const router = createNextRoute(contract, { const match = body.toString().match(regexPattern); const documentTitle = match?.[1] ?? 'Untitled document'; - console.log(body.toString()); - - const file = new Blob([body.toString()], { + const file = new Blob([body], { type: 'application/pdf', }); diff --git a/package-lock.json b/package-lock.json index f54eb40ca..d244df9e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6001,19 +6001,6 @@ } } }, - "node_modules/@ts-rest/open-api": { - "version": "3.30.5", - "resolved": "https://registry.npmjs.org/@ts-rest/open-api/-/open-api-3.30.5.tgz", - "integrity": "sha512-FOq6afvj6VCLMSQEO8J0B2YuZ2BfvQrscMy9i5rinI4sJO2/q17fdUqOoT9AI6n4coHCOFpcRUOz2xks7Nn5fA==", - "dependencies": { - "@anatine/zod-openapi": "^1.12.0", - "openapi3-ts": "^2.0.2" - }, - "peerDependencies": { - "@ts-rest/core": "3.30.5", - "zod": "^3.22.3" - } - }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -19539,7 +19526,6 @@ "@trpc/server": "^10.36.0", "@ts-rest/core": "^3.30.5", "@ts-rest/next": "^3.30.5", - "@ts-rest/open-api": "^3.30.5", "luxon": "^3.4.0", "superjson": "^1.13.1", "ts-pattern": "^5.0.5", diff --git a/packages/trpc/package.json b/packages/trpc/package.json index 69aba9116..fb32bcdf3 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -20,7 +20,6 @@ "@ts-rest/core": "^3.30.5", "@ts-rest/next": "^3.30.5", "luxon": "^3.4.0", - "@ts-rest/open-api": "^3.30.5", "superjson": "^1.13.1", "ts-pattern": "^5.0.5", "zod": "^3.22.4" From 54401b94ae8e9c12be1e92d674541ae3953f90d5 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Fri, 8 Dec 2023 09:58:23 +0000 Subject: [PATCH 018/311] chore: split api contract moved the schemas from the api contract to a separate file --- packages/trpc/api-contract/contract.ts | 100 ++++++++++--------------- packages/trpc/api-contract/schema.ts | 67 +++++++++++++++++ 2 files changed, 107 insertions(+), 60 deletions(-) create mode 100644 packages/trpc/api-contract/schema.ts diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts index 3dd5142cb..8e8f7b9bd 100644 --- a/packages/trpc/api-contract/contract.ts +++ b/packages/trpc/api-contract/contract.ts @@ -1,49 +1,20 @@ import { initContract } from '@ts-rest/core'; -import { z } from 'zod'; + +import { + AuthorizationHeadersSchema, + CreateDocumentMutationSchema, + DeleteDocumentMutationSchema, + GetDocumentsQuerySchema, + SendDocumentForSigningMutationSchema, + SuccessfulDocumentResponseSchema, + SuccessfulResponseSchema, + SuccessfulSigningResponseSchema, + UnsuccessfulResponseSchema, + UploadDocumentSuccessfulSchema, +} from './schema'; const c = initContract(); -/* - These schemas should be moved from here probably. - It grows quickly. -*/ -const GetDocumentsQuerySchema = z.object({ - page: z.string().optional(), - perPage: z.string().optional(), -}); - -const DocumentSchema = z.object({ - id: z.number(), - userId: z.number(), - title: z.string(), - status: z.string(), - documentDataId: z.string(), - createdAt: z.date(), - updatedAt: z.date(), - completedAt: z.date().nullable(), -}); - -const SendDocumentForSigningMutationSchema = z.object({ - signerEmail: z.string(), - signerName: z.string().optional(), -}); - -const UploadDocumentSuccessfulSchema = z.object({ - uploadedFile: z.object({ - id: z.number(), - message: z.string(), - }), -}); - -const SuccessfulResponseSchema = z.object({ - documents: DocumentSchema.array(), - totalPages: z.number(), -}); - -const UnsuccessfulResponseSchema = z.object({ - message: z.string(), -}); - export const contract = c.router( { getDocuments: { @@ -61,39 +32,48 @@ export const contract = c.router( method: 'GET', path: `/documents/:id`, responses: { - 200: DocumentSchema, + 200: SuccessfulDocumentResponseSchema, 401: UnsuccessfulResponseSchema, 404: UnsuccessfulResponseSchema, }, summary: 'Get a single document', }, + createDocument: { + method: 'POST', + path: '/documents', + body: CreateDocumentMutationSchema, + responses: { + 200: UploadDocumentSuccessfulSchema, + 401: UnsuccessfulResponseSchema, + 404: UnsuccessfulResponseSchema, + }, + summary: 'Upload a new document and get a presigned URL', + }, + sendDocumentForSigning: { + method: 'PATCH', + path: '/documents/:id/send-for-signing', + body: SendDocumentForSigningMutationSchema, + responses: { + 200: SuccessfulSigningResponseSchema, + 400: UnsuccessfulResponseSchema, + 401: UnsuccessfulResponseSchema, + 404: UnsuccessfulResponseSchema, + }, + summary: 'Send a document for signing', + }, deleteDocument: { method: 'DELETE', path: `/documents/:id`, - body: z.string(), + body: DeleteDocumentMutationSchema, responses: { - 200: DocumentSchema, + 200: SuccessfulDocumentResponseSchema, 401: UnsuccessfulResponseSchema, 404: UnsuccessfulResponseSchema, }, summary: 'Delete a document', }, - createDocument: { - method: 'POST', - path: '/documents', - contentType: 'multipart/form-data', - body: c.type<{ file: File }>(), - responses: { - 200: UploadDocumentSuccessfulSchema, - 401: UnsuccessfulResponseSchema, - 500: UnsuccessfulResponseSchema, - }, - summary: 'Upload a new document', - }, }, { - baseHeaders: z.object({ - authorization: z.string(), - }), + baseHeaders: AuthorizationHeadersSchema, }, ); diff --git a/packages/trpc/api-contract/schema.ts b/packages/trpc/api-contract/schema.ts new file mode 100644 index 000000000..504fa55b2 --- /dev/null +++ b/packages/trpc/api-contract/schema.ts @@ -0,0 +1,67 @@ +import { z } from 'zod'; + +import { FieldType } from '@documenso/prisma/client'; + +export const GetDocumentsQuerySchema = z.object({ + page: z.string().optional(), + perPage: z.string().optional(), +}); + +export const DeleteDocumentMutationSchema = z.string(); + +export const SuccessfulDocumentResponseSchema = z.object({ + id: z.number(), + userId: z.number(), + title: z.string(), + status: z.string(), + documentDataId: z.string(), + createdAt: z.date(), + updatedAt: z.date(), + completedAt: z.date().nullable(), +}); + +export const SendDocumentForSigningMutationSchema = z.object({ + signerEmail: z.string(), + signerName: z.string().optional(), + emailSubject: z.string().optional(), + emailBody: z.string().optional(), + fields: z.array( + z.object({ + fieldType: z.nativeEnum(FieldType), + pageNumber: z.number(), + pageX: z.number(), + pageY: z.number(), + pageWidth: z.number(), + pageHeight: z.number(), + }), + ), +}); + +export const UploadDocumentSuccessfulSchema = z.object({ + uploadedFile: z.object({ + url: z.string(), + key: z.string(), + }), +}); + +export const CreateDocumentMutationSchema = z.object({ + fileName: z.string(), + contentType: z.string().default('PDF'), +}); + +export const SuccessfulResponseSchema = z.object({ + documents: SuccessfulDocumentResponseSchema.array(), + totalPages: z.number(), +}); + +export const SuccessfulSigningResponseSchema = z.object({ + message: z.string(), +}); + +export const UnsuccessfulResponseSchema = z.object({ + message: z.string(), +}); + +export const AuthorizationHeadersSchema = z.object({ + authorization: z.string(), +}); From 66c0db91da6ffe3e2709e3f72f2d32823a61e5c5 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Fri, 8 Dec 2023 13:28:34 +0000 Subject: [PATCH 019/311] chore: cleanup and feedback implementation --- .../settings/layout/desktop-nav.tsx | 2 +- .../settings/layout/mobile-nav.tsx | 2 +- apps/web/src/pages/api/v1/[...ts-rest].tsx | 106 ++++++++++++++---- .../public-api/delete-api-token-by-id.ts | 2 +- .../server-only/public-api/get-documents.ts | 25 ----- packages/trpc/api-contract/schema.ts | 6 +- .../trpc/server/api-token-router/router.ts | 3 + 7 files changed, 90 insertions(+), 56 deletions(-) delete mode 100644 packages/lib/server-only/public-api/get-documents.ts diff --git a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx index 214c5af99..848ff17cc 100644 --- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx @@ -57,7 +57,7 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { )} > - API Token + API Tokens diff --git a/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx index ce61ba97d..7482c2f10 100644 --- a/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx +++ b/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx @@ -60,7 +60,7 @@ export const MobileNav = ({ className, ...props }: MobileNavProps) => { )} > - API Token + API Tokens diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx index b8e36340b..96e1584a1 100644 --- a/apps/web/src/pages/api/v1/[...ts-rest].tsx +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -1,12 +1,14 @@ import type { NextApiRequest, NextApiResponse } from 'next'; -import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data'; -import { createDocument } from '@documenso/lib/server-only/document/create-document'; +import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta'; import { deleteDocument } from '@documenso/lib/server-only/document/delete-document'; +import { findDocuments } from '@documenso/lib/server-only/document/find-documents'; import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; -import { getDocuments } from '@documenso/lib/server-only/public-api/get-documents'; +import { sendDocument } from '@documenso/lib/server-only/document/send-document'; +import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document'; import { checkUserFromToken } from '@documenso/lib/server-only/public-api/get-user-by-token'; -import { putFile } from '@documenso/lib/universal/upload/put-file'; +import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document'; +import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions'; import { contract } from '@documenso/trpc/api-contract/contract'; import { createNextRoute, createNextRouter } from '@documenso/trpc/server/public-api/ts-rest'; @@ -35,7 +37,7 @@ const router = createNextRoute(contract, { }; } - const { documents, totalPages } = await getDocuments({ page, perPage, userId: user.id }); + const { data: documents, totalPages } = await findDocuments({ page, perPage, userId: user.id }); return { status: 200, @@ -114,7 +116,30 @@ const router = createNextRoute(contract, { } }, createDocument: async (args) => { + const { body } = args; + + try { + const { url, key } = await getPresignPostUrl(body.fileName, body.contentType); + + return { + status: 200, + body: { + url, + key, + }, + }; + } catch (e) { + return { + status: 404, + body: { + message: 'An error has occured while uploading the file', + }, + }; + } + }, + sendDocumentForSigning: async (args) => { const { authorization } = args.headers; + const { id } = args.params; const { body } = args; const user = await validateUserToken(authorization); @@ -128,39 +153,72 @@ const router = createNextRoute(contract, { }; } + const document = await getDocumentById({ id: Number(id), userId: user.id }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === 'PENDING') { + return { + status: 400, + body: { + message: 'Document is already waiting for signing', + }, + }; + } + try { - const regexPattern = /filename="(.+?)"/; - const match = body.toString().match(regexPattern); - const documentTitle = match?.[1] ?? 'Untitled document'; - - const file = new Blob([body], { - type: 'application/pdf', + await setRecipientsForDocument({ + userId: user.id, + documentId: Number(id), + recipients: [ + { + email: body.signerEmail, + name: body.signerName ?? '', + }, + ], }); - const { type, data } = await putFile(file); - - const { id: documentDataId } = await createDocumentData({ - type, - data, + await setFieldsForDocument({ + documentId: Number(id), + userId: user.id, + fields: body.fields.map((field) => ({ + signerEmail: body.signerEmail, + type: field.fieldType, + pageNumber: field.pageNumber, + pageX: field.pageX, + pageY: field.pageY, + pageWidth: field.pageWidth, + pageHeight: field.pageHeight, + })), }); - const { id } = await createDocument({ - title: documentTitle, - documentDataId, + if (body.emailBody || body.emailSubject) { + await upsertDocumentMeta({ + documentId: Number(id), + subject: body.emailSubject ?? '', + message: body.emailBody ?? '', + }); + } + + await sendDocument({ + documentId: Number(id), userId: user.id, }); return { status: 200, body: { - uploadedFile: { - id, - message: 'Document uploaded successfuly', - }, + message: 'Document sent for signing successfully', }, }; } catch (e) { - console.error(e); return { status: 500, body: { diff --git a/packages/lib/server-only/public-api/delete-api-token-by-id.ts b/packages/lib/server-only/public-api/delete-api-token-by-id.ts index af176063f..398288006 100644 --- a/packages/lib/server-only/public-api/delete-api-token-by-id.ts +++ b/packages/lib/server-only/public-api/delete-api-token-by-id.ts @@ -6,7 +6,7 @@ export type DeleteTokenByIdOptions = { }; export const deleteTokenById = async ({ id, userId }: DeleteTokenByIdOptions) => { - return prisma.apiToken.delete({ + return await prisma.apiToken.delete({ where: { id, userId, diff --git a/packages/lib/server-only/public-api/get-documents.ts b/packages/lib/server-only/public-api/get-documents.ts deleted file mode 100644 index deea612e8..000000000 --- a/packages/lib/server-only/public-api/get-documents.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { prisma } from '@documenso/prisma'; - -type GetDocumentsProps = { - page: number; - perPage: number; - userId: number; -}; - -export const getDocuments = async ({ page = 1, perPage = 10, userId }: GetDocumentsProps) => { - const [documents, count] = await Promise.all([ - await prisma.document.findMany({ - where: { - userId, - }, - take: perPage, - skip: Math.max(page - 1, 0) * perPage, - }), - await prisma.document.count(), - ]); - - return { - documents, - totalPages: Math.ceil(count / perPage), - }; -}; diff --git a/packages/trpc/api-contract/schema.ts b/packages/trpc/api-contract/schema.ts index 504fa55b2..d62d50d52 100644 --- a/packages/trpc/api-contract/schema.ts +++ b/packages/trpc/api-contract/schema.ts @@ -38,10 +38,8 @@ export const SendDocumentForSigningMutationSchema = z.object({ }); export const UploadDocumentSuccessfulSchema = z.object({ - uploadedFile: z.object({ - url: z.string(), - key: z.string(), - }), + url: z.string(), + key: z.string(), }); export const CreateDocumentMutationSchema = z.object({ diff --git a/packages/trpc/server/api-token-router/router.ts b/packages/trpc/server/api-token-router/router.ts index 266c045d0..bae094456 100644 --- a/packages/trpc/server/api-token-router/router.ts +++ b/packages/trpc/server/api-token-router/router.ts @@ -23,6 +23,7 @@ export const apiTokenRouter = router({ }); } }), + getTokenById: authenticatedProcedure .input(ZGetApiTokenByIdQuerySchema) .query(async ({ input, ctx }) => { @@ -40,6 +41,7 @@ export const apiTokenRouter = router({ }); } }), + createToken: authenticatedProcedure .input(ZCreateTokenMutationSchema) .mutation(async ({ input, ctx }) => { @@ -56,6 +58,7 @@ export const apiTokenRouter = router({ }); } }), + deleteTokenById: authenticatedProcedure .input(ZDeleteTokenByIdMutationSchema) .mutation(async ({ input, ctx }) => { From 8ecd8a7d10ea9635d21cd4aac7cf94bb8281af5d Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Mon, 11 Dec 2023 14:33:30 +0200 Subject: [PATCH 020/311] chore: implemented feedback + a small refactoring --- .../app/(dashboard)/settings/token/page.tsx | 2 +- apps/web/src/components/forms/token.tsx | 15 ++----- apps/web/src/pages/api/v1/[...ts-rest].tsx | 43 +++++++++---------- packages/lib/constants/time.ts | 2 + .../public-api/create-api-token.ts | 4 +- .../public-api/get-user-by-token.ts | 15 ++++++- 6 files changed, 42 insertions(+), 39 deletions(-) diff --git a/apps/web/src/app/(dashboard)/settings/token/page.tsx b/apps/web/src/app/(dashboard)/settings/token/page.tsx index ab4992f14..889e7a2a8 100644 --- a/apps/web/src/app/(dashboard)/settings/token/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/token/page.tsx @@ -3,7 +3,7 @@ import { ApiTokenForm } from '~/components/forms/token'; export default function ApiToken() { return (
    -

    API Token

    +

    API Tokens

    On this page, you can create new API tokens and manage the existing ones. diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index 954d4dd2e..f3f05028e 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -6,6 +6,7 @@ import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; import { Loader } from 'lucide-react'; +import { DateTime } from 'luxon'; import { useForm } from 'react-hook-form'; import type { z } from 'zod'; @@ -139,23 +140,13 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => {

    Created:{' '} {token.createdAt - ? new Date(token.createdAt).toLocaleDateString(undefined, { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }) + ? DateTime.fromJSDate(token.createdAt).toLocaleString(DateTime.DATETIME_FULL) : 'N/A'}

    Expires:{' '} {token.expires - ? new Date(token.expires).toLocaleDateString(undefined, { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }) + ? DateTime.fromJSDate(token.createdAt).toLocaleString(DateTime.DATETIME_FULL) : 'N/A'}

    { - try { - return await checkUserFromToken({ token }); - } catch (e) { - return null; - } -}; - const router = createNextRoute(contract, { getDocuments: async (args) => { const page = Number(args.query.page) || 1; const perPage = Number(args.query.perPage) || 10; const { authorization } = args.headers; + let user; - const user = await validateUserToken(authorization); - - if (!user) { + try { + user = await checkUserFromToken({ token: authorization }); + } catch (e) { return { status: 401, body: { - message: 'Unauthorized', + message: e.message, }, }; } @@ -50,14 +43,15 @@ const router = createNextRoute(contract, { getDocument: async (args) => { const { id: documentId } = args.params; const { authorization } = args.headers; + let user; - const user = await validateUserToken(authorization); - - if (!user) { + try { + user = await checkUserFromToken({ token: authorization }); + } catch (e) { return { status: 401, body: { - message: 'Unauthorized', + message: e.message, }, }; } @@ -82,13 +76,15 @@ const router = createNextRoute(contract, { const { id: documentId } = args.params; const { authorization } = args.headers; - const user = await validateUserToken(authorization); + let user; - if (!user) { + try { + user = await checkUserFromToken({ token: authorization }); + } catch (e) { return { status: 401, body: { - message: 'Unauthorized', + message: e.message, }, }; } @@ -141,14 +137,15 @@ const router = createNextRoute(contract, { const { authorization } = args.headers; const { id } = args.params; const { body } = args; + let user; - const user = await validateUserToken(authorization); - - if (!user) { + try { + user = await checkUserFromToken({ token: authorization }); + } catch (e) { return { status: 401, body: { - message: 'Unauthorized', + message: e.message, }, }; } diff --git a/packages/lib/constants/time.ts b/packages/lib/constants/time.ts index e2581e14c..c1a262048 100644 --- a/packages/lib/constants/time.ts +++ b/packages/lib/constants/time.ts @@ -3,3 +3,5 @@ export const ONE_MINUTE = ONE_SECOND * 60; export const ONE_HOUR = ONE_MINUTE * 60; export const ONE_DAY = ONE_HOUR * 24; export const ONE_WEEK = ONE_DAY * 7; +export const ONE_MONTH = ONE_DAY * 30; +export const ONE_YEAR = ONE_DAY * 365; diff --git a/packages/lib/server-only/public-api/create-api-token.ts b/packages/lib/server-only/public-api/create-api-token.ts index 582053359..645e9fb1b 100644 --- a/packages/lib/server-only/public-api/create-api-token.ts +++ b/packages/lib/server-only/public-api/create-api-token.ts @@ -3,7 +3,7 @@ import crypto from 'crypto'; import { prisma } from '@documenso/prisma'; // temporary choice for testing only -import { ONE_WEEK } from '../../constants/time'; +import { ONE_YEAR } from '../../constants/time'; type CreateApiTokenInput = { userId: number; @@ -22,7 +22,7 @@ export const createApiToken = async ({ userId, tokenName }: CreateApiTokenInput) token: tokenHash, name: tokenName, userId, - expires: new Date(Date.now() + ONE_WEEK), + expires: new Date(Date.now() + ONE_YEAR), }, }); diff --git a/packages/lib/server-only/public-api/get-user-by-token.ts b/packages/lib/server-only/public-api/get-user-by-token.ts index 3092deaa7..277fc13b2 100644 --- a/packages/lib/server-only/public-api/get-user-by-token.ts +++ b/packages/lib/server-only/public-api/get-user-by-token.ts @@ -1,7 +1,7 @@ import { prisma } from '@documenso/prisma'; export const checkUserFromToken = async ({ token }: { token: string }) => { - const user = await prisma.user.findFirstOrThrow({ + const user = await prisma.user.findFirst({ where: { ApiToken: { some: { @@ -9,7 +9,20 @@ export const checkUserFromToken = async ({ token }: { token: string }) => { }, }, }, + include: { + ApiToken: true, + }, }); + if (!user) { + throw new Error('Token not found'); + } + + const tokenObject = user.ApiToken.find((apiToken) => apiToken.token === token); + + if (!tokenObject || new Date(tokenObject.expires) < new Date()) { + throw new Error('The API token has expired'); + } + return user; }; From 19736ce60b082dc317684352e484839924ed4163 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Thu, 14 Dec 2023 11:05:39 +0200 Subject: [PATCH 021/311] chore: implemented feedback --- apps/web/src/components/forms/token.tsx | 24 ++++++++++++++----- .../public-api/get-user-by-token.ts | 4 ++-- packages/trpc/server/field-router/router.ts | 2 ++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index f3f05028e..56b91b467 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -63,17 +63,29 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { */ const onDelete = (tokenId: number) => { if (tokenId === newlyCreatedToken.id) { - setShowNewToken((prev) => !prev); + setShowNewToken(false); } }; - const copyToken = (token: string) => { - void copy(token).then(() => { + const copyToken = async (token: string) => { + try { + const copied = await copy(token); + + if (!copied) { + throw new Error('Unable to copy the token'); + } + toast({ title: 'Token copied to clipboard', description: 'The token was copied to your clipboard.', }); - }); + } catch (error) { + toast({ + title: 'Unable to copy token', + description: 'We were unable to copy the token to your clipboard. Please try again.', + variant: 'destructive', + }); + } }; const onSubmit = async ({ tokenName }: TCreateTokenMutationSchema) => { @@ -146,7 +158,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => {

    Expires:{' '} {token.expires - ? DateTime.fromJSDate(token.createdAt).toLocaleString(DateTime.DATETIME_FULL) + ? DateTime.fromJSDate(token.expires).toLocaleString(DateTime.DATETIME_FULL) : 'N/A'}

    { diff --git a/packages/lib/server-only/public-api/get-user-by-token.ts b/packages/lib/server-only/public-api/get-user-by-token.ts index 277fc13b2..5e696521c 100644 --- a/packages/lib/server-only/public-api/get-user-by-token.ts +++ b/packages/lib/server-only/public-api/get-user-by-token.ts @@ -15,13 +15,13 @@ export const checkUserFromToken = async ({ token }: { token: string }) => { }); if (!user) { - throw new Error('Token not found'); + throw new Error('Invalid token'); } const tokenObject = user.ApiToken.find((apiToken) => apiToken.token === token); if (!tokenObject || new Date(tokenObject.expires) < new Date()) { - throw new Error('The API token has expired'); + throw new Error('Expired token'); } return user; diff --git a/packages/trpc/server/field-router/router.ts b/packages/trpc/server/field-router/router.ts index 7d049df0d..1dbc89426 100644 --- a/packages/trpc/server/field-router/router.ts +++ b/packages/trpc/server/field-router/router.ts @@ -18,6 +18,8 @@ export const fieldRouter = router({ try { const { documentId, fields } = input; + console.log('fields', fields); + return await setFieldsForDocument({ documentId, userId: ctx.user.id, From da03fc1fd0be29ede4130fb67a64219da9e5d54c Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Mon, 18 Dec 2023 12:24:42 +0200 Subject: [PATCH 022/311] chore: finishing touches --- .../(dashboard)/settings/token/delete-token-dialog.tsx | 4 ++-- apps/web/src/components/forms/token.tsx | 3 +++ packages/trpc/server/field-router/router.ts | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx index f847cd793..1e3513d98 100644 --- a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx @@ -88,7 +88,7 @@ export default function DeleteTokenDialog({ variant: 'destructive', duration: 5000, description: - 'We encountered an unknown error while attempting to delete this team. Please try again later.', + 'We encountered an unknown error while attempting to delete this token. Please try again later.', }); } }; @@ -151,7 +151,7 @@ export default function DeleteTokenDialog({ type="button" variant="secondary" className="flex-1" - onClick={(prev) => setIsOpen(!prev)} + onClick={() => setIsOpen(false)} > Cancel diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index 56b91b467..9091b7501 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -134,6 +134,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { ) : (
    )} + {!tokens && isTokensLoading ? (
    @@ -171,6 +172,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { ))}
)} + {newlyCreatedToken.token && showNewToken && (

@@ -187,6 +189,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => {

)} +

Create a new token

Enter a representative name for your new token. diff --git a/packages/trpc/server/field-router/router.ts b/packages/trpc/server/field-router/router.ts index 1dbc89426..7d049df0d 100644 --- a/packages/trpc/server/field-router/router.ts +++ b/packages/trpc/server/field-router/router.ts @@ -18,8 +18,6 @@ export const fieldRouter = router({ try { const { documentId, fields } = input; - console.log('fields', fields); - return await setFieldsForDocument({ documentId, userId: ctx.user.id, From 17486b961d99bcfbf8908ef1f732d0ee0811b385 Mon Sep 17 00:00:00 2001 From: Catalin Pit Date: Tue, 19 Dec 2023 15:51:43 +0200 Subject: [PATCH 023/311] chore: refactor delete dialog --- .../settings/token/delete-token-dialog.tsx | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx index 1e3513d98..b3f57018b 100644 --- a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx @@ -44,6 +44,7 @@ export default function DeleteTokenDialog({ const router = useRouter(); const { toast } = useToast(); const [isOpen, setIsOpen] = useState(false); + const [isDeleteEnabled, setIsDeleteEnabled] = useState(false); const deleteMessage = `delete ${tokenName}`; @@ -68,6 +69,10 @@ export default function DeleteTokenDialog({ }, }); + const onInputChange = (event: React.ChangeEvent) => { + setIsDeleteEnabled(event.target.value === deleteMessage); + }; + const onSubmit = async () => { try { await deleteTokenMutation({ @@ -94,10 +99,11 @@ export default function DeleteTokenDialog({ }; useEffect(() => { - if (!open) { + if (!isOpen) { + setIsDeleteEnabled(false); form.reset(); } - }, [open, form]); + }, [isOpen, form]); return (

- + { + onInputChange(value); + field.onChange(value); + }} + /> @@ -159,7 +173,7 @@ export default function DeleteTokenDialog({ + +
+ + + ))} + + )} ); } diff --git a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx index b3f57018b..ba0a4cc99 100644 --- a/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/token/delete-token-dialog.tsx @@ -1,3 +1,5 @@ +'use client'; + import { useEffect, useState } from 'react'; import { useRouter } from 'next/navigation'; @@ -6,6 +8,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; +import type { ApiToken } from '@documenso/prisma/client'; import { trpc } from '@documenso/trpc/react'; import { Button } from '@documenso/ui/primitives/button'; import { @@ -29,24 +32,18 @@ import { Input } from '@documenso/ui/primitives/input'; import { useToast } from '@documenso/ui/primitives/use-toast'; export type DeleteTokenDialogProps = { - trigger?: React.ReactNode; - tokenId: number; - tokenName: string; - onDelete: () => void; + token: Pick; + onDelete?: () => void; + children?: React.ReactNode; }; -export default function DeleteTokenDialog({ - trigger, - tokenId, - tokenName, - onDelete, -}: DeleteTokenDialogProps) { +export default function DeleteTokenDialog({ token, onDelete, children }: DeleteTokenDialogProps) { const router = useRouter(); const { toast } = useToast(); - const [isOpen, setIsOpen] = useState(false); - const [isDeleteEnabled, setIsDeleteEnabled] = useState(false); - const deleteMessage = `delete ${tokenName}`; + const [isOpen, setIsOpen] = useState(false); + + const deleteMessage = `delete ${token.name}`; const ZDeleteTokenDialogSchema = z.object({ tokenName: z.literal(deleteMessage, { @@ -58,7 +55,7 @@ export default function DeleteTokenDialog({ const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation({ onSuccess() { - onDelete(); + onDelete?.(); }, }); @@ -69,14 +66,10 @@ export default function DeleteTokenDialog({ }, }); - const onInputChange = (event: React.ChangeEvent) => { - setIsDeleteEnabled(event.target.value === deleteMessage); - }; - const onSubmit = async () => { try { await deleteTokenMutation({ - id: tokenId, + id: token.id, }); toast({ @@ -86,7 +79,8 @@ export default function DeleteTokenDialog({ }); setIsOpen(false); - router.push('/settings/token'); + + router.refresh(); } catch (error) { toast({ title: 'An unknown error occurred', @@ -100,7 +94,6 @@ export default function DeleteTokenDialog({ useEffect(() => { if (!isOpen) { - setIsDeleteEnabled(false); form.reset(); } }, [isOpen, form]); @@ -111,12 +104,13 @@ export default function DeleteTokenDialog({ onOpenChange={(value) => !form.formState.isSubmitting && setIsOpen(value)} > - {trigger ?? ( + {children ?? ( )} + Are you sure you want to delete this token? @@ -144,21 +138,15 @@ export default function DeleteTokenDialog({ {deleteMessage} + - { - onInputChange(value); - field.onChange(value); - }} - /> + )} /> +
-
- )} - -

Create a new token

-

- Enter a representative name for your new token. -

-
+
( - + Token Name - - - + +
+ + + + + +
+ + + Please enter a meaningful name for your token. This will help you identify it + later. + +
)} /> -
+
+ + {newlyCreatedToken && ( + + +

+ Your token was created successfully! Make sure to copy it because you won't be able to + see it again! +

+ +

+ {newlyCreatedToken} +

+ + +
+
+ )} ); }; diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx index 0b22d97c6..15b618ebd 100644 --- a/apps/web/src/pages/api/v1/[...ts-rest].tsx +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -1,227 +1,5 @@ -import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta'; -import { deleteDocument } from '@documenso/lib/server-only/document/delete-document'; -import { findDocuments } from '@documenso/lib/server-only/document/find-documents'; -import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; -import { sendDocument } from '@documenso/lib/server-only/document/send-document'; -import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document'; -import { getUserByApiToken } from '@documenso/lib/server-only/public-api/get-user-by-token'; -import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document'; -import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions'; -import { contract } from '@documenso/trpc/api-contract/contract'; -import { createNextRoute, createNextRouter } from '@documenso/trpc/server/public-api/ts-rest'; +import { createNextRouter } from '@documenso/api/next'; +import { ApiContractV1 } from '@documenso/api/v1/contract'; +import { ApiContractV1Implementation } from '@documenso/api/v1/implementation'; -const router = createNextRoute(contract, { - getDocuments: async (args) => { - const page = Number(args.query.page) || 1; - const perPage = Number(args.query.perPage) || 10; - const { authorization } = args.headers; - let user; - - try { - user = await getUserByApiToken({ token: authorization }); - } catch (e) { - return { - status: 401, - body: { - message: e.message, - }, - }; - } - - const { data: documents, totalPages } = await findDocuments({ page, perPage, userId: user.id }); - - return { - status: 200, - body: { - documents, - totalPages, - }, - }; - }, - getDocument: async (args) => { - const { id: documentId } = args.params; - const { authorization } = args.headers; - let user; - - try { - user = await getUserByApiToken({ token: authorization }); - } catch (e) { - return { - status: 401, - body: { - message: e.message, - }, - }; - } - - try { - const document = await getDocumentById({ id: Number(documentId), userId: user.id }); - - return { - status: 200, - body: document, - }; - } catch (e) { - return { - status: 404, - body: { - message: e.message ?? 'Document not found', - }, - }; - } - }, - deleteDocument: async (args) => { - const { id: documentId } = args.params; - const { authorization } = args.headers; - - let user; - - try { - user = await getUserByApiToken({ token: authorization }); - } catch (e) { - return { - status: 401, - body: { - message: e.message, - }, - }; - } - - try { - const document = await getDocumentById({ id: Number(documentId), userId: user.id }); - - const deletedDocument = await deleteDocument({ - id: Number(documentId), - userId: user.id, - status: document.status, - }); - - return { - status: 200, - body: deletedDocument, - }; - } catch (e) { - return { - status: 404, - body: { - message: e.message ?? 'Document not found', - }, - }; - } - }, - createDocument: async (args) => { - const { body } = args; - - try { - const { url, key } = await getPresignPostUrl(body.fileName, body.contentType); - - return { - status: 200, - body: { - url, - key, - }, - }; - } catch (e) { - return { - status: 404, - body: { - message: e.message ?? 'An error has occured while uploading the file', - }, - }; - } - }, - sendDocumentForSigning: async (args) => { - const { authorization } = args.headers; - const { id } = args.params; - const { body } = args; - let user; - - try { - user = await getUserByApiToken({ token: authorization }); - } catch (e) { - return { - status: 401, - body: { - message: e.message, - }, - }; - } - - const document = await getDocumentById({ id: Number(id), userId: user.id }); - - if (!document) { - return { - status: 404, - body: { - message: 'Document not found', - }, - }; - } - - if (document.status === 'PENDING') { - return { - status: 400, - body: { - message: 'Document is already waiting for signing', - }, - }; - } - - try { - await setRecipientsForDocument({ - userId: user.id, - documentId: Number(id), - recipients: [ - { - email: body.signerEmail, - name: body.signerName ?? '', - }, - ], - }); - - await setFieldsForDocument({ - documentId: Number(id), - userId: user.id, - fields: body.fields.map((field) => ({ - signerEmail: body.signerEmail, - type: field.fieldType, - pageNumber: field.pageNumber, - pageX: field.pageX, - pageY: field.pageY, - pageWidth: field.pageWidth, - pageHeight: field.pageHeight, - })), - }); - - if (body.emailBody || body.emailSubject) { - await upsertDocumentMeta({ - documentId: Number(id), - subject: body.emailSubject ?? '', - message: body.emailBody ?? '', - }); - } - - await sendDocument({ - documentId: Number(id), - userId: user.id, - }); - - return { - status: 200, - body: { - message: 'Document sent for signing successfully', - }, - }; - } catch (e) { - return { - status: 500, - body: { - message: e.message ?? 'An error has occured while sending the document for signing', - }, - }; - } - }, -}); - -export default createNextRouter(contract, router); +export default createNextRouter(ApiContractV1, ApiContractV1Implementation); diff --git a/package-lock.json b/package-lock.json index d244df9e8..148b02096 100644 --- a/package-lock.json +++ b/package-lock.json @@ -88,6 +88,7 @@ "version": "1.2.3", "license": "AGPL-3.0", "dependencies": { + "@documenso/api": "*", "@documenso/assets": "*", "@documenso/ee": "*", "@documenso/lib": "*", @@ -167,18 +168,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@anatine/zod-openapi": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/@anatine/zod-openapi/-/zod-openapi-1.14.2.tgz", - "integrity": "sha512-q0qHfnuNYVKu0Swrnnvfj9971AEyW7c8v9jCOZGCl5ZbyGMNG4RPyJkRcMi/JC8CRfdOe0IDfNm1nNsi2avprg==", - "dependencies": { - "ts-deepmerge": "^6.0.3" - }, - "peerDependencies": { - "openapi3-ts": "^2.0.0 || ^3.0.0", - "zod": "^3.20.0" - } - }, "node_modules/@aws-crypto/crc32": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", @@ -1776,6 +1765,10 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@documenso/api": { + "resolved": "packages/api", + "link": true + }, "node_modules/@documenso/app-tests": { "resolved": "packages/app-tests", "link": true @@ -14379,22 +14372,6 @@ "node": ">= 14.17.0" } }, - "node_modules/openapi3-ts": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-2.0.2.tgz", - "integrity": "sha512-TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw==", - "dependencies": { - "yaml": "^1.10.2" - } - }, - "node_modules/openapi3-ts/node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "engines": { - "node": ">= 6" - } - }, "node_modules/openid-client": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.6.1.tgz", @@ -17858,14 +17835,6 @@ "typescript": ">=4.2.0" } }, - "node_modules/ts-deepmerge": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ts-deepmerge/-/ts-deepmerge-6.2.0.tgz", - "integrity": "sha512-2qxI/FZVDPbzh63GwWIZYE7daWKtwXZYuyc8YNq0iTmMUwn4mL0jRLsp6hfFlgbdRSR4x2ppe+E86FnvEpN7Nw==", - "engines": { - "node": ">=14.13.1" - } - }, "node_modules/ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", @@ -19268,6 +19237,233 @@ "url": "https://github.com/sponsors/wooorm" } }, + "packages/api": { + "name": "@documenso/api", + "version": "1.0.0", + "license": "MIT", + "dependencies": { + "@documenso/lib": "*", + "@documenso/prisma": "*", + "@ts-rest/core": "^3.30.5", + "@ts-rest/next": "^3.30.5", + "luxon": "^3.4.0", + "superjson": "^1.13.1", + "ts-pattern": "^5.0.5", + "zod": "^3.22.4" + }, + "devDependencies": {} + }, + "packages/api/node_modules/@next/env": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", + "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==", + "peer": true + }, + "packages/api/node_modules/@next/swc-darwin-arm64": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz", + "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-darwin-x64": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz", + "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-linux-arm64-gnu": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz", + "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-linux-arm64-musl": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz", + "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-linux-x64-gnu": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz", + "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-linux-x64-musl": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz", + "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-win32-arm64-msvc": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz", + "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-win32-ia32-msvc": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz", + "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@next/swc-win32-x64-msvc": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz", + "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "packages/api/node_modules/@ts-rest/next": { + "version": "3.30.5", + "resolved": "https://registry.npmjs.org/@ts-rest/next/-/next-3.30.5.tgz", + "integrity": "sha512-NasfUN7SnwcjJNbxvvcemC4fOv4f4IF5I14wVqQODN0HWPokkrta6XLuv0eKQJYdB32AS7VINQhls8Sj1AIN0g==", + "peerDependencies": { + "@ts-rest/core": "3.30.5", + "next": "^12.0.0 || ^13.0.0", + "zod": "^3.22.3" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, + "packages/api/node_modules/next": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", + "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==", + "peer": true, + "dependencies": { + "@next/env": "13.5.6", + "@swc/helpers": "0.5.2", + "busboy": "1.6.0", + "caniuse-lite": "^1.0.30001406", + "postcss": "8.4.31", + "styled-jsx": "5.1.1", + "watchpack": "2.4.0" + }, + "bin": { + "next": "dist/bin/next" + }, + "engines": { + "node": ">=16.14.0" + }, + "optionalDependencies": { + "@next/swc-darwin-arm64": "13.5.6", + "@next/swc-darwin-x64": "13.5.6", + "@next/swc-linux-arm64-gnu": "13.5.6", + "@next/swc-linux-arm64-musl": "13.5.6", + "@next/swc-linux-x64-gnu": "13.5.6", + "@next/swc-linux-x64-musl": "13.5.6", + "@next/swc-win32-arm64-msvc": "13.5.6", + "@next/swc-win32-ia32-msvc": "13.5.6", + "@next/swc-win32-x64-msvc": "13.5.6" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "sass": "^1.3.0" + }, + "peerDependenciesMeta": { + "@opentelemetry/api": { + "optional": true + }, + "sass": { + "optional": true + } + } + }, "packages/app-tests": { "name": "@documenso/app-tests", "version": "1.0.0", diff --git a/packages/api/index.ts b/packages/api/index.ts new file mode 100644 index 000000000..cb0ff5c3b --- /dev/null +++ b/packages/api/index.ts @@ -0,0 +1 @@ +export {}; diff --git a/packages/api/next.ts b/packages/api/next.ts new file mode 100644 index 000000000..5ac5aab45 --- /dev/null +++ b/packages/api/next.ts @@ -0,0 +1 @@ +export { createNextRouter } from '@ts-rest/next'; diff --git a/packages/api/package.json b/packages/api/package.json new file mode 100644 index 000000000..9aea9b26f --- /dev/null +++ b/packages/api/package.json @@ -0,0 +1,28 @@ +{ + "name": "@documenso/api", + "version": "1.0.0", + "main": "./index.ts", + "types": "./index.ts", + "license": "MIT", + "scripts": { + "lint": "eslint .", + "lint:fix": "eslint . --fix", + "clean": "rimraf node_modules" + }, + "files": [ + "index.ts", + "next.ts", + "v1/" + ], + "dependencies": { + "@documenso/lib": "*", + "@documenso/prisma": "*", + "@ts-rest/core": "^3.30.5", + "@ts-rest/next": "^3.30.5", + "luxon": "^3.4.0", + "superjson": "^1.13.1", + "ts-pattern": "^5.0.5", + "zod": "^3.22.4" + }, + "devDependencies": {} +} diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json new file mode 100644 index 000000000..dc21318a7 --- /dev/null +++ b/packages/api/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "@documenso/tsconfig/react-library.json", + "include": ["."], + "exclude": ["dist", "build", "node_modules"], + "compilerOptions": { + "strict": true, + } +} diff --git a/packages/api/v1/contract.ts b/packages/api/v1/contract.ts new file mode 100644 index 000000000..0f853a020 --- /dev/null +++ b/packages/api/v1/contract.ts @@ -0,0 +1,84 @@ +import { initContract } from '@ts-rest/core'; + +import { + ZSendDocumentForSigningMutationSchema as SendDocumentMutationSchema, + ZAuthorizationHeadersSchema, + ZCreateDocumentMutationSchema, + ZDeleteDocumentMutationSchema, + ZGetDocumentsQuerySchema, + ZSuccessfulDocumentResponseSchema, + ZSuccessfulResponseSchema, + ZSuccessfulSigningResponseSchema, + ZUnsuccessfulResponseSchema, + ZUploadDocumentSuccessfulSchema, +} from './schema'; + +const c = initContract(); + +export const ApiContractV1 = c.router( + { + getDocuments: { + method: 'GET', + path: '/documents', + query: ZGetDocumentsQuerySchema, + responses: { + 200: ZSuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + }, + summary: 'Get all documents', + }, + + getDocument: { + method: 'GET', + path: `/documents/:id`, + responses: { + 200: ZSuccessfulDocumentResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + }, + summary: 'Get a single document', + }, + + createDocument: { + method: 'POST', + path: '/documents', + body: ZCreateDocumentMutationSchema, + responses: { + 200: ZUploadDocumentSuccessfulSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + }, + summary: 'Upload a new document and get a presigned URL', + }, + + sendDocument: { + method: 'PATCH', + path: '/documents/:id/send', + body: SendDocumentMutationSchema, + responses: { + 200: ZSuccessfulSigningResponseSchema, + 400: ZUnsuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + 500: ZUnsuccessfulResponseSchema, + }, + summary: 'Send a document for signing', + }, + + deleteDocument: { + method: 'DELETE', + path: `/documents/:id`, + body: ZDeleteDocumentMutationSchema, + responses: { + 200: ZSuccessfulDocumentResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + }, + summary: 'Delete a document', + }, + }, + { + baseHeaders: ZAuthorizationHeadersSchema, + }, +); diff --git a/packages/api/v1/implementation.ts b/packages/api/v1/implementation.ts new file mode 100644 index 000000000..b317e95d6 --- /dev/null +++ b/packages/api/v1/implementation.ts @@ -0,0 +1,178 @@ +import { createNextRoute } from '@ts-rest/next'; + +import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta'; +import { deleteDocument } from '@documenso/lib/server-only/document/delete-document'; +import { findDocuments } from '@documenso/lib/server-only/document/find-documents'; +import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; +import { sendDocument } from '@documenso/lib/server-only/document/send-document'; +import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document'; +import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document'; +import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions'; + +import { ApiContractV1 } from './contract'; +import { authenticatedMiddleware } from './middleware/authenticated'; + +export const ApiContractV1Implementation = createNextRoute(ApiContractV1, { + getDocuments: authenticatedMiddleware(async (args, user) => { + 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 }); + + return { + status: 200, + body: { + documents, + totalPages, + }, + }; + }), + + getDocument: authenticatedMiddleware(async (args, user) => { + const { id: documentId } = args.params; + + try { + const document = await getDocumentById({ id: Number(documentId), userId: user.id }); + + return { + status: 200, + body: document, + }; + } catch (err) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + }), + + deleteDocument: authenticatedMiddleware(async (args, user) => { + const { id: documentId } = args.params; + + try { + const document = await getDocumentById({ id: Number(documentId), userId: user.id }); + + const deletedDocument = await deleteDocument({ + id: Number(documentId), + userId: user.id, + status: document.status, + }); + + return { + status: 200, + body: deletedDocument, + }; + } catch (err) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + }), + + createDocument: authenticatedMiddleware(async (args, _user) => { + const { body } = args; + + try { + const { url, key } = await getPresignPostUrl(body.fileName, body.contentType); + + return { + status: 200, + body: { + url, + key, + }, + }; + } catch (err) { + return { + status: 404, + body: { + message: 'An error has occured while uploading the file', + }, + }; + } + }), + + sendDocument: authenticatedMiddleware(async (args, user) => { + const { id } = args.params; + const { body } = args; + + const document = await getDocumentById({ id: Number(id), userId: user.id }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === 'PENDING') { + return { + status: 400, + body: { + message: 'Document is already waiting for signing', + }, + }; + } + + try { + await setRecipientsForDocument({ + userId: user.id, + documentId: Number(id), + recipients: [ + { + email: body.signerEmail, + name: body.signerName ?? '', + }, + ], + }); + + await setFieldsForDocument({ + documentId: Number(id), + userId: user.id, + fields: body.fields.map((field) => ({ + signerEmail: body.signerEmail, + type: field.fieldType, + pageNumber: field.pageNumber, + pageX: field.pageX, + pageY: field.pageY, + pageWidth: field.pageWidth, + pageHeight: field.pageHeight, + })), + }); + + if (body.emailBody || body.emailSubject) { + await upsertDocumentMeta({ + documentId: Number(id), + subject: body.emailSubject ?? '', + message: body.emailBody ?? '', + }); + } + + await sendDocument({ + documentId: Number(id), + userId: user.id, + }); + + return { + status: 200, + body: { + message: 'Document sent for signing successfully', + }, + }; + } catch (err) { + return { + status: 500, + body: { + message: 'An error has occured while sending the document for signing', + }, + }; + } + }), +}); diff --git a/packages/api/v1/middleware/authenticated.ts b/packages/api/v1/middleware/authenticated.ts new file mode 100644 index 000000000..3e23029a5 --- /dev/null +++ b/packages/api/v1/middleware/authenticated.ts @@ -0,0 +1,37 @@ +import type { NextApiRequest } from 'next'; + +import { getUserByApiToken } from '@documenso/lib/server-only/public-api/get-user-by-token'; +import type { User } from '@documenso/prisma/client'; + +export const authenticatedMiddleware = < + T extends { + req: NextApiRequest; + }, + R extends { + status: number; + body: unknown; + }, +>( + handler: (args: T, user: User) => Promise, +) => { + return async (args: T) => { + try { + const { authorization: token } = args.req.headers; + + if (!token) { + throw new Error('Token was not provided for authenticated middleware'); + } + + const user = await getUserByApiToken({ token }); + + return await handler(args, user); + } catch (_err) { + return { + status: 401, + body: { + message: 'Unauthorized', + }, + } as const; + } + }; +}; diff --git a/packages/api/v1/schema.ts b/packages/api/v1/schema.ts new file mode 100644 index 000000000..f4c80ca73 --- /dev/null +++ b/packages/api/v1/schema.ts @@ -0,0 +1,87 @@ +import { z } from 'zod'; + +import { FieldType } from '@documenso/prisma/client'; + +export const ZGetDocumentsQuerySchema = z.object({ + page: z.string().optional(), + perPage: z.string().optional(), +}); + +export type TGetDocumentsQuerySchema = z.infer; + +export const ZDeleteDocumentMutationSchema = z.string(); + +export type TDeleteDocumentMutationSchema = z.infer; + +export const ZSuccessfulDocumentResponseSchema = z.object({ + id: z.number(), + userId: z.number(), + title: z.string(), + status: z.string(), + documentDataId: z.string(), + createdAt: z.date(), + updatedAt: z.date(), + completedAt: z.date().nullable(), +}); + +export type TSuccessfulDocumentResponseSchema = z.infer; + +export const ZSendDocumentForSigningMutationSchema = z.object({ + signerEmail: z.string(), + signerName: z.string().optional(), + emailSubject: z.string().optional(), + emailBody: z.string().optional(), + fields: z.array( + z.object({ + fieldType: z.nativeEnum(FieldType), + pageNumber: z.number(), + pageX: z.number(), + pageY: z.number(), + pageWidth: z.number(), + pageHeight: z.number(), + }), + ), +}); + +export type TSendDocumentForSigningMutationSchema = z.infer< + typeof ZSendDocumentForSigningMutationSchema +>; + +export const ZUploadDocumentSuccessfulSchema = z.object({ + url: z.string(), + key: z.string(), +}); + +export type TUploadDocumentSuccessfulSchema = z.infer; + +export const ZCreateDocumentMutationSchema = z.object({ + fileName: z.string(), + contentType: z.string().default('PDF'), +}); + +export type TCreateDocumentMutationSchema = z.infer; + +export const ZSuccessfulResponseSchema = z.object({ + documents: ZSuccessfulDocumentResponseSchema.array(), + totalPages: z.number(), +}); + +export type TSuccessfulResponseSchema = z.infer; + +export const ZSuccessfulSigningResponseSchema = z.object({ + message: z.string(), +}); + +export type TSuccessfulSigningResponseSchema = z.infer; + +export const ZUnsuccessfulResponseSchema = z.object({ + message: z.string(), +}); + +export type TUnsuccessfulResponseSchema = z.infer; + +export const ZAuthorizationHeadersSchema = z.object({ + authorization: z.string(), +}); + +export type TAuthorizationHeadersSchema = z.infer; diff --git a/packages/lib/server-only/public-api/get-all-user-tokens.ts b/packages/lib/server-only/public-api/get-all-user-tokens.ts index d64562b83..1ba31a6cf 100644 --- a/packages/lib/server-only/public-api/get-all-user-tokens.ts +++ b/packages/lib/server-only/public-api/get-all-user-tokens.ts @@ -5,7 +5,7 @@ export type GetUserTokensOptions = { }; export const getUserTokens = async ({ userId }: GetUserTokensOptions) => { - return prisma.apiToken.findMany({ + return await prisma.apiToken.findMany({ where: { userId, }, @@ -16,5 +16,8 @@ export const getUserTokens = async ({ userId }: GetUserTokensOptions) => { createdAt: true, expires: true, }, + orderBy: { + createdAt: 'desc', + }, }); }; diff --git a/packages/trpc/server/api-token-router/schema.ts b/packages/trpc/server/api-token-router/schema.ts index b615ef3af..c28920b9a 100644 --- a/packages/trpc/server/api-token-router/schema.ts +++ b/packages/trpc/server/api-token-router/schema.ts @@ -4,10 +4,16 @@ export const ZGetApiTokenByIdQuerySchema = z.object({ id: z.number().min(1), }); +export type TGetApiTokenByIdQuerySchema = z.infer; + export const ZCreateTokenMutationSchema = z.object({ tokenName: z.string().min(3, { message: 'The token name should be 3 characters or longer' }), }); +export type TCreateTokenMutationSchema = z.infer; + export const ZDeleteTokenByIdMutationSchema = z.object({ id: z.number().min(1), }); + +export type TDeleteTokenByIdMutationSchema = z.infer; From 0a9006430fe57f17320c874435d0d92fbafc9431 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Thu, 4 Jan 2024 23:40:35 +0530 Subject: [PATCH 028/311] fix: command --- package.json | 2 +- turbo.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 30076100f..59ee798d4 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev", "dx:up": "docker compose -f docker/compose-services.yml up -d", "dx:down": "docker compose -f docker/compose-services.yml down", - "ci": "turbo run build test:e2e", + "ci": "turbo run test:e2e", "prisma:generate": "npm run with:env -- npm run prisma:generate -w @documenso/prisma", "prisma:migrate-dev": "npm run with:env -- npm run prisma:migrate-dev -w @documenso/prisma", "prisma:migrate-deploy": "npm run with:env -- npm run prisma:migrate-deploy -w @documenso/prisma", diff --git a/turbo.json b/turbo.json index 3a96c2a07..5bc0ac483 100644 --- a/turbo.json +++ b/turbo.json @@ -27,7 +27,8 @@ "cache": false }, "test:e2e": { - "dependsOn": ["^build"] + "dependsOn": ["^build"], + "cache": false } }, "globalDependencies": ["**/.env.*local"], From e470020b166abf37975034c73d2efac5a59b305f Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Thu, 4 Jan 2024 23:41:24 +0530 Subject: [PATCH 029/311] feat: add cache build action --- .github/actions/cache-build/action.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/actions/cache-build/action.yml diff --git a/.github/actions/cache-build/action.yml b/.github/actions/cache-build/action.yml new file mode 100644 index 000000000..6fba4f745 --- /dev/null +++ b/.github/actions/cache-build/action.yml @@ -0,0 +1,25 @@ +name: Cache production build binaries +description: 'Cache or restore if necessary' +inputs: + node_version: + required: false + default: v18.x +runs: + using: 'composite' + steps: + - name: Cache production build + uses: actions/cache@v3 + id: production-build-cache + env: + cache-name: prod-build + with: + path: | + ${{ github.workspace }}/apps/web/.next + ${{ github.workspace }}/apps/marketing/.next + **/.turbo/** + **/dist/** + + key: ${{ runner.os }}-${{ env.cache-name }}-${{ github.run_id }} + + - run: npm run build + if: steps.production-build-cache.outputs.cache-hit != 'true' From fc372d0aa9cb05fe495d1a05536530965ec28fee Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Thu, 4 Jan 2024 23:41:48 +0530 Subject: [PATCH 030/311] feat: add node install action --- .github/actions/node-install/action.yml | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/actions/node-install/action.yml diff --git a/.github/actions/node-install/action.yml b/.github/actions/node-install/action.yml new file mode 100644 index 000000000..92d02092a --- /dev/null +++ b/.github/actions/node-install/action.yml @@ -0,0 +1,33 @@ +name: 'Setup node and cache node_modules' +inputs: + node_version: + required: false + default: v18.x + +runs: + using: 'composite' + steps: + - name: Set up Node ${{ inputs.node_version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ inputs.node_version }} + + - name: Cache node modules + id: cache-npm + uses: actions/cache@v3 + env: + cache-name: cache-node-modules + with: + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }} + + - name: Install dependencies + run: | + npm ci + npm run prisma:generate + env: + HUSKY: '0' From 9b5d64cc1a356e67600562f444b9a54aa5064cf8 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Thu, 4 Jan 2024 23:44:27 +0530 Subject: [PATCH 031/311] feat: add playwright action --- .github/actions/playwright-install/action.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/actions/playwright-install/action.yml diff --git a/.github/actions/playwright-install/action.yml b/.github/actions/playwright-install/action.yml new file mode 100644 index 000000000..6d0648649 --- /dev/null +++ b/.github/actions/playwright-install/action.yml @@ -0,0 +1,18 @@ +name: Install playwright binaries +description: 'Install playwright, cache and restore if necessary' +runs: + using: 'composite' + steps: + - name: Cache playwright + id: cache-playwright + uses: actions/cache@v3 + with: + path: | + ~/.cache/ms-playwright + ${{ github.workspace }}/node_modules/playwright + key: playwright-${{ hashFiles('**/package-lock.json') }} + restore-keys: playwright- + + - name: Install playwright + if: steps.cache-playwright.outputs.cache-hit != 'true' + run: npx playwright install --with-deps From 9e57de512a8cce6cbb225db7721981dc4f384599 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Thu, 4 Jan 2024 23:46:09 +0530 Subject: [PATCH 032/311] feat: use actions --- .github/workflows/ci.yml | 12 ++---------- .github/workflows/e2e-tests.yml | 17 +++++++---------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deda53ff0..53ed03f20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,20 +23,12 @@ jobs: with: fetch-depth: 2 - - name: Install Node.js - uses: actions/setup-node@v4 - with: - node-version: 18 - cache: npm - - - name: Install dependencies - run: npm ci + - uses: ./.github/actions/node-install - name: Copy env run: cp .env.example .env - - name: Build - run: npm run build + - uses: ./.github/actions/cache-build build_docker: name: Build Docker Image diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 7b05458d9..9d1782363 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -6,26 +6,21 @@ on: branches: ['main'] jobs: e2e_tests: - name: "E2E Tests" + name: 'E2E Tests' timeout-minutes: 60 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: 18 - cache: npm - - name: Install dependencies - run: npm ci - name: Copy env run: cp .env.example .env + - uses: ./.github/actions/node-install + - name: Start Services run: npm run dx:up - - name: Install Playwright Browsers - run: npx playwright install --with-deps + - uses: ./.github/actions/playwright-install - name: Generate Prisma Client run: npm run prisma:generate -w @documenso/prisma @@ -36,6 +31,8 @@ jobs: - name: Seed the database run: npm run prisma:seed + - uses: ./.github/actions/cache-build + - name: Run Playwright tests run: npm run ci @@ -43,7 +40,7 @@ jobs: if: always() with: name: test-results - path: "packages/app-tests/**/test-results/*" + path: 'packages/app-tests/**/test-results/*' retention-days: 30 env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} From ce6f523230164f830cabcfb4fff224a9db8080dd Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Thu, 4 Jan 2024 23:56:32 +0530 Subject: [PATCH 033/311] fix: key --- .github/actions/cache-build/action.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/cache-build/action.yml b/.github/actions/cache-build/action.yml index 6fba4f745..b91332e04 100644 --- a/.github/actions/cache-build/action.yml +++ b/.github/actions/cache-build/action.yml @@ -12,6 +12,11 @@ runs: id: production-build-cache env: cache-name: prod-build + key-1: ${{ hashFiles('**/package-lock.json') }} + key-2: ${{ github.run_id }} + + # Ensures production-build.yml will always be fresh + key-3: ${{ github.sha }} with: path: | ${{ github.workspace }}/apps/web/.next @@ -19,7 +24,7 @@ runs: **/.turbo/** **/dist/** - key: ${{ runner.os }}-${{ env.cache-name }}-${{ github.run_id }} + key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }} - run: npm run build if: steps.production-build-cache.outputs.cache-hit != 'true' From b35f050409a3b137e09a0a8d593b30a71e249050 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 00:03:20 +0530 Subject: [PATCH 034/311] fix: add shell --- .github/actions/cache-build/action.yml | 1 + .github/actions/node-install/action.yml | 1 + .github/actions/playwright-install/action.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/actions/cache-build/action.yml b/.github/actions/cache-build/action.yml index b91332e04..cbbe3a0a1 100644 --- a/.github/actions/cache-build/action.yml +++ b/.github/actions/cache-build/action.yml @@ -27,4 +27,5 @@ runs: key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }} - run: npm run build + shell: bash if: steps.production-build-cache.outputs.cache-hit != 'true' diff --git a/.github/actions/node-install/action.yml b/.github/actions/node-install/action.yml index 92d02092a..351598182 100644 --- a/.github/actions/node-install/action.yml +++ b/.github/actions/node-install/action.yml @@ -26,6 +26,7 @@ runs: ${{ runner.os }} - name: Install dependencies + shell: bash run: | npm ci npm run prisma:generate diff --git a/.github/actions/playwright-install/action.yml b/.github/actions/playwright-install/action.yml index 6d0648649..27d0e66b4 100644 --- a/.github/actions/playwright-install/action.yml +++ b/.github/actions/playwright-install/action.yml @@ -16,3 +16,4 @@ runs: - name: Install playwright if: steps.cache-playwright.outputs.cache-hit != 'true' run: npx playwright install --with-deps + shell: bash From e5b7bf81fa2af9a7add33502044f479d4641ff18 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 00:06:16 +0530 Subject: [PATCH 035/311] fix: add action to codeql --- .github/workflows/codeql-analysis.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 465041c0a..314dc7b7b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,19 +25,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: 18 - cache: npm - - - name: Install Dependencies - run: npm ci - - name: Copy env run: cp .env.example .env - - name: Build Documenso - run: npm run build + - uses: ./.github/actions/node-install + + - uses: ./.github/actions/cache-build - name: Initialize CodeQL uses: github/codeql-action/init@v2 From 308f55f3d40df50ec36e0bc9a816af668ed057bb Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 00:09:41 +0530 Subject: [PATCH 036/311] fix: key --- .github/actions/cache-build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/cache-build/action.yml b/.github/actions/cache-build/action.yml index cbbe3a0a1..9c0b1feae 100644 --- a/.github/actions/cache-build/action.yml +++ b/.github/actions/cache-build/action.yml @@ -24,7 +24,7 @@ runs: **/.turbo/** **/dist/** - key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }} + key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }} - run: npm run build shell: bash From 26b604dbd0fd6db002b318e6922df997beb44dfd Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 00:21:05 +0530 Subject: [PATCH 037/311] fix: add workflow call --- .github/workflows/ci.yml | 4 +--- .github/workflows/codeql-analysis.yml | 1 + .github/workflows/e2e-tests.yml | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53ed03f20..54dec497b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: 'Continuous Integration' on: + workflow_call: push: branches: ['main'] pull_request: @@ -10,9 +11,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true -env: - HUSKY: 0 - jobs: build_app: name: Build App diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 314dc7b7b..873869210 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,6 +1,7 @@ name: 'CodeQL' on: + workflow_call: workflow_dispatch: push: branches: ['main'] diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 9d1782363..ad9295ac2 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -1,5 +1,6 @@ name: Playwright Tests on: + workflow_call: push: branches: ['main'] pull_request: From 0c12e34c38d09ee00ec04edff6c4164cac762399 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 01:08:32 +0530 Subject: [PATCH 038/311] fix: remove call --- .github/workflows/codeql-analysis.yml | 1 - .github/workflows/e2e-tests.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 873869210..314dc7b7b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,7 +1,6 @@ name: 'CodeQL' on: - workflow_call: workflow_dispatch: push: branches: ['main'] diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index ad9295ac2..9d1782363 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -1,6 +1,5 @@ name: Playwright Tests on: - workflow_call: push: branches: ['main'] pull_request: From c86f79dd7b68c32d47b051e5745515e6db4385da Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 01:11:28 +0530 Subject: [PATCH 039/311] feat: add workflow call actions --- .github/workflows/node-install.yml | 16 ++++++++++++++++ .github/workflows/production-build.yml | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .github/workflows/node-install.yml create mode 100644 .github/workflows/production-build.yml diff --git a/.github/workflows/node-install.yml b/.github/workflows/node-install.yml new file mode 100644 index 000000000..9b1bd52a7 --- /dev/null +++ b/.github/workflows/node-install.yml @@ -0,0 +1,16 @@ +name: Node install + +on: + workflow_call: + +jobs: + setup: + name: Setup Node & cache + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Copy env + run: cp .env.example .env + + - uses: ./.github/actions/node-install diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml new file mode 100644 index 000000000..e227f2aaa --- /dev/null +++ b/.github/workflows/production-build.yml @@ -0,0 +1,21 @@ +name: Production Build + +on: + workflow_call: + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 2 + + - name: Copy env + run: cp .env.example .env + + - uses: ./.github/actions/node-install + + - uses: ./.github/actions/cache-build From d24b9de254062fff60162bc294ce1d23c15467ab Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 01:19:22 +0530 Subject: [PATCH 040/311] fix: skip install --- .github/actions/node-install/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/node-install/action.yml b/.github/actions/node-install/action.yml index 351598182..947049b62 100644 --- a/.github/actions/node-install/action.yml +++ b/.github/actions/node-install/action.yml @@ -27,6 +27,7 @@ runs: - name: Install dependencies shell: bash + if: steps.cache-npm.outputs.cache-hit != 'true' run: | npm ci npm run prisma:generate From 2bbbe1098a71fab800ea3486c2d381037e816f14 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 01:32:47 +0530 Subject: [PATCH 041/311] fix: action --- .github/actions/cache-build/action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/cache-build/action.yml b/.github/actions/cache-build/action.yml index 9c0b1feae..ca7550c76 100644 --- a/.github/actions/cache-build/action.yml +++ b/.github/actions/cache-build/action.yml @@ -12,11 +12,11 @@ runs: id: production-build-cache env: cache-name: prod-build - key-1: ${{ hashFiles('**/package-lock.json') }} - key-2: ${{ github.run_id }} - + key-1: ${{ inputs.node_version }}-${{ hashFiles('**/package-lock.json') }} + key-2: ${{ hashFiles('apps/**/**.[jt]s', 'apps/**/**.[jt]sx', 'packages/**/**.[jt]s', 'packages/**/**.[jt]sx', '!**/node_modules') }} + key-3: ${{ github.event.pull_request.number || github.ref }} # Ensures production-build.yml will always be fresh - key-3: ${{ github.sha }} + key-4: ${{ github.sha }} with: path: | ${{ github.workspace }}/apps/web/.next @@ -24,7 +24,7 @@ runs: **/.turbo/** **/dist/** - key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }} + key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }} - run: npm run build shell: bash From 634807328ed6b14c344a0f15decbe62c03157438 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 01:38:14 +0530 Subject: [PATCH 042/311] fix: command --- .github/actions/node-install/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/node-install/action.yml b/.github/actions/node-install/action.yml index 947049b62..351598182 100644 --- a/.github/actions/node-install/action.yml +++ b/.github/actions/node-install/action.yml @@ -27,7 +27,6 @@ runs: - name: Install dependencies shell: bash - if: steps.cache-npm.outputs.cache-hit != 'true' run: | npm ci npm run prisma:generate From 75630ef19d3329c03d85b44dd905152c00a7e072 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 01:58:00 +0530 Subject: [PATCH 043/311] fix: npm action --- .github/actions/node-install/action.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/actions/node-install/action.yml b/.github/actions/node-install/action.yml index 351598182..77483a9a4 100644 --- a/.github/actions/node-install/action.yml +++ b/.github/actions/node-install/action.yml @@ -12,23 +12,28 @@ runs: with: node-version: ${{ inputs.node_version }} - - name: Cache node modules - id: cache-npm + - name: Cache npm uses: actions/cache@v3 - env: - cache-name: cache-node-modules with: path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }} + key: npm-${{ hashFiles('package-lock.json') }} + restore-keys: npm- + + - name: Cache node_modules + uses: actions/cache@v3 + id: cache-node-modules + with: + path: | + node_modules + packages/*/node_modules + apps/*/node_modules + key: modules-${{ hashFiles('package-lock.json') }} - name: Install dependencies + if: steps.cache-node-modules.outputs.cache-hit != 'true' shell: bash run: | - npm ci + npm ci --no-audit npm run prisma:generate env: HUSKY: '0' From c8337d7dcc2def5bbaddf190867d946fe1a29b37 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 02:13:42 +0530 Subject: [PATCH 044/311] fix: key --- .github/actions/cache-build/action.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/actions/cache-build/action.yml b/.github/actions/cache-build/action.yml index ca7550c76..b903e8b07 100644 --- a/.github/actions/cache-build/action.yml +++ b/.github/actions/cache-build/action.yml @@ -10,13 +10,6 @@ runs: - name: Cache production build uses: actions/cache@v3 id: production-build-cache - env: - cache-name: prod-build - key-1: ${{ inputs.node_version }}-${{ hashFiles('**/package-lock.json') }} - key-2: ${{ hashFiles('apps/**/**.[jt]s', 'apps/**/**.[jt]sx', 'packages/**/**.[jt]s', 'packages/**/**.[jt]sx', '!**/node_modules') }} - key-3: ${{ github.event.pull_request.number || github.ref }} - # Ensures production-build.yml will always be fresh - key-4: ${{ github.sha }} with: path: | ${{ github.workspace }}/apps/web/.next @@ -24,7 +17,8 @@ runs: **/.turbo/** **/dist/** - key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }} + key: prod-build-${{ github.run_id }} + restore-keys: prod-build- - run: npm run build shell: bash From 346078dbbe7672c181214821b671f2723b130d90 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 02:15:27 +0530 Subject: [PATCH 045/311] fix: e2e --- .github/actions/cache-build/action.yml | 1 - .github/workflows/e2e-tests.yml | 3 --- 2 files changed, 4 deletions(-) diff --git a/.github/actions/cache-build/action.yml b/.github/actions/cache-build/action.yml index b903e8b07..e1eb4da22 100644 --- a/.github/actions/cache-build/action.yml +++ b/.github/actions/cache-build/action.yml @@ -22,4 +22,3 @@ runs: - run: npm run build shell: bash - if: steps.production-build-cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 9d1782363..12a7d9521 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -22,9 +22,6 @@ jobs: - uses: ./.github/actions/playwright-install - - name: Generate Prisma Client - run: npm run prisma:generate -w @documenso/prisma - - name: Create the database run: npm run prisma:migrate-dev From 8eed13e27520206627cce61c5d1771b08a93fc76 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Fri, 5 Jan 2024 02:22:42 +0530 Subject: [PATCH 046/311] fix: remove additional workflow --- .github/workflows/node-install.yml | 16 ---------------- .github/workflows/production-build.yml | 21 --------------------- 2 files changed, 37 deletions(-) delete mode 100644 .github/workflows/node-install.yml delete mode 100644 .github/workflows/production-build.yml diff --git a/.github/workflows/node-install.yml b/.github/workflows/node-install.yml deleted file mode 100644 index 9b1bd52a7..000000000 --- a/.github/workflows/node-install.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Node install - -on: - workflow_call: - -jobs: - setup: - name: Setup Node & cache - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Copy env - run: cp .env.example .env - - - uses: ./.github/actions/node-install diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml deleted file mode 100644 index e227f2aaa..000000000 --- a/.github/workflows/production-build.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Production Build - -on: - workflow_call: - -jobs: - build: - name: Build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 2 - - - name: Copy env - run: cp .env.example .env - - - uses: ./.github/actions/node-install - - - uses: ./.github/actions/cache-build From 6d1ad179d4b6cca4f835cc23e4a646f6f729ec7d Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Sat, 6 Jan 2024 13:30:21 +0530 Subject: [PATCH 047/311] feat: add clean cache workflow --- .github/workflows/clean-cache.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/clean-cache.yml diff --git a/.github/workflows/clean-cache.yml b/.github/workflows/clean-cache.yml new file mode 100644 index 000000000..2cb13f661 --- /dev/null +++ b/.github/workflows/clean-cache.yml @@ -0,0 +1,29 @@ +name: cleanup caches by a branch +on: + pull_request: + types: + - closed + +jobs: + cleanup: + runs-on: ubuntu-latest + steps: + - name: Cleanup + run: | + gh extension install actions/gh-actions-cache + + echo "Fetching list of cache key" + cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 ) + + ## Setting this to not fail the workflow while deleting cache keys. + set +e + echo "Deleting caches..." + for cacheKey in $cacheKeysForPR + do + gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm + done + echo "Done" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPO: ${{ github.repository }} + BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge From 3eb1a17d3c1be45f345967c749ea800419409d81 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Sat, 6 Jan 2024 14:42:49 +0530 Subject: [PATCH 048/311] chore: force build error --- apps/web/src/app/(dashboard)/layout.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/web/src/app/(dashboard)/layout.tsx b/apps/web/src/app/(dashboard)/layout.tsx index 433aeb18c..40831549b 100644 --- a/apps/web/src/app/(dashboard)/layout.tsx +++ b/apps/web/src/app/(dashboard)/layout.tsx @@ -2,8 +2,6 @@ import React from 'react'; import { redirect } from 'next/navigation'; -import { getServerSession } from 'next-auth'; - import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/server'; import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; From 142c93aa630c20622cfd31ae2cbd5383e2c006a6 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Sat, 6 Jan 2024 14:45:44 +0530 Subject: [PATCH 049/311] chore: revert force build error --- apps/web/src/app/(dashboard)/layout.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/web/src/app/(dashboard)/layout.tsx b/apps/web/src/app/(dashboard)/layout.tsx index 40831549b..433aeb18c 100644 --- a/apps/web/src/app/(dashboard)/layout.tsx +++ b/apps/web/src/app/(dashboard)/layout.tsx @@ -2,6 +2,8 @@ import React from 'react'; import { redirect } from 'next/navigation'; +import { getServerSession } from 'next-auth'; + import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/server'; import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; From 46e83d65bb3caaba4904d207750f9f66420ef9cd Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Sat, 6 Jan 2024 15:14:28 +0530 Subject: [PATCH 050/311] feat: cache docker --- .github/workflows/ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54dec497b..117064721 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,5 +37,13 @@ jobs: with: fetch-depth: 2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build Docker Image - run: ./docker/build.sh + uses: docker/build-push-action@v5 + with: + push: false + context: . + file: ./docker/Dockerfile + tags: documenso-${{ github.sha }} From ba37633ecd2a6aabce35b9250f8008d993953c74 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Sat, 6 Jan 2024 15:18:09 +0530 Subject: [PATCH 051/311] fix: revert --- .github/workflows/ci.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 117064721..54dec497b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,13 +37,5 @@ jobs: with: fetch-depth: 2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Build Docker Image - uses: docker/build-push-action@v5 - with: - push: false - context: . - file: ./docker/Dockerfile - tags: documenso-${{ github.sha }} + run: ./docker/build.sh From 34a59d2db3324b90044594be7a2ed46b4f6d25f2 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Sat, 6 Jan 2024 15:18:33 +0530 Subject: [PATCH 052/311] fix: cache --- .github/workflows/ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54dec497b..117064721 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,5 +37,13 @@ jobs: with: fetch-depth: 2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build Docker Image - run: ./docker/build.sh + uses: docker/build-push-action@v5 + with: + push: false + context: . + file: ./docker/Dockerfile + tags: documenso-${{ github.sha }} From 60651407157fd93153c5ace69b3b9b8689f32c58 Mon Sep 17 00:00:00 2001 From: nafees nazik Date: Sat, 6 Jan 2024 15:29:19 +0530 Subject: [PATCH 053/311] feat: cache layers --- .github/workflows/ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 117064721..bebca8e85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,14 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Build Docker Image uses: docker/build-push-action@v5 with: @@ -47,3 +55,13 @@ jobs: context: . file: ./docker/Dockerfile tags: documenso-${{ github.sha }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max + + - # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache From 4aefb809894c3ff7f98eb572b458df2edb6c9d40 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:25:05 +0200 Subject: [PATCH 054/311] feat: restrict app access for unverified users --- .../unverified-account/page.tsx | 80 +++++++++++++++++++ apps/web/src/components/forms/signin.tsx | 17 ++++ apps/web/src/components/forms/signup.tsx | 14 ++-- packages/lib/next-auth/auth-options.ts | 12 +++ packages/lib/next-auth/error-codes.ts | 1 + .../lib/server-only/user/get-user-by-email.ts | 3 + .../user/get-user-by-verification-token.ts | 17 ++++ packages/trpc/server/profile-router/router.ts | 34 ++++++++ packages/trpc/server/profile-router/schema.ts | 8 ++ 9 files changed, 181 insertions(+), 5 deletions(-) create mode 100644 apps/web/src/app/(unauthenticated)/unverified-account/page.tsx create mode 100644 packages/lib/server-only/user/get-user-by-verification-token.ts diff --git a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx new file mode 100644 index 000000000..7a0a9c78d --- /dev/null +++ b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx @@ -0,0 +1,80 @@ +'use client'; + +import { useState } from 'react'; + +import { useSearchParams } from 'next/navigation'; + +import { Mails } from 'lucide-react'; + +import { ONE_SECOND } from '@documenso/lib/constants/time'; +import { trpc } from '@documenso/trpc/react'; +import { Button } from '@documenso/ui/primitives/button'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +const RESEND_CONFIRMATION_EMAIL_TIMEOUT = 20 * ONE_SECOND; + +export default function UnverifiedAccount() { + const [isButtonDisabled, setIsButtonDisabled] = useState(false); + const searchParams = useSearchParams(); + const { toast } = useToast(); + + const token = searchParams?.get('t') ?? ''; + + const { data: { email } = {} } = trpc.profile.getUserFromVerificationToken.useQuery({ token }); + + const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation(); + + const onResendConfirmationEmail = async () => { + if (!email) { + toast({ + title: 'Unable to send confirmation email', + description: 'Something went wrong while sending the confirmation email. Please try again.', + variant: 'destructive', + }); + + return; + } + + try { + setIsButtonDisabled(true); + + await sendConfirmationEmail({ email: email }); + + toast({ + title: 'Success', + description: 'Verification email sent successfully.', + duration: 5000, + }); + + setTimeout(() => setIsButtonDisabled(false), RESEND_CONFIRMATION_EMAIL_TIMEOUT); + } catch (err) { + setIsButtonDisabled(false); + + toast({ + title: 'Error', + description: 'Something went wrong while sending the confirmation email.', + variant: 'destructive', + }); + } + }; + + return ( +
+
+ +
+
+

Confirm email

+ +

+ To gain full access to your account and unlock all its features, please confirm your email + address by clicking on the link sent to your email address. +

+ + +
+
+ ); +} diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx index 4e671a569..2924080b0 100644 --- a/apps/web/src/components/forms/signin.tsx +++ b/apps/web/src/components/forms/signin.tsx @@ -2,6 +2,8 @@ import { useState } from 'react'; +import { useRouter } from 'next/navigation'; + import { zodResolver } from '@hookform/resolvers/zod'; import { signIn } from 'next-auth/react'; import { useForm } from 'react-hook-form'; @@ -9,6 +11,7 @@ import { FcGoogle } from 'react-icons/fc'; import { z } from 'zod'; import { ErrorCode, isErrorCode } from '@documenso/lib/next-auth/error-codes'; +import { trpc } from '@documenso/trpc/react'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@documenso/ui/primitives/dialog'; @@ -31,6 +34,8 @@ const ERROR_MESSAGES: Partial> = { 'This account appears to be using a social login method, please sign in using that method', [ErrorCode.INCORRECT_TWO_FACTOR_CODE]: 'The two-factor authentication code provided is incorrect', [ErrorCode.INCORRECT_TWO_FACTOR_BACKUP_CODE]: 'The backup code provided is incorrect', + [ErrorCode.UNVERIFIED_EMAIL]: + 'This account has not been verified. Please verify your account before signing in.', }; const TwoFactorEnabledErrorCode = ErrorCode.TWO_FACTOR_MISSING_CREDENTIALS; @@ -54,6 +59,7 @@ export const SignInForm = ({ className }: SignInFormProps) => { const { toast } = useToast(); const [isTwoFactorAuthenticationDialogOpen, setIsTwoFactorAuthenticationDialogOpen] = useState(false); + const router = useRouter(); const [twoFactorAuthenticationMethod, setTwoFactorAuthenticationMethod] = useState< 'totp' | 'backup' @@ -69,6 +75,8 @@ export const SignInForm = ({ className }: SignInFormProps) => { resolver: zodResolver(ZSignInFormSchema), }); + const { mutateAsync: getUser } = trpc.profile.getUserByEmail.useMutation(); + const isSubmitting = form.formState.isSubmitting; const onCloseTwoFactorAuthenticationDialog = () => { @@ -122,6 +130,15 @@ export const SignInForm = ({ className }: SignInFormProps) => { const errorMessage = ERROR_MESSAGES[result.error]; + if (result.error === ErrorCode.UNVERIFIED_EMAIL) { + const user = await getUser({ email }); + const token = user?.VerificationToken[user.VerificationToken.length - 1].token; + + router.push(`/unverified-account?t=${token}`); + + return; + } + toast({ variant: 'destructive', title: 'Unable to sign in', diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index b91b4a9fd..526836ca7 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -1,7 +1,8 @@ 'use client'; +import { useRouter } from 'next/navigation'; + import { zodResolver } from '@hookform/resolvers/zod'; -import { signIn } from 'next-auth/react'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; @@ -42,6 +43,7 @@ export type SignUpFormProps = { export const SignUpForm = ({ className }: SignUpFormProps) => { const { toast } = useToast(); const analytics = useAnalytics(); + const router = useRouter(); const form = useForm({ values: { @@ -61,10 +63,12 @@ export const SignUpForm = ({ className }: SignUpFormProps) => { try { await signup({ name, email, password, signature }); - await signIn('credentials', { - email, - password, - callbackUrl: '/', + router.push('/signin'); + + toast({ + title: 'Registration Successful', + description: 'You have successfully registered. Please sign in to continue.', + duration: 5000, }); analytics.capture('App: User Sign Up', { diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 3b9492807..4c529d113 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -10,6 +10,7 @@ import GoogleProvider from 'next-auth/providers/google'; import { prisma } from '@documenso/prisma'; +import { ONE_DAY } from '../constants/time'; import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble'; import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa'; import { getUserByEmail } from '../server-only/user/get-user-by-email'; @@ -69,6 +70,17 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } } + const userCreationDate = user?.createdAt; + const createdWithinLast72Hours = userCreationDate > new Date(Date.now() - ONE_DAY * 3); + + /* + avoid messing with the users who signed up before the email verification requirement + the error is thrown only if the user doesn't have a verified email and the account was created within the last 72 hours + */ + if (!user.emailVerified && createdWithinLast72Hours) { + throw new Error(ErrorCode.UNVERIFIED_EMAIL); + } + return { id: Number(user.id), email: user.email, diff --git a/packages/lib/next-auth/error-codes.ts b/packages/lib/next-auth/error-codes.ts index c3dfafece..6e1b7488b 100644 --- a/packages/lib/next-auth/error-codes.ts +++ b/packages/lib/next-auth/error-codes.ts @@ -19,4 +19,5 @@ export const ErrorCode = { INCORRECT_PASSWORD: 'INCORRECT_PASSWORD', MISSING_ENCRYPTION_KEY: 'MISSING_ENCRYPTION_KEY', MISSING_BACKUP_CODE: 'MISSING_BACKUP_CODE', + UNVERIFIED_EMAIL: 'UNVERIFIED_EMAIL', } as const; diff --git a/packages/lib/server-only/user/get-user-by-email.ts b/packages/lib/server-only/user/get-user-by-email.ts index 0a2ef8d16..8c61202a2 100644 --- a/packages/lib/server-only/user/get-user-by-email.ts +++ b/packages/lib/server-only/user/get-user-by-email.ts @@ -9,5 +9,8 @@ export const getUserByEmail = async ({ email }: GetUserByEmailOptions) => { where: { email: email.toLowerCase(), }, + include: { + VerificationToken: true, + }, }); }; diff --git a/packages/lib/server-only/user/get-user-by-verification-token.ts b/packages/lib/server-only/user/get-user-by-verification-token.ts new file mode 100644 index 000000000..b33506d6e --- /dev/null +++ b/packages/lib/server-only/user/get-user-by-verification-token.ts @@ -0,0 +1,17 @@ +import { prisma } from '@documenso/prisma'; + +export interface GetUserByVerificationTokenOptions { + token: string; +} + +export const getUserByVerificationToken = async ({ token }: GetUserByVerificationTokenOptions) => { + return await prisma.user.findFirstOrThrow({ + where: { + VerificationToken: { + some: { + token, + }, + }, + }, + }); +}; diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 4dcf4ca93..79c67ed0c 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -1,7 +1,9 @@ import { TRPCError } from '@trpc/server'; import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password'; +import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email'; import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id'; +import { getUserByVerificationToken } from '@documenso/lib/server-only/user/get-user-by-verification-token'; import { resetPassword } from '@documenso/lib/server-only/user/reset-password'; import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-confirmation-token'; import { updatePassword } from '@documenso/lib/server-only/user/update-password'; @@ -12,7 +14,9 @@ import { ZConfirmEmailMutationSchema, ZForgotPasswordFormSchema, ZResetPasswordFormSchema, + ZRetrieveUserByEmailMutationSchema, ZRetrieveUserByIdQuerySchema, + ZRetrieveUserByVerificationTokenQuerySchema, ZUpdatePasswordMutationSchema, ZUpdateProfileMutationSchema, } from './schema'; @@ -31,6 +35,36 @@ export const profileRouter = router({ } }), + getUserByEmail: procedure + .input(ZRetrieveUserByEmailMutationSchema) + .mutation(async ({ input }) => { + try { + const { email } = input; + + return await getUserByEmail({ email }); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to retrieve the specified account. Please try again.', + }); + } + }), + + getUserFromVerificationToken: procedure + .input(ZRetrieveUserByVerificationTokenQuerySchema) + .query(async ({ input }) => { + try { + const { token } = input; + + return await getUserByVerificationToken({ token }); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to retrieve the specified account. Please try again.', + }); + } + }), + updateProfile: authenticatedProcedure .input(ZUpdateProfileMutationSchema) .mutation(async ({ input, ctx }) => { diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts index ef9ca2a14..671756e94 100644 --- a/packages/trpc/server/profile-router/schema.ts +++ b/packages/trpc/server/profile-router/schema.ts @@ -4,6 +4,14 @@ export const ZRetrieveUserByIdQuerySchema = z.object({ id: z.number().min(1), }); +export const ZRetrieveUserByEmailMutationSchema = z.object({ + email: z.string().email().min(1), +}); + +export const ZRetrieveUserByVerificationTokenQuerySchema = z.object({ + token: z.string().min(1), +}); + export const ZUpdateProfileMutationSchema = z.object({ name: z.string().min(1), signature: z.string(), From 3b82ba57f39cfb8cdc6b1387b448cd8264c96490 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:44:25 +0200 Subject: [PATCH 055/311] chore: implemented feedback plus some restructuring --- .../app/(dashboard)/settings/{token => tokens}/page.tsx | 0 .../components/(dashboard)/layout/profile-dropdown.tsx | 8 ++++++++ .../(dashboard)/settings/layout/desktop-nav.tsx | 4 ++-- .../components/(dashboard)/settings/layout/mobile-nav.tsx | 4 ++-- .../(dashboard)/settings/token/delete-token-dialog.tsx | 3 ++- packages/lib/server-only/public-api/create-api-token.ts | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) rename apps/web/src/app/(dashboard)/settings/{token => tokens}/page.tsx (100%) diff --git a/apps/web/src/app/(dashboard)/settings/token/page.tsx b/apps/web/src/app/(dashboard)/settings/tokens/page.tsx similarity index 100% rename from apps/web/src/app/(dashboard)/settings/token/page.tsx rename to apps/web/src/app/(dashboard)/settings/tokens/page.tsx diff --git a/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx b/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx index e488ba6e9..7c06557b1 100644 --- a/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx +++ b/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx @@ -3,6 +3,7 @@ import Link from 'next/link'; import { + Braces, CreditCard, Lock, LogOut, @@ -97,6 +98,13 @@ export const ProfileDropdown = ({ user }: ProfileDropdownProps) => { + + + + API Tokens + + + {isBillingEnabled && ( diff --git a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx index 848ff17cc..8bc395121 100644 --- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx @@ -48,12 +48,12 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { - + - +
- + +
+ + + + Delete your account and all its contents, including completed documents. This action is + irreversible and will cancel your subscription, so proceed with caution. + + + + + + + + + Delete Account + + Documenso will delete{' '} + all of your documents, along with all of + your completed documents, signatures, and all other resources belonging to your + Account. + + + + + Cancel + + Delete Account + + + + + + +
); }; + +export function AlertDestructive() { + return ( + + + This action is not reversible. Please be certain. + + + ); +} diff --git a/packages/ui/primitives/alert.tsx b/packages/ui/primitives/alert.tsx index 190f7781d..5409152b7 100644 --- a/packages/ui/primitives/alert.tsx +++ b/packages/ui/primitives/alert.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; -import { VariantProps, cva } from 'class-variance-authority'; +import { cva } from 'class-variance-authority'; +import type { VariantProps } from 'class-variance-authority'; import { cn } from '../lib/utils'; From a3e560899a82521c1edbfa75e0d259f3f12d9ac1 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sat, 20 Jan 2024 23:30:56 +0000 Subject: [PATCH 059/311] feat: delete user from db and unsubscribe from stripe --- .devcontainer/devcontainer.json | 12 +++- apps/web/src/components/forms/profile.tsx | 58 +++++++++++++++---- .../ee/server-only/stripe/delete-customer.ts | 10 ++++ packages/trpc/react/index.tsx | 2 +- packages/trpc/server/auth-router/schema.ts | 6 ++ packages/trpc/server/profile-router/router.ts | 25 ++++++++ 6 files changed, 98 insertions(+), 15 deletions(-) create mode 100644 packages/ee/server-only/stripe/delete-customer.ts diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 60b385403..3471f4f88 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,7 +10,13 @@ "ghcr.io/devcontainers/features/node:1": {} }, "onCreateCommand": "./.devcontainer/on-create.sh", - "forwardPorts": [3000, 54320, 9000, 2500, 1100], + "forwardPorts": [ + 3000, + 54320, + 9000, + 2500, + 1100 + ], "customizations": { "vscode": { "extensions": [ @@ -25,8 +31,8 @@ "GitHub.copilot", "GitHub.vscode-pull-request-github", "Prisma.prisma", - "VisualStudioExptTeam.vscodeintellicode", + "VisualStudioExptTeam.vscodeintellicode" ] } } -} +} \ No newline at end of file diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index 78da0f636..b36df4e7f 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -3,6 +3,7 @@ import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; +import { signOut } from 'next-auth/react'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; @@ -65,6 +66,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { const isSubmitting = form.formState.isSubmitting; const { mutateAsync: updateProfile } = trpc.profile.updateProfile.useMutation(); + const { mutateAsync: deleteAccount } = trpc.profile.deleteAccount.useMutation(); const onFormSubmit = async ({ name, signature }: TProfileFormSchema) => { try { @@ -98,6 +100,39 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { } }; + const onDeleteAccount = async () => { + try { + await deleteAccount(); + + await signOut({ callbackUrl: '/' }); + + toast({ + title: 'Account deleted', + description: 'Your account has been deleted successfully.', + duration: 5000, + }); + + // logout after deleting account + + router.push('/'); + } catch (err) { + if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') { + toast({ + title: 'An error occurred', + description: err.message, + variant: 'destructive', + }); + } else { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + description: + 'We encountered an unknown error while attempting to delete your account. Please try again later.', + }); + } + } + }; + return (
{ all of your documents, along with all of your completed documents, signatures, and all other resources belonging to your Account. - + + + This action is not reversible. Please be certain. + + Cancel - + Delete Account @@ -189,12 +231,6 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { ); }; -export function AlertDestructive() { - return ( - - - This action is not reversible. Please be certain. - - - ); -} +// Cal.com Delete User TRPC = https://github.com/calcom/cal.com/blob/main/packages/trpc/server/routers/loggedInViewer/deleteMe.handler.ts#L11 +// https://github.com/calcom/cal.com/blob/main/packages/features/users/lib/userDeletionService.ts#L7 +// delete stripe: https://github.com/calcom/cal.com/blob/main/packages/app-store/stripepayment/lib/customer.ts#L72 diff --git a/packages/ee/server-only/stripe/delete-customer.ts b/packages/ee/server-only/stripe/delete-customer.ts new file mode 100644 index 000000000..16120de68 --- /dev/null +++ b/packages/ee/server-only/stripe/delete-customer.ts @@ -0,0 +1,10 @@ +import { stripe } from '@documenso/lib/server-only/stripe'; +import type { User } from '@documenso/prisma/client'; + +export const deleteStripeCustomer = async (user: User) => { + if (!user.customerId) { + return null; + } + + return await stripe.customers.del(user.customerId); +}; diff --git a/packages/trpc/react/index.tsx b/packages/trpc/react/index.tsx index 85161d0e8..ce80ba267 100644 --- a/packages/trpc/react/index.tsx +++ b/packages/trpc/react/index.tsx @@ -9,7 +9,7 @@ import SuperJSON from 'superjson'; import { getBaseUrl } from '@documenso/lib/universal/get-base-url'; -import { AppRouter } from '../server/router'; +import type { AppRouter } from '../server/router'; export const trpc = createTRPCReact({ unstable_overrides: { diff --git a/packages/trpc/server/auth-router/schema.ts b/packages/trpc/server/auth-router/schema.ts index cc969c679..f342c25fb 100644 --- a/packages/trpc/server/auth-router/schema.ts +++ b/packages/trpc/server/auth-router/schema.ts @@ -10,3 +10,9 @@ export const ZSignUpMutationSchema = z.object({ export type TSignUpMutationSchema = z.infer; export const ZVerifyPasswordMutationSchema = ZSignUpMutationSchema.pick({ password: true }); + +export const ZDeleteAccountMutationSchema = z.object({ + email: z.string().email(), +}); + +export type TDeleteAccountMutationSchema = z.infer; diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 4dcf4ca93..cf5fdbf94 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -1,5 +1,7 @@ import { TRPCError } from '@trpc/server'; +import { deleteStripeCustomer } from '@documenso/ee/server-only/stripe/delete-customer'; +import { deleteUser } from '@documenso/lib/server-only/user/delete-user'; import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password'; import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id'; import { resetPassword } from '@documenso/lib/server-only/user/reset-password'; @@ -133,4 +135,27 @@ export const profileRouter = router({ }); } }), + + deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => { + try { + const user = ctx.user; + + const deletedUser = await deleteStripeCustomer(user); + + console.log(deletedUser); + + return await deleteUser(user); + } catch (err) { + let message = 'We were unable to delete your account. Please try again.'; + + if (err instanceof Error) { + message = err.message; + } + + throw new TRPCError({ + code: 'BAD_REQUEST', + message, + }); + } + }), }); From 7762b1db6593e80af92bc854989828f53d2545a6 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sun, 21 Jan 2024 09:47:50 +0000 Subject: [PATCH 060/311] feat: add loading to button --- apps/web/src/components/forms/profile.tsx | 63 +++++++++++------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index b36df4e7f..7e274ff8e 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -12,19 +12,17 @@ import { TRPCClientError } from '@documenso/trpc/client'; import { trpc } from '@documenso/trpc/react'; import { cn } from '@documenso/ui/lib/utils'; import { Alert, AlertDescription } from '@documenso/ui/primitives/alert'; -import { - AlertDialog, - AlertDialogAction, - AlertDialogCancel, - AlertDialogContent, - AlertDialogDescription, - AlertDialogFooter, - AlertDialogHeader, - AlertDialogTitle, - AlertDialogTrigger, -} from '@documenso/ui/primitives/alert-dialog'; import { Button } from '@documenso/ui/primitives/button'; import { Card, CardContent, CardFooter } from '@documenso/ui/primitives/card'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, + DialogTrigger, +} from '@documenso/ui/primitives/dialog'; import { Form, FormControl, @@ -66,7 +64,8 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { const isSubmitting = form.formState.isSubmitting; const { mutateAsync: updateProfile } = trpc.profile.updateProfile.useMutation(); - const { mutateAsync: deleteAccount } = trpc.profile.deleteAccount.useMutation(); + const { mutateAsync: deleteAccount, isLoading: isDeletingAccount } = + trpc.profile.deleteAccount.useMutation(); const onFormSubmit = async ({ name, signature }: TProfileFormSchema) => { try { @@ -194,14 +193,14 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { irreversible and will cancel your subscription, so proceed with caution. - - + + - - - - Delete Account - + + + + Delete Account + Documenso will delete{' '} all of your documents, along with all of your completed documents, signatures, and all other resources belonging to your @@ -211,26 +210,22 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { This action is not reversible. Please be certain. - - - - Cancel - + + + + + + ); }; - -// Cal.com Delete User TRPC = https://github.com/calcom/cal.com/blob/main/packages/trpc/server/routers/loggedInViewer/deleteMe.handler.ts#L11 -// https://github.com/calcom/cal.com/blob/main/packages/features/users/lib/userDeletionService.ts#L7 -// delete stripe: https://github.com/calcom/cal.com/blob/main/packages/app-store/stripepayment/lib/customer.ts#L72 From 9e433af1126c2d0f7665d0cb827cd16ffe9fff91 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sun, 21 Jan 2024 15:38:32 +0000 Subject: [PATCH 061/311] feat: require 2fa code before account is deleted --- apps/web/src/components/forms/profile.tsx | 123 +++++++++++++----- packages/lib/server-only/2fa/setup-2fa.ts | 2 +- packages/lib/server-only/2fa/validate-2fa.ts | 2 +- .../lib/server-only/2fa/verify-2fa-token.ts | 3 +- packages/ui/primitives/button.tsx | 3 +- 5 files changed, 98 insertions(+), 35 deletions(-) diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index 7e274ff8e..575a81d46 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -7,6 +7,7 @@ import { signOut } from 'next-auth/react'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; +import { validateTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/validate-2fa'; import type { User } from '@documenso/prisma/client'; import { TRPCClientError } from '@documenso/trpc/client'; import { trpc } from '@documenso/trpc/react'; @@ -41,6 +42,11 @@ export const ZProfileFormSchema = z.object({ signature: z.string().min(1, 'Signature Pad cannot be empty'), }); +export const ZTwoFactorAuthTokenSchema = z.object({ + token: z.string(), +}); + +export type TTwoFactorAuthTokenSchema = z.infer; export type TProfileFormSchema = z.infer; export type ProfileFormProps = { @@ -61,7 +67,15 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { resolver: zodResolver(ZProfileFormSchema), }); + const deleteAccountTwoFactorTokenForm = useForm({ + defaultValues: { + token: '', + }, + resolver: zodResolver(ZTwoFactorAuthTokenSchema), + }); + const isSubmitting = form.formState.isSubmitting; + const hasTwoFactorAuthentication = user.twoFactorEnabled; const { mutateAsync: updateProfile } = trpc.profile.updateProfile.useMutation(); const { mutateAsync: deleteAccount, isLoading: isDeletingAccount } = @@ -101,9 +115,20 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { const onDeleteAccount = async () => { try { - await deleteAccount(); + const { token } = deleteAccountTwoFactorTokenForm.getValues(); - await signOut({ callbackUrl: '/' }); + if (!token) { + throw new Error('Please enter your Two Factor Authentication token.'); + } + + await validateTwoFactorAuthentication({ + totpCode: token, + user, + }).catch(() => { + throw new Error('We were unable to validate your Two Factor Authentication token.'); + }); + + await deleteAccount(); toast({ title: 'Account deleted', @@ -111,9 +136,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { duration: 5000, }); - // logout after deleting account - - router.push('/'); + await signOut({ callbackUrl: '/' }); } catch (err) { if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') { toast({ @@ -126,6 +149,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { title: 'An unknown error occurred', variant: 'destructive', description: + err.message ?? 'We encountered an unknown error while attempting to delete your account. Please try again later.', }); } @@ -193,36 +217,73 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { irreversible and will cancel your subscription, so proceed with caution. - - - - - - - Delete Account - - Documenso will delete{' '} - all of your documents, along with all of - your completed documents, signatures, and all other resources belonging to your - Account. - +
+ { + console.log('delete account'); + })} + > + + + + + + + Delete Account + + Documenso will delete{' '} + all of your documents, along with all + of your completed documents, signatures, and all other resources belonging + to your Account. + + + + This action is not reversible. Please be certain. - - - - - - - + + {hasTwoFactorAuthentication && ( +
+ ( + + + Two Factor Authentication Token + + + + + + + )} + /> +
+ )} + + + + + +
+ +
diff --git a/packages/lib/server-only/2fa/setup-2fa.ts b/packages/lib/server-only/2fa/setup-2fa.ts index 30ddf0ec3..a60b0934b 100644 --- a/packages/lib/server-only/2fa/setup-2fa.ts +++ b/packages/lib/server-only/2fa/setup-2fa.ts @@ -5,7 +5,7 @@ import { createTOTPKeyURI } from 'oslo/otp'; import { ErrorCode } from '@documenso/lib/next-auth/error-codes'; import { prisma } from '@documenso/prisma'; -import { User } from '@documenso/prisma/client'; +import type { User } from '@documenso/prisma/client'; import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto'; import { symmetricEncrypt } from '../../universal/crypto'; diff --git a/packages/lib/server-only/2fa/validate-2fa.ts b/packages/lib/server-only/2fa/validate-2fa.ts index 7fc76a8bb..33141c325 100644 --- a/packages/lib/server-only/2fa/validate-2fa.ts +++ b/packages/lib/server-only/2fa/validate-2fa.ts @@ -1,4 +1,4 @@ -import { User } from '@documenso/prisma/client'; +import type { User } from '@documenso/prisma/client'; import { ErrorCode } from '../../next-auth/error-codes'; import { verifyTwoFactorAuthenticationToken } from './verify-2fa-token'; diff --git a/packages/lib/server-only/2fa/verify-2fa-token.ts b/packages/lib/server-only/2fa/verify-2fa-token.ts index fa9159517..3c410bd58 100644 --- a/packages/lib/server-only/2fa/verify-2fa-token.ts +++ b/packages/lib/server-only/2fa/verify-2fa-token.ts @@ -1,7 +1,7 @@ import { base32 } from '@scure/base'; import { TOTPController } from 'oslo/otp'; -import { User } from '@documenso/prisma/client'; +import type { User } from '@documenso/prisma/client'; import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto'; import { symmetricDecrypt } from '../../universal/crypto'; @@ -17,6 +17,7 @@ export const verifyTwoFactorAuthenticationToken = async ({ user, totpCode, }: VerifyTwoFactorAuthenticationTokenOptions) => { + // TODO: This is undefined and I can't figure out why. const key = DOCUMENSO_ENCRYPTION_KEY; if (!user.twoFactorSecret) { diff --git a/packages/ui/primitives/button.tsx b/packages/ui/primitives/button.tsx index 5754b35a5..68ecb6eb0 100644 --- a/packages/ui/primitives/button.tsx +++ b/packages/ui/primitives/button.tsx @@ -13,7 +13,8 @@ const buttonVariants = cva( variants: { variant: { default: 'bg-primary text-primary-foreground hover:bg-primary/90', - destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90', + destructive: + 'bg-destructive text-destructive-foreground hover:bg-destructive/90 focus-visible:ring-destructive', outline: 'border border-input hover:bg-accent hover:text-accent-foreground', secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80', ghost: 'hover:bg-accent hover:text-accent-foreground', From 5a28eaa4ff6477fda00776931e2076783c08d7d5 Mon Sep 17 00:00:00 2001 From: Mythie Date: Mon, 22 Jan 2024 17:38:02 +1100 Subject: [PATCH 062/311] feat: add recipient creation --- apps/web/src/pages/api/v1/[...ts-rest].tsx | 14 +- package-lock.json | 19 ++- packages/api/package.json | 1 + packages/api/v1/api-documentation.tsx | 2 + packages/api/v1/contract.ts | 28 +++- packages/api/v1/implementation.ts | 141 ++++++++++++++---- packages/api/v1/schema.ts | 50 ++++--- .../public-api/get-api-token-by-id.ts | 2 +- packages/trpc/api-contract/contract.ts | 80 ---------- packages/trpc/api-contract/schema.ts | 65 -------- packages/trpc/server/public-api/ts-rest.ts | 3 - 11 files changed, 187 insertions(+), 218 deletions(-) delete mode 100644 packages/trpc/api-contract/contract.ts delete mode 100644 packages/trpc/api-contract/schema.ts delete mode 100644 packages/trpc/server/public-api/ts-rest.ts diff --git a/apps/web/src/pages/api/v1/[...ts-rest].tsx b/apps/web/src/pages/api/v1/[...ts-rest].tsx index 15b618ebd..095936cf0 100644 --- a/apps/web/src/pages/api/v1/[...ts-rest].tsx +++ b/apps/web/src/pages/api/v1/[...ts-rest].tsx @@ -1,5 +1,17 @@ +import type { NextApiRequest, NextApiResponse } from 'next'; + import { createNextRouter } from '@documenso/api/next'; import { ApiContractV1 } from '@documenso/api/v1/contract'; import { ApiContractV1Implementation } from '@documenso/api/v1/implementation'; -export default createNextRouter(ApiContractV1, ApiContractV1Implementation); +const nextRouteHandler = createNextRouter(ApiContractV1, ApiContractV1Implementation, { + responseValidation: false, +}); + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + // TODO: Dirty hack to make ts-rest handler work with next.js in a more intuitive way. + req.query['ts-rest'] = Array.isArray(req.query['ts-rest']) ? req.query['ts-rest'] : []; // Make `ts-rest` an array. + req.query['ts-rest'].unshift('api', 'v1'); // Prepend our base path to the array. + + return await nextRouteHandler(req, res); +} diff --git a/package-lock.json b/package-lock.json index 8aa403089..decf0485d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6718,8 +6718,7 @@ "node_modules/@types/prop-types": { "version": "15.7.11", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", - "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==", - "devOptional": true + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" }, "node_modules/@types/ramda": { "version": "0.29.9", @@ -6733,7 +6732,6 @@ "version": "18.2.18", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz", "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==", - "devOptional": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -6757,14 +6755,21 @@ "node_modules/@types/scheduler": { "version": "0.16.8", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", - "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==", - "devOptional": true + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, "node_modules/@types/semver": { "version": "7.5.6", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==" }, + "node_modules/@types/swagger-ui-react": { + "version": "4.18.3", + "resolved": "https://registry.npmjs.org/@types/swagger-ui-react/-/swagger-ui-react-4.18.3.tgz", + "integrity": "sha512-Mo/R7IjDVwtiFPs84pWvh5pI9iyNGBjmfielxqbOh2Jv+8WVSDVe8Nu25kb5BOuV2xmGS3o33jr6nwDJMBcX+Q==", + "dependencies": { + "@types/react": "*" + } + }, "node_modules/@types/unist": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", @@ -8729,8 +8734,7 @@ "node_modules/csstype": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==", - "devOptional": true + "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "node_modules/d3-array": { "version": "3.2.4", @@ -20739,6 +20743,7 @@ "@ts-rest/core": "^3.30.5", "@ts-rest/next": "^3.30.5", "@ts-rest/open-api": "^3.33.0", + "@types/swagger-ui-react": "^4.18.3", "luxon": "^3.4.0", "superjson": "^1.13.1", "swagger-ui-react": "^5.11.0", diff --git a/packages/api/package.json b/packages/api/package.json index 1d9b5c159..aebb09c9b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -20,6 +20,7 @@ "@ts-rest/core": "^3.30.5", "@ts-rest/next": "^3.30.5", "@ts-rest/open-api": "^3.33.0", + "@types/swagger-ui-react": "^4.18.3", "luxon": "^3.4.0", "superjson": "^1.13.1", "swagger-ui-react": "^5.11.0", diff --git a/packages/api/v1/api-documentation.tsx b/packages/api/v1/api-documentation.tsx index 6f8062271..6082d2d7f 100644 --- a/packages/api/v1/api-documentation.tsx +++ b/packages/api/v1/api-documentation.tsx @@ -1,3 +1,5 @@ +'use client'; + import SwaggerUI from 'swagger-ui-react'; import 'swagger-ui-react/swagger-ui.css'; diff --git a/packages/api/v1/contract.ts b/packages/api/v1/contract.ts index 0f853a020..438fa9cee 100644 --- a/packages/api/v1/contract.ts +++ b/packages/api/v1/contract.ts @@ -4,9 +4,11 @@ import { ZSendDocumentForSigningMutationSchema as SendDocumentMutationSchema, ZAuthorizationHeadersSchema, ZCreateDocumentMutationSchema, + ZCreateRecipientMutationSchema, ZDeleteDocumentMutationSchema, ZGetDocumentsQuerySchema, ZSuccessfulDocumentResponseSchema, + ZSuccessfulRecipientResponseSchema, ZSuccessfulResponseSchema, ZSuccessfulSigningResponseSchema, ZUnsuccessfulResponseSchema, @@ -19,7 +21,7 @@ export const ApiContractV1 = c.router( { getDocuments: { method: 'GET', - path: '/documents', + path: '/api/v1/documents', query: ZGetDocumentsQuerySchema, responses: { 200: ZSuccessfulResponseSchema, @@ -31,7 +33,7 @@ export const ApiContractV1 = c.router( getDocument: { method: 'GET', - path: `/documents/:id`, + path: '/api/v1/documents/:id', responses: { 200: ZSuccessfulDocumentResponseSchema, 401: ZUnsuccessfulResponseSchema, @@ -42,7 +44,7 @@ export const ApiContractV1 = c.router( createDocument: { method: 'POST', - path: '/documents', + path: '/api/v1/documents', body: ZCreateDocumentMutationSchema, responses: { 200: ZUploadDocumentSuccessfulSchema, @@ -53,8 +55,8 @@ export const ApiContractV1 = c.router( }, sendDocument: { - method: 'PATCH', - path: '/documents/:id/send', + method: 'POST', + path: '/api/v1/documents/:id/send', body: SendDocumentMutationSchema, responses: { 200: ZSuccessfulSigningResponseSchema, @@ -68,7 +70,7 @@ export const ApiContractV1 = c.router( deleteDocument: { method: 'DELETE', - path: `/documents/:id`, + path: '/api/v1/documents/:id', body: ZDeleteDocumentMutationSchema, responses: { 200: ZSuccessfulDocumentResponseSchema, @@ -77,6 +79,20 @@ export const ApiContractV1 = c.router( }, summary: 'Delete a document', }, + + createRecipient: { + method: 'POST', + path: '/api/v1/documents/:id/recipients', + body: ZCreateRecipientMutationSchema, + responses: { + 200: ZSuccessfulRecipientResponseSchema, + 400: ZUnsuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + 500: ZUnsuccessfulResponseSchema, + }, + summary: 'Create a recipient for a document', + }, }, { baseHeaders: ZAuthorizationHeadersSchema, diff --git a/packages/api/v1/implementation.ts b/packages/api/v1/implementation.ts index b317e95d6..4dd709246 100644 --- a/packages/api/v1/implementation.ts +++ b/packages/api/v1/implementation.ts @@ -1,13 +1,13 @@ import { createNextRoute } from '@ts-rest/next'; -import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta'; import { deleteDocument } from '@documenso/lib/server-only/document/delete-document'; import { findDocuments } from '@documenso/lib/server-only/document/find-documents'; import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; import { sendDocument } from '@documenso/lib/server-only/document/send-document'; -import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document'; +import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document'; import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document'; import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions'; +import { DocumentStatus } from '@documenso/prisma/client'; import { ApiContractV1 } from './contract'; import { authenticatedMiddleware } from './middleware/authenticated'; @@ -99,7 +99,6 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, { sendDocument: authenticatedMiddleware(async (args, user) => { const { id } = args.params; - const { body } = args; const document = await getDocumentById({ id: Number(id), userId: user.id }); @@ -122,38 +121,38 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, { } try { - await setRecipientsForDocument({ - userId: user.id, - documentId: Number(id), - recipients: [ - { - email: body.signerEmail, - name: body.signerName ?? '', - }, - ], - }); + // await setRecipientsForDocument({ + // userId: user.id, + // documentId: Number(id), + // recipients: [ + // { + // email: body.signerEmail, + // name: body.signerName ?? '', + // }, + // ], + // }); - await setFieldsForDocument({ - documentId: Number(id), - userId: user.id, - fields: body.fields.map((field) => ({ - signerEmail: body.signerEmail, - type: field.fieldType, - pageNumber: field.pageNumber, - pageX: field.pageX, - pageY: field.pageY, - pageWidth: field.pageWidth, - pageHeight: field.pageHeight, - })), - }); + // await setFieldsForDocument({ + // documentId: Number(id), + // userId: user.id, + // fields: body.fields.map((field) => ({ + // signerEmail: body.signerEmail, + // type: field.fieldType, + // pageNumber: field.pageNumber, + // pageX: field.pageX, + // pageY: field.pageY, + // pageWidth: field.pageWidth, + // pageHeight: field.pageHeight, + // })), + // }); - if (body.emailBody || body.emailSubject) { - await upsertDocumentMeta({ - documentId: Number(id), - subject: body.emailSubject ?? '', - message: body.emailBody ?? '', - }); - } + // if (body.emailBody || body.emailSubject) { + // await upsertDocumentMeta({ + // documentId: Number(id), + // subject: body.emailSubject ?? '', + // message: body.emailBody ?? '', + // }); + // } await sendDocument({ documentId: Number(id), @@ -175,4 +174,80 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, { }; } }), + + createRecipient: authenticatedMiddleware(async (args, user) => { + const { id: documentId } = args.params; + const { name, email } = args.body; + + const document = await getDocumentById({ + id: Number(documentId), + userId: user.id, + }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === DocumentStatus.COMPLETED) { + return { + status: 400, + body: { + message: 'Document is already completed', + }, + }; + } + + const recipients = await getRecipientsForDocument({ + documentId: Number(documentId), + userId: user.id, + }); + + const recipientAlreadyExists = recipients.some((recipient) => recipient.email === email); + + if (recipientAlreadyExists) { + return { + status: 400, + body: { + message: 'Recipient already exists', + }, + }; + } + + try { + const newRecipients = await setRecipientsForDocument({ + documentId: Number(documentId), + userId: user.id, + recipients: [ + ...recipients, + { + email, + name, + }, + ], + }); + + const newRecipient = newRecipients.find((recipient) => recipient.email === email); + + if (!newRecipient) { + throw new Error('Recipient not found'); + } + + return { + status: 200, + body: newRecipient, + }; + } catch (err) { + return { + status: 500, + body: { + message: 'An error has occured while creating the recipient', + }, + }; + } + }), }); diff --git a/packages/api/v1/schema.ts b/packages/api/v1/schema.ts index f4c80ca73..91c35ce28 100644 --- a/packages/api/v1/schema.ts +++ b/packages/api/v1/schema.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; -import { FieldType } from '@documenso/prisma/client'; +import { ReadStatus, SendStatus, SigningStatus } from '@documenso/prisma/client'; export const ZGetDocumentsQuerySchema = z.object({ page: z.string().optional(), @@ -9,9 +9,9 @@ export const ZGetDocumentsQuerySchema = z.object({ export type TGetDocumentsQuerySchema = z.infer; -export const ZDeleteDocumentMutationSchema = z.string(); +export const ZDeleteDocumentMutationSchema = null; -export type TDeleteDocumentMutationSchema = z.infer; +export type TDeleteDocumentMutationSchema = typeof ZDeleteDocumentMutationSchema; export const ZSuccessfulDocumentResponseSchema = z.object({ id: z.number(), @@ -26,26 +26,9 @@ export const ZSuccessfulDocumentResponseSchema = z.object({ export type TSuccessfulDocumentResponseSchema = z.infer; -export const ZSendDocumentForSigningMutationSchema = z.object({ - signerEmail: z.string(), - signerName: z.string().optional(), - emailSubject: z.string().optional(), - emailBody: z.string().optional(), - fields: z.array( - z.object({ - fieldType: z.nativeEnum(FieldType), - pageNumber: z.number(), - pageX: z.number(), - pageY: z.number(), - pageWidth: z.number(), - pageHeight: z.number(), - }), - ), -}); +export const ZSendDocumentForSigningMutationSchema = null; -export type TSendDocumentForSigningMutationSchema = z.infer< - typeof ZSendDocumentForSigningMutationSchema ->; +export type TSendDocumentForSigningMutationSchema = typeof ZSendDocumentForSigningMutationSchema; export const ZUploadDocumentSuccessfulSchema = z.object({ url: z.string(), @@ -61,6 +44,29 @@ export const ZCreateDocumentMutationSchema = z.object({ export type TCreateDocumentMutationSchema = z.infer; +export const ZCreateRecipientMutationSchema = z.object({ + name: z.string().min(1), + email: z.string().email().min(1), +}); + +export type TCreateRecipientMutationSchema = z.infer; + +export const ZSuccessfulRecipientResponseSchema = z.object({ + id: z.number(), + documentId: z.number(), + email: z.string().email().min(1), + name: z.string(), + token: z.string(), + // !: Not used for now + // expired: z.string(), + signedAt: z.date().nullable(), + readStatus: z.nativeEnum(ReadStatus), + signingStatus: z.nativeEnum(SigningStatus), + sendStatus: z.nativeEnum(SendStatus), +}); + +export type TSuccessfulRecipientResponseSchema = z.infer; + export const ZSuccessfulResponseSchema = z.object({ documents: ZSuccessfulDocumentResponseSchema.array(), totalPages: z.number(), diff --git a/packages/lib/server-only/public-api/get-api-token-by-id.ts b/packages/lib/server-only/public-api/get-api-token-by-id.ts index ae442f05e..8b25717f9 100644 --- a/packages/lib/server-only/public-api/get-api-token-by-id.ts +++ b/packages/lib/server-only/public-api/get-api-token-by-id.ts @@ -6,7 +6,7 @@ export type GetApiTokenByIdOptions = { }; export const getApiTokenById = async ({ id, userId }: GetApiTokenByIdOptions) => { - return prisma.apiToken.findFirstOrThrow({ + return await prisma.apiToken.findFirstOrThrow({ where: { id, userId, diff --git a/packages/trpc/api-contract/contract.ts b/packages/trpc/api-contract/contract.ts deleted file mode 100644 index 5f28a0c63..000000000 --- a/packages/trpc/api-contract/contract.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { initContract } from '@ts-rest/core'; - -import { - AuthorizationHeadersSchema, - CreateDocumentMutationSchema, - DeleteDocumentMutationSchema, - GetDocumentsQuerySchema, - SendDocumentForSigningMutationSchema, - SuccessfulDocumentResponseSchema, - SuccessfulResponseSchema, - SuccessfulSigningResponseSchema, - UnsuccessfulResponseSchema, - UploadDocumentSuccessfulSchema, -} from './schema'; - -const c = initContract(); - -export const contract = c.router( - { - getDocuments: { - method: 'GET', - path: '/documents', - query: GetDocumentsQuerySchema, - responses: { - 200: SuccessfulResponseSchema, - 401: UnsuccessfulResponseSchema, - 404: UnsuccessfulResponseSchema, - }, - summary: 'Get all documents', - }, - getDocument: { - method: 'GET', - path: `/documents/:id`, - responses: { - 200: SuccessfulDocumentResponseSchema, - 401: UnsuccessfulResponseSchema, - 404: UnsuccessfulResponseSchema, - }, - summary: 'Get a single document', - }, - createDocument: { - method: 'POST', - path: '/documents', - body: CreateDocumentMutationSchema, - responses: { - 200: UploadDocumentSuccessfulSchema, - 401: UnsuccessfulResponseSchema, - 404: UnsuccessfulResponseSchema, - }, - summary: 'Upload a new document and get a presigned URL', - }, - sendDocumentForSigning: { - method: 'PATCH', - path: '/documents/:id/send', - body: SendDocumentForSigningMutationSchema, - responses: { - 200: SuccessfulSigningResponseSchema, - 400: UnsuccessfulResponseSchema, - 401: UnsuccessfulResponseSchema, - 404: UnsuccessfulResponseSchema, - 500: UnsuccessfulResponseSchema, - }, - summary: 'Send a document for signing', - }, - deleteDocument: { - method: 'DELETE', - path: `/documents/:id`, - body: DeleteDocumentMutationSchema, - responses: { - 200: SuccessfulDocumentResponseSchema, - 401: UnsuccessfulResponseSchema, - 404: UnsuccessfulResponseSchema, - }, - summary: 'Delete a document', - }, - }, - { - baseHeaders: AuthorizationHeadersSchema, - }, -); diff --git a/packages/trpc/api-contract/schema.ts b/packages/trpc/api-contract/schema.ts deleted file mode 100644 index d62d50d52..000000000 --- a/packages/trpc/api-contract/schema.ts +++ /dev/null @@ -1,65 +0,0 @@ -import { z } from 'zod'; - -import { FieldType } from '@documenso/prisma/client'; - -export const GetDocumentsQuerySchema = z.object({ - page: z.string().optional(), - perPage: z.string().optional(), -}); - -export const DeleteDocumentMutationSchema = z.string(); - -export const SuccessfulDocumentResponseSchema = z.object({ - id: z.number(), - userId: z.number(), - title: z.string(), - status: z.string(), - documentDataId: z.string(), - createdAt: z.date(), - updatedAt: z.date(), - completedAt: z.date().nullable(), -}); - -export const SendDocumentForSigningMutationSchema = z.object({ - signerEmail: z.string(), - signerName: z.string().optional(), - emailSubject: z.string().optional(), - emailBody: z.string().optional(), - fields: z.array( - z.object({ - fieldType: z.nativeEnum(FieldType), - pageNumber: z.number(), - pageX: z.number(), - pageY: z.number(), - pageWidth: z.number(), - pageHeight: z.number(), - }), - ), -}); - -export const UploadDocumentSuccessfulSchema = z.object({ - url: z.string(), - key: z.string(), -}); - -export const CreateDocumentMutationSchema = z.object({ - fileName: z.string(), - contentType: z.string().default('PDF'), -}); - -export const SuccessfulResponseSchema = z.object({ - documents: SuccessfulDocumentResponseSchema.array(), - totalPages: z.number(), -}); - -export const SuccessfulSigningResponseSchema = z.object({ - message: z.string(), -}); - -export const UnsuccessfulResponseSchema = z.object({ - message: z.string(), -}); - -export const AuthorizationHeadersSchema = z.object({ - authorization: z.string(), -}); diff --git a/packages/trpc/server/public-api/ts-rest.ts b/packages/trpc/server/public-api/ts-rest.ts deleted file mode 100644 index 0d66cda1f..000000000 --- a/packages/trpc/server/public-api/ts-rest.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { createNextRoute, createNextRouter } from '@ts-rest/next'; - -export { createNextRoute, createNextRouter }; From e5c2263e9276ce08eabcab3d12e4d5dfd35ba19b Mon Sep 17 00:00:00 2001 From: Sumit Bisht Date: Tue, 23 Jan 2024 18:37:02 +0530 Subject: [PATCH 063/311] fix: imporoved document-dropzone ui for small vertical screens --- apps/web/src/app/(dashboard)/documents/upload-document.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/web/src/app/(dashboard)/documents/upload-document.tsx b/apps/web/src/app/(dashboard)/documents/upload-document.tsx index 65b95f9ec..71926dafc 100644 --- a/apps/web/src/app/(dashboard)/documents/upload-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/upload-document.tsx @@ -96,10 +96,12 @@ export const UploadDocument = ({ className }: UploadDocumentProps) => { } }; + const isSmallVerticalScreen = typeof window !== 'undefined' && window.innerHeight < 800; + return (
Date: Thu, 25 Jan 2024 13:21:55 +0530 Subject: [PATCH 064/311] fixed undo operation on signature pad --- packages/ui/primitives/signature-pad/signature-pad.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/ui/primitives/signature-pad/signature-pad.tsx b/packages/ui/primitives/signature-pad/signature-pad.tsx index 80bac0e18..e6f844b52 100644 --- a/packages/ui/primitives/signature-pad/signature-pad.tsx +++ b/packages/ui/primitives/signature-pad/signature-pad.tsx @@ -26,7 +26,7 @@ export const SignaturePad = ({ ...props }: SignaturePadProps) => { const $el = useRef(null); - + const defaultImageRef = useRef(null); const [isPressed, setIsPressed] = useState(false); const [lines, setLines] = useState([]); const [currentLine, setCurrentLine] = useState([]); @@ -161,6 +161,7 @@ export const SignaturePad = ({ const ctx = $el.current.getContext('2d'); ctx?.clearRect(0, 0, $el.current.width, $el.current.height); + defaultImageRef.current = null; } onChange?.(null); @@ -181,8 +182,11 @@ export const SignaturePad = ({ // Clear the canvas if ($el.current) { const ctx = $el.current.getContext('2d'); + const { width, height } = $el.current; ctx?.clearRect(0, 0, $el.current.width, $el.current.height); - + if (typeof defaultValue === 'string' && defaultImageRef.current) { + ctx?.putImageData(defaultImageRef.current, 0, 0); + } newLines.forEach((line) => { const pathData = new Path2D(getSvgPathFromStroke(getStroke(line, perfectFreehandOptions))); ctx?.fill(pathData); @@ -207,6 +211,8 @@ export const SignaturePad = ({ img.onload = () => { ctx?.drawImage(img, 0, 0, Math.min(width, img.width), Math.min(height, img.height)); + const defaultImageData = ctx?.getImageData(0, 0, width, height) || null; + defaultImageRef.current = defaultImageData; }; img.src = defaultValue; From d451a7accecc19bfdf1be559e4c5af79c3e14002 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:48:20 +0200 Subject: [PATCH 065/311] feat: add next-runtime-env --- .../(dashboard)/documents/[id]/edit-document.tsx | 2 +- .../billing/create-billing-portal.action.ts | 6 +++++- .../settings/billing/create-checkout.action.ts | 8 ++++++-- .../app/(share)/share/[slug]/opengraph/route.tsx | 5 ++++- apps/web/src/app/(share)/share/[slug]/page.tsx | 8 ++++++-- .../src/app/(unauthenticated)/signin/page.tsx | 6 +++++- .../src/app/(unauthenticated)/signup/page.tsx | 6 +++++- apps/web/src/app/layout.tsx | 9 +++++++-- .../(dashboard)/avatar/avatar-with-recipient.tsx | 6 +++++- apps/web/src/helpers/get-asset-buffer.ts | 6 +++++- package-lock.json | 16 ++++++++++++++++ package.json | 4 +++- packages/ee/server-only/limits/client.ts | 5 +++-- .../template-document-self-signed.tsx | 6 +++++- .../template-reset-password.tsx | 6 +++++- packages/lib/constants/app.ts | 14 +++++++++----- packages/lib/constants/feature-flags.ts | 9 +++++++-- packages/lib/next-auth/auth-options.ts | 5 ++++- .../server-only/auth/send-confirmation-email.ts | 12 +++++++++--- .../lib/server-only/auth/send-forgot-password.ts | 8 ++++++-- .../lib/server-only/auth/send-reset-password.ts | 6 +++++- .../lib/server-only/document/delete-document.ts | 6 +++++- .../lib/server-only/document/resend-document.tsx | 8 ++++++-- .../server-only/document/send-completed-email.ts | 8 ++++++-- .../lib/server-only/document/send-document.tsx | 8 ++++++-- .../server-only/document/send-pending-email.ts | 6 +++++- packages/lib/server-only/feature-flags/all.ts | 8 ++++++-- packages/lib/server-only/feature-flags/get.ts | 11 ++++++++--- packages/lib/universal/get-base-url.ts | 8 ++++++-- packages/lib/universal/upload/put-file.ts | 5 ++++- packages/lib/universal/upload/server-actions.ts | 5 ++++- packages/trpc/server/auth-router/router.ts | 5 ++++- .../trpc/server/singleplayer-router/router.ts | 5 ++++- .../document/document-share-button.tsx | 12 +++++++----- 34 files changed, 192 insertions(+), 56 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx index 2159b87f2..832e255fd 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx @@ -61,7 +61,7 @@ export const EditDocumentForm = ({ const { mutateAsync: setPasswordForDocument } = trpc.document.setPasswordForDocument.useMutation(); - const documentFlow: Record = { + const documentFlow: Record = { title: { title: 'Add Title', description: 'Add the title to the document.', diff --git a/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts b/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts index 885414515..7d952d599 100644 --- a/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts +++ b/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts @@ -1,16 +1,20 @@ 'use server'; +import { env } from 'next-runtime-env'; + import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer'; import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; export const createBillingPortal = async () => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const { user } = await getRequiredServerComponentSession(); const { stripeCustomer } = await getStripeCustomerByUser(user); return getPortalSession({ customerId: stripeCustomer.id, - returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, + returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, }); }; diff --git a/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts b/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts index f8f20030c..ef3fb0f30 100644 --- a/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts +++ b/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts @@ -1,5 +1,7 @@ 'use server'; +import { env } from 'next-runtime-env'; + import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session'; import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer'; import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session'; @@ -11,6 +13,8 @@ export type CreateCheckoutOptions = { }; export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const session = await getRequiredServerComponentSession(); const { user, stripeCustomer } = await getStripeCustomerByUser(session.user); @@ -27,13 +31,13 @@ export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => { if (foundSubscription) { return getPortalSession({ customerId: stripeCustomer.id, - returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, + returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, }); } return getCheckoutSession({ customerId: stripeCustomer.id, priceId, - returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, + returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, }); }; diff --git a/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx b/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx index d8f0ecac8..e9977b8f3 100644 --- a/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx +++ b/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx @@ -1,6 +1,7 @@ import { ImageResponse } from 'next/og'; import { NextResponse } from 'next/server'; +import { env } from 'next-runtime-env'; import { P, match } from 'ts-pattern'; import type { ShareHandlerAPIResponse } from '~/pages/api/share'; @@ -22,6 +23,8 @@ type SharePageOpenGraphImageProps = { }; export async function GET(_request: Request, { params: { slug } }: SharePageOpenGraphImageProps) { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const [interSemiBold, interRegular, caveatRegular, shareFrameImage] = await Promise.all([ fetch(new URL('@documenso/assets/fonts/inter-semibold.ttf', import.meta.url)).then( async (res) => res.arrayBuffer(), @@ -37,7 +40,7 @@ export async function GET(_request: Request, { params: { slug } }: SharePageOpen ), ]); - const baseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const baseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; const recipientOrSender: ShareHandlerAPIResponse = await fetch( new URL(`/api/share?slug=${slug}`, baseUrl), diff --git a/apps/web/src/app/(share)/share/[slug]/page.tsx b/apps/web/src/app/(share)/share/[slug]/page.tsx index 8e8fd7769..ab530ba0b 100644 --- a/apps/web/src/app/(share)/share/[slug]/page.tsx +++ b/apps/web/src/app/(share)/share/[slug]/page.tsx @@ -1,7 +1,9 @@ -import { Metadata } from 'next'; +import type { Metadata } from 'next'; import { headers } from 'next/headers'; import { redirect } from 'next/navigation'; +import { env } from 'next-runtime-env'; + import { APP_BASE_URL } from '@documenso/lib/constants/app'; type SharePageProps = { @@ -28,6 +30,8 @@ export function generateMetadata({ params: { slug } }: SharePageProps) { } export default function SharePage() { + const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); + const userAgent = headers().get('User-Agent') ?? ''; // https://stackoverflow.com/questions/47026171/how-to-detect-bots-for-open-graph-with-user-agent @@ -35,5 +39,5 @@ export default function SharePage() { return null; } - redirect(process.env.NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001'); + redirect(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001'); } diff --git a/apps/web/src/app/(unauthenticated)/signin/page.tsx b/apps/web/src/app/(unauthenticated)/signin/page.tsx index 5fda07e70..bbea70ecb 100644 --- a/apps/web/src/app/(unauthenticated)/signin/page.tsx +++ b/apps/web/src/app/(unauthenticated)/signin/page.tsx @@ -1,10 +1,14 @@ import Link from 'next/link'; +import { env } from 'next-runtime-env'; + import { IS_GOOGLE_SSO_ENABLED } from '@documenso/lib/constants/auth'; import { SignInForm } from '~/components/forms/signin'; export default function SignInPage() { + const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP'); + return (

Sign in to your account

@@ -15,7 +19,7 @@ export default function SignInPage() { - {process.env.NEXT_PUBLIC_DISABLE_SIGNUP !== 'true' && ( + {NEXT_PUBLIC_DISABLE_SIGNUP !== 'true' && (

Don't have an account?{' '} diff --git a/apps/web/src/app/(unauthenticated)/signup/page.tsx b/apps/web/src/app/(unauthenticated)/signup/page.tsx index 353716d9b..996797d55 100644 --- a/apps/web/src/app/(unauthenticated)/signup/page.tsx +++ b/apps/web/src/app/(unauthenticated)/signup/page.tsx @@ -1,10 +1,14 @@ import Link from 'next/link'; import { redirect } from 'next/navigation'; +import { env } from 'next-runtime-env'; + import { SignUpForm } from '~/components/forms/signup'; export default function SignUpPage() { - if (process.env.NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { + const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP'); + + if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { redirect('/signin'); } diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx index ac88469b0..f36d59353 100644 --- a/apps/web/src/app/layout.tsx +++ b/apps/web/src/app/layout.tsx @@ -2,6 +2,8 @@ import { Suspense } from 'react'; import { Caveat, Inter } from 'next/font/google'; +import { PublicEnvScript, env } from 'next-runtime-env'; + import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag'; import { LocaleProvider } from '@documenso/lib/client-only/providers/locale'; import { getServerComponentAllFlags } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag'; @@ -19,6 +21,8 @@ import './globals.css'; const fontInter = Inter({ subsets: ['latin'], variable: '--font-sans' }); const fontCaveat = Caveat({ subsets: ['latin'], variable: '--font-signature' }); +const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + export const metadata = { title: 'Documenso - The Open Source DocuSign Alternative', description: @@ -32,12 +36,12 @@ export const metadata = { description: 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', type: 'website', - images: [`${process.env.NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`], + images: [`${NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`], }, twitter: { site: '@documenso', card: 'summary_large_image', - images: [`${process.env.NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`], + images: [`${NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`], description: 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', }, @@ -59,6 +63,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo + diff --git a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx index d04b3a998..727627ddd 100644 --- a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx +++ b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx @@ -2,6 +2,8 @@ import React from 'react'; +import { env } from 'next-runtime-env'; + import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard'; import { getRecipientType } from '@documenso/lib/client-only/recipient-type'; import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter'; @@ -16,6 +18,8 @@ export type AvatarWithRecipientProps = { }; export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const [, copy] = useCopyToClipboard(); const { toast } = useToast(); @@ -24,7 +28,7 @@ export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) { return; } - void copy(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`).then(() => { + void copy(`${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`).then(() => { toast({ title: 'Copied to clipboard', description: 'The signing link has been copied to your clipboard.', diff --git a/apps/web/src/helpers/get-asset-buffer.ts b/apps/web/src/helpers/get-asset-buffer.ts index 85887071e..12c27d1a5 100644 --- a/apps/web/src/helpers/get-asset-buffer.ts +++ b/apps/web/src/helpers/get-asset-buffer.ts @@ -1,3 +1,5 @@ +import { env } from 'next-runtime-env'; + /** * getAssetBuffer is used to retrieve array buffers for various assets * that are hosted in the `public` folder. @@ -8,7 +10,9 @@ * @param path The path to the asset, relative to the `public` folder. */ export const getAssetBuffer = async (path: string) => { - const baseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + + const baseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; return fetch(new URL(path, baseUrl)).then(async (res) => res.arrayBuffer()); }; diff --git a/package-lock.json b/package-lock.json index 69825e8d8..d92461436 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,9 @@ "apps/*", "packages/*" ], + "dependencies": { + "next-runtime-env": "^3.2.0" + }, "devDependencies": { "@commitlint/cli": "^17.7.1", "@commitlint/config-conventional": "^17.7.0", @@ -14503,6 +14506,19 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/next-runtime-env": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/next-runtime-env/-/next-runtime-env-3.2.0.tgz", + "integrity": "sha512-rwe3flUgSRm51hzRN4Vt5MMSYMS4aDMEPJa0r+CMONA3UyUZl8Y5O8zjHSIlaNb3yquTCttZ0ahObPyPprBj9g==", + "dependencies": { + "next": "^14", + "react": "^18" + }, + "peerDependencies": { + "next": "^14", + "react": "^18" + } + }, "node_modules/next-themes": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.2.1.tgz", diff --git a/package.json b/package.json index 30076100f..853de1c6b 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,9 @@ "apps/*", "packages/*" ], - "dependencies": {}, + "dependencies": { + "next-runtime-env": "^3.2.0" + }, "overrides": { "next-auth": { "next": "14.0.3" diff --git a/packages/ee/server-only/limits/client.ts b/packages/ee/server-only/limits/client.ts index 7f48e6856..9bb2bd0ac 100644 --- a/packages/ee/server-only/limits/client.ts +++ b/packages/ee/server-only/limits/client.ts @@ -1,7 +1,8 @@ import { APP_BASE_URL } from '@documenso/lib/constants/app'; import { FREE_PLAN_LIMITS } from './constants'; -import { TLimitsResponseSchema, ZLimitsResponseSchema } from './schema'; +import type { TLimitsResponseSchema } from './schema'; +import { ZLimitsResponseSchema } from './schema'; export type GetLimitsOptions = { headers?: Record; @@ -10,7 +11,7 @@ export type GetLimitsOptions = { export const getLimits = async ({ headers }: GetLimitsOptions = {}) => { const requestHeaders = headers ?? {}; - const url = new URL(`${APP_BASE_URL}/api/limits`); + const url = new URL('/api/limits', APP_BASE_URL ?? 'http://localhost:3000'); return fetch(url, { headers: { diff --git a/packages/email/template-components/template-document-self-signed.tsx b/packages/email/template-components/template-document-self-signed.tsx index 90a1d3951..db16fb000 100644 --- a/packages/email/template-components/template-document-self-signed.tsx +++ b/packages/email/template-components/template-document-self-signed.tsx @@ -1,3 +1,5 @@ +import { env } from 'next-runtime-env'; + import { Button, Column, Img, Link, Section, Text } from '../components'; import { TemplateDocumentImage } from './template-document-image'; @@ -10,7 +12,9 @@ export const TemplateDocumentSelfSigned = ({ documentName, assetBaseUrl, }: TemplateDocumentSelfSignedProps) => { - const signUpUrl = `${process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signup`; + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + + const signUpUrl = `${NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signup`; const getAssetUrl = (path: string) => { return new URL(path, assetBaseUrl).toString(); diff --git a/packages/email/template-components/template-reset-password.tsx b/packages/email/template-components/template-reset-password.tsx index 8788d60b8..d05393c83 100644 --- a/packages/email/template-components/template-reset-password.tsx +++ b/packages/email/template-components/template-reset-password.tsx @@ -1,3 +1,5 @@ +import { env } from 'next-runtime-env'; + import { Button, Section, Text } from '../components'; import { TemplateDocumentImage } from './template-document-image'; @@ -8,6 +10,8 @@ export interface TemplateResetPasswordProps { } export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordProps) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + return ( <> @@ -24,7 +28,7 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro

diff --git a/packages/lib/constants/app.ts b/packages/lib/constants/app.ts index 827fcef0a..cee5a7586 100644 --- a/packages/lib/constants/app.ts +++ b/packages/lib/constants/app.ts @@ -1,8 +1,12 @@ -export const IS_APP_MARKETING = process.env.NEXT_PUBLIC_PROJECT === 'marketing'; -export const IS_APP_WEB = process.env.NEXT_PUBLIC_PROJECT === 'web'; +import { env } from 'next-runtime-env'; + +const NEXT_PUBLIC_PROJECT = process.env.NEXT_PUBLIC_PROJECT; +const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); +const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); + +export const IS_APP_MARKETING = NEXT_PUBLIC_PROJECT === 'marketing'; +export const IS_APP_WEB = NEXT_PUBLIC_PROJECT === 'web'; export const APP_FOLDER = IS_APP_MARKETING ? 'marketing' : 'web'; -export const APP_BASE_URL = IS_APP_WEB - ? process.env.NEXT_PUBLIC_WEBAPP_URL - : process.env.NEXT_PUBLIC_MARKETING_URL; +export const APP_BASE_URL = IS_APP_WEB ? NEXT_PUBLIC_WEBAPP_URL : NEXT_PUBLIC_MARKETING_URL; diff --git a/packages/lib/constants/feature-flags.ts b/packages/lib/constants/feature-flags.ts index e972b47c2..a0e958e3a 100644 --- a/packages/lib/constants/feature-flags.ts +++ b/packages/lib/constants/feature-flags.ts @@ -1,5 +1,10 @@ +import { env } from 'next-runtime-env'; + 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'); + /** * The flag name for global session recording feature flag. */ @@ -16,7 +21,7 @@ export const FEATURE_FLAG_POLL_INTERVAL = 30000; * Does not take any person or group properties into account. */ export const LOCAL_FEATURE_FLAGS: Record = { - app_billing: process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true', + app_billing: NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true', marketing_header_single_player_mode: false, } as const; @@ -24,7 +29,7 @@ export const LOCAL_FEATURE_FLAGS: Record = { * Extract the PostHog configuration from the environment. */ export function extractPostHogConfig(): { key: string; host: string } | null { - const postHogKey = process.env.NEXT_PUBLIC_POSTHOG_KEY; + const postHogKey = NEXT_PUBLIC_POSTHOG_KEY; const postHogHost = `${APP_BASE_URL}/ingest`; if (!postHogKey || !postHogHost) { diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 3b9492807..dc5f1b6f4 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -7,6 +7,7 @@ import type { JWT } from 'next-auth/jwt'; import CredentialsProvider from 'next-auth/providers/credentials'; import type { GoogleProfile } from 'next-auth/providers/google'; import GoogleProvider from 'next-auth/providers/google'; +import { env } from 'next-runtime-env'; import { prisma } from '@documenso/prisma'; @@ -15,6 +16,8 @@ import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa import { getUserByEmail } from '../server-only/user/get-user-by-email'; import { ErrorCode } from './error-codes'; +const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP'); + export const NEXT_AUTH_OPTIONS: AuthOptions = { adapter: PrismaAdapter(prisma), secret: process.env.NEXTAUTH_SECRET ?? 'secret', @@ -166,7 +169,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { async signIn({ user }) { // We do this to stop OAuth providers from creating an account // when signups are disabled - if (process.env.NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { + if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { const userData = await getUserByEmail({ email: user.email! }); return !!userData; diff --git a/packages/lib/server-only/auth/send-confirmation-email.ts b/packages/lib/server-only/auth/send-confirmation-email.ts index 7defdb1bd..c808e8f3d 100644 --- a/packages/lib/server-only/auth/send-confirmation-email.ts +++ b/packages/lib/server-only/auth/send-confirmation-email.ts @@ -1,5 +1,7 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { ConfirmEmailTemplate } from '@documenso/email/templates/confirm-email'; @@ -10,6 +12,10 @@ export interface SendConfirmationEmailProps { } export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailProps) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const NEXT_PRIVATE_SMTP_FROM_NAME = env('NEXT_PRIVATE_SMTP_FROM_NAME'); + const NEXT_PRIVATE_SMTP_FROM_ADDRESS = env('NEXT_PRIVATE_SMTP_FROM_ADDRESS'); + const user = await prisma.user.findFirstOrThrow({ where: { id: userId, @@ -30,10 +36,10 @@ export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailPro throw new Error('Verification token not found for the user'); } - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; const confirmationLink = `${assetBaseUrl}/verify-email/${verificationToken.token}`; - const senderName = process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso'; - const senderAdress = process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com'; + const senderName = NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso'; + const senderAdress = NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com'; const confirmationTemplate = createElement(ConfirmEmailTemplate, { assetBaseUrl, diff --git a/packages/lib/server-only/auth/send-forgot-password.ts b/packages/lib/server-only/auth/send-forgot-password.ts index e62d5e176..125db9338 100644 --- a/packages/lib/server-only/auth/send-forgot-password.ts +++ b/packages/lib/server-only/auth/send-forgot-password.ts @@ -1,5 +1,7 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { ForgotPasswordTemplate } from '@documenso/email/templates/forgot-password'; @@ -10,6 +12,8 @@ export interface SendForgotPasswordOptions { } export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const user = await prisma.user.findFirstOrThrow({ where: { id: userId, @@ -29,8 +33,8 @@ export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions) } const token = user.PasswordResetToken[0].token; - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; - const resetPasswordLink = `${process.env.NEXT_PUBLIC_WEBAPP_URL}/reset-password/${token}`; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const resetPasswordLink = `${NEXT_PUBLIC_WEBAPP_URL}/reset-password/${token}`; const template = createElement(ForgotPasswordTemplate, { assetBaseUrl, diff --git a/packages/lib/server-only/auth/send-reset-password.ts b/packages/lib/server-only/auth/send-reset-password.ts index 9479f1a45..3dcec113c 100644 --- a/packages/lib/server-only/auth/send-reset-password.ts +++ b/packages/lib/server-only/auth/send-reset-password.ts @@ -1,5 +1,7 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { ResetPasswordTemplate } from '@documenso/email/templates/reset-password'; @@ -10,13 +12,15 @@ export interface SendResetPasswordOptions { } export const sendResetPassword = async ({ userId }: SendResetPasswordOptions) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const user = await prisma.user.findFirstOrThrow({ where: { id: userId, }, }); - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; const template = createElement(ResetPasswordTemplate, { assetBaseUrl, diff --git a/packages/lib/server-only/document/delete-document.ts b/packages/lib/server-only/document/delete-document.ts index 22365a727..58b1f48a9 100644 --- a/packages/lib/server-only/document/delete-document.ts +++ b/packages/lib/server-only/document/delete-document.ts @@ -2,6 +2,8 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import DocumentCancelTemplate from '@documenso/email/templates/document-cancel'; @@ -16,6 +18,8 @@ export type DeleteDocumentOptions = { status: DocumentStatus; }; +const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptions) => { // if the document is a draft, hard-delete if (status === DocumentStatus.DRAFT) { @@ -49,7 +53,7 @@ export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptio if (document.Recipient.length > 0) { await Promise.all( document.Recipient.map(async (recipient) => { - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; const template = createElement(DocumentCancelTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx index da4ffcb58..a048cf600 100644 --- a/packages/lib/server-only/document/resend-document.tsx +++ b/packages/lib/server-only/document/resend-document.tsx @@ -1,5 +1,7 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite'; @@ -14,6 +16,8 @@ export type ResendDocumentOptions = { recipients: number[]; }; +const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + export const resendDocument = async ({ documentId, userId, recipients }: ResendDocumentOptions) => { const user = await prisma.user.findFirstOrThrow({ where: { @@ -67,8 +71,8 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD 'document.name': document.title, }; - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; - const signDocumentLink = `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`; const template = createElement(DocumentInviteEmailTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/document/send-completed-email.ts b/packages/lib/server-only/document/send-completed-email.ts index 226ff43ec..9b624a23c 100644 --- a/packages/lib/server-only/document/send-completed-email.ts +++ b/packages/lib/server-only/document/send-completed-email.ts @@ -1,5 +1,7 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed'; @@ -12,6 +14,8 @@ export interface SendDocumentOptions { } export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const document = await prisma.document.findUnique({ where: { id: documentId, @@ -36,12 +40,12 @@ export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => document.Recipient.map(async (recipient) => { const { email, name, token } = recipient; - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; const template = createElement(DocumentCompletedEmailTemplate, { documentName: document.title, assetBaseUrl, - downloadLink: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${token}/complete`, + downloadLink: `${NEXT_PUBLIC_WEBAPP_URL}/sign/${token}/complete`, }); await mailer.sendMail({ diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx index 25dc132ba..f72c79792 100644 --- a/packages/lib/server-only/document/send-document.tsx +++ b/packages/lib/server-only/document/send-document.tsx @@ -1,5 +1,7 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite'; @@ -14,6 +16,8 @@ export type SendDocumentOptions = { }; export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const user = await prisma.user.findFirstOrThrow({ where: { id: userId, @@ -59,8 +63,8 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) return; } - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; - const signDocumentLink = `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`; const template = createElement(DocumentInviteEmailTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/document/send-pending-email.ts b/packages/lib/server-only/document/send-pending-email.ts index 75861be78..abbecd72a 100644 --- a/packages/lib/server-only/document/send-pending-email.ts +++ b/packages/lib/server-only/document/send-pending-email.ts @@ -1,5 +1,7 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; + import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentPendingEmailTemplate } from '@documenso/email/templates/document-pending'; @@ -11,6 +13,8 @@ export interface SendPendingEmailOptions { } export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingEmailOptions) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const document = await prisma.document.findFirst({ where: { id: documentId, @@ -41,7 +45,7 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE const { email, name } = recipient; - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; const template = createElement(DocumentPendingEmailTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/feature-flags/all.ts b/packages/lib/server-only/feature-flags/all.ts index 40e759221..fff6cd855 100644 --- a/packages/lib/server-only/feature-flags/all.ts +++ b/packages/lib/server-only/feature-flags/all.ts @@ -1,6 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; import { getToken } from 'next-auth/jwt'; +import { env } from 'next-runtime-env'; import { LOCAL_FEATURE_FLAGS } from '@documenso/lib/constants/feature-flags'; import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client'; @@ -11,6 +12,9 @@ import { extractDistinctUserId, mapJwtToFlagProperties } from './get'; * Get all the evaluated feature flags based on the current user if possible. */ export default async function handlerFeatureFlagAll(req: Request) { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); + const requestHeaders = Object.fromEntries(req.headers.entries()); const nextReq = new NextRequest(req, { @@ -38,11 +42,11 @@ export default async function handlerFeatureFlagAll(req: Request) { const origin = req.headers.get('origin'); if (origin) { - if (origin.startsWith(process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) { + if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) { res.headers.set('Access-Control-Allow-Origin', origin); } - if (origin.startsWith(process.env.NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) { + if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) { res.headers.set('Access-Control-Allow-Origin', origin); } } diff --git a/packages/lib/server-only/feature-flags/get.ts b/packages/lib/server-only/feature-flags/get.ts index 36aafc7b7..6f8a2c011 100644 --- a/packages/lib/server-only/feature-flags/get.ts +++ b/packages/lib/server-only/feature-flags/get.ts @@ -1,7 +1,9 @@ import { NextRequest, NextResponse } from 'next/server'; import { nanoid } from 'nanoid'; -import { JWT, getToken } from 'next-auth/jwt'; +import type { JWT } from 'next-auth/jwt'; +import { getToken } from 'next-auth/jwt'; +import { env } from 'next-runtime-env'; import { LOCAL_FEATURE_FLAGS, extractPostHogConfig } from '@documenso/lib/constants/feature-flags'; import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client'; @@ -13,6 +15,9 @@ import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-po * @returns A Response with the feature flag value. */ export default async function handleFeatureFlagGet(req: Request) { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); + const { searchParams } = new URL(req.url ?? ''); const flag = searchParams.get('flag'); @@ -57,11 +62,11 @@ export default async function handleFeatureFlagGet(req: Request) { const origin = req.headers.get('Origin'); if (origin) { - if (origin.startsWith(process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) { + if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) { res.headers.set('Access-Control-Allow-Origin', origin); } - if (origin.startsWith(process.env.NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) { + if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) { res.headers.set('Access-Control-Allow-Origin', origin); } } diff --git a/packages/lib/universal/get-base-url.ts b/packages/lib/universal/get-base-url.ts index 2120c9f54..b7c9d4ea4 100644 --- a/packages/lib/universal/get-base-url.ts +++ b/packages/lib/universal/get-base-url.ts @@ -1,4 +1,8 @@ /* eslint-disable turbo/no-undeclared-env-vars */ +import { env } from 'next-runtime-env'; + +const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + export const getBaseUrl = () => { if (typeof window !== 'undefined') { return ''; @@ -8,8 +12,8 @@ export const getBaseUrl = () => { return `https://${process.env.VERCEL_URL}`; } - if (process.env.NEXT_PUBLIC_WEBAPP_URL) { - return process.env.NEXT_PUBLIC_WEBAPP_URL; + if (NEXT_PUBLIC_WEBAPP_URL) { + return NEXT_PUBLIC_WEBAPP_URL; } return `http://localhost:${process.env.PORT ?? 3000}`; diff --git a/packages/lib/universal/upload/put-file.ts b/packages/lib/universal/upload/put-file.ts index c54ccef77..498bed3bd 100644 --- a/packages/lib/universal/upload/put-file.ts +++ b/packages/lib/universal/upload/put-file.ts @@ -1,4 +1,5 @@ import { base64 } from '@scure/base'; +import { env } from 'next-runtime-env'; import { match } from 'ts-pattern'; import { DocumentDataType } from '@documenso/prisma/client'; @@ -11,8 +12,10 @@ type File = { arrayBuffer: () => Promise; }; +const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT'); + export const putFile = async (file: File) => { - const { type, data } = await match(process.env.NEXT_PUBLIC_UPLOAD_TRANSPORT) + const { type, data } = await match(NEXT_PUBLIC_UPLOAD_TRANSPORT) .with('s3', async () => putFileInS3(file)) .otherwise(async () => putFileInDatabase(file)); diff --git a/packages/lib/universal/upload/server-actions.ts b/packages/lib/universal/upload/server-actions.ts index 69274c30c..61429cd86 100644 --- a/packages/lib/universal/upload/server-actions.ts +++ b/packages/lib/universal/upload/server-actions.ts @@ -11,12 +11,15 @@ import { } from '@aws-sdk/client-s3'; import slugify from '@sindresorhus/slugify'; import { type JWT, getToken } from 'next-auth/jwt'; +import { env } from 'next-runtime-env'; import path from 'node:path'; import { APP_BASE_URL } from '../../constants/app'; import { ONE_HOUR, ONE_SECOND } from '../../constants/time'; import { alphaid } from '../id'; +const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT'); + export const getPresignPostUrl = async (fileName: string, contentType: string) => { const client = getS3Client(); @@ -117,7 +120,7 @@ export const deleteS3File = async (key: string) => { }; const getS3Client = () => { - if (process.env.NEXT_PUBLIC_UPLOAD_TRANSPORT !== 's3') { + if (NEXT_PUBLIC_UPLOAD_TRANSPORT !== 's3') { throw new Error('Invalid upload transport'); } diff --git a/packages/trpc/server/auth-router/router.ts b/packages/trpc/server/auth-router/router.ts index 24dd272ee..0debd7f8d 100644 --- a/packages/trpc/server/auth-router/router.ts +++ b/packages/trpc/server/auth-router/router.ts @@ -1,4 +1,5 @@ import { TRPCError } from '@trpc/server'; +import { env } from 'next-runtime-env'; import { ErrorCode } from '@documenso/lib/next-auth/error-codes'; import { compareSync } from '@documenso/lib/server-only/auth/hash'; @@ -8,10 +9,12 @@ import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-conf import { authenticatedProcedure, procedure, router } from '../trpc'; import { ZSignUpMutationSchema, ZVerifyPasswordMutationSchema } from './schema'; +const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP'); + export const authRouter = router({ signup: procedure.input(ZSignUpMutationSchema).mutation(async ({ input }) => { try { - if (process.env.NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { + if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { throw new TRPCError({ code: 'BAD_REQUEST', message: 'Signups are disabled.', diff --git a/packages/trpc/server/singleplayer-router/router.ts b/packages/trpc/server/singleplayer-router/router.ts index 8e2266fcc..cb92aa7a4 100644 --- a/packages/trpc/server/singleplayer-router/router.ts +++ b/packages/trpc/server/singleplayer-router/router.ts @@ -1,5 +1,6 @@ import { createElement } from 'react'; +import { env } from 'next-runtime-env'; import { PDFDocument } from 'pdf-lib'; import { mailer } from '@documenso/email/mailer'; @@ -24,6 +25,8 @@ import { procedure, router } from '../trpc'; import { mapField } from './helper'; import { ZCreateSinglePlayerDocumentMutationSchema } from './schema'; +const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); + export const singleplayerRouter = router({ createSinglePlayerDocument: procedure .input(ZCreateSinglePlayerDocumentMutationSchema) @@ -148,7 +151,7 @@ export const singleplayerRouter = router({ const template = createElement(DocumentSelfSignedEmailTemplate, { documentName: documentName, - assetBaseUrl: process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000', + assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000', }); const [html, text] = await Promise.all([ diff --git a/packages/ui/components/document/document-share-button.tsx b/packages/ui/components/document/document-share-button.tsx index b366123fb..f304d92c0 100644 --- a/packages/ui/components/document/document-share-button.tsx +++ b/packages/ui/components/document/document-share-button.tsx @@ -4,6 +4,7 @@ import type { HTMLAttributes } from 'react'; import React, { useState } from 'react'; import { Copy, Sparkles } from 'lucide-react'; +import { env } from 'next-runtime-env'; import { FaXTwitter } from 'react-icons/fa6'; import { useCopyShareLink } from '@documenso/lib/client-only/hooks/use-copy-share-link'; @@ -38,6 +39,7 @@ export const DocumentShareButton = ({ className, trigger, }: DocumentShareButtonProps) => { + const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); const { toast } = useToast(); const { copyShareLink, createAndCopyShareLink, isCopyingShareLink } = useCopyShareLink({ @@ -68,7 +70,7 @@ export const DocumentShareButton = ({ const onCopyClick = async () => { if (shareLink) { - await copyShareLink(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${shareLink.slug}`); + await copyShareLink(`${NEXT_PUBLIC_WEBAPP_URL}/share/${shareLink.slug}`); } else { await createAndCopyShareLink({ token, @@ -92,7 +94,7 @@ export const DocumentShareButton = ({ } // Ensuring we've prewarmed the opengraph image for the Twitter - await fetch(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}/opengraph`, { + await fetch(`${NEXT_PUBLIC_WEBAPP_URL}/share/${slug}/opengraph`, { // We don't care about the response, so we can use no-cors mode: 'no-cors', }); @@ -100,7 +102,7 @@ export const DocumentShareButton = ({ window.open( generateTwitterIntent( `I just ${token ? 'signed' : 'sent'} a document in style with @documenso. Check it out!`, - `${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`, + `${NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`, ), '_blank', ); @@ -148,7 +150,7 @@ export const DocumentShareButton = ({ 'animate-pulse': !shareLink?.slug, })} > - {process.env.NEXT_PUBLIC_WEBAPP_URL}/share/{shareLink?.slug || '...'} + {NEXT_PUBLIC_WEBAPP_URL}/share/{shareLink?.slug || '...'}
{shareLink?.slug && ( sharing link From 49ecfc1a2cf01e3bcdf195819657b463faf7e890 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:42:40 +0200 Subject: [PATCH 066/311] chore: refactor --- .../unverified-account/page.tsx | 16 +++------------- apps/web/src/components/forms/signin.tsx | 9 ++++----- apps/web/src/components/forms/signup.tsx | 5 ++++- packages/lib/next-auth/auth-options.ts | 10 +--------- .../lib/server-only/user/get-user-by-email.ts | 3 --- .../user/get-user-by-verification-token.ts | 17 ----------------- packages/trpc/server/profile-router/router.ts | 19 +------------------ 7 files changed, 13 insertions(+), 66 deletions(-) delete mode 100644 packages/lib/server-only/user/get-user-by-verification-token.ts diff --git a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx index 7a0a9c78d..456971a9f 100644 --- a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx +++ b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx @@ -20,25 +20,15 @@ export default function UnverifiedAccount() { const token = searchParams?.get('t') ?? ''; - const { data: { email } = {} } = trpc.profile.getUserFromVerificationToken.useQuery({ token }); - const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation(); const onResendConfirmationEmail = async () => { - if (!email) { - toast({ - title: 'Unable to send confirmation email', - description: 'Something went wrong while sending the confirmation email. Please try again.', - variant: 'destructive', - }); - - return; - } - try { setIsButtonDisabled(true); - await sendConfirmationEmail({ email: email }); + // TODO: decrypt email and send it + + await sendConfirmationEmail({ email: token ?? '' }); toast({ title: 'Success', diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx index c79021396..4e3701c84 100644 --- a/apps/web/src/components/forms/signin.tsx +++ b/apps/web/src/components/forms/signin.tsx @@ -62,6 +62,8 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = useState(false); const router = useRouter(); + const { mutateAsync: encryptSecondaryData } = trpc.crypto.encryptSecondaryData.useMutation(); + const [twoFactorAuthenticationMethod, setTwoFactorAuthenticationMethod] = useState< 'totp' | 'backup' >('totp'); @@ -76,8 +78,6 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = resolver: zodResolver(ZSignInFormSchema), }); - const { mutateAsync: getUser } = trpc.profile.getUserByEmail.useMutation(); - const isSubmitting = form.formState.isSubmitting; const onCloseTwoFactorAuthenticationDialog = () => { @@ -132,10 +132,9 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = const errorMessage = ERROR_MESSAGES[result.error]; if (result.error === ErrorCode.UNVERIFIED_EMAIL) { - const user = await getUser({ email }); - const token = user?.VerificationToken[user.VerificationToken.length - 1].token; + const encryptedEmail = await encryptSecondaryData({ data: email }); - router.push(`/unverified-account?t=${token}`); + router.push(`/unverified-account?t=${encryptedEmail}`); return; } diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index 6258dcdee..190084226 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -62,12 +62,15 @@ export const SignUpForm = ({ className, isGoogleSSOEnabled }: SignUpFormProps) = const isSubmitting = form.formState.isSubmitting; const { mutateAsync: signup } = trpc.auth.signup.useMutation(); + const { mutateAsync: encryptSecondaryData } = trpc.crypto.encryptSecondaryData.useMutation(); const onFormSubmit = async ({ name, email, password, signature }: TSignUpFormSchema) => { try { await signup({ name, email, password, signature }); - router.push('/signin'); + const encryptedEmail = await encryptSecondaryData({ data: email }); + + router.push(`/unverified-account?t=${encryptedEmail}`); toast({ title: 'Registration Successful', diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index ed4aeaf44..37f1ed864 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -11,7 +11,6 @@ import GoogleProvider from 'next-auth/providers/google'; import { prisma } from '@documenso/prisma'; import { IdentityProvider } from '@documenso/prisma/client'; -import { ONE_DAY } from '../constants/time'; import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble'; import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa'; import { getUserByEmail } from '../server-only/user/get-user-by-email'; @@ -71,14 +70,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } } - const userCreationDate = user?.createdAt; - const createdWithinLast72Hours = userCreationDate > new Date(Date.now() - ONE_DAY * 3); - - /* - avoid messing with the users who signed up before the email verification requirement - the error is thrown only if the user doesn't have a verified email and the account was created within the last 72 hours - */ - if (!user.emailVerified && createdWithinLast72Hours) { + if (!user.emailVerified) { throw new Error(ErrorCode.UNVERIFIED_EMAIL); } diff --git a/packages/lib/server-only/user/get-user-by-email.ts b/packages/lib/server-only/user/get-user-by-email.ts index 8c61202a2..0a2ef8d16 100644 --- a/packages/lib/server-only/user/get-user-by-email.ts +++ b/packages/lib/server-only/user/get-user-by-email.ts @@ -9,8 +9,5 @@ export const getUserByEmail = async ({ email }: GetUserByEmailOptions) => { where: { email: email.toLowerCase(), }, - include: { - VerificationToken: true, - }, }); }; diff --git a/packages/lib/server-only/user/get-user-by-verification-token.ts b/packages/lib/server-only/user/get-user-by-verification-token.ts deleted file mode 100644 index b33506d6e..000000000 --- a/packages/lib/server-only/user/get-user-by-verification-token.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { prisma } from '@documenso/prisma'; - -export interface GetUserByVerificationTokenOptions { - token: string; -} - -export const getUserByVerificationToken = async ({ token }: GetUserByVerificationTokenOptions) => { - return await prisma.user.findFirstOrThrow({ - where: { - VerificationToken: { - some: { - token, - }, - }, - }, - }); -}; diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 79c67ed0c..09ee0351f 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -3,7 +3,6 @@ import { TRPCError } from '@trpc/server'; import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password'; import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email'; import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id'; -import { getUserByVerificationToken } from '@documenso/lib/server-only/user/get-user-by-verification-token'; import { resetPassword } from '@documenso/lib/server-only/user/reset-password'; import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-confirmation-token'; import { updatePassword } from '@documenso/lib/server-only/user/update-password'; @@ -16,7 +15,6 @@ import { ZResetPasswordFormSchema, ZRetrieveUserByEmailMutationSchema, ZRetrieveUserByIdQuerySchema, - ZRetrieveUserByVerificationTokenQuerySchema, ZUpdatePasswordMutationSchema, ZUpdateProfileMutationSchema, } from './schema'; @@ -50,21 +48,6 @@ export const profileRouter = router({ } }), - getUserFromVerificationToken: procedure - .input(ZRetrieveUserByVerificationTokenQuerySchema) - .query(async ({ input }) => { - try { - const { token } = input; - - return await getUserByVerificationToken({ token }); - } catch (err) { - throw new TRPCError({ - code: 'BAD_REQUEST', - message: 'We were unable to retrieve the specified account. Please try again.', - }); - } - }), - updateProfile: authenticatedProcedure .input(ZUpdateProfileMutationSchema) .mutation(async ({ input, ctx }) => { @@ -153,7 +136,7 @@ export const profileRouter = router({ try { const { email } = input; - return sendConfirmationToken({ email }); + return await sendConfirmationToken({ email }); } catch (err) { let message = 'We were unable to send a confirmation email. Please try again.'; From 311c8da8fc8ad5ded8f8ed11146a517e740f07b5 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:24:37 +0200 Subject: [PATCH 067/311] chore: encrypt and decrypt email addr --- .../src/app/(unauthenticated)/unverified-account/page.tsx | 6 ++---- packages/trpc/server/profile-router/router.ts | 5 ++++- packages/trpc/server/profile-router/schema.ts | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx index 456971a9f..5199249e0 100644 --- a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx +++ b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx @@ -18,7 +18,7 @@ export default function UnverifiedAccount() { const searchParams = useSearchParams(); const { toast } = useToast(); - const token = searchParams?.get('t') ?? ''; + const encryptedEmail = searchParams?.get('t') ?? ''; // TODO: choose a better name instead of t const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation(); @@ -26,9 +26,7 @@ export default function UnverifiedAccount() { try { setIsButtonDisabled(true); - // TODO: decrypt email and send it - - await sendConfirmationEmail({ email: token ?? '' }); + await sendConfirmationEmail({ email: encryptedEmail }); toast({ title: 'Success', diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 09ee0351f..510e2a6fd 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -1,5 +1,6 @@ import { TRPCError } from '@trpc/server'; +import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt'; import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password'; import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email'; import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id'; @@ -136,7 +137,9 @@ export const profileRouter = router({ try { const { email } = input; - return await sendConfirmationToken({ email }); + const decryptedEmail = decryptSecondaryData(email); + + return await sendConfirmationToken({ email: decryptedEmail ?? '' }); // TODO: fix this tomorrow } catch (err) { let message = 'We were unable to send a confirmation email. Please try again.'; diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts index 671756e94..5aa9844ca 100644 --- a/packages/trpc/server/profile-router/schema.ts +++ b/packages/trpc/server/profile-router/schema.ts @@ -30,9 +30,9 @@ export const ZResetPasswordFormSchema = z.object({ password: z.string().min(6), token: z.string().min(1), }); - +// TODO: revisit this export const ZConfirmEmailMutationSchema = z.object({ - email: z.string().email().min(1), + email: z.string().min(1), }); export type TRetrieveUserByIdQuerySchema = z.infer; From e2fa01509dc602aedc9d9764a0f0f24e0e8208c5 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:33:35 +0200 Subject: [PATCH 068/311] chore: avoid returning unnecessary info --- packages/lib/server-only/user/send-confirmation-token.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/lib/server-only/user/send-confirmation-token.ts b/packages/lib/server-only/user/send-confirmation-token.ts index 5206d202e..6c070125b 100644 --- a/packages/lib/server-only/user/send-confirmation-token.ts +++ b/packages/lib/server-only/user/send-confirmation-token.ts @@ -37,5 +37,12 @@ export const sendConfirmationToken = async ({ email }: { email: string }) => { throw new Error(`Failed to create the verification token`); } - return sendConfirmationEmail({ userId: user.id }); + // TODO: Revisit tomorrow + try { + await sendConfirmationEmail({ userId: user.id }); + + return { success: true }; + } catch (err) { + throw new Error(`Failed to send the confirmation email`); + } }; From b2cca9afb677da0505189aa5e0f68e57dc1250e5 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:27:36 +0200 Subject: [PATCH 069/311] chore: refactor --- .../app/(unauthenticated)/unverified-account/page.tsx | 4 ++-- apps/web/src/components/forms/signin.tsx | 2 +- apps/web/src/components/forms/signup.tsx | 2 +- .../lib/server-only/user/send-confirmation-token.ts | 1 - packages/trpc/server/profile-router/router.ts | 10 +++++++--- packages/trpc/server/profile-router/schema.ts | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx index 5199249e0..dc98044ae 100644 --- a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx +++ b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx @@ -18,7 +18,7 @@ export default function UnverifiedAccount() { const searchParams = useSearchParams(); const { toast } = useToast(); - const encryptedEmail = searchParams?.get('t') ?? ''; // TODO: choose a better name instead of t + const encryptedEmail = searchParams?.get('token') ?? ''; const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation(); @@ -26,7 +26,7 @@ export default function UnverifiedAccount() { try { setIsButtonDisabled(true); - await sendConfirmationEmail({ email: encryptedEmail }); + await sendConfirmationEmail({ encryptedEmail }); toast({ title: 'Success', diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx index 4e3701c84..0353333cf 100644 --- a/apps/web/src/components/forms/signin.tsx +++ b/apps/web/src/components/forms/signin.tsx @@ -134,7 +134,7 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = if (result.error === ErrorCode.UNVERIFIED_EMAIL) { const encryptedEmail = await encryptSecondaryData({ data: email }); - router.push(`/unverified-account?t=${encryptedEmail}`); + router.push(`/unverified-account?token=${encryptedEmail}`); return; } diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index 190084226..bc7ee0ce5 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -70,7 +70,7 @@ export const SignUpForm = ({ className, isGoogleSSOEnabled }: SignUpFormProps) = const encryptedEmail = await encryptSecondaryData({ data: email }); - router.push(`/unverified-account?t=${encryptedEmail}`); + router.push(`/unverified-account?token=${encryptedEmail}`); toast({ title: 'Registration Successful', diff --git a/packages/lib/server-only/user/send-confirmation-token.ts b/packages/lib/server-only/user/send-confirmation-token.ts index 6c070125b..af4a97a48 100644 --- a/packages/lib/server-only/user/send-confirmation-token.ts +++ b/packages/lib/server-only/user/send-confirmation-token.ts @@ -37,7 +37,6 @@ export const sendConfirmationToken = async ({ email }: { email: string }) => { throw new Error(`Failed to create the verification token`); } - // TODO: Revisit tomorrow try { await sendConfirmationEmail({ userId: user.id }); diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 510e2a6fd..44d0f59bd 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -135,11 +135,15 @@ export const profileRouter = router({ .input(ZConfirmEmailMutationSchema) .mutation(async ({ input }) => { try { - const { email } = input; + const { encryptedEmail } = input; - const decryptedEmail = decryptSecondaryData(email); + const decryptedEmail = decryptSecondaryData(encryptedEmail); - return await sendConfirmationToken({ email: decryptedEmail ?? '' }); // TODO: fix this tomorrow + if (!decryptedEmail) { + throw new Error('Email is required'); + } + + return await sendConfirmationToken({ email: decryptedEmail }); } catch (err) { let message = 'We were unable to send a confirmation email. Please try again.'; diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts index 5aa9844ca..897a4912d 100644 --- a/packages/trpc/server/profile-router/schema.ts +++ b/packages/trpc/server/profile-router/schema.ts @@ -30,9 +30,9 @@ export const ZResetPasswordFormSchema = z.object({ password: z.string().min(6), token: z.string().min(1), }); -// TODO: revisit this + export const ZConfirmEmailMutationSchema = z.object({ - email: z.string().min(1), + encryptedEmail: z.string().min(1), }); export type TRetrieveUserByIdQuerySchema = z.infer; From 927a656c576228ab4ef54dbc5a22237a4a9c116b Mon Sep 17 00:00:00 2001 From: Tangerine Kugelmann <9637909+daallgeier@users.noreply.github.com> Date: Sun, 28 Jan 2024 01:00:07 +0100 Subject: [PATCH 070/311] Create security.txt See also https://securitytxt.org --- .well-known/security.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .well-known/security.txt diff --git a/.well-known/security.txt b/.well-known/security.txt new file mode 100644 index 000000000..5cd29187c --- /dev/null +++ b/.well-known/security.txt @@ -0,0 +1,3 @@ +Contact: https://github.com/documenso/documenso/issues/new?assignees=&labels=bug&projects=&template=bug-report.yml +Preferred-Languages: en +Canonical: https://documenso.com/.well-known/security.txt From 014c09bd910a407f974dff880e1c35e10e02ece8 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sun, 28 Jan 2024 18:43:20 +0000 Subject: [PATCH 071/311] fix: account deletion error for users without two factor authentication --- apps/web/src/components/forms/profile.tsx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index 575a81d46..80c33dd60 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -113,10 +113,26 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { } }; - const onDeleteAccount = async () => { + const onDeleteAccount = async (hasTwoFactorAuthentication: boolean) => { try { + if (!hasTwoFactorAuthentication) { + await deleteAccount(); + + toast({ + title: 'Account deleted', + description: 'Your account has been deleted successfully.', + duration: 5000, + }); + + await signOut({ callbackUrl: '/' }); + + return; + } + const { token } = deleteAccountTwoFactorTokenForm.getValues(); + console.log(token); + if (!token) { throw new Error('Please enter your Two Factor Authentication token.'); } @@ -273,7 +289,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { +
); } diff --git a/apps/web/src/components/forms/2fa/authenticator-app.tsx b/apps/web/src/components/forms/2fa/authenticator-app.tsx index 1d164bd22..316272e34 100644 --- a/apps/web/src/components/forms/2fa/authenticator-app.tsx +++ b/apps/web/src/components/forms/2fa/authenticator-app.tsx @@ -19,27 +19,14 @@ export const AuthenticatorApp = ({ isTwoFactorEnabled }: AuthenticatorAppProps) return ( <> -
-
-

Authenticator app

- -

- Create one-time passwords that serve as a secondary authentication method for confirming - your identity when requested during the sign-in process. -

-
- -
- {isTwoFactorEnabled ? ( - - ) : ( - - )} -
+
+ {isTwoFactorEnabled ? ( + + ) : ( + + )}
-
- @@ -157,7 +158,7 @@ export const DisableAuthenticatorAppDialog = ({ > Disable 2FA -
+ diff --git a/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx b/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx index 0db1c8b50..7a181c4cc 100644 --- a/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx +++ b/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx @@ -15,6 +15,7 @@ import { Dialog, DialogContent, DialogDescription, + DialogFooter, DialogHeader, DialogTitle, } from '@documenso/ui/primitives/dialog'; @@ -190,15 +191,15 @@ export const EnableAuthenticatorAppDialog = ({ )} /> -
- -
+ ); @@ -251,15 +252,15 @@ export const EnableAuthenticatorAppDialog = ({ )} /> -
- -
+ )) diff --git a/apps/web/src/components/forms/2fa/recovery-codes.tsx b/apps/web/src/components/forms/2fa/recovery-codes.tsx index 7e8950227..29834c74a 100644 --- a/apps/web/src/components/forms/2fa/recovery-codes.tsx +++ b/apps/web/src/components/forms/2fa/recovery-codes.tsx @@ -7,7 +7,6 @@ import { Button } from '@documenso/ui/primitives/button'; import { ViewRecoveryCodesDialog } from './view-recovery-codes-dialog'; type RecoveryCodesProps = { - // backupCodes: string[] | null; isTwoFactorEnabled: boolean; }; @@ -16,22 +15,13 @@ export const RecoveryCodes = ({ isTwoFactorEnabled }: RecoveryCodesProps) => { return ( <> -
-
-

Recovery Codes

- -

- Recovery codes are used to access your account in the event that you lose access to your - authenticator app. -

-
- -
- -
-
+ -
- -
+ ); diff --git a/apps/web/src/components/forms/password.tsx b/apps/web/src/components/forms/password.tsx index 0fa5ad462..03f95ff7f 100644 --- a/apps/web/src/components/forms/password.tsx +++ b/apps/web/src/components/forms/password.tsx @@ -137,7 +137,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => { /> -
+
diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx index 17bb2c57c..b3e4ea019 100644 --- a/apps/web/src/components/forms/signin.tsx +++ b/apps/web/src/components/forms/signin.tsx @@ -12,7 +12,13 @@ import { ErrorCode, isErrorCode } from '@documenso/lib/next-auth/error-codes'; import { ZCurrentPasswordSchema } from '@documenso/trpc/server/auth-router/schema'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; -import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@documenso/ui/primitives/dialog'; +import { + Dialog, + DialogContent, + DialogFooter, + DialogHeader, + DialogTitle, +} from '@documenso/ui/primitives/dialog'; import { Form, FormControl, @@ -111,7 +117,6 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = const result = await signIn('credentials', { ...credentials, - callbackUrl: LOGIN_REDIRECT_PATH, redirect: false, }); @@ -270,21 +275,23 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = )} /> )} + + + + + + - -
- - - -
diff --git a/apps/web/src/pages/api/auth/[...nextauth].ts b/apps/web/src/pages/api/auth/[...nextauth].ts index 4039703b8..ed1809691 100644 --- a/apps/web/src/pages/api/auth/[...nextauth].ts +++ b/apps/web/src/pages/api/auth/[...nextauth].ts @@ -1,17 +1,75 @@ -// import { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from 'next'; + import NextAuth from 'next-auth'; import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options'; +import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { prisma } from '@documenso/prisma'; +import { UserSecurityAuditLogType } from '@documenso/prisma/client'; -export default NextAuth({ - ...NEXT_AUTH_OPTIONS, - pages: { - signIn: '/signin', - signOut: '/signout', - error: '/signin', - }, -}); +export default async function auth(req: NextApiRequest, res: NextApiResponse) { + const { ipAddress, userAgent } = extractRequestMetadata(req); -// export default async function handler(_req: NextApiRequest, res: NextApiResponse) { -// res.json({ hello: 'world' }); -// } + return await NextAuth(req, res, { + ...NEXT_AUTH_OPTIONS, + pages: { + signIn: '/signin', + signOut: '/signout', + error: '/signin', + }, + events: { + createUser: async ({ user }) => { + await prisma.userSecurityAuditLog.create({ + data: { + userId: user.id, + ipAddress, + userAgent, + type: UserSecurityAuditLogType.ACCOUNT_CREATE, + }, + }); + }, + signIn: async ({ user }) => { + await prisma.userSecurityAuditLog.create({ + data: { + userId: user.id, + ipAddress, + userAgent, + type: UserSecurityAuditLogType.SIGN_IN, + }, + }); + }, + signOut: async ({ token }) => { + const userId = typeof token.id === 'string' ? parseInt(token.id) : token.id; + + if (isNaN(userId)) { + return; + } + + await prisma.userSecurityAuditLog.create({ + data: { + userId, + ipAddress, + userAgent, + type: UserSecurityAuditLogType.SIGN_OUT, + }, + }); + }, + linkAccount: async ({ user }) => { + const userId = typeof user.id === 'string' ? parseInt(user.id) : user.id; + + if (isNaN(userId)) { + return; + } + + await prisma.userSecurityAuditLog.create({ + data: { + userId, + ipAddress, + userAgent, + type: UserSecurityAuditLogType.ACCOUNT_SSO_LINK, + }, + }); + }, + }, + }); +} diff --git a/package-lock.json b/package-lock.json index 69825e8d8..9012d3f29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -158,6 +158,7 @@ "sharp": "0.33.1", "ts-pattern": "^5.0.5", "typescript": "5.2.2", + "ua-parser-js": "^1.0.37", "uqr": "^0.1.2", "zod": "^3.22.4" }, @@ -166,7 +167,8 @@ "@types/luxon": "^3.3.1", "@types/node": "20.1.0", "@types/react": "18.2.18", - "@types/react-dom": "18.2.7" + "@types/react-dom": "18.2.7", + "@types/ua-parser-js": "^0.7.39" } }, "apps/web/node_modules/@types/node": { @@ -6756,6 +6758,12 @@ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==" }, + "node_modules/@types/ua-parser-js": { + "version": "0.7.39", + "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz", + "integrity": "sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==", + "dev": true + }, "node_modules/@types/unist": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", @@ -18643,6 +18651,28 @@ "node": ">=14.17" } }, + "node_modules/ua-parser-js": { + "version": "1.0.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz", + "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/ua-parser-js" + }, + { + "type": "paypal", + "url": "https://paypal.me/faisalman" + }, + { + "type": "github", + "url": "https://github.com/sponsors/faisalman" + } + ], + "engines": { + "node": "*" + } + }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", diff --git a/packages/lib/constants/auth.ts b/packages/lib/constants/auth.ts index 837ca3e3a..48f1e9d7b 100644 --- a/packages/lib/constants/auth.ts +++ b/packages/lib/constants/auth.ts @@ -1,4 +1,4 @@ -import { IdentityProvider } from '@documenso/prisma/client'; +import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/client'; export const SALT_ROUNDS = 12; @@ -10,3 +10,15 @@ export const IDENTITY_PROVIDER_NAME: { [key in IdentityProvider]: string } = { export const IS_GOOGLE_SSO_ENABLED = Boolean( process.env.NEXT_PRIVATE_GOOGLE_CLIENT_ID && process.env.NEXT_PRIVATE_GOOGLE_CLIENT_SECRET, ); + +export const USER_SECURITY_AUDIT_LOG_MAP: { [key in UserSecurityAuditLogType]: string } = { + [UserSecurityAuditLogType.ACCOUNT_CREATE]: 'Account created', + [UserSecurityAuditLogType.ACCOUNT_SSO_LINK]: 'Linked account to SSO', + [UserSecurityAuditLogType.ACCOUNT_PROFILE_UPDATE]: 'Profile updated', + [UserSecurityAuditLogType.AUTH_2FA_DISABLE]: '2FA Disabled', + [UserSecurityAuditLogType.AUTH_2FA_ENABLE]: '2FA Enabled', + [UserSecurityAuditLogType.PASSWORD_RESET]: 'Password reset', + [UserSecurityAuditLogType.PASSWORD_UPDATE]: 'Password updated', + [UserSecurityAuditLogType.SIGN_IN]: 'Signed In', + [UserSecurityAuditLogType.SIGN_OUT]: 'Signed Out', +}; diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 50240174c..9babae987 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -192,4 +192,5 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { return true; }, }, + // Note: `events` are handled in `apps/web/src/pages/api/auth/[...nextauth].ts` to allow access to the request. }; diff --git a/packages/lib/server-only/2fa/disable-2fa.ts b/packages/lib/server-only/2fa/disable-2fa.ts index 5b27d5c9d..dd8a180c9 100644 --- a/packages/lib/server-only/2fa/disable-2fa.ts +++ b/packages/lib/server-only/2fa/disable-2fa.ts @@ -1,21 +1,25 @@ import { compare } from 'bcrypt'; import { prisma } from '@documenso/prisma'; -import { User } from '@documenso/prisma/client'; +import type { User } from '@documenso/prisma/client'; +import { UserSecurityAuditLogType } from '@documenso/prisma/client'; import { ErrorCode } from '../../next-auth/error-codes'; +import type { RequestMetadata } from '../../universal/extract-request-metadata'; import { validateTwoFactorAuthentication } from './validate-2fa'; type DisableTwoFactorAuthenticationOptions = { user: User; backupCode: string; password: string; + requestMetadata?: RequestMetadata; }; export const disableTwoFactorAuthentication = async ({ backupCode, user, password, + requestMetadata, }: DisableTwoFactorAuthenticationOptions) => { if (!user.password) { throw new Error(ErrorCode.USER_MISSING_PASSWORD); @@ -33,15 +37,26 @@ export const disableTwoFactorAuthentication = async ({ throw new Error(ErrorCode.INCORRECT_TWO_FACTOR_BACKUP_CODE); } - await prisma.user.update({ - where: { - id: user.id, - }, - data: { - twoFactorEnabled: false, - twoFactorBackupCodes: null, - twoFactorSecret: null, - }, + await prisma.$transaction(async (tx) => { + await tx.user.update({ + where: { + id: user.id, + }, + data: { + twoFactorEnabled: false, + twoFactorBackupCodes: null, + twoFactorSecret: null, + }, + }); + + await tx.userSecurityAuditLog.create({ + data: { + userId: user.id, + type: UserSecurityAuditLogType.AUTH_2FA_DISABLE, + userAgent: requestMetadata?.userAgent, + ipAddress: requestMetadata?.ipAddress, + }, + }); }); return true; diff --git a/packages/lib/server-only/2fa/enable-2fa.ts b/packages/lib/server-only/2fa/enable-2fa.ts index 9f61e52a4..19a2b67c2 100644 --- a/packages/lib/server-only/2fa/enable-2fa.ts +++ b/packages/lib/server-only/2fa/enable-2fa.ts @@ -1,18 +1,21 @@ import { ErrorCode } from '@documenso/lib/next-auth/error-codes'; import { prisma } from '@documenso/prisma'; -import { User } from '@documenso/prisma/client'; +import { type User, UserSecurityAuditLogType } from '@documenso/prisma/client'; +import type { RequestMetadata } from '../../universal/extract-request-metadata'; import { getBackupCodes } from './get-backup-code'; import { verifyTwoFactorAuthenticationToken } from './verify-2fa-token'; type EnableTwoFactorAuthenticationOptions = { user: User; code: string; + requestMetadata?: RequestMetadata; }; export const enableTwoFactorAuthentication = async ({ user, code, + requestMetadata, }: EnableTwoFactorAuthenticationOptions) => { if (user.identityProvider !== 'DOCUMENSO') { throw new Error(ErrorCode.INCORRECT_IDENTITY_PROVIDER); @@ -32,13 +35,24 @@ export const enableTwoFactorAuthentication = async ({ throw new Error(ErrorCode.INCORRECT_TWO_FACTOR_CODE); } - const updatedUser = await prisma.user.update({ - where: { - id: user.id, - }, - data: { - twoFactorEnabled: true, - }, + const updatedUser = await prisma.$transaction(async (tx) => { + await tx.userSecurityAuditLog.create({ + data: { + userId: user.id, + type: UserSecurityAuditLogType.AUTH_2FA_ENABLE, + userAgent: requestMetadata?.userAgent, + ipAddress: requestMetadata?.ipAddress, + }, + }); + + return await tx.user.update({ + where: { + id: user.id, + }, + data: { + twoFactorEnabled: true, + }, + }); }); const recoveryCodes = getBackupCodes({ user: updatedUser }); diff --git a/packages/lib/server-only/2fa/setup-2fa.ts b/packages/lib/server-only/2fa/setup-2fa.ts index 30ddf0ec3..23f213574 100644 --- a/packages/lib/server-only/2fa/setup-2fa.ts +++ b/packages/lib/server-only/2fa/setup-2fa.ts @@ -5,7 +5,7 @@ import { createTOTPKeyURI } from 'oslo/otp'; import { ErrorCode } from '@documenso/lib/next-auth/error-codes'; import { prisma } from '@documenso/prisma'; -import { User } from '@documenso/prisma/client'; +import { type User } from '@documenso/prisma/client'; import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto'; import { symmetricEncrypt } from '../../universal/crypto'; diff --git a/packages/lib/server-only/user/find-user-security-audit-logs.ts b/packages/lib/server-only/user/find-user-security-audit-logs.ts new file mode 100644 index 000000000..0d6b5c8d5 --- /dev/null +++ b/packages/lib/server-only/user/find-user-security-audit-logs.ts @@ -0,0 +1,52 @@ +import type { FindResultSet } from '@documenso/lib/types/find-result-set'; +import { prisma } from '@documenso/prisma'; +import type { UserSecurityAuditLog, UserSecurityAuditLogType } from '@documenso/prisma/client'; + +export type FindUserSecurityAuditLogsOptions = { + userId: number; + type?: UserSecurityAuditLogType; + page?: number; + perPage?: number; + orderBy?: { + column: keyof Omit; + direction: 'asc' | 'desc'; + }; +}; + +export const findUserSecurityAuditLogs = async ({ + userId, + type, + page = 1, + perPage = 10, + orderBy, +}: FindUserSecurityAuditLogsOptions) => { + const orderByColumn = orderBy?.column ?? 'createdAt'; + const orderByDirection = orderBy?.direction ?? 'desc'; + + const whereClause = { + userId, + type, + }; + + const [data, count] = await Promise.all([ + prisma.userSecurityAuditLog.findMany({ + where: whereClause, + skip: Math.max(page - 1, 0) * perPage, + take: perPage, + orderBy: { + [orderByColumn]: orderByDirection, + }, + }), + prisma.userSecurityAuditLog.count({ + where: whereClause, + }), + ]); + + return { + data, + count, + currentPage: Math.max(page, 1), + perPage, + totalPages: Math.ceil(count / perPage), + } satisfies FindResultSet; +}; diff --git a/packages/lib/server-only/user/reset-password.ts b/packages/lib/server-only/user/reset-password.ts index 2233894d8..39aac5d28 100644 --- a/packages/lib/server-only/user/reset-password.ts +++ b/packages/lib/server-only/user/reset-password.ts @@ -1,16 +1,19 @@ import { compare, hash } from 'bcrypt'; import { prisma } from '@documenso/prisma'; +import { UserSecurityAuditLogType } from '@documenso/prisma/client'; import { SALT_ROUNDS } from '../../constants/auth'; +import type { RequestMetadata } from '../../universal/extract-request-metadata'; import { sendResetPassword } from '../auth/send-reset-password'; export type ResetPasswordOptions = { token: string; password: string; + requestMetadata?: RequestMetadata; }; -export const resetPassword = async ({ token, password }: ResetPasswordOptions) => { +export const resetPassword = async ({ token, password, requestMetadata }: ResetPasswordOptions) => { if (!token) { throw new Error('Invalid token provided. Please try again.'); } @@ -56,6 +59,14 @@ export const resetPassword = async ({ token, password }: ResetPasswordOptions) = userId: foundToken.userId, }, }), + prisma.userSecurityAuditLog.create({ + data: { + userId: foundToken.userId, + type: UserSecurityAuditLogType.PASSWORD_RESET, + userAgent: requestMetadata?.userAgent, + ipAddress: requestMetadata?.ipAddress, + }, + }), ]); await sendResetPassword({ userId: foundToken.userId }); diff --git a/packages/lib/server-only/user/update-password.ts b/packages/lib/server-only/user/update-password.ts index b7579cd35..2621fe8e3 100644 --- a/packages/lib/server-only/user/update-password.ts +++ b/packages/lib/server-only/user/update-password.ts @@ -1,19 +1,22 @@ import { compare, hash } from 'bcrypt'; +import { SALT_ROUNDS } from '@documenso/lib/constants/auth'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { prisma } from '@documenso/prisma'; - -import { SALT_ROUNDS } from '../../constants/auth'; +import { UserSecurityAuditLogType } from '@documenso/prisma/client'; export type UpdatePasswordOptions = { userId: number; password: string; currentPassword: string; + requestMetadata?: RequestMetadata; }; export const updatePassword = async ({ userId, password, currentPassword, + requestMetadata, }: UpdatePasswordOptions) => { // Existence check const user = await prisma.user.findFirstOrThrow({ @@ -39,14 +42,23 @@ export const updatePassword = async ({ const hashedNewPassword = await hash(password, SALT_ROUNDS); - const updatedUser = await prisma.user.update({ - where: { - id: userId, - }, - data: { - password: hashedNewPassword, - }, - }); + return await prisma.$transaction(async (tx) => { + await tx.userSecurityAuditLog.create({ + data: { + userId, + type: UserSecurityAuditLogType.PASSWORD_UPDATE, + userAgent: requestMetadata?.userAgent, + ipAddress: requestMetadata?.ipAddress, + }, + }); - return updatedUser; + return await tx.user.update({ + where: { + id: userId, + }, + data: { + password: hashedNewPassword, + }, + }); + }); }; diff --git a/packages/lib/server-only/user/update-profile.ts b/packages/lib/server-only/user/update-profile.ts index a28fd21c5..a99caff99 100644 --- a/packages/lib/server-only/user/update-profile.ts +++ b/packages/lib/server-only/user/update-profile.ts @@ -1,12 +1,21 @@ import { prisma } from '@documenso/prisma'; +import { UserSecurityAuditLogType } from '@documenso/prisma/client'; + +import type { RequestMetadata } from '../../universal/extract-request-metadata'; export type UpdateProfileOptions = { userId: number; name: string; signature: string; + requestMetadata?: RequestMetadata; }; -export const updateProfile = async ({ userId, name, signature }: UpdateProfileOptions) => { +export const updateProfile = async ({ + userId, + name, + signature, + requestMetadata, +}: UpdateProfileOptions) => { // Existence check await prisma.user.findFirstOrThrow({ where: { @@ -14,15 +23,24 @@ export const updateProfile = async ({ userId, name, signature }: UpdateProfileOp }, }); - const updatedUser = await prisma.user.update({ - where: { - id: userId, - }, - data: { - name, - signature, - }, - }); + return await prisma.$transaction(async (tx) => { + await tx.userSecurityAuditLog.create({ + data: { + userId, + type: UserSecurityAuditLogType.ACCOUNT_PROFILE_UPDATE, + userAgent: requestMetadata?.userAgent, + ipAddress: requestMetadata?.ipAddress, + }, + }); - return updatedUser; + return await tx.user.update({ + where: { + id: userId, + }, + data: { + name, + signature, + }, + }); + }); }; diff --git a/packages/lib/types/search-params.ts b/packages/lib/types/search-params.ts new file mode 100644 index 000000000..ff3fdc4e2 --- /dev/null +++ b/packages/lib/types/search-params.ts @@ -0,0 +1,20 @@ +import { z } from 'zod'; + +export const ZBaseTableSearchParamsSchema = z.object({ + query: z + .string() + .optional() + .catch(() => undefined), + page: z.coerce + .number() + .min(1) + .optional() + .catch(() => undefined), + perPage: z.coerce + .number() + .min(1) + .optional() + .catch(() => undefined), +}); + +export type TBaseTableSearchParamsSchema = z.infer; diff --git a/packages/lib/universal/extract-request-metadata.ts b/packages/lib/universal/extract-request-metadata.ts new file mode 100644 index 000000000..ceb4ad35f --- /dev/null +++ b/packages/lib/universal/extract-request-metadata.ts @@ -0,0 +1,22 @@ +import type { NextApiRequest } from 'next'; + +import { z } from 'zod'; + +const ZIpSchema = z.string().ip(); + +export type RequestMetadata = { + ipAddress?: string; + userAgent?: string; +}; + +export const extractRequestMetadata = (req: NextApiRequest): RequestMetadata => { + const parsedIp = ZIpSchema.safeParse(req.headers['x-forwarded-for'] || req.socket.remoteAddress); + + const ipAddress = parsedIp.success ? parsedIp.data : undefined; + const userAgent = req.headers['user-agent']; + + return { + ipAddress, + userAgent, + }; +}; diff --git a/packages/prisma/migrations/20240130062658_add_user_security_audit_logs/migration.sql b/packages/prisma/migrations/20240130062658_add_user_security_audit_logs/migration.sql new file mode 100644 index 000000000..73d85ada8 --- /dev/null +++ b/packages/prisma/migrations/20240130062658_add_user_security_audit_logs/migration.sql @@ -0,0 +1,17 @@ +-- CreateEnum +CREATE TYPE "UserSecurityAuditLogType" AS ENUM ('ACCOUNT_CREATE', 'ACCOUNT_PROFILE_UPDATE', 'ACCOUNT_SSO_LINK', 'AUTH_2FA_DISABLE', 'AUTH_2FA_ENABLE', 'PASSWORD_RESET', 'PASSWORD_UPDATE', 'SIGN_OUT', 'SIGN_IN'); + +-- CreateTable +CREATE TABLE "UserSecurityAuditLog" ( + "id" SERIAL NOT NULL, + "userId" INTEGER NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "type" "UserSecurityAuditLogType" NOT NULL, + "userAgent" TEXT, + "ipAddress" TEXT, + + CONSTRAINT "UserSecurityAuditLog_pkey" PRIMARY KEY ("id") +); + +-- AddForeignKey +ALTER TABLE "UserSecurityAuditLog" ADD CONSTRAINT "UserSecurityAuditLog_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index e1549e072..8f83f0ac3 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -40,12 +40,37 @@ model User { twoFactorSecret String? twoFactorEnabled Boolean @default(false) twoFactorBackupCodes String? - VerificationToken VerificationToken[] - Template Template[] + + VerificationToken VerificationToken[] + Template Template[] + securityAuditLogs UserSecurityAuditLog[] @@index([email]) } +enum UserSecurityAuditLogType { + ACCOUNT_CREATE + ACCOUNT_PROFILE_UPDATE + ACCOUNT_SSO_LINK + AUTH_2FA_DISABLE + AUTH_2FA_ENABLE + PASSWORD_RESET + PASSWORD_UPDATE + SIGN_OUT + SIGN_IN +} + +model UserSecurityAuditLog { + id Int @id @default(autoincrement()) + userId Int + createdAt DateTime @default(now()) + type UserSecurityAuditLogType + userAgent String? + ipAddress String? + + User User @relation(fields: [userId], references: [id]) +} + model PasswordResetToken { id Int @id @default(autoincrement()) token String @unique @@ -161,9 +186,9 @@ model DocumentMeta { id String @id @default(cuid()) subject String? message String? - timezone String? @db.Text @default("Etc/UTC") - password String? - dateFormat String? @db.Text @default("yyyy-MM-dd hh:mm a") + timezone String? @default("Etc/UTC") @db.Text + password String? + dateFormat String? @default("yyyy-MM-dd hh:mm a") @db.Text documentId Int @unique document Document @relation(fields: [documentId], references: [id], onDelete: Cascade) } @@ -184,19 +209,19 @@ enum SigningStatus { } model Recipient { - id Int @id @default(autoincrement()) + id Int @id @default(autoincrement()) documentId Int? templateId Int? - email String @db.VarChar(255) - name String @default("") @db.VarChar(255) + email String @db.VarChar(255) + name String @default("") @db.VarChar(255) token String expired DateTime? signedAt DateTime? readStatus ReadStatus @default(NOT_OPENED) signingStatus SigningStatus @default(NOT_SIGNED) sendStatus SendStatus @default(NOT_SENT) - Document Document? @relation(fields: [documentId], references: [id], onDelete: Cascade) - Template Template? @relation(fields: [templateId], references: [id], onDelete: Cascade) + Document Document? @relation(fields: [documentId], references: [id], onDelete: Cascade) + Template Template? @relation(fields: [templateId], references: [id], onDelete: Cascade) Field Field[] Signature Signature[] @@ -280,10 +305,10 @@ model Template { createdAt DateTime @default(now()) updatedAt DateTime @default(now()) @updatedAt - templateDocumentData DocumentData @relation(fields: [templateDocumentDataId], references: [id], onDelete: Cascade) - User User @relation(fields: [userId], references: [id], onDelete: Cascade) - Recipient Recipient[] - Field Field[] + templateDocumentData DocumentData @relation(fields: [templateDocumentDataId], references: [id], onDelete: Cascade) + User User @relation(fields: [userId], references: [id], onDelete: Cascade) + Recipient Recipient[] + Field Field[] @@unique([templateDocumentDataId]) } diff --git a/packages/trpc/server/context.ts b/packages/trpc/server/context.ts index e1973f08b..7136afd70 100644 --- a/packages/trpc/server/context.ts +++ b/packages/trpc/server/context.ts @@ -1,4 +1,4 @@ -import { CreateNextContextOptions } from '@trpc/server/adapters/next'; +import type { CreateNextContextOptions } from '@trpc/server/adapters/next'; import { getServerSession } from '@documenso/lib/next-auth/get-server-session'; @@ -9,6 +9,7 @@ export const createTrpcContext = async ({ req, res }: CreateNextContextOptions) return { session: null, user: null, + req, }; } @@ -16,12 +17,14 @@ export const createTrpcContext = async ({ req, res }: CreateNextContextOptions) return { session: null, user: null, + req, }; } return { session, user, + req, }; }; diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 4dcf4ca93..c595c628c 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -1,15 +1,18 @@ import { TRPCError } from '@trpc/server'; +import { findUserSecurityAuditLogs } from '@documenso/lib/server-only/user/find-user-security-audit-logs'; import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password'; import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id'; import { resetPassword } from '@documenso/lib/server-only/user/reset-password'; import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-confirmation-token'; import { updatePassword } from '@documenso/lib/server-only/user/update-password'; import { updateProfile } from '@documenso/lib/server-only/user/update-profile'; +import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { adminProcedure, authenticatedProcedure, procedure, router } from '../trpc'; import { ZConfirmEmailMutationSchema, + ZFindUserSecurityAuditLogsSchema, ZForgotPasswordFormSchema, ZResetPasswordFormSchema, ZRetrieveUserByIdQuerySchema, @@ -18,6 +21,22 @@ import { } from './schema'; export const profileRouter = router({ + findUserSecurityAuditLogs: authenticatedProcedure + .input(ZFindUserSecurityAuditLogsSchema) + .query(async ({ input, ctx }) => { + try { + return await findUserSecurityAuditLogs({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to find user security audit logs. Please try again.', + }); + } + }), + getUser: adminProcedure.input(ZRetrieveUserByIdQuerySchema).query(async ({ input }) => { try { const { id } = input; @@ -41,6 +60,7 @@ export const profileRouter = router({ userId: ctx.user.id, name, signature, + requestMetadata: extractRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -63,6 +83,7 @@ export const profileRouter = router({ userId: ctx.user.id, password, currentPassword, + requestMetadata: extractRequestMetadata(ctx.req), }); } catch (err) { let message = @@ -91,13 +112,14 @@ export const profileRouter = router({ } }), - resetPassword: procedure.input(ZResetPasswordFormSchema).mutation(async ({ input }) => { + resetPassword: procedure.input(ZResetPasswordFormSchema).mutation(async ({ input, ctx }) => { try { const { password, token } = input; return await resetPassword({ token, password, + requestMetadata: extractRequestMetadata(ctx.req), }); } catch (err) { let message = 'We were unable to reset your password. Please try again.'; diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts index 1d6820007..522b13552 100644 --- a/packages/trpc/server/profile-router/schema.ts +++ b/packages/trpc/server/profile-router/schema.ts @@ -2,6 +2,11 @@ import { z } from 'zod'; import { ZCurrentPasswordSchema, ZPasswordSchema } from '../auth-router/schema'; +export const ZFindUserSecurityAuditLogsSchema = z.object({ + page: z.number().optional(), + perPage: z.number().optional(), +}); + export const ZRetrieveUserByIdQuerySchema = z.object({ id: z.number().min(1), }); @@ -29,6 +34,7 @@ export const ZConfirmEmailMutationSchema = z.object({ email: z.string().email().min(1), }); +export type TFindUserSecurityAuditLogsSchema = z.infer; export type TRetrieveUserByIdQuerySchema = z.infer; export type TUpdateProfileMutationSchema = z.infer; export type TUpdatePasswordMutationSchema = z.infer; diff --git a/packages/trpc/server/two-factor-authentication-router/router.ts b/packages/trpc/server/two-factor-authentication-router/router.ts index a10f7a543..b499de703 100644 --- a/packages/trpc/server/two-factor-authentication-router/router.ts +++ b/packages/trpc/server/two-factor-authentication-router/router.ts @@ -6,6 +6,7 @@ import { enableTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/en import { getBackupCodes } from '@documenso/lib/server-only/2fa/get-backup-code'; import { setupTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/setup-2fa'; import { compareSync } from '@documenso/lib/server-only/auth/hash'; +import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { authenticatedProcedure, router } from '../trpc'; import { @@ -23,7 +24,10 @@ export const twoFactorAuthenticationRouter = router({ const { password } = input; - return await setupTwoFactorAuthentication({ user, password }); + return await setupTwoFactorAuthentication({ + user, + password, + }); }), enable: authenticatedProcedure @@ -34,7 +38,11 @@ export const twoFactorAuthenticationRouter = router({ const { code } = input; - return await enableTwoFactorAuthentication({ user, code }); + return await enableTwoFactorAuthentication({ + user, + code, + requestMetadata: extractRequestMetadata(ctx.req), + }); } catch (err) { console.error(err); @@ -53,7 +61,12 @@ export const twoFactorAuthenticationRouter = router({ const { password, backupCode } = input; - return await disableTwoFactorAuthentication({ user, password, backupCode }); + return await disableTwoFactorAuthentication({ + user, + password, + backupCode, + requestMetadata: extractRequestMetadata(ctx.req), + }); } catch (err) { console.error(err); diff --git a/packages/ui/primitives/alert.tsx b/packages/ui/primitives/alert.tsx index 190f7781d..092fbb2b4 100644 --- a/packages/ui/primitives/alert.tsx +++ b/packages/ui/primitives/alert.tsx @@ -1,21 +1,33 @@ import * as React from 'react'; -import { VariantProps, cva } from 'class-variance-authority'; +import type { VariantProps } from 'class-variance-authority'; +import { cva } from 'class-variance-authority'; import { cn } from '../lib/utils'; const alertVariants = cva( - 'relative w-full rounded-lg border p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&:has(svg)]:pl-11', + 'relative w-full rounded-lg p-4 [&>svg]:absolute [&>svg]:text-foreground [&>svg]:left-4 [&>svg]:top-4 [&>svg+div]:translate-y-[-3px] [&>svg~*]:pl-8', { variants: { variant: { - default: 'bg-background text-foreground', - destructive: - 'text-destructive border-destructive/50 dark:border-destructive [&>svg]:text-destructive text-destructive', + default: + 'bg-green-50 text-green-700 [&_.alert-title]:text-green-800 [&>svg]:text-green-400', + neutral: + 'bg-gray-50 dark:bg-neutral-900/20 text-muted-foreground [&_.alert-title]:text-foreground', + secondary: 'bg-blue-50 text-blue-700 [&_.alert-title]:text-blue-800 [&>svg]:text-blue-400', + destructive: 'bg-red-50 text-red-700 [&_.alert-title]:text-red-800 [&>svg]:text-red-400', + warning: + 'bg-yellow-50 text-yellow-700 [&_.alert-title]:text-yellow-800 [&>svg]:text-yellow-400', + }, + padding: { + tighter: 'p-2', + tight: 'px-4 py-2', + default: 'p-4', }, }, defaultVariants: { variant: 'default', + padding: 'default', }, }, ); @@ -23,19 +35,20 @@ const alertVariants = cva( const Alert = React.forwardRef< HTMLDivElement, React.HTMLAttributes & VariantProps ->(({ className, variant, ...props }, ref) => ( -
+>(({ className, variant, padding, ...props }, ref) => ( +
)); Alert.displayName = 'Alert'; const AlertTitle = React.forwardRef>( ({ className, ...props }, ref) => ( -
+
), ); @@ -45,7 +58,7 @@ const AlertDescription = React.forwardRef< HTMLParagraphElement, React.HTMLAttributes >(({ className, ...props }, ref) => ( -
+
)); AlertDescription.displayName = 'AlertDescription'; diff --git a/packages/ui/primitives/data-table.tsx b/packages/ui/primitives/data-table.tsx index e4a89e141..9cc14a684 100644 --- a/packages/ui/primitives/data-table.tsx +++ b/packages/ui/primitives/data-table.tsx @@ -2,36 +2,53 @@ import React, { useMemo } from 'react'; -import { +import type { ColumnDef, PaginationState, Table as TTable, Updater, - flexRender, - getCoreRowModel, - useReactTable, + VisibilityState, } from '@tanstack/react-table'; +import { flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table'; +import { Skeleton } from './skeleton'; import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from './table'; export type DataTableChildren = (_table: TTable) => React.ReactNode; export interface DataTableProps { columns: ColumnDef[]; + columnVisibility?: VisibilityState; data: TData[]; perPage?: number; currentPage?: number; totalPages?: number; onPaginationChange?: (_page: number, _perPage: number) => void; + onClearFilters?: () => void; + hasFilters?: boolean; children?: DataTableChildren; + skeleton?: { + enable: boolean; + rows: number; + component?: React.ReactNode; + }; + error?: { + enable: boolean; + component?: React.ReactNode; + }; } export function DataTable({ columns, + columnVisibility, data, + error, perPage, currentPage, totalPages, + skeleton, + hasFilters, + onClearFilters, onPaginationChange, children, }: DataTableProps) { @@ -67,6 +84,7 @@ export function DataTable({ getCoreRowModel: getCoreRowModel(), state: { pagination: manualPagination ? pagination : undefined, + columnVisibility, }, manualPagination, pageCount: totalPages, @@ -103,10 +121,31 @@ export function DataTable({ ))} )) + ) : error?.enable ? ( + + {error.component ?? ( + + Something went wrong. + + )} + + ) : skeleton?.enable ? ( + Array.from({ length: skeleton.rows }).map((_, i) => ( + {skeleton.component ?? } + )) ) : ( - - No results. + +

No results found

+ + {hasFilters && onClearFilters !== undefined && ( + + )}
)} From 9427143951563b2d1c58f7aa34700566a23a3e79 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Tue, 30 Jan 2024 18:26:46 +1100 Subject: [PATCH 080/311] fix: remove account create log --- apps/web/src/pages/api/auth/[...nextauth].ts | 10 ---------- packages/lib/constants/auth.ts | 1 - .../migration.sql | 2 +- packages/prisma/schema.prisma | 1 - 4 files changed, 1 insertion(+), 13 deletions(-) rename packages/prisma/migrations/{20240130062658_add_user_security_audit_logs => 20240130072543_add_user_security_audit_logs}/migration.sql (71%) diff --git a/apps/web/src/pages/api/auth/[...nextauth].ts b/apps/web/src/pages/api/auth/[...nextauth].ts index ed1809691..7666dd104 100644 --- a/apps/web/src/pages/api/auth/[...nextauth].ts +++ b/apps/web/src/pages/api/auth/[...nextauth].ts @@ -18,16 +18,6 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) { error: '/signin', }, events: { - createUser: async ({ user }) => { - await prisma.userSecurityAuditLog.create({ - data: { - userId: user.id, - ipAddress, - userAgent, - type: UserSecurityAuditLogType.ACCOUNT_CREATE, - }, - }); - }, signIn: async ({ user }) => { await prisma.userSecurityAuditLog.create({ data: { diff --git a/packages/lib/constants/auth.ts b/packages/lib/constants/auth.ts index 48f1e9d7b..54fc9f6a8 100644 --- a/packages/lib/constants/auth.ts +++ b/packages/lib/constants/auth.ts @@ -12,7 +12,6 @@ export const IS_GOOGLE_SSO_ENABLED = Boolean( ); export const USER_SECURITY_AUDIT_LOG_MAP: { [key in UserSecurityAuditLogType]: string } = { - [UserSecurityAuditLogType.ACCOUNT_CREATE]: 'Account created', [UserSecurityAuditLogType.ACCOUNT_SSO_LINK]: 'Linked account to SSO', [UserSecurityAuditLogType.ACCOUNT_PROFILE_UPDATE]: 'Profile updated', [UserSecurityAuditLogType.AUTH_2FA_DISABLE]: '2FA Disabled', diff --git a/packages/prisma/migrations/20240130062658_add_user_security_audit_logs/migration.sql b/packages/prisma/migrations/20240130072543_add_user_security_audit_logs/migration.sql similarity index 71% rename from packages/prisma/migrations/20240130062658_add_user_security_audit_logs/migration.sql rename to packages/prisma/migrations/20240130072543_add_user_security_audit_logs/migration.sql index 73d85ada8..b33a614ac 100644 --- a/packages/prisma/migrations/20240130062658_add_user_security_audit_logs/migration.sql +++ b/packages/prisma/migrations/20240130072543_add_user_security_audit_logs/migration.sql @@ -1,5 +1,5 @@ -- CreateEnum -CREATE TYPE "UserSecurityAuditLogType" AS ENUM ('ACCOUNT_CREATE', 'ACCOUNT_PROFILE_UPDATE', 'ACCOUNT_SSO_LINK', 'AUTH_2FA_DISABLE', 'AUTH_2FA_ENABLE', 'PASSWORD_RESET', 'PASSWORD_UPDATE', 'SIGN_OUT', 'SIGN_IN'); +CREATE TYPE "UserSecurityAuditLogType" AS ENUM ('ACCOUNT_PROFILE_UPDATE', 'ACCOUNT_SSO_LINK', 'AUTH_2FA_DISABLE', 'AUTH_2FA_ENABLE', 'PASSWORD_RESET', 'PASSWORD_UPDATE', 'SIGN_OUT', 'SIGN_IN'); -- CreateTable CREATE TABLE "UserSecurityAuditLog" ( diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 8f83f0ac3..9c41cfb30 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -49,7 +49,6 @@ model User { } enum UserSecurityAuditLogType { - ACCOUNT_CREATE ACCOUNT_PROFILE_UPDATE ACCOUNT_SSO_LINK AUTH_2FA_DISABLE From 1bda74b3aa38d74e5d4faf6e6ff1bfa8fa7a9757 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Tue, 30 Jan 2024 18:37:48 +1100 Subject: [PATCH 081/311] fix: add cascade delete for audit logs --- .../migration.sql | 2 +- packages/prisma/schema.prisma | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename packages/prisma/migrations/{20240130072543_add_user_security_audit_logs => 20240130073345_add_user_security_audit_logs}/migration.sql (94%) diff --git a/packages/prisma/migrations/20240130072543_add_user_security_audit_logs/migration.sql b/packages/prisma/migrations/20240130073345_add_user_security_audit_logs/migration.sql similarity index 94% rename from packages/prisma/migrations/20240130072543_add_user_security_audit_logs/migration.sql rename to packages/prisma/migrations/20240130073345_add_user_security_audit_logs/migration.sql index b33a614ac..da643eee3 100644 --- a/packages/prisma/migrations/20240130072543_add_user_security_audit_logs/migration.sql +++ b/packages/prisma/migrations/20240130073345_add_user_security_audit_logs/migration.sql @@ -14,4 +14,4 @@ CREATE TABLE "UserSecurityAuditLog" ( ); -- AddForeignKey -ALTER TABLE "UserSecurityAuditLog" ADD CONSTRAINT "UserSecurityAuditLog_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE; +ALTER TABLE "UserSecurityAuditLog" ADD CONSTRAINT "UserSecurityAuditLog_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 9c41cfb30..596013a85 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -67,7 +67,7 @@ model UserSecurityAuditLog { userAgent String? ipAddress String? - User User @relation(fields: [userId], references: [id]) + User User @relation(fields: [userId], references: [id], onDelete: Cascade) } model PasswordResetToken { From cc090adce0918def56279c44d76cecaa21bf5fe5 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:54:48 +0200 Subject: [PATCH 082/311] chore: refactor --- .../unverified-account/page.tsx | 53 ++----------------- apps/web/src/components/forms/signin.tsx | 10 ++-- apps/web/src/components/forms/signup.tsx | 8 ++- packages/lib/next-auth/auth-options.ts | 10 ++++ .../lib/server-only/user/get-user-by-email.ts | 3 ++ .../user/send-confirmation-token.ts | 4 ++ packages/trpc/server/profile-router/router.ts | 11 +--- packages/trpc/server/profile-router/schema.ts | 2 +- 8 files changed, 32 insertions(+), 69 deletions(-) diff --git a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx index dc98044ae..9b636f7cf 100644 --- a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx +++ b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx @@ -1,51 +1,8 @@ -'use client'; - -import { useState } from 'react'; - -import { useSearchParams } from 'next/navigation'; - import { Mails } from 'lucide-react'; -import { ONE_SECOND } from '@documenso/lib/constants/time'; -import { trpc } from '@documenso/trpc/react'; -import { Button } from '@documenso/ui/primitives/button'; -import { useToast } from '@documenso/ui/primitives/use-toast'; - -const RESEND_CONFIRMATION_EMAIL_TIMEOUT = 20 * ONE_SECOND; +import { SendConfirmationEmailForm } from '~/components/forms/send-confirmation-email'; export default function UnverifiedAccount() { - const [isButtonDisabled, setIsButtonDisabled] = useState(false); - const searchParams = useSearchParams(); - const { toast } = useToast(); - - const encryptedEmail = searchParams?.get('token') ?? ''; - - const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation(); - - const onResendConfirmationEmail = async () => { - try { - setIsButtonDisabled(true); - - await sendConfirmationEmail({ encryptedEmail }); - - toast({ - title: 'Success', - description: 'Verification email sent successfully.', - duration: 5000, - }); - - setTimeout(() => setIsButtonDisabled(false), RESEND_CONFIRMATION_EMAIL_TIMEOUT); - } catch (err) { - setIsButtonDisabled(false); - - toast({ - title: 'Error', - description: 'Something went wrong while sending the confirmation email.', - variant: 'destructive', - }); - } - }; - return (
@@ -55,13 +12,11 @@ export default function UnverifiedAccount() {

Confirm email

- To gain full access to your account and unlock all its features, please confirm your email - address by clicking on the link sent to your email address. + To gain access to your account, please confirm your email address by clicking on the + confirmation link from your inbox.

- +
); diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx index 0353333cf..d0b5e1b60 100644 --- a/apps/web/src/components/forms/signin.tsx +++ b/apps/web/src/components/forms/signin.tsx @@ -11,7 +11,6 @@ import { FcGoogle } from 'react-icons/fc'; import { z } from 'zod'; import { ErrorCode, isErrorCode } from '@documenso/lib/next-auth/error-codes'; -import { trpc } from '@documenso/trpc/react'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@documenso/ui/primitives/dialog'; @@ -62,8 +61,6 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = useState(false); const router = useRouter(); - const { mutateAsync: encryptSecondaryData } = trpc.crypto.encryptSecondaryData.useMutation(); - const [twoFactorAuthenticationMethod, setTwoFactorAuthenticationMethod] = useState< 'totp' | 'backup' >('totp'); @@ -132,9 +129,12 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = const errorMessage = ERROR_MESSAGES[result.error]; if (result.error === ErrorCode.UNVERIFIED_EMAIL) { - const encryptedEmail = await encryptSecondaryData({ data: email }); + router.push(`/unverified-account`); - router.push(`/unverified-account?token=${encryptedEmail}`); + toast({ + title: 'Unable to sign in', + description: errorMessage ?? 'An unknown error occurred', + }); return; } diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index bc7ee0ce5..4520e00ca 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -62,19 +62,17 @@ export const SignUpForm = ({ className, isGoogleSSOEnabled }: SignUpFormProps) = const isSubmitting = form.formState.isSubmitting; const { mutateAsync: signup } = trpc.auth.signup.useMutation(); - const { mutateAsync: encryptSecondaryData } = trpc.crypto.encryptSecondaryData.useMutation(); const onFormSubmit = async ({ name, email, password, signature }: TSignUpFormSchema) => { try { await signup({ name, email, password, signature }); - const encryptedEmail = await encryptSecondaryData({ data: email }); - - router.push(`/unverified-account?token=${encryptedEmail}`); + router.push(`/unverified-account}`); toast({ title: 'Registration Successful', - description: 'You have successfully registered. Please sign in to continue.', + description: + 'You have successfully registered. Please verify your account by clicking on the link you received in the email.', duration: 5000, }); diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 37f1ed864..1dedfe12b 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -14,6 +14,7 @@ import { IdentityProvider } from '@documenso/prisma/client'; import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble'; import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa'; import { getUserByEmail } from '../server-only/user/get-user-by-email'; +import { sendConfirmationToken } from '../server-only/user/send-confirmation-token'; import { ErrorCode } from './error-codes'; export const NEXT_AUTH_OPTIONS: AuthOptions = { @@ -71,6 +72,15 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } if (!user.emailVerified) { + const totalUserVerificationTokens = user.VerificationToken.length; + const lastUserVerificationToken = user.VerificationToken[totalUserVerificationTokens - 1]; + const expiredToken = + DateTime.fromJSDate(lastUserVerificationToken.expires) <= DateTime.now(); + + if (totalUserVerificationTokens < 1 || expiredToken) { + await sendConfirmationToken({ email }); + } + throw new Error(ErrorCode.UNVERIFIED_EMAIL); } diff --git a/packages/lib/server-only/user/get-user-by-email.ts b/packages/lib/server-only/user/get-user-by-email.ts index 0a2ef8d16..8c61202a2 100644 --- a/packages/lib/server-only/user/get-user-by-email.ts +++ b/packages/lib/server-only/user/get-user-by-email.ts @@ -9,5 +9,8 @@ export const getUserByEmail = async ({ email }: GetUserByEmailOptions) => { where: { email: email.toLowerCase(), }, + include: { + VerificationToken: true, + }, }); }; diff --git a/packages/lib/server-only/user/send-confirmation-token.ts b/packages/lib/server-only/user/send-confirmation-token.ts index af4a97a48..a399dd9fc 100644 --- a/packages/lib/server-only/user/send-confirmation-token.ts +++ b/packages/lib/server-only/user/send-confirmation-token.ts @@ -20,6 +20,10 @@ export const sendConfirmationToken = async ({ email }: { email: string }) => { throw new Error('User not found'); } + if (user.emailVerified) { + throw new Error('Email verified'); + } + const createdToken = await prisma.verificationToken.create({ data: { identifier: IDENTIFIER, diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 1faa3c8e6..3d765372b 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -1,6 +1,5 @@ import { TRPCError } from '@trpc/server'; -import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt'; import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password'; import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id'; import { resetPassword } from '@documenso/lib/server-only/user/reset-password'; @@ -118,15 +117,9 @@ export const profileRouter = router({ .input(ZConfirmEmailMutationSchema) .mutation(async ({ input }) => { try { - const { encryptedEmail } = input; + const { email } = input; - const decryptedEmail = decryptSecondaryData(encryptedEmail); - - if (!decryptedEmail) { - throw new Error('Email is required'); - } - - return await sendConfirmationToken({ email: decryptedEmail }); + return await sendConfirmationToken({ email }); } catch (err) { let message = 'We were unable to send a confirmation email. Please try again.'; diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts index 135d0d1e8..ef9ca2a14 100644 --- a/packages/trpc/server/profile-router/schema.ts +++ b/packages/trpc/server/profile-router/schema.ts @@ -24,7 +24,7 @@ export const ZResetPasswordFormSchema = z.object({ }); export const ZConfirmEmailMutationSchema = z.object({ - encryptedEmail: z.string().min(1), + email: z.string().email().min(1), }); export type TRetrieveUserByIdQuerySchema = z.infer; From 6053a4a40a55db36c815dbc2bdbf3c140f62860d Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:56:32 +0200 Subject: [PATCH 083/311] chore: refactor --- .../forms/send-confirmation-email.tsx | 93 +++++++++++++++++++ apps/web/src/components/forms/signup.tsx | 2 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 apps/web/src/components/forms/send-confirmation-email.tsx diff --git a/apps/web/src/components/forms/send-confirmation-email.tsx b/apps/web/src/components/forms/send-confirmation-email.tsx new file mode 100644 index 000000000..9e669539e --- /dev/null +++ b/apps/web/src/components/forms/send-confirmation-email.tsx @@ -0,0 +1,93 @@ +'use client'; + +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 { + Form, + FormControl, + FormField, + FormItem, + FormLabel, +} from '@documenso/ui/primitives/form/form'; +import { Input } from '@documenso/ui/primitives/input'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export const ZSendConfirmationEmailFormSchema = z.object({ + email: z.string().email().min(1), +}); + +export type TSendConfirmationEmailFormSchema = z.infer; + +export type SendConfirmationEmailFormProps = { + className?: string; +}; + +export const SendConfirmationEmailForm = ({ className }: SendConfirmationEmailFormProps) => { + const { toast } = useToast(); + + const form = useForm({ + values: { + email: '', + }, + resolver: zodResolver(ZSendConfirmationEmailFormSchema), + }); + + const isSubmitting = form.formState.isSubmitting; + + const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation(); + + const onFormSubmit = async ({ email }: TSendConfirmationEmailFormSchema) => { + try { + await sendConfirmationEmail({ email }); + + toast({ + title: 'Confirmation email sent', + description: + 'A confirmation email has been sent, and it should arrive in your inbox shortly.', + duration: 5000, + }); + + form.reset(); + } catch (err) { + toast({ + title: 'An error occurred while sending your confirmation email', + description: 'Please try again and make sure you enter the correct email address.', + variant: 'destructive', + }); + } + }; + + return ( +
+
+ +
+ ( + + Email address + + + + + )} + /> +
+ +
+ +
+ ); +}; diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index 4520e00ca..7bfe07968 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -67,7 +67,7 @@ export const SignUpForm = ({ className, isGoogleSSOEnabled }: SignUpFormProps) = try { await signup({ name, email, password, signature }); - router.push(`/unverified-account}`); + router.push(`/unverified-account`); toast({ title: 'Registration Successful', From 747a7b0aea078d4cf52db95abda58b51e269b7f8 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Tue, 30 Jan 2024 16:15:32 +0100 Subject: [PATCH 084/311] chore: security contacts and descr --- .well-known/security.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.well-known/security.txt b/.well-known/security.txt index 5cd29187c..0b00c7123 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -1,3 +1,6 @@ +# General Issues Contact: https://github.com/documenso/documenso/issues/new?assignees=&labels=bug&projects=&template=bug-report.yml +# Report critical issues privately, to let us take appropriate action before publishing +Contact: mailto:security@documenso.com Preferred-Languages: en Canonical: https://documenso.com/.well-known/security.txt From ada46a5f47e764ba523e8cb55f04d9dbae36bfcd Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Wed, 31 Jan 2024 12:27:40 +1100 Subject: [PATCH 085/311] feat: add auth fail logs --- apps/web/src/pages/api/auth/[...nextauth].ts | 4 ++-- packages/lib/constants/auth.ts | 4 +++- packages/lib/next-auth/auth-options.ts | 24 +++++++++++++++++-- .../lib/universal/extract-request-metadata.ts | 17 ++++++++++++- .../migration.sql | 2 +- packages/prisma/schema.prisma | 2 ++ packages/trpc/server/profile-router/router.ts | 8 +++---- .../router.ts | 6 ++--- 8 files changed, 53 insertions(+), 14 deletions(-) rename packages/prisma/migrations/{20240130073345_add_user_security_audit_logs => 20240131004516_add_user_security_audit_logs}/migration.sql (86%) diff --git a/apps/web/src/pages/api/auth/[...nextauth].ts b/apps/web/src/pages/api/auth/[...nextauth].ts index 7666dd104..365b6ec40 100644 --- a/apps/web/src/pages/api/auth/[...nextauth].ts +++ b/apps/web/src/pages/api/auth/[...nextauth].ts @@ -3,12 +3,12 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import NextAuth from 'next-auth'; import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options'; -import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { prisma } from '@documenso/prisma'; import { UserSecurityAuditLogType } from '@documenso/prisma/client'; export default async function auth(req: NextApiRequest, res: NextApiResponse) { - const { ipAddress, userAgent } = extractRequestMetadata(req); + const { ipAddress, userAgent } = extractNextApiRequestMetadata(req); return await NextAuth(req, res, { ...NEXT_AUTH_OPTIONS, diff --git a/packages/lib/constants/auth.ts b/packages/lib/constants/auth.ts index 54fc9f6a8..1918e2db0 100644 --- a/packages/lib/constants/auth.ts +++ b/packages/lib/constants/auth.ts @@ -18,6 +18,8 @@ export const USER_SECURITY_AUDIT_LOG_MAP: { [key in UserSecurityAuditLogType]: s [UserSecurityAuditLogType.AUTH_2FA_ENABLE]: '2FA Enabled', [UserSecurityAuditLogType.PASSWORD_RESET]: 'Password reset', [UserSecurityAuditLogType.PASSWORD_UPDATE]: 'Password updated', - [UserSecurityAuditLogType.SIGN_IN]: 'Signed In', [UserSecurityAuditLogType.SIGN_OUT]: 'Signed Out', + [UserSecurityAuditLogType.SIGN_IN]: 'Signed In', + [UserSecurityAuditLogType.SIGN_IN_FAIL]: 'Sign in attempt failed', + [UserSecurityAuditLogType.SIGN_IN_2FA_FAIL]: 'Sign in 2FA attempt failed', }; diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 9babae987..f23295a81 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -9,11 +9,12 @@ import type { GoogleProfile } from 'next-auth/providers/google'; import GoogleProvider from 'next-auth/providers/google'; import { prisma } from '@documenso/prisma'; -import { IdentityProvider } from '@documenso/prisma/client'; +import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/client'; import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble'; import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa'; import { getUserByEmail } from '../server-only/user/get-user-by-email'; +import { extractNextAuthRequestMetadata } from '../universal/extract-request-metadata'; import { ErrorCode } from './error-codes'; export const NEXT_AUTH_OPTIONS: AuthOptions = { @@ -35,7 +36,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { }, backupCode: { label: 'Backup Code', type: 'input', placeholder: 'Two-factor backup code' }, }, - authorize: async (credentials, _req) => { + authorize: async (credentials, req) => { if (!credentials) { throw new Error(ErrorCode.CREDENTIALS_NOT_FOUND); } @@ -51,8 +52,18 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } const isPasswordsSame = await compare(password, user.password); + const requestMetadata = extractNextAuthRequestMetadata(req); if (!isPasswordsSame) { + await prisma.userSecurityAuditLog.create({ + data: { + userId: user.id, + ipAddress: requestMetadata.ipAddress, + userAgent: requestMetadata.userAgent, + type: UserSecurityAuditLogType.SIGN_IN_FAIL, + }, + }); + throw new Error(ErrorCode.INCORRECT_EMAIL_PASSWORD); } @@ -62,6 +73,15 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { const isValid = await validateTwoFactorAuthentication({ backupCode, totpCode, user }); if (!isValid) { + await prisma.userSecurityAuditLog.create({ + data: { + userId: user.id, + ipAddress: requestMetadata.ipAddress, + userAgent: requestMetadata.userAgent, + type: UserSecurityAuditLogType.SIGN_IN_2FA_FAIL, + }, + }); + throw new Error( totpCode ? ErrorCode.INCORRECT_TWO_FACTOR_CODE diff --git a/packages/lib/universal/extract-request-metadata.ts b/packages/lib/universal/extract-request-metadata.ts index ceb4ad35f..5549e5de7 100644 --- a/packages/lib/universal/extract-request-metadata.ts +++ b/packages/lib/universal/extract-request-metadata.ts @@ -1,5 +1,6 @@ import type { NextApiRequest } from 'next'; +import type { RequestInternal } from 'next-auth'; import { z } from 'zod'; const ZIpSchema = z.string().ip(); @@ -9,7 +10,7 @@ export type RequestMetadata = { userAgent?: string; }; -export const extractRequestMetadata = (req: NextApiRequest): RequestMetadata => { +export const extractNextApiRequestMetadata = (req: NextApiRequest): RequestMetadata => { const parsedIp = ZIpSchema.safeParse(req.headers['x-forwarded-for'] || req.socket.remoteAddress); const ipAddress = parsedIp.success ? parsedIp.data : undefined; @@ -20,3 +21,17 @@ export const extractRequestMetadata = (req: NextApiRequest): RequestMetadata => userAgent, }; }; + +export const extractNextAuthRequestMetadata = ( + req: Pick, +): RequestMetadata => { + const parsedIp = ZIpSchema.safeParse(req.headers?.['x-forwarded-for']); + + const ipAddress = parsedIp.success ? parsedIp.data : undefined; + const userAgent = req.headers?.['user-agent']; + + return { + ipAddress, + userAgent, + }; +}; diff --git a/packages/prisma/migrations/20240130073345_add_user_security_audit_logs/migration.sql b/packages/prisma/migrations/20240131004516_add_user_security_audit_logs/migration.sql similarity index 86% rename from packages/prisma/migrations/20240130073345_add_user_security_audit_logs/migration.sql rename to packages/prisma/migrations/20240131004516_add_user_security_audit_logs/migration.sql index da643eee3..491012380 100644 --- a/packages/prisma/migrations/20240130073345_add_user_security_audit_logs/migration.sql +++ b/packages/prisma/migrations/20240131004516_add_user_security_audit_logs/migration.sql @@ -1,5 +1,5 @@ -- CreateEnum -CREATE TYPE "UserSecurityAuditLogType" AS ENUM ('ACCOUNT_PROFILE_UPDATE', 'ACCOUNT_SSO_LINK', 'AUTH_2FA_DISABLE', 'AUTH_2FA_ENABLE', 'PASSWORD_RESET', 'PASSWORD_UPDATE', 'SIGN_OUT', 'SIGN_IN'); +CREATE TYPE "UserSecurityAuditLogType" AS ENUM ('ACCOUNT_PROFILE_UPDATE', 'ACCOUNT_SSO_LINK', 'AUTH_2FA_DISABLE', 'AUTH_2FA_ENABLE', 'PASSWORD_RESET', 'PASSWORD_UPDATE', 'SIGN_OUT', 'SIGN_IN', 'SIGN_IN_FAIL', 'SIGN_IN_2FA_FAIL'); -- CreateTable CREATE TABLE "UserSecurityAuditLog" ( diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 596013a85..353a855ae 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -57,6 +57,8 @@ enum UserSecurityAuditLogType { PASSWORD_UPDATE SIGN_OUT SIGN_IN + SIGN_IN_FAIL + SIGN_IN_2FA_FAIL } model UserSecurityAuditLog { diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index c595c628c..4a0d47345 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -7,7 +7,7 @@ import { resetPassword } from '@documenso/lib/server-only/user/reset-password'; import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-confirmation-token'; import { updatePassword } from '@documenso/lib/server-only/user/update-password'; import { updateProfile } from '@documenso/lib/server-only/user/update-profile'; -import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { adminProcedure, authenticatedProcedure, procedure, router } from '../trpc'; import { @@ -60,7 +60,7 @@ export const profileRouter = router({ userId: ctx.user.id, name, signature, - requestMetadata: extractRequestMetadata(ctx.req), + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -83,7 +83,7 @@ export const profileRouter = router({ userId: ctx.user.id, password, currentPassword, - requestMetadata: extractRequestMetadata(ctx.req), + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { let message = @@ -119,7 +119,7 @@ export const profileRouter = router({ return await resetPassword({ token, password, - requestMetadata: extractRequestMetadata(ctx.req), + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { let message = 'We were unable to reset your password. Please try again.'; diff --git a/packages/trpc/server/two-factor-authentication-router/router.ts b/packages/trpc/server/two-factor-authentication-router/router.ts index b499de703..36fe93a60 100644 --- a/packages/trpc/server/two-factor-authentication-router/router.ts +++ b/packages/trpc/server/two-factor-authentication-router/router.ts @@ -6,7 +6,7 @@ import { enableTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/en import { getBackupCodes } from '@documenso/lib/server-only/2fa/get-backup-code'; import { setupTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/setup-2fa'; import { compareSync } from '@documenso/lib/server-only/auth/hash'; -import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { authenticatedProcedure, router } from '../trpc'; import { @@ -41,7 +41,7 @@ export const twoFactorAuthenticationRouter = router({ return await enableTwoFactorAuthentication({ user, code, - requestMetadata: extractRequestMetadata(ctx.req), + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -65,7 +65,7 @@ export const twoFactorAuthenticationRouter = router({ user, password, backupCode, - requestMetadata: extractRequestMetadata(ctx.req), + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); From 27d8098511e4d62f01f1ad403ead38ee88b47616 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Wed, 31 Jan 2024 12:40:37 +1100 Subject: [PATCH 086/311] fix: document count period filter (#882) ## Description Currently the count for the documents table tabs do not display the correct values when the period filter is applied. ## Changes Made - Updated `getStats` to support filtering on period ## Testing Performed - Tested to see if the documents tab count were being filtered based on the period ## Checklist - [X] I have tested these changes locally and they work as expected. - [X] I have followed the project's coding style guidelines. --- .../src/app/(dashboard)/documents/page.tsx | 11 +++++---- .../(dashboard)/period-selector/types.ts | 2 +- .../server-only/document/find-documents.ts | 4 +++- .../lib/server-only/document/get-stats.ts | 24 +++++++++++++++++-- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/page.tsx b/apps/web/src/app/(dashboard)/documents/page.tsx index a15d65306..e61aad649 100644 --- a/apps/web/src/app/(dashboard)/documents/page.tsx +++ b/apps/web/src/app/(dashboard)/documents/page.tsx @@ -2,6 +2,7 @@ import type { Metadata } from 'next'; import Link from 'next/link'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents'; import { findDocuments } from '@documenso/lib/server-only/document/find-documents'; import { getStats } from '@documenso/lib/server-only/document/get-stats'; import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status'; @@ -9,7 +10,6 @@ import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-documen import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs'; import { PeriodSelector } from '~/components/(dashboard)/period-selector/period-selector'; -import type { PeriodSelectorValue } from '~/components/(dashboard)/period-selector/types'; import { isPeriodSelectorValue } from '~/components/(dashboard)/period-selector/types'; import { DocumentStatus } from '~/components/formatter/document-status'; @@ -32,15 +32,16 @@ export const metadata: Metadata = { export default async function DocumentsPage({ searchParams = {} }: DocumentsPageProps) { const { user } = await getRequiredServerComponentSession(); - const stats = await getStats({ - user, - }); - const status = isExtendedDocumentStatus(searchParams.status) ? searchParams.status : 'ALL'; const period = isPeriodSelectorValue(searchParams.period) ? searchParams.period : ''; const page = Number(searchParams.page) || 1; const perPage = Number(searchParams.perPage) || 20; + const stats = await getStats({ + user, + period, + }); + const results = await findDocuments({ userId: user.id, status, diff --git a/apps/web/src/components/(dashboard)/period-selector/types.ts b/apps/web/src/components/(dashboard)/period-selector/types.ts index 2b50f5d6c..8ae1c5fbe 100644 --- a/apps/web/src/components/(dashboard)/period-selector/types.ts +++ b/apps/web/src/components/(dashboard)/period-selector/types.ts @@ -1,4 +1,4 @@ -export type PeriodSelectorValue = '' | '7d' | '14d' | '30d'; +import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents'; export const isPeriodSelectorValue = (value: unknown): value is PeriodSelectorValue => { // eslint-disable-next-line @typescript-eslint/consistent-type-assertions diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts index def85f2d4..2929c515b 100644 --- a/packages/lib/server-only/document/find-documents.ts +++ b/packages/lib/server-only/document/find-documents.ts @@ -9,6 +9,8 @@ import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-documen import type { FindResultSet } from '../../types/find-result-set'; import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-tokens-for-document'; +export type PeriodSelectorValue = '' | '7d' | '14d' | '30d'; + export type FindDocumentsOptions = { userId: number; term?: string; @@ -19,7 +21,7 @@ export type FindDocumentsOptions = { column: keyof Omit; direction: 'asc' | 'desc'; }; - period?: '' | '7d' | '14d' | '30d'; + period?: PeriodSelectorValue; }; export const findDocuments = async ({ diff --git a/packages/lib/server-only/document/get-stats.ts b/packages/lib/server-only/document/get-stats.ts index 044d9a2dc..6aaa9a596 100644 --- a/packages/lib/server-only/document/get-stats.ts +++ b/packages/lib/server-only/document/get-stats.ts @@ -1,14 +1,31 @@ +import { DateTime } from 'luxon'; + import { prisma } from '@documenso/prisma'; -import type { User } from '@documenso/prisma/client'; +import type { Prisma, User } from '@documenso/prisma/client'; import { SigningStatus } from '@documenso/prisma/client'; import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status'; import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status'; +import type { PeriodSelectorValue } from './find-documents'; + export type GetStatsInput = { user: User; + period?: PeriodSelectorValue; }; -export const getStats = async ({ user }: GetStatsInput) => { +export const getStats = async ({ user, period }: GetStatsInput) => { + let createdAt: Prisma.DocumentWhereInput['createdAt']; + + if (period) { + const daysAgo = parseInt(period.replace(/d$/, ''), 10); + + const startOfPeriod = DateTime.now().minus({ days: daysAgo }).startOf('day'); + + createdAt = { + gte: startOfPeriod.toJSDate(), + }; + } + const [ownerCounts, notSignedCounts, hasSignedCounts] = await Promise.all([ prisma.document.groupBy({ by: ['status'], @@ -17,6 +34,7 @@ export const getStats = async ({ user }: GetStatsInput) => { }, where: { userId: user.id, + createdAt, deletedAt: null, }, }), @@ -33,6 +51,7 @@ export const getStats = async ({ user }: GetStatsInput) => { signingStatus: SigningStatus.NOT_SIGNED, }, }, + createdAt, deletedAt: null, }, }), @@ -42,6 +61,7 @@ export const getStats = async ({ user }: GetStatsInput) => { _all: true, }, where: { + createdAt, User: { email: { not: user.email, From 08f82b23dcc78f309f648785574cfe30eb0e2387 Mon Sep 17 00:00:00 2001 From: Mythie Date: Wed, 31 Jan 2024 22:32:42 +1100 Subject: [PATCH 087/311] fix: update env entries to evaluate at runtime --- .../src/app/(marketing)/claimed/page.tsx | 7 ++----- .../src/app/(marketing)/singleplayer/client.tsx | 3 ++- .../src/components/(marketing)/pricing-table.tsx | 9 +++------ .../single-player-mode-success.tsx | 3 ++- .../src/components/(marketing)/widget.tsx | 7 ++++++- apps/marketing/src/pages/api/claim-plan/index.ts | 14 ++++++++------ .../(dashboard)/documents/[id]/edit-document.tsx | 2 +- .../billing/create-billing-portal.action.ts | 7 ++----- .../settings/billing/create-checkout.action.ts | 9 +++------ .../app/(share)/share/[slug]/opengraph/route.tsx | 7 +++---- apps/web/src/app/(share)/share/[slug]/page.tsx | 12 ++++-------- apps/web/src/app/layout.tsx | 9 ++++----- .../(dashboard)/avatar/avatar-with-recipient.tsx | 7 ++----- apps/web/src/helpers/get-asset-buffer.ts | 6 ++---- packages/ee/server-only/limits/client.ts | 2 +- packages/lib/constants/app.ts | 15 ++++++++------- packages/lib/constants/crypto.ts | 16 ++++++++-------- packages/lib/constants/feature-flags.ts | 10 +++++----- packages/lib/constants/pdf.ts | 2 +- packages/lib/next-auth/auth-options.ts | 4 +--- .../server-only/auth/send-confirmation-email.ts | 11 +++++------ .../lib/server-only/auth/send-forgot-password.ts | 10 ++++------ .../lib/server-only/auth/send-reset-password.ts | 8 +++----- .../lib/server-only/document/delete-document.ts | 7 ++----- .../lib/server-only/document/resend-document.tsx | 10 ++++------ .../server-only/document/send-completed-email.ts | 9 +++------ .../lib/server-only/document/send-document.tsx | 10 ++++------ .../server-only/document/send-pending-email.ts | 8 +++----- packages/lib/server-only/feature-flags/all.ts | 9 +++------ packages/lib/server-only/feature-flags/get.ts | 10 ++++------ .../lib/server-only/pdf/insert-text-in-pdf.ts | 2 +- packages/lib/universal/get-base-url.ts | 10 +++++----- packages/lib/universal/get-feature-flag.ts | 6 +++--- packages/lib/universal/upload/put-file.ts | 4 ++-- packages/lib/universal/upload/server-actions.ts | 8 +++++--- packages/trpc/server/auth-router/router.ts | 4 ++-- .../trpc/server/singleplayer-router/router.ts | 6 ++---- .../document/document-share-button.tsx | 13 ++++++------- 38 files changed, 129 insertions(+), 167 deletions(-) diff --git a/apps/marketing/src/app/(marketing)/claimed/page.tsx b/apps/marketing/src/app/(marketing)/claimed/page.tsx index 931045bd2..7f85b5d2e 100644 --- a/apps/marketing/src/app/(marketing)/claimed/page.tsx +++ b/apps/marketing/src/app/(marketing)/claimed/page.tsx @@ -4,6 +4,7 @@ import { redirect } from 'next/navigation'; import { ArrowRight } from 'lucide-react'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { redis } from '@documenso/lib/server-only/redis'; import { stripe } from '@documenso/lib/server-only/stripe'; import { prisma } from '@documenso/prisma'; @@ -175,11 +176,7 @@ export default async function ClaimedPlanPage({ searchParams = {} }: ClaimedPlan This is a temporary password. Please change it as soon as possible.

- + @@ -117,7 +114,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {

diff --git a/apps/marketing/src/components/(marketing)/single-player-mode/single-player-mode-success.tsx b/apps/marketing/src/components/(marketing)/single-player-mode/single-player-mode-success.tsx index 1af71c775..d8a8e2c53 100644 --- a/apps/marketing/src/components/(marketing)/single-player-mode/single-player-mode-success.tsx +++ b/apps/marketing/src/components/(marketing)/single-player-mode/single-player-mode-success.tsx @@ -6,6 +6,7 @@ import Link from 'next/link'; import signingCelebration from '@documenso/assets/images/signing-celebration.png'; import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import type { Signature } from '@documenso/prisma/client'; import { DocumentStatus } from '@documenso/prisma/client'; import type { DocumentWithRecipient } from '@documenso/prisma/types/document-with-recipient'; @@ -85,7 +86,7 @@ export const SinglePlayerModeSuccess = ({

Create a{' '} diff --git a/apps/marketing/src/components/(marketing)/widget.tsx b/apps/marketing/src/components/(marketing)/widget.tsx index 80c13b275..b0baeb5fc 100644 --- a/apps/marketing/src/components/(marketing)/widget.tsx +++ b/apps/marketing/src/components/(marketing)/widget.tsx @@ -7,6 +7,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; import { AnimatePresence, motion } from 'framer-motion'; import { Loader } from 'lucide-react'; import { usePlausible } from 'next-plausible'; +import { env } from 'next-runtime-env'; import { Controller, useForm } from 'react-hook-form'; import { z } from 'zod'; @@ -144,7 +145,11 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => { setTimeout(resolve, 1000); }); - const planId = process.env.NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID; + const planId = env('NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID'); + + if (!planId) { + throw new Error('No plan ID found.'); + } const claimPlanInput = signatureDataUrl ? { diff --git a/apps/marketing/src/pages/api/claim-plan/index.ts b/apps/marketing/src/pages/api/claim-plan/index.ts index 57597001e..c63a727c5 100644 --- a/apps/marketing/src/pages/api/claim-plan/index.ts +++ b/apps/marketing/src/pages/api/claim-plan/index.ts @@ -1,13 +1,15 @@ -import { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from 'next'; import { randomUUID } from 'crypto'; -import { TEarlyAdopterCheckoutMetadataSchema } from '@documenso/ee/server-only/stripe/webhook/early-adopter-checkout-metadata'; +import type { TEarlyAdopterCheckoutMetadataSchema } from '@documenso/ee/server-only/stripe/webhook/early-adopter-checkout-metadata'; +import { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { redis } from '@documenso/lib/server-only/redis'; import { stripe } from '@documenso/lib/server-only/stripe'; import { prisma } from '@documenso/prisma'; -import { TClaimPlanResponseSchema, ZClaimPlanRequestSchema } from '~/api/claim-plan/types'; +import type { TClaimPlanResponseSchema } from '~/api/claim-plan/types'; +import { ZClaimPlanRequestSchema } from '~/api/claim-plan/types'; export default async function handler( req: NextApiRequest, @@ -40,7 +42,7 @@ export default async function handler( if (user) { return res.status(200).json({ - redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/signin`, + redirectUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/signin`, }); } @@ -77,8 +79,8 @@ export default async function handler( mode: 'subscription', metadata, allow_promotion_codes: true, - success_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}/claimed?sessionId={CHECKOUT_SESSION_ID}`, - cancel_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}`, + success_url: `${NEXT_PUBLIC_MARKETING_URL()}/claimed?sessionId={CHECKOUT_SESSION_ID}`, + cancel_url: `${NEXT_PUBLIC_MARKETING_URL()}`, }); if (!checkout.url) { diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx index 832e255fd..2159b87f2 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx @@ -61,7 +61,7 @@ export const EditDocumentForm = ({ const { mutateAsync: setPasswordForDocument } = trpc.document.setPasswordForDocument.useMutation(); - const documentFlow: Record = { + const documentFlow: Record = { title: { title: 'Add Title', description: 'Add the title to the document.', diff --git a/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts b/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts index 7d952d599..5435aefb1 100644 --- a/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts +++ b/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts @@ -1,20 +1,17 @@ 'use server'; -import { env } from 'next-runtime-env'; - import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer'; import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; export const createBillingPortal = async () => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const { user } = await getRequiredServerComponentSession(); const { stripeCustomer } = await getStripeCustomerByUser(user); return getPortalSession({ customerId: stripeCustomer.id, - returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, + returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`, }); }; diff --git a/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts b/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts index ef3fb0f30..90dd77e79 100644 --- a/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts +++ b/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts @@ -1,10 +1,9 @@ 'use server'; -import { env } from 'next-runtime-env'; - import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session'; import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer'; import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; import { getSubscriptionsByUserId } from '@documenso/lib/server-only/subscription/get-subscriptions-by-user-id'; @@ -13,8 +12,6 @@ export type CreateCheckoutOptions = { }; export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const session = await getRequiredServerComponentSession(); const { user, stripeCustomer } = await getStripeCustomerByUser(session.user); @@ -31,13 +28,13 @@ export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => { if (foundSubscription) { return getPortalSession({ customerId: stripeCustomer.id, - returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, + returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`, }); } return getCheckoutSession({ customerId: stripeCustomer.id, priceId, - returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`, + returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`, }); }; diff --git a/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx b/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx index e9977b8f3..27f39a6b1 100644 --- a/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx +++ b/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx @@ -1,9 +1,10 @@ import { ImageResponse } from 'next/og'; import { NextResponse } from 'next/server'; -import { env } from 'next-runtime-env'; import { P, match } from 'ts-pattern'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; + import type { ShareHandlerAPIResponse } from '~/pages/api/share'; export const runtime = 'edge'; @@ -23,8 +24,6 @@ type SharePageOpenGraphImageProps = { }; export async function GET(_request: Request, { params: { slug } }: SharePageOpenGraphImageProps) { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const [interSemiBold, interRegular, caveatRegular, shareFrameImage] = await Promise.all([ fetch(new URL('@documenso/assets/fonts/inter-semibold.ttf', import.meta.url)).then( async (res) => res.arrayBuffer(), @@ -40,7 +39,7 @@ export async function GET(_request: Request, { params: { slug } }: SharePageOpen ), ]); - const baseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const baseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; const recipientOrSender: ShareHandlerAPIResponse = await fetch( new URL(`/api/share?slug=${slug}`, baseUrl), diff --git a/apps/web/src/app/(share)/share/[slug]/page.tsx b/apps/web/src/app/(share)/share/[slug]/page.tsx index ab530ba0b..80d991934 100644 --- a/apps/web/src/app/(share)/share/[slug]/page.tsx +++ b/apps/web/src/app/(share)/share/[slug]/page.tsx @@ -2,9 +2,7 @@ import type { Metadata } from 'next'; import { headers } from 'next/headers'; import { redirect } from 'next/navigation'; -import { env } from 'next-runtime-env'; - -import { APP_BASE_URL } from '@documenso/lib/constants/app'; +import { APP_BASE_URL, NEXT_PUBLIC_MARKETING_URL } from '@documenso/lib/constants/app'; type SharePageProps = { params: { slug: string }; @@ -18,20 +16,18 @@ export function generateMetadata({ params: { slug } }: SharePageProps) { title: 'Documenso - Join the open source signing revolution', description: 'I just signed with Documenso!', type: 'website', - images: [`${APP_BASE_URL}/share/${slug}/opengraph`], + images: [`${APP_BASE_URL()}/share/${slug}/opengraph`], }, twitter: { site: '@documenso', card: 'summary_large_image', - images: [`${APP_BASE_URL}/share/${slug}/opengraph`], + images: [`${APP_BASE_URL()}/share/${slug}/opengraph`], description: 'I just signed with Documenso!', }, } satisfies Metadata; } export default function SharePage() { - const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); - const userAgent = headers().get('User-Agent') ?? ''; // https://stackoverflow.com/questions/47026171/how-to-detect-bots-for-open-graph-with-user-agent @@ -39,5 +35,5 @@ export default function SharePage() { return null; } - redirect(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001'); + redirect(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001'); } diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx index 1e6619a46..606aa0f10 100644 --- a/apps/web/src/app/layout.tsx +++ b/apps/web/src/app/layout.tsx @@ -2,10 +2,11 @@ import { Suspense } from 'react'; import { Caveat, Inter } from 'next/font/google'; -import { PublicEnvScript, env } from 'next-runtime-env'; +import { PublicEnvScript } from 'next-runtime-env'; import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag'; import { LocaleProvider } from '@documenso/lib/client-only/providers/locale'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { getServerComponentAllFlags } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag'; import { getLocale } from '@documenso/lib/server-only/headers/get-locale'; import { TrpcProvider } from '@documenso/trpc/react'; @@ -21,8 +22,6 @@ import './globals.css'; const fontInter = Inter({ subsets: ['latin'], variable: '--font-sans' }); const fontCaveat = Caveat({ subsets: ['latin'], variable: '--font-signature' }); -const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - export const metadata = { title: { template: '%s - Documenso', @@ -39,12 +38,12 @@ export const metadata = { description: 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', type: 'website', - images: [`${NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`], + images: [`${NEXT_PUBLIC_WEBAPP_URL()}/opengraph-image.jpg`], }, twitter: { site: '@documenso', card: 'summary_large_image', - images: [`${NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`], + images: [`${NEXT_PUBLIC_WEBAPP_URL()}/opengraph-image.jpg`], description: 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', }, diff --git a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx index 727627ddd..a809ed23e 100644 --- a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx +++ b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx @@ -2,10 +2,9 @@ import React from 'react'; -import { env } from 'next-runtime-env'; - import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard'; import { getRecipientType } from '@documenso/lib/client-only/recipient-type'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter'; import type { Recipient } from '@documenso/prisma/client'; import { cn } from '@documenso/ui/lib/utils'; @@ -18,8 +17,6 @@ export type AvatarWithRecipientProps = { }; export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const [, copy] = useCopyToClipboard(); const { toast } = useToast(); @@ -28,7 +25,7 @@ export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) { return; } - void copy(`${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`).then(() => { + void copy(`${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`).then(() => { toast({ title: 'Copied to clipboard', description: 'The signing link has been copied to your clipboard.', diff --git a/apps/web/src/helpers/get-asset-buffer.ts b/apps/web/src/helpers/get-asset-buffer.ts index 12c27d1a5..871e669b1 100644 --- a/apps/web/src/helpers/get-asset-buffer.ts +++ b/apps/web/src/helpers/get-asset-buffer.ts @@ -1,4 +1,4 @@ -import { env } from 'next-runtime-env'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; /** * getAssetBuffer is used to retrieve array buffers for various assets @@ -10,9 +10,7 @@ import { env } from 'next-runtime-env'; * @param path The path to the asset, relative to the `public` folder. */ export const getAssetBuffer = async (path: string) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - - const baseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const baseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; return fetch(new URL(path, baseUrl)).then(async (res) => res.arrayBuffer()); }; diff --git a/packages/ee/server-only/limits/client.ts b/packages/ee/server-only/limits/client.ts index 9bb2bd0ac..fa31e6e40 100644 --- a/packages/ee/server-only/limits/client.ts +++ b/packages/ee/server-only/limits/client.ts @@ -11,7 +11,7 @@ export type GetLimitsOptions = { export const getLimits = async ({ headers }: GetLimitsOptions = {}) => { const requestHeaders = headers ?? {}; - const url = new URL('/api/limits', APP_BASE_URL ?? 'http://localhost:3000'); + const url = new URL('/api/limits', APP_BASE_URL() ?? 'http://localhost:3000'); return fetch(url, { headers: { diff --git a/packages/lib/constants/app.ts b/packages/lib/constants/app.ts index cee5a7586..0675bb84b 100644 --- a/packages/lib/constants/app.ts +++ b/packages/lib/constants/app.ts @@ -1,12 +1,13 @@ import { env } from 'next-runtime-env'; -const NEXT_PUBLIC_PROJECT = process.env.NEXT_PUBLIC_PROJECT; -const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); -const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); +export const NEXT_PUBLIC_PROJECT = () => env('NEXT_PUBLIC_PROJECT'); +export const NEXT_PUBLIC_WEBAPP_URL = () => env('NEXT_PUBLIC_WEBAPP_URL'); +export const NEXT_PUBLIC_MARKETING_URL = () => env('NEXT_PUBLIC_MARKETING_URL'); -export const IS_APP_MARKETING = NEXT_PUBLIC_PROJECT === 'marketing'; -export const IS_APP_WEB = NEXT_PUBLIC_PROJECT === 'web'; +export const IS_APP_MARKETING = () => NEXT_PUBLIC_PROJECT() === 'marketing'; +export const IS_APP_WEB = () => NEXT_PUBLIC_PROJECT() === 'web'; -export const APP_FOLDER = IS_APP_MARKETING ? 'marketing' : 'web'; +export const APP_FOLDER = () => (IS_APP_MARKETING() ? 'marketing' : 'web'); -export const APP_BASE_URL = IS_APP_WEB ? NEXT_PUBLIC_WEBAPP_URL : NEXT_PUBLIC_MARKETING_URL; +export const APP_BASE_URL = () => + IS_APP_WEB() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PUBLIC_MARKETING_URL(); diff --git a/packages/lib/constants/crypto.ts b/packages/lib/constants/crypto.ts index 40d3ef113..74f306a53 100644 --- a/packages/lib/constants/crypto.ts +++ b/packages/lib/constants/crypto.ts @@ -2,15 +2,15 @@ export const DOCUMENSO_ENCRYPTION_KEY = process.env.NEXT_PRIVATE_ENCRYPTION_KEY; export const DOCUMENSO_ENCRYPTION_SECONDARY_KEY = process.env.NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY; -if (!DOCUMENSO_ENCRYPTION_KEY || !DOCUMENSO_ENCRYPTION_SECONDARY_KEY) { - throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY or DOCUMENSO_ENCRYPTION_SECONDARY_KEY keys'); -} +// if (!DOCUMENSO_ENCRYPTION_KEY || !DOCUMENSO_ENCRYPTION_SECONDARY_KEY) { +// throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY or DOCUMENSO_ENCRYPTION_SECONDARY_KEY keys'); +// } -if (DOCUMENSO_ENCRYPTION_KEY === DOCUMENSO_ENCRYPTION_SECONDARY_KEY) { - throw new Error( - 'DOCUMENSO_ENCRYPTION_KEY and DOCUMENSO_ENCRYPTION_SECONDARY_KEY cannot be equal', - ); -} +// if (DOCUMENSO_ENCRYPTION_KEY === DOCUMENSO_ENCRYPTION_SECONDARY_KEY) { +// throw new Error( +// 'DOCUMENSO_ENCRYPTION_KEY and DOCUMENSO_ENCRYPTION_SECONDARY_KEY cannot be equal', +// ); +// } if (DOCUMENSO_ENCRYPTION_KEY === 'CAFEBABE') { console.warn('*********************************************************************'); diff --git a/packages/lib/constants/feature-flags.ts b/packages/lib/constants/feature-flags.ts index a0e958e3a..d33db549e 100644 --- a/packages/lib/constants/feature-flags.ts +++ b/packages/lib/constants/feature-flags.ts @@ -2,8 +2,8 @@ import { env } from 'next-runtime-env'; 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'); +const NEXT_PUBLIC_FEATURE_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED'); +const NEXT_PUBLIC_POSTHOG_KEY = () => env('NEXT_PUBLIC_POSTHOG_KEY'); /** * The flag name for global session recording feature flag. @@ -21,7 +21,7 @@ export const FEATURE_FLAG_POLL_INTERVAL = 30000; * Does not take any person or group properties into account. */ export const LOCAL_FEATURE_FLAGS: Record = { - app_billing: NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true', + app_billing: NEXT_PUBLIC_FEATURE_BILLING_ENABLED() === 'true', marketing_header_single_player_mode: false, } as const; @@ -29,8 +29,8 @@ export const LOCAL_FEATURE_FLAGS: Record = { * Extract the PostHog configuration from the environment. */ export function extractPostHogConfig(): { key: string; host: string } | null { - const postHogKey = NEXT_PUBLIC_POSTHOG_KEY; - const postHogHost = `${APP_BASE_URL}/ingest`; + const postHogKey = NEXT_PUBLIC_POSTHOG_KEY(); + const postHogHost = `${APP_BASE_URL()}/ingest`; if (!postHogKey || !postHogHost) { return null; diff --git a/packages/lib/constants/pdf.ts b/packages/lib/constants/pdf.ts index eba72ab56..19663ef58 100644 --- a/packages/lib/constants/pdf.ts +++ b/packages/lib/constants/pdf.ts @@ -6,4 +6,4 @@ export const DEFAULT_HANDWRITING_FONT_SIZE = 50; export const MIN_STANDARD_FONT_SIZE = 8; export const MIN_HANDWRITING_FONT_SIZE = 20; -export const CAVEAT_FONT_PATH = `${APP_BASE_URL}/fonts/caveat.ttf`; +export const CAVEAT_FONT_PATH = () => `${APP_BASE_URL()}/fonts/caveat.ttf`; diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 4823833cc..8f324d248 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -17,8 +17,6 @@ import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa import { getUserByEmail } from '../server-only/user/get-user-by-email'; import { ErrorCode } from './error-codes'; -const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP'); - export const NEXT_AUTH_OPTIONS: AuthOptions = { adapter: PrismaAdapter(prisma), secret: process.env.NEXTAUTH_SECRET ?? 'secret', @@ -186,7 +184,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { async signIn({ user }) { // We do this to stop OAuth providers from creating an account // when signups are disabled - if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { + if (env('NEXT_PUBLIC_DISABLE_SIGNUP') === 'true') { const userData = await getUserByEmail({ email: user.email! }); return !!userData; diff --git a/packages/lib/server-only/auth/send-confirmation-email.ts b/packages/lib/server-only/auth/send-confirmation-email.ts index c808e8f3d..3e1ac920d 100644 --- a/packages/lib/server-only/auth/send-confirmation-email.ts +++ b/packages/lib/server-only/auth/send-confirmation-email.ts @@ -1,20 +1,19 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { ConfirmEmailTemplate } from '@documenso/email/templates/confirm-email'; import { prisma } from '@documenso/prisma'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; + export interface SendConfirmationEmailProps { userId: number; } export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailProps) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const NEXT_PRIVATE_SMTP_FROM_NAME = env('NEXT_PRIVATE_SMTP_FROM_NAME'); - const NEXT_PRIVATE_SMTP_FROM_ADDRESS = env('NEXT_PRIVATE_SMTP_FROM_ADDRESS'); + const NEXT_PRIVATE_SMTP_FROM_NAME = process.env.NEXT_PRIVATE_SMTP_FROM_NAME; + const NEXT_PRIVATE_SMTP_FROM_ADDRESS = process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS; const user = await prisma.user.findFirstOrThrow({ where: { @@ -36,7 +35,7 @@ export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailPro throw new Error('Verification token not found for the user'); } - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; const confirmationLink = `${assetBaseUrl}/verify-email/${verificationToken.token}`; const senderName = NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso'; const senderAdress = NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com'; diff --git a/packages/lib/server-only/auth/send-forgot-password.ts b/packages/lib/server-only/auth/send-forgot-password.ts index 125db9338..6e3a582a8 100644 --- a/packages/lib/server-only/auth/send-forgot-password.ts +++ b/packages/lib/server-only/auth/send-forgot-password.ts @@ -1,19 +1,17 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { ForgotPasswordTemplate } from '@documenso/email/templates/forgot-password'; import { prisma } from '@documenso/prisma'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; + export interface SendForgotPasswordOptions { userId: number; } export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const user = await prisma.user.findFirstOrThrow({ where: { id: userId, @@ -33,8 +31,8 @@ export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions) } const token = user.PasswordResetToken[0].token; - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; - const resetPasswordLink = `${NEXT_PUBLIC_WEBAPP_URL}/reset-password/${token}`; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; + const resetPasswordLink = `${NEXT_PUBLIC_WEBAPP_URL()}/reset-password/${token}`; const template = createElement(ForgotPasswordTemplate, { assetBaseUrl, diff --git a/packages/lib/server-only/auth/send-reset-password.ts b/packages/lib/server-only/auth/send-reset-password.ts index 3dcec113c..6bcd5820d 100644 --- a/packages/lib/server-only/auth/send-reset-password.ts +++ b/packages/lib/server-only/auth/send-reset-password.ts @@ -1,26 +1,24 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { ResetPasswordTemplate } from '@documenso/email/templates/reset-password'; import { prisma } from '@documenso/prisma'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; + export interface SendResetPasswordOptions { userId: number; } export const sendResetPassword = async ({ userId }: SendResetPasswordOptions) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const user = await prisma.user.findFirstOrThrow({ where: { id: userId, }, }); - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; const template = createElement(ResetPasswordTemplate, { assetBaseUrl, diff --git a/packages/lib/server-only/document/delete-document.ts b/packages/lib/server-only/document/delete-document.ts index 58b1f48a9..a5cf96cdd 100644 --- a/packages/lib/server-only/document/delete-document.ts +++ b/packages/lib/server-only/document/delete-document.ts @@ -2,14 +2,13 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import DocumentCancelTemplate from '@documenso/email/templates/document-cancel'; import { prisma } from '@documenso/prisma'; import { DocumentStatus } from '@documenso/prisma/client'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; import { FROM_ADDRESS, FROM_NAME } from '../../constants/email'; export type DeleteDocumentOptions = { @@ -18,8 +17,6 @@ export type DeleteDocumentOptions = { status: DocumentStatus; }; -const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptions) => { // if the document is a draft, hard-delete if (status === DocumentStatus.DRAFT) { @@ -53,7 +50,7 @@ export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptio if (document.Recipient.length > 0) { await Promise.all( document.Recipient.map(async (recipient) => { - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; const template = createElement(DocumentCancelTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx index a048cf600..85e148a57 100644 --- a/packages/lib/server-only/document/resend-document.tsx +++ b/packages/lib/server-only/document/resend-document.tsx @@ -1,7 +1,5 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite'; @@ -10,14 +8,14 @@ import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-em import { prisma } from '@documenso/prisma'; import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; + export type ResendDocumentOptions = { documentId: number; userId: number; recipients: number[]; }; -const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - export const resendDocument = async ({ documentId, userId, recipients }: ResendDocumentOptions) => { const user = await prisma.user.findFirstOrThrow({ where: { @@ -71,8 +69,8 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD 'document.name': document.title, }; - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; - const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; + const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`; const template = createElement(DocumentInviteEmailTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/document/send-completed-email.ts b/packages/lib/server-only/document/send-completed-email.ts index 9b624a23c..c7134d164 100644 --- a/packages/lib/server-only/document/send-completed-email.ts +++ b/packages/lib/server-only/document/send-completed-email.ts @@ -1,12 +1,11 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed'; import { prisma } from '@documenso/prisma'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; import { getFile } from '../../universal/upload/get-file'; export interface SendDocumentOptions { @@ -14,8 +13,6 @@ export interface SendDocumentOptions { } export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const document = await prisma.document.findUnique({ where: { id: documentId, @@ -40,12 +37,12 @@ export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => document.Recipient.map(async (recipient) => { const { email, name, token } = recipient; - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; const template = createElement(DocumentCompletedEmailTemplate, { documentName: document.title, assetBaseUrl, - downloadLink: `${NEXT_PUBLIC_WEBAPP_URL}/sign/${token}/complete`, + downloadLink: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${token}/complete`, }); await mailer.sendMail({ diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx index f72c79792..86f610cc9 100644 --- a/packages/lib/server-only/document/send-document.tsx +++ b/packages/lib/server-only/document/send-document.tsx @@ -1,7 +1,5 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite'; @@ -10,14 +8,14 @@ import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-em import { prisma } from '@documenso/prisma'; import { DocumentStatus, SendStatus } from '@documenso/prisma/client'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; + export type SendDocumentOptions = { documentId: number; userId: number; }; export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const user = await prisma.user.findFirstOrThrow({ where: { id: userId, @@ -63,8 +61,8 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) return; } - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; - const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; + const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`; const template = createElement(DocumentInviteEmailTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/document/send-pending-email.ts b/packages/lib/server-only/document/send-pending-email.ts index abbecd72a..73e938a7d 100644 --- a/packages/lib/server-only/document/send-pending-email.ts +++ b/packages/lib/server-only/document/send-pending-email.ts @@ -1,20 +1,18 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; - import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentPendingEmailTemplate } from '@documenso/email/templates/document-pending'; import { prisma } from '@documenso/prisma'; +import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; + export interface SendPendingEmailOptions { documentId: number; recipientId: number; } export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingEmailOptions) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const document = await prisma.document.findFirst({ where: { id: documentId, @@ -45,7 +43,7 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE const { email, name } = recipient; - const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000'; const template = createElement(DocumentPendingEmailTemplate, { documentName: document.title, diff --git a/packages/lib/server-only/feature-flags/all.ts b/packages/lib/server-only/feature-flags/all.ts index fff6cd855..71efd5425 100644 --- a/packages/lib/server-only/feature-flags/all.ts +++ b/packages/lib/server-only/feature-flags/all.ts @@ -1,20 +1,17 @@ import { NextRequest, NextResponse } from 'next/server'; import { getToken } from 'next-auth/jwt'; -import { env } from 'next-runtime-env'; import { LOCAL_FEATURE_FLAGS } from '@documenso/lib/constants/feature-flags'; import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client'; +import { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; import { extractDistinctUserId, mapJwtToFlagProperties } from './get'; /** * Get all the evaluated feature flags based on the current user if possible. */ export default async function handlerFeatureFlagAll(req: Request) { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); - const requestHeaders = Object.fromEntries(req.headers.entries()); const nextReq = new NextRequest(req, { @@ -42,11 +39,11 @@ export default async function handlerFeatureFlagAll(req: Request) { const origin = req.headers.get('origin'); if (origin) { - if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) { + if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000')) { res.headers.set('Access-Control-Allow-Origin', origin); } - if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) { + if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001')) { res.headers.set('Access-Control-Allow-Origin', origin); } } diff --git a/packages/lib/server-only/feature-flags/get.ts b/packages/lib/server-only/feature-flags/get.ts index 6f8a2c011..5b2b3b7fd 100644 --- a/packages/lib/server-only/feature-flags/get.ts +++ b/packages/lib/server-only/feature-flags/get.ts @@ -3,11 +3,12 @@ import { NextRequest, NextResponse } from 'next/server'; import { nanoid } from 'nanoid'; import type { JWT } from 'next-auth/jwt'; import { getToken } from 'next-auth/jwt'; -import { env } from 'next-runtime-env'; import { LOCAL_FEATURE_FLAGS, extractPostHogConfig } from '@documenso/lib/constants/feature-flags'; import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client'; +import { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; + /** * Evaluate a single feature flag based on the current user if possible. * @@ -15,9 +16,6 @@ import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-po * @returns A Response with the feature flag value. */ export default async function handleFeatureFlagGet(req: Request) { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL'); - const { searchParams } = new URL(req.url ?? ''); const flag = searchParams.get('flag'); @@ -62,11 +60,11 @@ export default async function handleFeatureFlagGet(req: Request) { const origin = req.headers.get('Origin'); if (origin) { - if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) { + if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000')) { res.headers.set('Access-Control-Allow-Origin', origin); } - if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) { + if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001')) { res.headers.set('Access-Control-Allow-Origin', origin); } } diff --git a/packages/lib/server-only/pdf/insert-text-in-pdf.ts b/packages/lib/server-only/pdf/insert-text-in-pdf.ts index 248702b6e..d5120341c 100644 --- a/packages/lib/server-only/pdf/insert-text-in-pdf.ts +++ b/packages/lib/server-only/pdf/insert-text-in-pdf.ts @@ -12,7 +12,7 @@ export async function insertTextInPDF( useHandwritingFont = true, ): Promise { // Fetch the font file from the public URL. - const fontResponse = await fetch(CAVEAT_FONT_PATH); + const fontResponse = await fetch(CAVEAT_FONT_PATH()); const fontCaveat = await fontResponse.arrayBuffer(); const pdfDoc = await PDFDocument.load(pdfAsBase64); diff --git a/packages/lib/universal/get-base-url.ts b/packages/lib/universal/get-base-url.ts index b7c9d4ea4..7f9380047 100644 --- a/packages/lib/universal/get-base-url.ts +++ b/packages/lib/universal/get-base-url.ts @@ -1,7 +1,5 @@ /* eslint-disable turbo/no-undeclared-env-vars */ -import { env } from 'next-runtime-env'; - -const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); +import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app'; export const getBaseUrl = () => { if (typeof window !== 'undefined') { @@ -12,8 +10,10 @@ export const getBaseUrl = () => { return `https://${process.env.VERCEL_URL}`; } - if (NEXT_PUBLIC_WEBAPP_URL) { - return NEXT_PUBLIC_WEBAPP_URL; + const webAppUrl = NEXT_PUBLIC_WEBAPP_URL(); + + if (webAppUrl) { + return webAppUrl; } return `http://localhost:${process.env.PORT ?? 3000}`; diff --git a/packages/lib/universal/get-feature-flag.ts b/packages/lib/universal/get-feature-flag.ts index 0fc0aa131..f4650f691 100644 --- a/packages/lib/universal/get-feature-flag.ts +++ b/packages/lib/universal/get-feature-flag.ts @@ -22,7 +22,7 @@ export const getFlag = async ( return LOCAL_FEATURE_FLAGS[flag] ?? true; } - const url = new URL(`${APP_BASE_URL}/api/feature-flag/get`); + const url = new URL(`${APP_BASE_URL()}/api/feature-flag/get`); url.searchParams.set('flag', flag); const response = await fetch(url, { @@ -55,7 +55,7 @@ export const getAllFlags = async ( return LOCAL_FEATURE_FLAGS; } - const url = new URL(`${APP_BASE_URL}/api/feature-flag/all`); + const url = new URL(`${APP_BASE_URL()}/api/feature-flag/all`); return fetch(url, { headers: { @@ -80,7 +80,7 @@ export const getAllAnonymousFlags = async (): Promise Promise; }; -const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT'); - export const putFile = async (file: File) => { + const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT'); + const { type, data } = await match(NEXT_PUBLIC_UPLOAD_TRANSPORT) .with('s3', async () => putFileInS3(file)) .otherwise(async () => putFileInDatabase(file)); diff --git a/packages/lib/universal/upload/server-actions.ts b/packages/lib/universal/upload/server-actions.ts index 61429cd86..fd4bfc57a 100644 --- a/packages/lib/universal/upload/server-actions.ts +++ b/packages/lib/universal/upload/server-actions.ts @@ -18,8 +18,6 @@ import { APP_BASE_URL } from '../../constants/app'; import { ONE_HOUR, ONE_SECOND } from '../../constants/time'; import { alphaid } from '../id'; -const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT'); - export const getPresignPostUrl = async (fileName: string, contentType: string) => { const client = getS3Client(); @@ -28,8 +26,10 @@ export const getPresignPostUrl = async (fileName: string, contentType: string) = let token: JWT | null = null; try { + const baseUrl = APP_BASE_URL() ?? 'http://localhost:3000'; + token = await getToken({ - req: new NextRequest(APP_BASE_URL ?? 'http://localhost:3000', { + req: new NextRequest(baseUrl, { headers: headers(), }), }); @@ -120,6 +120,8 @@ export const deleteS3File = async (key: string) => { }; const getS3Client = () => { + const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT'); + if (NEXT_PUBLIC_UPLOAD_TRANSPORT !== 's3') { throw new Error('Invalid upload transport'); } diff --git a/packages/trpc/server/auth-router/router.ts b/packages/trpc/server/auth-router/router.ts index 0debd7f8d..65fe8d296 100644 --- a/packages/trpc/server/auth-router/router.ts +++ b/packages/trpc/server/auth-router/router.ts @@ -9,12 +9,12 @@ import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-conf import { authenticatedProcedure, procedure, router } from '../trpc'; import { ZSignUpMutationSchema, ZVerifyPasswordMutationSchema } from './schema'; -const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP'); +const NEXT_PUBLIC_DISABLE_SIGNUP = () => env('NEXT_PUBLIC_DISABLE_SIGNUP'); export const authRouter = router({ signup: procedure.input(ZSignUpMutationSchema).mutation(async ({ input }) => { try { - if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { + if (NEXT_PUBLIC_DISABLE_SIGNUP() === 'true') { throw new TRPCError({ code: 'BAD_REQUEST', message: 'Signups are disabled.', diff --git a/packages/trpc/server/singleplayer-router/router.ts b/packages/trpc/server/singleplayer-router/router.ts index cb92aa7a4..4b4c12c0a 100644 --- a/packages/trpc/server/singleplayer-router/router.ts +++ b/packages/trpc/server/singleplayer-router/router.ts @@ -1,11 +1,11 @@ import { createElement } from 'react'; -import { env } from 'next-runtime-env'; import { PDFDocument } from 'pdf-lib'; import { mailer } from '@documenso/email/mailer'; import { renderAsync } from '@documenso/email/render'; import { DocumentSelfSignedEmailTemplate } from '@documenso/email/templates/document-self-signed'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { FROM_ADDRESS, FROM_NAME, SERVICE_USER_EMAIL } from '@documenso/lib/constants/email'; import { insertFieldInPDF } from '@documenso/lib/server-only/pdf/insert-field-in-pdf'; import { alphaid } from '@documenso/lib/universal/id'; @@ -25,8 +25,6 @@ import { procedure, router } from '../trpc'; import { mapField } from './helper'; import { ZCreateSinglePlayerDocumentMutationSchema } from './schema'; -const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); - export const singleplayerRouter = router({ createSinglePlayerDocument: procedure .input(ZCreateSinglePlayerDocumentMutationSchema) @@ -151,7 +149,7 @@ export const singleplayerRouter = router({ const template = createElement(DocumentSelfSignedEmailTemplate, { documentName: documentName, - assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000', + assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000', }); const [html, text] = await Promise.all([ diff --git a/packages/ui/components/document/document-share-button.tsx b/packages/ui/components/document/document-share-button.tsx index f304d92c0..e20e677c7 100644 --- a/packages/ui/components/document/document-share-button.tsx +++ b/packages/ui/components/document/document-share-button.tsx @@ -4,10 +4,10 @@ import type { HTMLAttributes } from 'react'; import React, { useState } from 'react'; import { Copy, Sparkles } from 'lucide-react'; -import { env } from 'next-runtime-env'; import { FaXTwitter } from 'react-icons/fa6'; import { useCopyShareLink } from '@documenso/lib/client-only/hooks/use-copy-share-link'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; import { TOAST_DOCUMENT_SHARE_ERROR, TOAST_DOCUMENT_SHARE_SUCCESS, @@ -39,7 +39,6 @@ export const DocumentShareButton = ({ className, trigger, }: DocumentShareButtonProps) => { - const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL'); const { toast } = useToast(); const { copyShareLink, createAndCopyShareLink, isCopyingShareLink } = useCopyShareLink({ @@ -70,7 +69,7 @@ export const DocumentShareButton = ({ const onCopyClick = async () => { if (shareLink) { - await copyShareLink(`${NEXT_PUBLIC_WEBAPP_URL}/share/${shareLink.slug}`); + await copyShareLink(`${NEXT_PUBLIC_WEBAPP_URL()}/share/${shareLink.slug}`); } else { await createAndCopyShareLink({ token, @@ -94,7 +93,7 @@ export const DocumentShareButton = ({ } // Ensuring we've prewarmed the opengraph image for the Twitter - await fetch(`${NEXT_PUBLIC_WEBAPP_URL}/share/${slug}/opengraph`, { + await fetch(`${NEXT_PUBLIC_WEBAPP_URL()}/share/${slug}/opengraph`, { // We don't care about the response, so we can use no-cors mode: 'no-cors', }); @@ -102,7 +101,7 @@ export const DocumentShareButton = ({ window.open( generateTwitterIntent( `I just ${token ? 'signed' : 'sent'} a document in style with @documenso. Check it out!`, - `${NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`, + `${NEXT_PUBLIC_WEBAPP_URL()}/share/${slug}`, ), '_blank', ); @@ -150,7 +149,7 @@ export const DocumentShareButton = ({ 'animate-pulse': !shareLink?.slug, })} > - {NEXT_PUBLIC_WEBAPP_URL}/share/{shareLink?.slug || '...'} + {NEXT_PUBLIC_WEBAPP_URL()}/share/{shareLink?.slug || '...'}

{shareLink?.slug && ( sharing link From 3541a805e5477570396fa8cfab59429946c9ff75 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Wed, 31 Jan 2024 18:16:07 +0530 Subject: [PATCH 088/311] chore: add migration file Signed-off-by: Adithya Krishna --- .../20240131120410_add_document_meta_redirect_url/migration.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 packages/prisma/migrations/20240131120410_add_document_meta_redirect_url/migration.sql diff --git a/packages/prisma/migrations/20240131120410_add_document_meta_redirect_url/migration.sql b/packages/prisma/migrations/20240131120410_add_document_meta_redirect_url/migration.sql new file mode 100644 index 000000000..0eb8a1175 --- /dev/null +++ b/packages/prisma/migrations/20240131120410_add_document_meta_redirect_url/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "DocumentMeta" ADD COLUMN "redirectUrl" TEXT; From f4c24fd9441fb8ff2224b0ef73dc6a019baf802f Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Wed, 31 Jan 2024 18:17:43 +0530 Subject: [PATCH 089/311] feat: add a feature for redirecting users on signing Signed-off-by: Adithya Krishna --- .../documents/[id]/edit-document.tsx | 5 ++-- .../document-meta/upsert-document-meta.ts | 8 +++++-- packages/prisma/schema.prisma | 1 + .../trpc/server/document-router/router.ts | 3 ++- .../trpc/server/document-router/schema.ts | 1 + .../primitives/document-flow/add-subject.tsx | 24 ++++++++++++++++++- .../document-flow/add-subject.types.ts | 1 + 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx index 2159b87f2..546452352 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx @@ -149,7 +149,7 @@ export const EditDocumentForm = ({ }; const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => { - const { subject, message, timezone, dateFormat } = data.meta; + const { subject, message, timezone, dateFormat, redirectUrl } = data.meta; try { await sendDocument({ @@ -157,8 +157,9 @@ export const EditDocumentForm = ({ meta: { subject, message, - timezone, dateFormat, + timezone, + redirectUrl, }, }); diff --git a/packages/lib/server-only/document-meta/upsert-document-meta.ts b/packages/lib/server-only/document-meta/upsert-document-meta.ts index b67c6848b..b5e1dc553 100644 --- a/packages/lib/server-only/document-meta/upsert-document-meta.ts +++ b/packages/lib/server-only/document-meta/upsert-document-meta.ts @@ -9,6 +9,7 @@ export type CreateDocumentMetaOptions = { timezone?: string; password?: string; dateFormat?: string; + redirectUrl?: string; userId: number; }; @@ -20,6 +21,7 @@ export const upsertDocumentMeta = async ({ documentId, userId, password, + redirectUrl, }: CreateDocumentMetaOptions) => { await prisma.document.findFirstOrThrow({ where: { @@ -35,17 +37,19 @@ export const upsertDocumentMeta = async ({ create: { subject, message, + password, dateFormat, timezone, - password, documentId, + redirectUrl, }, update: { subject, message, - dateFormat, password, + dateFormat, timezone, + redirectUrl, }, }); }; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index e1549e072..35da3dbd6 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -166,6 +166,7 @@ model DocumentMeta { dateFormat String? @db.Text @default("yyyy-MM-dd hh:mm a") documentId Int @unique document Document @relation(fields: [documentId], references: [id], onDelete: Cascade) + redirectUrl String? @db.Text } enum ReadStatus { diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts index 9dba63797..304788525 100644 --- a/packages/trpc/server/document-router/router.ts +++ b/packages/trpc/server/document-router/router.ts @@ -216,13 +216,14 @@ export const documentRouter = router({ try { const { documentId, meta } = input; - if (meta.message || meta.subject || meta.timezone || meta.dateFormat) { + if (meta.message || meta.subject || meta.timezone || meta.dateFormat || meta.redirectUrl) { await upsertDocumentMeta({ documentId, subject: meta.subject, message: meta.message, dateFormat: meta.dateFormat, timezone: meta.timezone, + redirectUrl: meta.redirectUrl, userId: ctx.user.id, }); } diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts index c4389bdfb..ddf945bfe 100644 --- a/packages/trpc/server/document-router/schema.ts +++ b/packages/trpc/server/document-router/schema.ts @@ -70,6 +70,7 @@ export const ZSendDocumentMutationSchema = z.object({ message: z.string(), timezone: z.string(), dateFormat: z.string(), + redirectUrl: z.string().optional(), }), }); diff --git a/packages/ui/primitives/document-flow/add-subject.tsx b/packages/ui/primitives/document-flow/add-subject.tsx index 8fef8af7b..2b361e7fa 100644 --- a/packages/ui/primitives/document-flow/add-subject.tsx +++ b/packages/ui/primitives/document-flow/add-subject.tsx @@ -60,7 +60,6 @@ export const AddSubjectFormPartial = ({ register, handleSubmit, formState: { errors, isSubmitting, touchedFields }, - getValues, setValue, } = useForm({ defaultValues: { @@ -69,6 +68,7 @@ export const AddSubjectFormPartial = ({ message: document.documentMeta?.message ?? '', timezone: document.documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE, dateFormat: document.documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT, + redirectUrl: document.documentMeta?.redirectUrl ?? '', }, }, }); @@ -214,6 +214,28 @@ export const AddSubjectFormPartial = ({ )} />
+ +
+
+
+ + + + + +
+
+
diff --git a/packages/ui/primitives/document-flow/add-subject.types.ts b/packages/ui/primitives/document-flow/add-subject.types.ts index ea14f4c0f..285b8f813 100644 --- a/packages/ui/primitives/document-flow/add-subject.types.ts +++ b/packages/ui/primitives/document-flow/add-subject.types.ts @@ -9,6 +9,7 @@ export const ZAddSubjectFormSchema = z.object({ message: z.string(), timezone: z.string().optional().default(DEFAULT_DOCUMENT_TIME_ZONE), dateFormat: z.string().optional().default(DEFAULT_DOCUMENT_DATE_FORMAT), + redirectUrl: z.string().optional(), }), }); From 7fbf124b895de5a120c675e4d66f8277551d6aaf Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Thu, 1 Feb 2024 01:10:50 +0000 Subject: [PATCH 090/311] fix: use div instead of rnd for preview fields --- .../documents/[id]/edit-document.tsx | 2 +- .../ui/primitives/document-flow/add-title.tsx | 9 ++- .../document-flow/show-field-item.tsx | 62 +++---------------- 3 files changed, 18 insertions(+), 55 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx index 2159b87f2..af1877a64 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx @@ -218,9 +218,9 @@ export const EditDocumentForm = ({ diff --git a/packages/ui/primitives/document-flow/add-title.tsx b/packages/ui/primitives/document-flow/add-title.tsx index afce0d9e0..730c4248f 100644 --- a/packages/ui/primitives/document-flow/add-title.tsx +++ b/packages/ui/primitives/document-flow/add-title.tsx @@ -17,6 +17,7 @@ import { DocumentFlowFormContainerHeader, DocumentFlowFormContainerStep, } from './document-flow-root'; +import { ShowFieldItem } from './show-field-item'; import type { DocumentFlowStep } from './types'; export type AddTitleFormProps = { @@ -29,8 +30,8 @@ export type AddTitleFormProps = { export const AddTitleFormPartial = ({ documentFlow, - recipients: _recipients, - fields: _fields, + recipients, + fields, document, onSubmit, }: AddTitleFormProps) => { @@ -55,6 +56,10 @@ export const AddTitleFormPartial = ({ description={documentFlow.description} /> + {fields.map((field, index) => ( + + ))} +
diff --git a/packages/ui/primitives/document-flow/show-field-item.tsx b/packages/ui/primitives/document-flow/show-field-item.tsx index 7aee9c602..4e4a0dc99 100644 --- a/packages/ui/primitives/document-flow/show-field-item.tsx +++ b/packages/ui/primitives/document-flow/show-field-item.tsx @@ -1,12 +1,9 @@ 'use client'; -import { useCallback, useEffect, useState } from 'react'; - import type { Prisma } from '@prisma/client'; import { createPortal } from 'react-dom'; -import { Rnd } from 'react-rnd'; -import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer'; +import { useFieldPageCoords } from '@documenso/lib/client-only/hooks/use-field-page-coords'; import { cn } from '../../lib/utils'; import { Card, CardContent } from '../card'; @@ -18,59 +15,20 @@ export type ShowFieldItemProps = { }; export const ShowFieldItem = ({ field, recipients }: ShowFieldItemProps) => { - const [coords, setCoords] = useState({ - pageX: Number(field.positionX), - pageY: Number(field.positionY), - pageHeight: Number(field.height), - pageWidth: Number(field.width), - }); + const coords = useFieldPageCoords(field); const signerEmail = recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? ''; - const calculateCoords = useCallback(() => { - const $page = document.querySelector( - `${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${field.page}"]`, - ); - - if (!$page) { - return; - } - - const { height, width } = $page.getBoundingClientRect(); - - const top = $page.getBoundingClientRect().top + window.scrollY; - const left = $page.getBoundingClientRect().left + window.scrollX; - - const pageX = (Number(field.positionX) / 100) * width + left; - const pageY = (Number(field.positionY) / 100) * height + top; - - const pageHeight = (Number(field.height) / 100) * height; - const pageWidth = (Number(field.width) / 100) * width; - - setCoords({ - pageX: pageX, - pageY: pageY, - pageHeight: pageHeight, - pageWidth: pageWidth, - }); - }, [field.page, field.positionX, field.positionY, field.height, field.width]); - - useEffect(() => { - calculateCoords(); - }, [calculateCoords]); - return createPortal( - {

-
, +
, document.body, ); }; From 56683aa99897f098cc7d536d4fe73adccc0363e3 Mon Sep 17 00:00:00 2001 From: Apoorv Taneja Date: Thu, 1 Feb 2024 13:44:37 +0530 Subject: [PATCH 091/311] fix: Added signing pad disable state while submitting form (#892) Fixes : #891 --- apps/marketing/src/components/(marketing)/widget.tsx | 1 + apps/web/src/app/(signing)/sign/[token]/form.tsx | 1 + apps/web/src/components/forms/profile.tsx | 6 ++---- apps/web/src/components/forms/signup.tsx | 1 + packages/ui/primitives/signature-pad/signature-pad.tsx | 8 +++++++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/marketing/src/components/(marketing)/widget.tsx b/apps/marketing/src/components/(marketing)/widget.tsx index 80c13b275..d4305a04c 100644 --- a/apps/marketing/src/components/(marketing)/widget.tsx +++ b/apps/marketing/src/components/(marketing)/widget.tsx @@ -399,6 +399,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => { { setSignature(value); diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index 7036f4e43..2c278292f 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -121,10 +121,8 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { onChange(v ?? '')} /> diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index ebfbf72c9..f38ab15d1 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -172,6 +172,7 @@ export const SignUpForm = ({ className, isGoogleSSOEnabled }: SignUpFormProps) = onChange(v ?? '')} /> diff --git a/packages/ui/primitives/signature-pad/signature-pad.tsx b/packages/ui/primitives/signature-pad/signature-pad.tsx index 80bac0e18..eb9403df4 100644 --- a/packages/ui/primitives/signature-pad/signature-pad.tsx +++ b/packages/ui/primitives/signature-pad/signature-pad.tsx @@ -16,6 +16,7 @@ const DPI = 2; export type SignaturePadProps = Omit, 'onChange'> & { onChange?: (_signatureDataUrl: string | null) => void; containerClassName?: string; + disabled?: boolean; }; export const SignaturePad = ({ @@ -23,6 +24,7 @@ export const SignaturePad = ({ containerClassName, defaultValue, onChange, + disabled = false, ...props }: SignaturePadProps) => { const $el = useRef(null); @@ -214,7 +216,11 @@ export const SignaturePad = ({ }, [defaultValue]); return ( -
+
Date: Fri, 2 Feb 2024 03:00:02 +0530 Subject: [PATCH 092/311] fix: active-tab changes correctly (#897) fixes: #890 --- apps/web/src/app/(dashboard)/documents/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/app/(dashboard)/documents/page.tsx b/apps/web/src/app/(dashboard)/documents/page.tsx index e61aad649..5780df1dc 100644 --- a/apps/web/src/app/(dashboard)/documents/page.tsx +++ b/apps/web/src/app/(dashboard)/documents/page.tsx @@ -74,7 +74,7 @@ export default async function DocumentsPage({ searchParams = {} }: DocumentsPage

Documents

- + {[ ExtendedDocumentStatus.INBOX, From 7ece6ef239a3efc12efe102b5f76b33d7bac458b Mon Sep 17 00:00:00 2001 From: Hani Date: Thu, 1 Feb 2024 18:45:02 -0500 Subject: [PATCH 093/311] feat: add recipient roles (#716) Fixes #705 --------- Co-authored-by: Lucas Smith Co-authored-by: David Nguyen --- apps/marketing/content/blog/linear-gh.mdx | 2 +- .../app/(marketing)/singleplayer/client.tsx | 1 + .../documents/data-table-action-button.tsx | 35 +++- .../documents/data-table-action-dropdown.tsx | 36 +++- .../(signing)/sign/[token]/complete/page.tsx | 7 +- .../src/app/(signing)/sign/[token]/form.tsx | 158 +++++++++++------- .../src/app/(signing)/sign/[token]/page.tsx | 7 +- .../(signing)/sign/[token]/sign-dialog.tsx | 20 ++- .../avatar/avatar-with-recipient.tsx | 14 +- .../avatar/stack-avatars-with-tooltip.tsx | 8 +- .../template-document-invite.tsx | 13 +- packages/email/templates/document-invite.tsx | 11 +- packages/lib/client-only/recipient-type.ts | 6 +- packages/lib/constants/recipient-roles.ts | 26 +++ .../server-only/document/find-documents.ts | 8 +- .../server-only/document/resend-document.tsx | 13 +- .../lib/server-only/document/seal-document.ts | 5 +- .../server-only/document/send-document.tsx | 17 +- .../recipient/set-recipients-for-document.ts | 9 + .../migration.sql | 5 + packages/prisma/schema.prisma | 8 + .../trpc/server/document-router/schema.ts | 3 +- .../trpc/server/recipient-router/router.ts | 1 + .../trpc/server/recipient-router/schema.ts | 3 + .../primitives/document-flow/add-fields.tsx | 145 ++++++++++------ .../primitives/document-flow/add-signers.tsx | 57 ++++++- .../document-flow/add-signers.types.ts | 3 + .../primitives/document-flow/add-subject.tsx | 1 - 28 files changed, 466 insertions(+), 156 deletions(-) create mode 100644 packages/lib/constants/recipient-roles.ts create mode 100644 packages/prisma/migrations/20231202220928_add_recipient_roles/migration.sql diff --git a/apps/marketing/content/blog/linear-gh.mdx b/apps/marketing/content/blog/linear-gh.mdx index 27b1ae208..1267931d6 100644 --- a/apps/marketing/content/blog/linear-gh.mdx +++ b/apps/marketing/content/blog/linear-gh.mdx @@ -109,7 +109,7 @@ It's similar to the Kanban board for the development backlog. While the internal design backlog also existed in Linear, the public design repository is new. Since designing in the open is tricky, we opted to publish the detailed design artifacts with the corresponding feature instead. We already have design.documenso.com housing our general design system. Here, we will publish the specifics of how we applied this to each feature. We will publish the first artifacts here soon, what may be in the cards can be found on the [LIVE Roadmap](https://documen.so/live). -Feel free to connect with us on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord) if you have any questions or comments! We're always here to help and would love to hear from you :) +Feel free to connect with us on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord) if you have any questions or comments! We're always here to help and would love to hear from you :) Best from Hamburg\ Timur diff --git a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx b/apps/marketing/src/app/(marketing)/singleplayer/client.tsx index 389528bf8..a1b56257a 100644 --- a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx +++ b/apps/marketing/src/app/(marketing)/singleplayer/client.tsx @@ -158,6 +158,7 @@ export const SinglePlayerClient = () => { readStatus: 'OPENED', signingStatus: 'NOT_SIGNED', sendStatus: 'NOT_SENT', + role: 'SIGNER', }; const onFileDrop = async (file: File) => { diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx index 9910ef111..ecddf1190 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx @@ -2,13 +2,13 @@ import Link from 'next/link'; -import { Download, Edit, Pencil } from 'lucide-react'; +import { CheckCircle, Download, Edit, EyeIcon, Pencil } from 'lucide-react'; import { useSession } from 'next-auth/react'; import { match } from 'ts-pattern'; import { downloadPDF } from '@documenso/lib/client-only/download-pdf'; import type { Document, Recipient, User } from '@documenso/prisma/client'; -import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; +import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import type { DocumentWithData } from '@documenso/prisma/types/document-with-data'; import { trpc as trpcClient } from '@documenso/trpc/client'; import { Button } from '@documenso/ui/primitives/button'; @@ -37,6 +37,7 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => { const isPending = row.status === DocumentStatus.PENDING; const isComplete = row.status === DocumentStatus.COMPLETED; const isSigned = recipient?.signingStatus === SigningStatus.SIGNED; + const role = recipient?.role; const onDownloadClick = async () => { try { @@ -68,6 +69,11 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => { } }; + // TODO: Consider if want to keep this logic for hiding viewing for CC'ers + if (recipient?.role === RecipientRole.CC && isComplete === false) { + return null; + } + return match({ isOwner, isRecipient, @@ -87,15 +93,32 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => { .with({ isRecipient: true, isPending: true, isSigned: false }, () => ( )) .with({ isPending: true, isSigned: true }, () => ( )) .with({ isComplete: true }, () => ( diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx index f14321b35..e1d9b64bb 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx @@ -5,9 +5,11 @@ import { useState } from 'react'; import Link from 'next/link'; import { + CheckCircle, Copy, Download, Edit, + EyeIcon, Loader, MoreHorizontal, Pencil, @@ -19,7 +21,7 @@ import { useSession } from 'next-auth/react'; import { downloadPDF } from '@documenso/lib/client-only/download-pdf'; import type { Document, Recipient, User } from '@documenso/prisma/client'; -import { DocumentStatus } from '@documenso/prisma/client'; +import { DocumentStatus, RecipientRole } from '@documenso/prisma/client'; import type { DocumentWithData } from '@documenso/prisma/types/document-with-data'; import { trpc as trpcClient } from '@documenso/trpc/client'; import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button'; @@ -105,12 +107,32 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) = Action - - - - Sign - - + {recipient?.role !== RecipientRole.CC && ( + + + {recipient?.role === RecipientRole.VIEWER && ( + <> + + View + + )} + + {recipient?.role === RecipientRole.SIGNER && ( + <> + + Sign + + )} + + {recipient?.role === RecipientRole.APPROVER && ( + <> + + Approve + + )} + + + )} diff --git a/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx b/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx index 3d5814113..a64831804 100644 --- a/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx @@ -10,7 +10,7 @@ import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token'; import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token'; import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures'; -import { DocumentStatus, FieldType } from '@documenso/prisma/client'; +import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/client'; import { DocumentDownloadButton } from '@documenso/ui/components/document/document-download-button'; import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button'; import { SigningCard3D } from '@documenso/ui/components/signing-card'; @@ -94,7 +94,10 @@ export default async function CompletedSigningPage({ ))}

- You have signed + You have + {recipient.role === RecipientRole.SIGNER && ' signed '} + {recipient.role === RecipientRole.VIEWER && ' viewed '} + {recipient.role === RecipientRole.APPROVER && ' approved '} "{truncatedTitle}"

diff --git a/apps/web/src/app/(signing)/sign/[token]/form.tsx b/apps/web/src/app/(signing)/sign/[token]/form.tsx index 65dab5e61..7105baafd 100644 --- a/apps/web/src/app/(signing)/sign/[token]/form.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/form.tsx @@ -9,7 +9,7 @@ import { useForm } from 'react-hook-form'; import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics'; import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields'; -import type { Document, Field, Recipient } from '@documenso/prisma/client'; +import { type Document, type Field, type Recipient, RecipientRole } from '@documenso/prisma/client'; import { trpc } from '@documenso/trpc/react'; import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip'; import { cn } from '@documenso/ui/lib/utils'; @@ -96,74 +96,114 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =
-
-

Sign Document

+
+

+ {recipient.role === RecipientRole.VIEWER && 'View Document'} + {recipient.role === RecipientRole.SIGNER && 'Sign Document'} + {recipient.role === RecipientRole.APPROVER && 'Approve Document'} +

-

- Please review the document before signing. -

+ {recipient.role === RecipientRole.VIEWER ? ( + <> +

+ Please mark as viewed to complete +

-
+
-
-
-
- +
+
+
+ - setFullName(e.target.value.trimStart())} - /> + +
+ + ) : ( + <> +

+ Please review the document before signing. +

-
- +
- - - { - setSignature(value); - }} +
+
+
+ + + setFullName(e.target.value.trimStart())} /> - - +
+ +
+ + + + + { + setSignature(value); + }} + /> + + +
+
+ +
+ + + +
-
- -
- - - -
-
+ + )}
diff --git a/apps/web/src/app/(signing)/sign/[token]/page.tsx b/apps/web/src/app/(signing)/sign/[token]/page.tsx index 004c59329..7e025593c 100644 --- a/apps/web/src/app/(signing)/sign/[token]/page.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/page.tsx @@ -14,7 +14,7 @@ import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-f import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token'; import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures'; import { symmetricDecrypt } from '@documenso/lib/universal/crypto'; -import { DocumentStatus, FieldType, SigningStatus } from '@documenso/prisma/client'; +import { DocumentStatus, FieldType, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import { Card, CardContent } from '@documenso/ui/primitives/card'; import { ElementVisible } from '@documenso/ui/primitives/element-visible'; import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer'; @@ -110,7 +110,10 @@ export default async function SigningPage({ params: { token } }: SigningPageProp

- {document.User.name} ({document.User.email}) has invited you to sign this document. + {document.User.name} ({document.User.email}) has invited you to{' '} + {recipient.role === RecipientRole.VIEWER && 'view'} + {recipient.role === RecipientRole.SIGNER && 'sign'} + {recipient.role === RecipientRole.APPROVER && 'approve'} this document.

diff --git a/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx b/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx index 1e86e99bc..a9aedbc3d 100644 --- a/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx @@ -1,6 +1,7 @@ import { useState } from 'react'; import type { Document, Field } from '@documenso/prisma/client'; +import { RecipientRole } from '@documenso/prisma/client'; import { Button } from '@documenso/ui/primitives/button'; import { Dialog, @@ -17,6 +18,7 @@ export type SignDialogProps = { fields: Field[]; fieldsValidated: () => void | Promise; onSignatureComplete: () => void | Promise; + role: RecipientRole; }; export const SignDialog = ({ @@ -25,6 +27,7 @@ export const SignDialog = ({ fields, fieldsValidated, onSignatureComplete, + role, }: SignDialogProps) => { const [showDialog, setShowDialog] = useState(false); const truncatedTitle = truncateTitle(document.title); @@ -45,9 +48,18 @@ export const SignDialog = ({
-
Sign Document
+
+ {role === RecipientRole.VIEWER && 'Mark Document as Viewed'} + {role === RecipientRole.SIGNER && 'Sign Document'} + {role === RecipientRole.APPROVER && 'Approve Document'} +
- You are about to finish signing "{truncatedTitle}". Are you sure? + {role === RecipientRole.VIEWER && + `You are about to finish viewing "${truncatedTitle}". Are you sure?`} + {role === RecipientRole.SIGNER && + `You are about to finish signing "${truncatedTitle}". Are you sure?`} + {role === RecipientRole.APPROVER && + `You are about to finish approving "${truncatedTitle}". Are you sure?`}
@@ -71,7 +83,9 @@ export const SignDialog = ({ loading={isSubmitting} onClick={onSignatureComplete} > - Sign + {role === RecipientRole.VIEWER && 'Mark as Viewed'} + {role === RecipientRole.SIGNER && 'Sign'} + {role === RecipientRole.APPROVER && 'Approve'}
diff --git a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx index d04b3a998..46182c36e 100644 --- a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx +++ b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx @@ -4,6 +4,7 @@ import React from 'react'; import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard'; 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 { cn } from '@documenso/ui/lib/utils'; @@ -47,8 +48,17 @@ export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) { type={getRecipientType(recipient)} fallbackText={recipientAbbreviation(recipient)} /> - - {recipient.email} +
+
+

{recipient.email}

+

+ {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName} +

+
+
); } diff --git a/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx b/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx index 7429d8ee5..bd7bea2b0 100644 --- a/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx +++ b/apps/web/src/components/(dashboard)/avatar/stack-avatars-with-tooltip.tsx @@ -1,4 +1,5 @@ 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 { @@ -59,7 +60,12 @@ export const StackAvatarsWithTooltip = ({ type={getRecipientType(recipient)} fallbackText={recipientAbbreviation(recipient)} /> - {recipient.email} +
+

{recipient.email}

+

+ {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName} +

+
))}
diff --git a/packages/email/template-components/template-document-invite.tsx b/packages/email/template-components/template-document-invite.tsx index 216a3183d..b958e9029 100644 --- a/packages/email/template-components/template-document-invite.tsx +++ b/packages/email/template-components/template-document-invite.tsx @@ -1,3 +1,6 @@ +import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles'; +import type { RecipientRole } from '@documenso/prisma/client'; + import { Button, Section, Text } from '../components'; import { TemplateDocumentImage } from './template-document-image'; @@ -7,6 +10,7 @@ export interface TemplateDocumentInviteProps { documentName: string; signDocumentLink: string; assetBaseUrl: string; + role: RecipientRole; } export const TemplateDocumentInvite = ({ @@ -14,19 +18,22 @@ export const TemplateDocumentInvite = ({ documentName, signDocumentLink, assetBaseUrl, + role, }: TemplateDocumentInviteProps) => { + const { actionVerb, progressiveVerb } = RECIPIENT_ROLES_DESCRIPTION[role]; + return ( <>
- {inviterName} has invited you to sign + {inviterName} has invited you to {actionVerb.toLowerCase()}
"{documentName}"
- Continue by signing the document. + Continue by {progressiveVerb.toLowerCase()} the document.
@@ -34,7 +41,7 @@ export const TemplateDocumentInvite = ({ className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline" href={signDocumentLink} > - Sign Document + {actionVerb} Document
diff --git a/packages/email/templates/document-invite.tsx b/packages/email/templates/document-invite.tsx index d6a45d5fc..d3bceb872 100644 --- a/packages/email/templates/document-invite.tsx +++ b/packages/email/templates/document-invite.tsx @@ -1,3 +1,5 @@ +import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles'; +import type { RecipientRole } from '@documenso/prisma/client'; import config from '@documenso/tailwind-config'; import { @@ -19,6 +21,7 @@ import { TemplateFooter } from '../template-components/template-footer'; export type DocumentInviteEmailTemplateProps = Partial & { customBody?: string; + role: RecipientRole; }; export const DocumentInviteEmailTemplate = ({ @@ -28,8 +31,11 @@ export const DocumentInviteEmailTemplate = ({ signDocumentLink = 'https://documenso.com', assetBaseUrl = 'http://localhost:3002', customBody, + role, }: DocumentInviteEmailTemplateProps) => { - const previewText = `${inviterName} has invited you to sign ${documentName}`; + const action = RECIPIENT_ROLES_DESCRIPTION[role].actionVerb.toLowerCase(); + + const previewText = `${inviterName} has invited you to ${action} ${documentName}`; const getAssetUrl = (path: string) => { return new URL(path, assetBaseUrl).toString(); @@ -64,6 +70,7 @@ export const DocumentInviteEmailTemplate = ({ documentName={documentName} signDocumentLink={signDocumentLink} assetBaseUrl={assetBaseUrl} + role={role} />
@@ -81,7 +88,7 @@ export const DocumentInviteEmailTemplate = ({ {customBody ? (
{customBody}
) : ( - `${inviterName} has invited you to sign the document "${documentName}".` + `${inviterName} has invited you to ${action} the document "${documentName}".` )} diff --git a/packages/lib/client-only/recipient-type.ts b/packages/lib/client-only/recipient-type.ts index 8b5a8a528..44993796a 100644 --- a/packages/lib/client-only/recipient-type.ts +++ b/packages/lib/client-only/recipient-type.ts @@ -1,10 +1,10 @@ import type { Recipient } from '@documenso/prisma/client'; -import { ReadStatus, SendStatus, SigningStatus } from '@documenso/prisma/client'; +import { ReadStatus, RecipientRole, SendStatus, SigningStatus } from '@documenso/prisma/client'; export const getRecipientType = (recipient: Recipient) => { if ( - recipient.sendStatus === SendStatus.SENT && - recipient.signingStatus === SigningStatus.SIGNED + recipient.role === RecipientRole.CC || + (recipient.sendStatus === SendStatus.SENT && recipient.signingStatus === SigningStatus.SIGNED) ) { return 'completed'; } diff --git a/packages/lib/constants/recipient-roles.ts b/packages/lib/constants/recipient-roles.ts new file mode 100644 index 000000000..920cf1f32 --- /dev/null +++ b/packages/lib/constants/recipient-roles.ts @@ -0,0 +1,26 @@ +import { RecipientRole } from '@documenso/prisma/client'; + +export const RECIPIENT_ROLES_DESCRIPTION: { + [key in RecipientRole]: { actionVerb: string; progressiveVerb: string; roleName: string }; +} = { + [RecipientRole.APPROVER]: { + actionVerb: 'Approve', + progressiveVerb: 'Approving', + roleName: 'Approver', + }, + [RecipientRole.CC]: { + actionVerb: 'CC', + progressiveVerb: 'CC', + roleName: 'CC', + }, + [RecipientRole.SIGNER]: { + actionVerb: 'Sign', + progressiveVerb: 'Signing', + roleName: 'Signer', + }, + [RecipientRole.VIEWER]: { + actionVerb: 'View', + progressiveVerb: 'Viewing', + roleName: 'Viewer', + }, +}; diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts index 2929c515b..8d367dbe4 100644 --- a/packages/lib/server-only/document/find-documents.ts +++ b/packages/lib/server-only/document/find-documents.ts @@ -3,7 +3,7 @@ import { P, match } from 'ts-pattern'; import { prisma } from '@documenso/prisma'; import type { Document, Prisma } from '@documenso/prisma/client'; -import { SigningStatus } from '@documenso/prisma/client'; +import { RecipientRole, SigningStatus } from '@documenso/prisma/client'; import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status'; import type { FindResultSet } from '../../types/find-result-set'; @@ -87,6 +87,9 @@ export const findDocuments = async ({ some: { email: user.email, signingStatus: SigningStatus.NOT_SIGNED, + role: { + not: RecipientRole.CC, + }, }, }, deletedAt: null, @@ -109,6 +112,9 @@ export const findDocuments = async ({ some: { email: user.email, signingStatus: SigningStatus.SIGNED, + role: { + not: RecipientRole.CC, + }, }, }, deletedAt: null, diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx index da4ffcb58..4c7b66be8 100644 --- a/packages/lib/server-only/document/resend-document.tsx +++ b/packages/lib/server-only/document/resend-document.tsx @@ -6,7 +6,9 @@ import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template'; import { prisma } from '@documenso/prisma'; -import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; +import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; + +import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles'; export type ResendDocumentOptions = { documentId: number; @@ -59,6 +61,10 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD await Promise.all( document.Recipient.map(async (recipient) => { + if (recipient.role === RecipientRole.CC) { + return; + } + const { email, name } = recipient; const customEmailTemplate = { @@ -77,8 +83,11 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD assetBaseUrl, signDocumentLink, customBody: renderCustomEmailTemplate(customEmail?.message || '', customEmailTemplate), + role: recipient.role, }); + const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role]; + await mailer.sendMail({ to: { address: email, @@ -90,7 +99,7 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD }, subject: customEmail?.subject ? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate) - : 'Please sign this document', + : `Please ${actionVerb.toLowerCase()} this document`, html: render(template), text: render(template, { plainText: true }), }); diff --git a/packages/lib/server-only/document/seal-document.ts b/packages/lib/server-only/document/seal-document.ts index 5fa4b1a00..b24288c3e 100644 --- a/packages/lib/server-only/document/seal-document.ts +++ b/packages/lib/server-only/document/seal-document.ts @@ -6,7 +6,7 @@ import { PDFDocument } from 'pdf-lib'; import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client'; import { prisma } from '@documenso/prisma'; -import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; +import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import { signPdf } from '@documenso/signing'; import { getFile } from '../../universal/upload/get-file'; @@ -44,6 +44,9 @@ export const sealDocument = async ({ documentId, sendEmail = true }: SealDocumen const recipients = await prisma.recipient.findMany({ where: { documentId: document.id, + role: { + not: RecipientRole.CC, + }, }, }); diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx index 25dc132ba..82b37852b 100644 --- a/packages/lib/server-only/document/send-document.tsx +++ b/packages/lib/server-only/document/send-document.tsx @@ -6,7 +6,9 @@ import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template'; import { prisma } from '@documenso/prisma'; -import { DocumentStatus, SendStatus } from '@documenso/prisma/client'; +import { DocumentStatus, RecipientRole, SendStatus } from '@documenso/prisma/client'; + +import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles'; export type SendDocumentOptions = { documentId: number; @@ -47,6 +49,10 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) await Promise.all( document.Recipient.map(async (recipient) => { + if (recipient.sendStatus === SendStatus.SENT || recipient.role === RecipientRole.CC) { + return; + } + const { email, name } = recipient; const customEmailTemplate = { @@ -55,10 +61,6 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) 'document.name': document.title, }; - if (recipient.sendStatus === SendStatus.SENT) { - return; - } - const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; const signDocumentLink = `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`; @@ -69,8 +71,11 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) assetBaseUrl, signDocumentLink, customBody: renderCustomEmailTemplate(customEmail?.message || '', customEmailTemplate), + role: recipient.role, }); + const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role]; + await mailer.sendMail({ to: { address: email, @@ -82,7 +87,7 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) }, subject: customEmail?.subject ? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate) - : 'Please sign this document', + : `Please ${actionVerb.toLowerCase()} this document`, html: render(template), text: render(template, { plainText: true }), }); diff --git a/packages/lib/server-only/recipient/set-recipients-for-document.ts b/packages/lib/server-only/recipient/set-recipients-for-document.ts index 198f79be1..4917b213d 100644 --- a/packages/lib/server-only/recipient/set-recipients-for-document.ts +++ b/packages/lib/server-only/recipient/set-recipients-for-document.ts @@ -1,4 +1,5 @@ import { prisma } from '@documenso/prisma'; +import { RecipientRole } from '@documenso/prisma/client'; import { SendStatus, SigningStatus } from '@documenso/prisma/client'; import { nanoid } from '../../universal/id'; @@ -10,6 +11,7 @@ export interface SetRecipientsForDocumentOptions { id?: number | null; email: string; name: string; + role: RecipientRole; }[]; } @@ -79,13 +81,20 @@ export const setRecipientsForDocument = async ({ update: { name: recipient.name, email: recipient.email, + role: recipient.role, documentId, + signingStatus: + recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED, }, create: { name: recipient.name, email: recipient.email, + role: recipient.role, token: nanoid(), documentId, + sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT, + signingStatus: + recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED, }, }), ), diff --git a/packages/prisma/migrations/20231202220928_add_recipient_roles/migration.sql b/packages/prisma/migrations/20231202220928_add_recipient_roles/migration.sql new file mode 100644 index 000000000..441132300 --- /dev/null +++ b/packages/prisma/migrations/20231202220928_add_recipient_roles/migration.sql @@ -0,0 +1,5 @@ +-- CreateEnum +CREATE TYPE "RecipientRole" AS ENUM ('CC', 'SIGNER', 'VIEWER', 'APPROVER'); + +-- AlterTable +ALTER TABLE "Recipient" ADD COLUMN "role" "RecipientRole" NOT NULL DEFAULT 'SIGNER'; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 353a855ae..87d29d6b2 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -209,6 +209,13 @@ enum SigningStatus { SIGNED } +enum RecipientRole { + CC + SIGNER + VIEWER + APPROVER +} + model Recipient { id Int @id @default(autoincrement()) documentId Int? @@ -218,6 +225,7 @@ model Recipient { token String expired DateTime? signedAt DateTime? + role RecipientRole @default(SIGNER) readStatus ReadStatus @default(NOT_OPENED) signingStatus SigningStatus @default(NOT_SIGNED) sendStatus SendStatus @default(NOT_SENT) diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts index c4389bdfb..5d8c23c27 100644 --- a/packages/trpc/server/document-router/schema.ts +++ b/packages/trpc/server/document-router/schema.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; -import { DocumentStatus, FieldType } from '@documenso/prisma/client'; +import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/client'; export const ZGetDocumentByIdQuerySchema = z.object({ id: z.number().min(1), @@ -35,6 +35,7 @@ export const ZSetRecipientsForDocumentMutationSchema = z.object({ id: z.number().nullish(), email: z.string().min(1).email(), name: z.string(), + role: z.nativeEnum(RecipientRole), }), ), }); diff --git a/packages/trpc/server/recipient-router/router.ts b/packages/trpc/server/recipient-router/router.ts index 09097895c..1ada3d0d3 100644 --- a/packages/trpc/server/recipient-router/router.ts +++ b/packages/trpc/server/recipient-router/router.ts @@ -25,6 +25,7 @@ export const recipientRouter = router({ id: signer.nativeId, email: signer.email, name: signer.name, + role: signer.role, })), }); } catch (err) { diff --git a/packages/trpc/server/recipient-router/schema.ts b/packages/trpc/server/recipient-router/schema.ts index 8920e7672..a6b4e0d11 100644 --- a/packages/trpc/server/recipient-router/schema.ts +++ b/packages/trpc/server/recipient-router/schema.ts @@ -1,5 +1,7 @@ import { z } from 'zod'; +import { RecipientRole } from '@documenso/prisma/client'; + export const ZAddSignersMutationSchema = z .object({ documentId: z.number(), @@ -8,6 +10,7 @@ export const ZAddSignersMutationSchema = z nativeId: z.number().optional(), email: z.string().email().min(1), name: z.string(), + role: z.nativeEnum(RecipientRole), }), ), }) diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsx index afd09809d..74764df80 100644 --- a/packages/ui/primitives/document-flow/add-fields.tsx +++ b/packages/ui/primitives/document-flow/add-fields.tsx @@ -1,6 +1,6 @@ 'use client'; -import { useCallback, useEffect, useRef, useState } from 'react'; +import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Caveat } from 'next/font/google'; @@ -10,8 +10,10 @@ import { useFieldArray, useForm } from 'react-hook-form'; import { getBoundingClientRect } from '@documenso/lib/client-only/get-bounding-client-rect'; import { useDocumentElement } from '@documenso/lib/client-only/hooks/use-document-element'; import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer'; +import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles'; import { nanoid } from '@documenso/lib/universal/id'; import type { Field, Recipient } from '@documenso/prisma/client'; +import { RecipientRole } from '@documenso/prisma/client'; import { FieldType, SendStatus } from '@documenso/prisma/client'; import { cn } from '../../lib/utils'; @@ -102,6 +104,12 @@ export const AddFieldsFormPartial = ({ const hasSelectedSignerBeenSent = selectedSigner?.sendStatus === SendStatus.SENT; + const isFieldsDisabled = + !selectedSigner || + hasSelectedSignerBeenSent || + selectedSigner?.role === RecipientRole.VIEWER || + selectedSigner?.role === RecipientRole.CC; + const [isFieldWithinBounds, setIsFieldWithinBounds] = useState(false); const [coords, setCoords] = useState({ x: 0, @@ -281,12 +289,28 @@ export const AddFieldsFormPartial = ({ setSelectedSigner(recipients.find((r) => r.sendStatus !== SendStatus.SENT) ?? recipients[0]); }, [recipients]); + const recipientsByRole = useMemo(() => { + const recipientsByRole: Record = { + CC: [], + VIEWER: [], + SIGNER: [], + APPROVER: [], + }; + + recipients.forEach((recipient) => { + recipientsByRole[recipient.role].push(recipient); + }); + + return recipientsByRole; + }, [recipients]); + return ( <> +
{selectedField && ( @@ -351,72 +375,94 @@ export const AddFieldsFormPartial = ({ + No recipient matching this description was found. - - {recipients.map((recipient, index) => ( - { - setSelectedSigner(recipient); - setShowRecipientsSelector(false); - }} - > - {recipient.sendStatus !== SendStatus.SENT ? ( - - ) : ( - - - - - - This document has already been sent to this recipient. You can no - longer edit this recipient. - - - )} + {Object.entries(recipientsByRole).map(([role, recipients], roleIndex) => ( + +
+ { + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + RECIPIENT_ROLES_DESCRIPTION[role as RecipientRole].roleName + } +
- {recipient.name && ( + {recipients.length === 0 && ( +
+ No recipients with this role +
+ )} + + {recipients.map((recipient) => ( + { + setSelectedSigner(recipient); + setShowRecipientsSelector(false); + }} + > - {recipient.name} ({recipient.email}) - - )} + {recipient.name && ( + + {recipient.name} ({recipient.email}) + + )} - {!recipient.name && ( - - {recipient.email} + {!recipient.name && ( + {recipient.email} + )} - )} - - ))} -
+ +
+ {recipient.sendStatus !== SendStatus.SENT ? ( + + ) : ( + + + + + + + This document has already been sent to this recipient. You can no + longer edit this recipient. + + + )} +
+
+ ))} +
+ ))}
)}
-
+
-
+
diff --git a/packages/ui/primitives/document-flow/add-signers.tsx b/packages/ui/primitives/document-flow/add-signers.tsx index bd25cb87d..26aedcae7 100644 --- a/packages/ui/primitives/document-flow/add-signers.tsx +++ b/packages/ui/primitives/document-flow/add-signers.tsx @@ -4,19 +4,20 @@ import React, { useId } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; import { AnimatePresence, motion } from 'framer-motion'; -import { Plus, Trash } from 'lucide-react'; +import { BadgeCheck, Copy, Eye, PencilLine, Plus, Trash } from 'lucide-react'; import { Controller, useFieldArray, useForm } from 'react-hook-form'; import { useLimits } from '@documenso/ee/server-only/limits/provider/client'; import { nanoid } from '@documenso/lib/universal/id'; import type { Field, Recipient } from '@documenso/prisma/client'; -import { DocumentStatus, SendStatus } from '@documenso/prisma/client'; +import { DocumentStatus, RecipientRole, SendStatus } from '@documenso/prisma/client'; import type { DocumentWithData } from '@documenso/prisma/types/document-with-data'; import { Button } from '../button'; import { FormErrorMessage } from '../form/form-error-message'; import { Input } from '../input'; import { Label } from '../label'; +import { Select, SelectContent, SelectItem, SelectTrigger } from '../select'; import { useStep } from '../stepper'; import { useToast } from '../use-toast'; import type { TAddSignersFormSchema } from './add-signers.types'; @@ -31,6 +32,13 @@ import { import { ShowFieldItem } from './show-field-item'; import type { DocumentFlowStep } from './types'; +const ROLE_ICONS: Record = { + SIGNER: , + APPROVER: , + CC: , + VIEWER: , +}; + export type AddSignersFormProps = { documentFlow: DocumentFlowStep; recipients: Recipient[]; @@ -67,12 +75,14 @@ export const AddSignersFormPartial = ({ formId: String(recipient.id), name: recipient.name, email: recipient.email, + role: recipient.role, })) : [ { formId: initialId, name: '', email: '', + role: RecipientRole.SIGNER, }, ], }, @@ -104,6 +114,7 @@ export const AddSignersFormPartial = ({ formId: nanoid(12), name: '', email: '', + role: RecipientRole.SIGNER, }); }; @@ -189,6 +200,48 @@ export const AddSignersFormPartial = ({ />
+
+ ( + + )} + /> +
+
+ diff --git a/packages/lib/server-only/user/delete-user.ts b/packages/lib/server-only/user/delete-user.ts index df5132aff..13ab038d4 100644 --- a/packages/lib/server-only/user/delete-user.ts +++ b/packages/lib/server-only/user/delete-user.ts @@ -13,10 +13,32 @@ export const deleteUser = async ({ email }: DeleteUserOptions) => { }, }); + const defaultDeleteUser = await prisma.user.findFirst({ + where: { + email: 'deleted@documenso.com', + }, + }); + if (!user) { throw new Error(`User with email ${email} not found`); } + if (!defaultDeleteUser) { + throw new Error(`Default delete account not found`); + } + + await prisma.document.updateMany({ + where: { + userId: user.id, + status: { + in: ['PENDING', 'COMPLETED'], + }, + }, + data: { + userId: defaultDeleteUser.id, + }, + }); + return await prisma.user.delete({ where: { id: user.id, diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index cf5fdbf94..2cadfd574 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -139,10 +139,7 @@ export const profileRouter = router({ deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => { try { const user = ctx.user; - - const deletedUser = await deleteStripeCustomer(user); - - console.log(deletedUser); + await deleteStripeCustomer(user); return await deleteUser(user); } catch (err) { From 30752815e77138c269ccc8f901575268e2df4f86 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Mon, 5 Feb 2024 13:06:36 +0000 Subject: [PATCH 108/311] feat: soft-delete transfered documents --- packages/lib/server-only/user/delete-user.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/lib/server-only/user/delete-user.ts b/packages/lib/server-only/user/delete-user.ts index 13ab038d4..352f5c9e9 100644 --- a/packages/lib/server-only/user/delete-user.ts +++ b/packages/lib/server-only/user/delete-user.ts @@ -36,6 +36,7 @@ export const deleteUser = async ({ email }: DeleteUserOptions) => { }, data: { userId: defaultDeleteUser.id, + deletedAt: new Date(), }, }); From 0c339b78b65a63c8e9ca52a92266001fb394f183 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Tue, 6 Feb 2024 16:16:10 +1100 Subject: [PATCH 109/311] feat: add teams (#848) ## Description Add support for teams which will allow users to collaborate on documents. Teams features allows users to: - Create, manage and transfer teams - Manage team members - Manage team emails - Manage a shared team inbox and documents These changes do NOT include the following, which are planned for a future release: - Team templates - Team API - Search menu integration ## Testing Performed - Added E2E tests for general team management - Added E2E tests to validate document counts ## Checklist - [X] I have tested these changes locally and they work as expected. - [X] I have added/updated tests that prove the effectiveness of these changes. - [ ] I have updated the documentation to reflect these changes, if applicable. - [X] I have followed the project's coding style guidelines. --- apps/web/public/static/add-user.png | Bin 0 -> 3361 bytes apps/web/public/static/mail-open-alert.png | Bin 0 -> 3818 bytes apps/web/public/static/mail-open.png | Bin 0 -> 3839 bytes .../admin/documents/data-table.tsx | 8 +- .../users/[id]/multiselect-role-combobox.tsx | 4 +- .../app/(dashboard)/admin/users/[id]/page.tsx | 5 +- .../src/app/(dashboard)/admin/users/page.tsx | 5 +- .../documents/[id]/document-page-view.tsx | 131 +++++ .../documents/[id]/edit-document.tsx | 4 +- .../app/(dashboard)/documents/[id]/page.tsx | 119 +--- .../_action-items/resend-document.tsx | 12 +- .../documents/data-table-action-button.tsx | 31 +- .../documents/data-table-action-dropdown.tsx | 18 +- .../documents/data-table-sender-filter.tsx | 63 +++ .../app/(dashboard)/documents/data-table.tsx | 23 +- .../documents/documents-page-view.tsx | 158 ++++++ .../documents/duplicate-document-dialog.tsx | 11 +- .../src/app/(dashboard)/documents/page.tsx | 113 +--- .../(dashboard)/documents/upload-document.tsx | 30 +- apps/web/src/app/(dashboard)/layout.tsx | 9 +- .../billing/billing-portal-button.tsx | 12 +- .../app/(dashboard)/settings/billing/page.tsx | 19 +- .../app/(dashboard)/settings/profile/page.tsx | 7 +- .../(dashboard)/settings/security/page.tsx | 12 +- .../teams/accept-team-invitation-button.tsx | 45 ++ .../app/(dashboard)/settings/teams/page.tsx | 39 ++ .../settings/teams/team-email-usage.tsx | 105 ++++ .../settings/teams/team-invitations.tsx | 83 +++ .../templates/data-table-templates.tsx | 2 +- .../src/app/(signing)/sign/[token]/layout.tsx | 10 +- .../t/[teamUrl]/documents/[id]/page.tsx | 20 + .../(teams)/t/[teamUrl]/documents/page.tsx | 25 + .../web/src/app/(teams)/t/[teamUrl]/error.tsx | 54 ++ .../t/[teamUrl]/layout-billing-banner.tsx | 130 +++++ .../src/app/(teams)/t/[teamUrl]/layout.tsx | 65 +++ .../src/app/(teams)/t/[teamUrl]/not-found.tsx | 32 ++ .../t/[teamUrl]/settings/billing/page.tsx | 84 +++ .../(teams)/t/[teamUrl]/settings/layout.tsx | 54 ++ .../t/[teamUrl]/settings/members/page.tsx | 38 ++ .../app/(teams)/t/[teamUrl]/settings/page.tsx | 186 +++++++ .../settings/team-email-dropdown.tsx | 143 +++++ .../settings/team-transfer-status.tsx | 115 ++++ .../src/app/(unauthenticated)/signin/page.tsx | 23 +- .../src/app/(unauthenticated)/signup/page.tsx | 22 +- .../team/invite/[token]/page.tsx | 121 +++++ .../team/verify/email/[token]/page.tsx | 89 +++ .../team/verify/transfer/[token]/page.tsx | 80 +++ .../(dashboard)/common/command-menu.tsx | 17 +- .../(dashboard)/layout/desktop-nav.tsx | 38 +- .../components/(dashboard)/layout/header.tsx | 44 +- .../(dashboard)/layout/menu-switcher.tsx | 214 ++++++++ .../(dashboard)/layout/mobile-nav.tsx | 0 .../(dashboard)/layout/mobile-navigation.tsx | 96 ++++ .../(dashboard)/layout/profile-dropdown.tsx | 169 ------ .../period-selector/period-selector.tsx | 8 +- .../settings/layout/desktop-nav.tsx | 17 +- .../(dashboard)/settings/layout/header.tsx | 25 + .../settings/layout/mobile-nav.tsx | 17 +- .../(teams)/dialogs/add-team-email-dialog.tsx | 188 +++++++ .../dialogs/create-team-checkout-dialog.tsx | 177 ++++++ .../(teams)/dialogs/create-team-dialog.tsx | 223 ++++++++ .../(teams)/dialogs/delete-team-dialog.tsx | 160 ++++++ .../dialogs/delete-team-member-dialog.tsx | 107 ++++ .../dialogs/invite-team-member-dialog.tsx | 244 +++++++++ .../(teams)/dialogs/leave-team-dialog.tsx | 98 ++++ .../(teams)/dialogs/transfer-team-dialog.tsx | 293 ++++++++++ .../dialogs/update-team-email-dialog.tsx | 165 ++++++ .../dialogs/update-team-member-dialog.tsx | 185 +++++++ .../(teams)/forms/update-team-form.tsx | 173 ++++++ .../(teams)/settings/layout/desktop-nav.tsx | 67 +++ .../(teams)/settings/layout/mobile-nav.tsx | 75 +++ .../tables/current-user-teams-data-table.tsx | 158 ++++++ .../pending-user-teams-data-table-actions.tsx | 53 ++ .../tables/pending-user-teams-data-table.tsx | 145 +++++ .../team-billing-invoices-data-table.tsx | 152 ++++++ .../tables/team-member-invites-data-table.tsx | 203 +++++++ .../tables/team-members-data-table.tsx | 209 +++++++ .../tables/teams-member-page-data-table.tsx | 93 ++++ .../user-settings-teams-page-data-table.tsx | 83 +++ .../(teams)/team-billing-portal-button.tsx | 39 ++ apps/web/src/components/forms/signin.tsx | 5 +- apps/web/src/components/forms/signup.tsx | 5 +- apps/web/src/middleware.ts | 81 ++- package-lock.json | 133 +---- .../app-tests/e2e/fixtures/authentication.ts | 40 ++ .../e2e/pr-711-deletion-of-documents.spec.ts | 65 +-- ...dd-document-search-to-command-menu.spec.ts | 18 - .../app-tests/e2e/teams/manage-team.spec.ts | 87 +++ .../e2e/teams/team-documents.spec.ts | 282 ++++++++++ .../app-tests/e2e/teams/team-email.spec.ts | 102 ++++ .../app-tests/e2e/teams/team-members.spec.ts | 110 ++++ .../app-tests/e2e/teams/transfer-team.spec.ts | 69 +++ packages/app-tests/e2e/test-auth-flow.spec.ts | 2 +- packages/ee/server-only/limits/client.ts | 10 +- packages/ee/server-only/limits/constants.ts | 7 +- packages/ee/server-only/limits/handler.ts | 18 +- .../ee/server-only/limits/provider/client.tsx | 17 +- .../ee/server-only/limits/provider/server.tsx | 12 +- packages/ee/server-only/limits/server.ts | 74 ++- .../stripe/create-team-customer.ts | 20 + .../stripe/delete-customer-payment-methods.ts | 22 + .../stripe/get-checkout-session.ts | 7 + .../stripe/get-community-plan-prices.ts | 13 + .../ee/server-only/stripe/get-customer.ts | 15 +- .../ee/server-only/stripe/get-invoices.ts | 11 + .../server-only/stripe/get-portal-session.ts | 2 +- .../stripe/get-prices-by-interval.ts | 8 +- .../server-only/stripe/get-prices-by-plan.ts | 14 + .../server-only/stripe/get-prices-by-type.ts | 11 - .../ee/server-only/stripe/get-team-prices.ts | 43 ++ .../stripe/transfer-team-subscription.ts | 126 +++++ .../ee/server-only/stripe/update-customer.ts | 18 + .../update-subscription-item-quantity.ts | 44 ++ .../ee/server-only/stripe/webhook/handler.ts | 115 +++- .../stripe/webhook/on-subscription-updated.ts | 26 +- packages/email/static/add-user.png | Bin 0 -> 3361 bytes packages/email/static/mail-open-alert.png | Bin 0 -> 3818 bytes packages/email/static/mail-open.png | Bin 0 -> 3839 bytes .../template-components/template-image.tsx | 17 + packages/email/templates/confirm-email.tsx | 4 +- .../email/templates/confirm-team-email.tsx | 127 +++++ .../email/templates/team-email-removed.tsx | 83 +++ packages/email/templates/team-invite.tsx | 108 ++++ .../email/templates/team-transfer-request.tsx | 112 ++++ packages/lib/constants/app.ts | 9 +- packages/lib/constants/billing.ts | 11 + packages/lib/constants/teams.ts | 102 ++++ packages/lib/errors/app-error.ts | 144 +++++ packages/lib/server-only/crypto/decrypt.ts | 30 +- .../document-meta/upsert-document-meta.ts | 15 +- .../server-only/document/create-document.ts | 36 +- .../document/duplicate-document-by-id.ts | 35 +- .../server-only/document/find-documents.ts | 433 +++++++++++---- .../document/get-document-by-id.ts | 101 +++- .../lib/server-only/document/get-stats.ts | 186 +++++-- .../server-only/document/resend-document.tsx | 21 +- .../server-only/document/send-document.tsx | 15 +- .../lib/server-only/document/update-title.ts | 15 +- .../field/get-fields-for-document.ts | 15 +- .../field/set-fields-for-document.ts | 15 +- .../recipient/get-recipients-for-document.ts | 15 +- .../recipient/set-recipients-for-document.ts | 15 +- .../team/accept-team-invitation.ts | 63 +++ .../team/create-team-billing-portal.ts | 47 ++ .../team/create-team-checkout-session.ts | 52 ++ .../team/create-team-email-verification.ts | 132 +++++ .../team/create-team-member-invites.ts | 161 ++++++ packages/lib/server-only/team/create-team.ts | 207 +++++++ .../team/delete-team-email-verification.ts | 34 ++ .../lib/server-only/team/delete-team-email.ts | 93 ++++ .../team/delete-team-invitations.ts | 47 ++ .../server-only/team/delete-team-members.ts | 102 ++++ .../server-only/team/delete-team-pending.ts | 15 + .../team/delete-team-transfer-request.ts | 42 ++ packages/lib/server-only/team/delete-team.ts | 42 ++ .../server-only/team/find-team-invoices.ts | 52 ++ .../team/find-team-member-invites.ts | 91 ++++ .../lib/server-only/team/find-team-members.ts | 100 ++++ .../server-only/team/find-teams-pending.ts | 58 ++ packages/lib/server-only/team/find-teams.ts | 76 +++ .../team/get-team-email-by-email.ts | 22 + .../server-only/team/get-team-invitations.ts | 22 + .../lib/server-only/team/get-team-members.ts | 33 ++ packages/lib/server-only/team/get-team.ts | 95 ++++ packages/lib/server-only/team/get-teams.ts | 33 ++ packages/lib/server-only/team/leave-team.ts | 59 ++ .../team/request-team-ownership-transfer.ts | 106 ++++ .../team/resend-team-email-verification.ts | 65 +++ .../team/resend-team-member-invitation.ts | 76 +++ .../team/transfer-team-ownership.ts | 88 +++ .../lib/server-only/team/update-team-email.ts | 42 ++ .../server-only/team/update-team-member.ts | 92 ++++ packages/lib/server-only/team/update-team.ts | 65 +++ packages/lib/server-only/user/create-user.ts | 88 ++- packages/lib/utils/billing.ts | 16 + packages/lib/utils/params.ts | 30 ++ packages/lib/utils/recipient-formatter.ts | 4 +- packages/lib/utils/teams.ts | 42 ++ packages/lib/utils/token-verification.ts | 21 + .../20240205040421_add_teams/migration.sql | 187 +++++++ packages/prisma/package.json | 3 +- packages/prisma/schema.prisma | 109 +++- packages/prisma/seed/documents.ts | 375 +++++++++++++ packages/prisma/seed/teams.ts | 177 ++++++ packages/prisma/seed/users.ts | 34 ++ .../trpc/server/document-router/router.ts | 19 +- .../trpc/server/document-router/schema.ts | 3 + packages/trpc/server/router.ts | 4 +- packages/trpc/server/team-router/router.ts | 508 ++++++++++++++++++ packages/trpc/server/team-router/schema.ts | 213 ++++++++ .../animate/animate-generic-fade-in-out.tsx | 27 + packages/ui/package.json | 4 +- packages/ui/primitives/avatar.tsx | 35 +- packages/ui/primitives/badge.tsx | 3 +- packages/ui/primitives/button.tsx | 1 + packages/ui/primitives/command.tsx | 4 +- packages/ui/primitives/dialog.tsx | 5 +- .../primitives/document-flow/add-fields.tsx | 4 +- .../ui/primitives/multi-select-combobox.tsx | 165 ++++++ turbo.json | 1 - 200 files changed, 12916 insertions(+), 968 deletions(-) create mode 100644 apps/web/public/static/add-user.png create mode 100644 apps/web/public/static/mail-open-alert.png create mode 100644 apps/web/public/static/mail-open.png rename packages/ui/primitives/multiselect-combobox.tsx => apps/web/src/app/(dashboard)/admin/users/[id]/multiselect-role-combobox.tsx (95%) create mode 100644 apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx create mode 100644 apps/web/src/app/(dashboard)/documents/data-table-sender-filter.tsx create mode 100644 apps/web/src/app/(dashboard)/documents/documents-page-view.tsx create mode 100644 apps/web/src/app/(dashboard)/settings/teams/accept-team-invitation-button.tsx create mode 100644 apps/web/src/app/(dashboard)/settings/teams/page.tsx create mode 100644 apps/web/src/app/(dashboard)/settings/teams/team-email-usage.tsx create mode 100644 apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/error.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/layout.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/not-found.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/settings/billing/page.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/settings/layout.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/settings/members/page.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/settings/team-email-dropdown.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/settings/team-transfer-status.tsx create mode 100644 apps/web/src/app/(unauthenticated)/team/invite/[token]/page.tsx create mode 100644 apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx create mode 100644 apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx create mode 100644 apps/web/src/components/(dashboard)/layout/menu-switcher.tsx delete mode 100644 apps/web/src/components/(dashboard)/layout/mobile-nav.tsx create mode 100644 apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx delete mode 100644 apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx create mode 100644 apps/web/src/components/(dashboard)/settings/layout/header.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/add-team-email-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/create-team-checkout-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/create-team-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/delete-team-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/delete-team-member-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/update-team-email-dialog.tsx create mode 100644 apps/web/src/components/(teams)/dialogs/update-team-member-dialog.tsx create mode 100644 apps/web/src/components/(teams)/forms/update-team-form.tsx create mode 100644 apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx create mode 100644 apps/web/src/components/(teams)/settings/layout/mobile-nav.tsx create mode 100644 apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx create mode 100644 apps/web/src/components/(teams)/tables/pending-user-teams-data-table-actions.tsx create mode 100644 apps/web/src/components/(teams)/tables/pending-user-teams-data-table.tsx create mode 100644 apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx create mode 100644 apps/web/src/components/(teams)/tables/team-member-invites-data-table.tsx create mode 100644 apps/web/src/components/(teams)/tables/team-members-data-table.tsx create mode 100644 apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx create mode 100644 apps/web/src/components/(teams)/tables/user-settings-teams-page-data-table.tsx create mode 100644 apps/web/src/components/(teams)/team-billing-portal-button.tsx create mode 100644 packages/app-tests/e2e/fixtures/authentication.ts create mode 100644 packages/app-tests/e2e/teams/manage-team.spec.ts create mode 100644 packages/app-tests/e2e/teams/team-documents.spec.ts create mode 100644 packages/app-tests/e2e/teams/team-email.spec.ts create mode 100644 packages/app-tests/e2e/teams/team-members.spec.ts create mode 100644 packages/app-tests/e2e/teams/transfer-team.spec.ts create mode 100644 packages/ee/server-only/stripe/create-team-customer.ts create mode 100644 packages/ee/server-only/stripe/delete-customer-payment-methods.ts create mode 100644 packages/ee/server-only/stripe/get-community-plan-prices.ts create mode 100644 packages/ee/server-only/stripe/get-invoices.ts create mode 100644 packages/ee/server-only/stripe/get-prices-by-plan.ts delete mode 100644 packages/ee/server-only/stripe/get-prices-by-type.ts create mode 100644 packages/ee/server-only/stripe/get-team-prices.ts create mode 100644 packages/ee/server-only/stripe/transfer-team-subscription.ts create mode 100644 packages/ee/server-only/stripe/update-customer.ts create mode 100644 packages/ee/server-only/stripe/update-subscription-item-quantity.ts create mode 100644 packages/email/static/add-user.png create mode 100644 packages/email/static/mail-open-alert.png create mode 100644 packages/email/static/mail-open.png create mode 100644 packages/email/template-components/template-image.tsx create mode 100644 packages/email/templates/confirm-team-email.tsx create mode 100644 packages/email/templates/team-email-removed.tsx create mode 100644 packages/email/templates/team-invite.tsx create mode 100644 packages/email/templates/team-transfer-request.tsx create mode 100644 packages/lib/constants/billing.ts create mode 100644 packages/lib/constants/teams.ts create mode 100644 packages/lib/errors/app-error.ts create mode 100644 packages/lib/server-only/team/accept-team-invitation.ts create mode 100644 packages/lib/server-only/team/create-team-billing-portal.ts create mode 100644 packages/lib/server-only/team/create-team-checkout-session.ts create mode 100644 packages/lib/server-only/team/create-team-email-verification.ts create mode 100644 packages/lib/server-only/team/create-team-member-invites.ts create mode 100644 packages/lib/server-only/team/create-team.ts create mode 100644 packages/lib/server-only/team/delete-team-email-verification.ts create mode 100644 packages/lib/server-only/team/delete-team-email.ts create mode 100644 packages/lib/server-only/team/delete-team-invitations.ts create mode 100644 packages/lib/server-only/team/delete-team-members.ts create mode 100644 packages/lib/server-only/team/delete-team-pending.ts create mode 100644 packages/lib/server-only/team/delete-team-transfer-request.ts create mode 100644 packages/lib/server-only/team/delete-team.ts create mode 100644 packages/lib/server-only/team/find-team-invoices.ts create mode 100644 packages/lib/server-only/team/find-team-member-invites.ts create mode 100644 packages/lib/server-only/team/find-team-members.ts create mode 100644 packages/lib/server-only/team/find-teams-pending.ts create mode 100644 packages/lib/server-only/team/find-teams.ts create mode 100644 packages/lib/server-only/team/get-team-email-by-email.ts create mode 100644 packages/lib/server-only/team/get-team-invitations.ts create mode 100644 packages/lib/server-only/team/get-team-members.ts create mode 100644 packages/lib/server-only/team/get-team.ts create mode 100644 packages/lib/server-only/team/get-teams.ts create mode 100644 packages/lib/server-only/team/leave-team.ts create mode 100644 packages/lib/server-only/team/request-team-ownership-transfer.ts create mode 100644 packages/lib/server-only/team/resend-team-email-verification.ts create mode 100644 packages/lib/server-only/team/resend-team-member-invitation.ts create mode 100644 packages/lib/server-only/team/transfer-team-ownership.ts create mode 100644 packages/lib/server-only/team/update-team-email.ts create mode 100644 packages/lib/server-only/team/update-team-member.ts create mode 100644 packages/lib/server-only/team/update-team.ts create mode 100644 packages/lib/utils/billing.ts create mode 100644 packages/lib/utils/params.ts create mode 100644 packages/lib/utils/teams.ts create mode 100644 packages/lib/utils/token-verification.ts create mode 100644 packages/prisma/migrations/20240205040421_add_teams/migration.sql create mode 100644 packages/prisma/seed/documents.ts create mode 100644 packages/prisma/seed/teams.ts create mode 100644 packages/prisma/seed/users.ts create mode 100644 packages/trpc/server/team-router/router.ts create mode 100644 packages/trpc/server/team-router/schema.ts create mode 100644 packages/ui/components/animate/animate-generic-fade-in-out.tsx create mode 100644 packages/ui/primitives/multi-select-combobox.tsx diff --git a/apps/web/public/static/add-user.png b/apps/web/public/static/add-user.png new file mode 100644 index 0000000000000000000000000000000000000000..abd337ceb70d306c70f31d07f1c74e2ca34399be GIT binary patch literal 3361 zcmV++4c_vJP)Gv`oIefP1`wEzQaL0KGNQ&`y?Uh=78W#-p`*s);-W_U zGcz;iRRRbdVk;eN}Y;suHZD8npcaxE1d`GfO#C`k`2XJ3-i082610B20TR31@FMaS~g zQ2n%>OiOwhAenH=G)1|T;zU(6q<3Os!Yh?ZBXrnj3OF?w?a@cZ9`b|AoI8>eBbe3w z`1rV{f*rztIUFe(LL2ogqL9@TWB63kXP#&vne&=xGTl}U0F_VW5Q$sS#)4i{83OWy%E!lf zlHx?(gKc$;0>$`j7Jz&pKd|m`Z1%aaw!Av7xBRfIqRoHwL66e$fA;R(8_A%4v%vHo zOa`DleSh%a!70vPT<`yBpq2zj^`PAL`Uf=l{y*$#*iNMhOx6QPitqEYq9R7AqA}Jz zGc)sxN(o5~Hk8#LwxdUnE>a;*fBN)Er3q9pdd8`tp`o{`Qkz94!K9%u)%TQ235mRj zaz&Ab484Qif{LWRV3h_Sy&#zOzd?FY@q{Ja8S8!`?Abx#p)z@9u)(``@7``|ix=L# zd#BR?=6)f4>NXul-Z)=6VBuLSpfrlKJym&zRdD`(Y;0`Pix)2@W@l&hmoHy*l0bTx zfQQ28if5CoB0|~(C(;>g43`aUIvF4TBC&aY(X~lZ)v=L`co9F+IdtgIgv^($aCsY1N^CTVyRzhx8)VlMN$i+8pD>_kq#BI8i6eHPM4%eMKcdpRW)AMg_W?f=yWO5#iHhRDI_Y?=Z zMgL0H`ZT3czQ;DMgnbaH2!mkSojGvez_3aIH9f*a{lF&93RTG3n+f1ObwZpaV*d`J zF(`p4HXxeG#yP};UMXxO@rtC@?;WG_)3l$wa^=b-r^E5GF%XcCn$L>9`x>*2$PU3iTu6bk<$wK{p>!iD4X z&?jm86Ll|+hD5zcao;DB|4&ifrm#~Wl;ZLbmoex(*c1PV_R*@^RR?(+_<6bYb>Qah|le5^QA-PRfj)?xkPc}2PtlT}$gmRYu?kBJ1iT5s%yV3JLx&_PC&B$Y{4 zIhuFXHqh(dS#ellgxSM-s3CBt*I^@Wq@GJ0>Q*Q zLpG%PhrBo{jeW`vmQGSU=OL-^Ntu@8vwFburj7IPTzm>3HVH;M+uPd<*ZiX(7Owf* z1?*RvaDQcGklM z4f7d*QF`72j@v=o^=ev0%WE*MI)Pxoc!@v8bGNgurd#&WVTSoe@@ib!Fa#Iy6SM{@YiQQntX!Fg zSEN;ZO)T$iFu=}SXgqoM(9n?IKb_@;Y)yHa<+;e%N~Kakbs(^EU#~lF$!uHPl($(o zJ#`Jj$46!hq^W7Ma;SIoXgM5}@hRbuRD`wNBW;LRrfa!c3UaL^osxEmbLB9_fbS~ll-)B$ zf_gg9g9<^3LM#S2F4LA@D_zAemaGJV_ze!ybbuqYpmddRre^jkEKQEfzOLGt)J9Q_ zps@d8(hx>+(Q?0Ejl7`i*7?8>b=joam8)Y325hNRRY(XTL|H`0LbVAF(-1+Vif~G) zP!D-w6+~HiQ|+jhW6P*6d(Gd_8Sjbf8-nrmAVV(beAsZEWdH?T*Rlz+9j)m~r)#+# zIg7Lc$O5gBhF8b`y6)E*9;bD1h#yV@@{i847CQ}2f*o=R`C4S33%ft;dQcqI?zh7P r9fzHBaBy&NaBy&NaBy&NsEOYJQ|7+=Yxnzq00000NkvXXu0mjfB)pO| literal 0 HcmV?d00001 diff --git a/apps/web/public/static/mail-open-alert.png b/apps/web/public/static/mail-open-alert.png new file mode 100644 index 0000000000000000000000000000000000000000..1511f0bc539302bf3fc9de7e18283d8882861ffb GIT binary patch literal 3818 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 BjST<* literal 0 HcmV?d00001 diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx index 83ad81ca1..0fc660968 100644 --- a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx +++ b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx @@ -7,9 +7,9 @@ import Link from 'next/link'; import { Loader } from 'lucide-react'; import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; -import { FindResultSet } from '@documenso/lib/types/find-result-set'; -import { recipientInitials } from '@documenso/lib/utils/recipient-formatter'; -import { Document, User } from '@documenso/prisma/client'; +import type { FindResultSet } from '@documenso/lib/types/find-result-set'; +import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; +import type { Document, User } from '@documenso/prisma/client'; import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar'; import { DataTable } from '@documenso/ui/primitives/data-table'; import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination'; @@ -65,7 +65,7 @@ export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => { accessorKey: 'owner', cell: ({ row }) => { const avatarFallbackText = row.original.User.name - ? recipientInitials(row.original.User.name) + ? extractInitials(row.original.User.name) : row.original.User.email.slice(0, 1).toUpperCase(); return ( diff --git a/packages/ui/primitives/multiselect-combobox.tsx b/apps/web/src/app/(dashboard)/admin/users/[id]/multiselect-role-combobox.tsx similarity index 95% rename from packages/ui/primitives/multiselect-combobox.tsx rename to apps/web/src/app/(dashboard)/admin/users/[id]/multiselect-role-combobox.tsx index bac87ce0b..9a25af897 100644 --- a/packages/ui/primitives/multiselect-combobox.tsx +++ b/apps/web/src/app/(dashboard)/admin/users/[id]/multiselect-role-combobox.tsx @@ -19,7 +19,7 @@ type ComboboxProps = { onChange: (_values: string[]) => void; }; -const MultiSelectCombobox = ({ listValues, onChange }: ComboboxProps) => { +const MultiSelectRoleCombobox = ({ listValues, onChange }: ComboboxProps) => { const [open, setOpen] = React.useState(false); const [selectedValues, setSelectedValues] = React.useState([]); const dbRoles = Object.values(Role); @@ -79,4 +79,4 @@ const MultiSelectCombobox = ({ listValues, onChange }: ComboboxProps) => { ); }; -export { MultiSelectCombobox }; +export { MultiSelectRoleCombobox }; diff --git a/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx b/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx index 9ae270d28..3bd909623 100644 --- a/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx +++ b/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx @@ -18,9 +18,10 @@ import { FormMessage, } from '@documenso/ui/primitives/form/form'; import { Input } from '@documenso/ui/primitives/input'; -import { MultiSelectCombobox } from '@documenso/ui/primitives/multiselect-combobox'; import { useToast } from '@documenso/ui/primitives/use-toast'; +import { MultiSelectRoleCombobox } from './multiselect-role-combobox'; + const ZUserFormSchema = ZUpdateProfileMutationByAdminSchema.omit({ id: true }); type TUserFormSchema = z.infer; @@ -117,7 +118,7 @@ export default function UserPage({ params }: { params: { id: number } }) {
Roles - onChange(values)} /> diff --git a/apps/web/src/app/(dashboard)/admin/users/page.tsx b/apps/web/src/app/(dashboard)/admin/users/page.tsx index 069378274..577e0739a 100644 --- a/apps/web/src/app/(dashboard)/admin/users/page.tsx +++ b/apps/web/src/app/(dashboard)/admin/users/page.tsx @@ -1,4 +1,5 @@ -import { getPricesByType } from '@documenso/ee/server-only/stripe/get-prices-by-type'; +import { getPricesByPlan } from '@documenso/ee/server-only/stripe/get-prices-by-plan'; +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; import { UsersDataTable } from './data-table-users'; import { search } from './fetch-users.actions'; @@ -18,7 +19,7 @@ export default async function AdminManageUsers({ searchParams = {} }: AdminManag const [{ users, totalPages }, individualPrices] = await Promise.all([ search(searchString, page, perPage), - getPricesByType('individual'), + getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY), ]); const individualPriceIds = individualPrices.map((price) => price.id); diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx new file mode 100644 index 000000000..3a46ed5e7 --- /dev/null +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx @@ -0,0 +1,131 @@ +import Link from 'next/link'; +import { redirect } from 'next/navigation'; + +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 { 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'; +import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client'; +import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer'; + +import { EditDocumentForm } from '~/app/(dashboard)/documents/[id]/edit-document'; +import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip'; +import { DocumentStatus } from '~/components/formatter/document-status'; + +export type DocumentPageViewProps = { + params: { + id: string; + }; + team?: Team; +}; + +export default async function DocumentPageView({ params, team }: DocumentPageViewProps) { + const { id } = params; + + const documentId = Number(id); + + const documentRootPath = formatDocumentsPath(team?.url); + + if (!documentId || Number.isNaN(documentId)) { + redirect(documentRootPath); + } + + const { user } = await getRequiredServerComponentSession(); + + const document = await getDocumentById({ + id: documentId, + userId: user.id, + teamId: team?.id, + }).catch(() => null); + + if (!document || !document.documentData) { + redirect(documentRootPath); + } + + const { documentData, documentMeta } = document; + + if (documentMeta?.password) { + const key = DOCUMENSO_ENCRYPTION_KEY; + + if (!key) { + throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY'); + } + + const securePassword = Buffer.from( + symmetricDecrypt({ + key, + data: documentMeta.password, + }), + ).toString('utf-8'); + + documentMeta.password = securePassword; + } + + const [recipients, fields] = await Promise.all([ + getRecipientsForDocument({ + documentId, + userId: user.id, + }), + getFieldsForDocument({ + documentId, + userId: user.id, + }), + ]); + + return ( +
+ + + Documents + + +

+ {document.title} +

+ +
+ + + {recipients.length > 0 && ( +
+ + + + {recipients.length} Recipient(s) + +
+ )} +
+ + {document.status !== InternalDocumentStatus.COMPLETED && ( + + )} + + {document.status === InternalDocumentStatus.COMPLETED && ( +
+ +
+ )} +
+ ); +} diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx index af1877a64..e6cbd6fd4 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx @@ -32,6 +32,7 @@ export type EditDocumentFormProps = { documentMeta: DocumentMeta | null; fields: Field[]; documentData: DocumentData; + documentRootPath: string; }; type EditDocumentStep = 'title' | 'signers' | 'fields' | 'subject'; @@ -45,6 +46,7 @@ export const EditDocumentForm = ({ documentMeta, user: _user, documentData, + documentRootPath, }: EditDocumentFormProps) => { const { toast } = useToast(); const router = useRouter(); @@ -168,7 +170,7 @@ export const EditDocumentForm = ({ duration: 5000, }); - router.push('/documents'); + router.push(documentRootPath); } catch (err) { console.error(err); diff --git a/apps/web/src/app/(dashboard)/documents/[id]/page.tsx b/apps/web/src/app/(dashboard)/documents/[id]/page.tsx index 44f3991d8..e7a34889e 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/page.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/page.tsx @@ -1,20 +1,4 @@ -import Link from 'next/link'; -import { redirect } from 'next/navigation'; - -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 { 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 { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client'; -import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer'; - -import { EditDocumentForm } from '~/app/(dashboard)/documents/[id]/edit-document'; -import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip'; -import { DocumentStatus } from '~/components/formatter/document-status'; +import DocumentPageView from './document-page-view'; export type DocumentPageProps = { params: { @@ -22,103 +6,6 @@ export type DocumentPageProps = { }; }; -export default async function DocumentPage({ params }: DocumentPageProps) { - const { id } = params; - - const documentId = Number(id); - - if (!documentId || Number.isNaN(documentId)) { - redirect('/documents'); - } - - const { user } = await getRequiredServerComponentSession(); - - const document = await getDocumentById({ - id: documentId, - userId: user.id, - }).catch(() => null); - - if (!document || !document.documentData) { - redirect('/documents'); - } - - const { documentData, documentMeta } = document; - - if (documentMeta?.password) { - const key = DOCUMENSO_ENCRYPTION_KEY; - - if (!key) { - throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY'); - } - - const securePassword = Buffer.from( - symmetricDecrypt({ - key, - data: documentMeta.password, - }), - ).toString('utf-8'); - - documentMeta.password = securePassword; - } - - const [recipients, fields] = await Promise.all([ - getRecipientsForDocument({ - documentId, - userId: user.id, - }), - getFieldsForDocument({ - documentId, - userId: user.id, - }), - ]); - - return ( -
- - - Documents - - -

- {document.title} -

- -
- - - {recipients.length > 0 && ( -
- - - - {recipients.length} Recipient(s) - -
- )} -
- - {document.status !== InternalDocumentStatus.COMPLETED && ( - - )} - - {document.status === InternalDocumentStatus.COMPLETED && ( -
- -
- )} -
- ); +export default function DocumentPage({ params }: DocumentPageProps) { + return ; } diff --git a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx index 7fabeef95..e8e3d6130 100644 --- a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx @@ -10,6 +10,7 @@ import * as z from 'zod'; import { getRecipientType } from '@documenso/lib/client-only/recipient-type'; import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter'; +import type { Team } from '@documenso/prisma/client'; import { type Document, type Recipient, SigningStatus } from '@documenso/prisma/client'; import { trpc as trpcReact } from '@documenso/trpc/react'; import { cn } from '@documenso/ui/lib/utils'; @@ -39,8 +40,11 @@ import { StackAvatar } from '~/components/(dashboard)/avatar/stack-avatar'; const FORM_ID = 'resend-email'; export type ResendDocumentActionItemProps = { - document: Document; + document: Document & { + team: Pick | null; + }; recipients: Recipient[]; + team?: Pick; }; export const ZResendDocumentFormSchema = z.object({ @@ -54,15 +58,17 @@ export type TResendDocumentFormSchema = z.infer { const { data: session } = useSession(); const { toast } = useToast(); const [isOpen, setIsOpen] = useState(false); const isOwner = document.userId === session?.user?.id; + const isCurrentTeamDocument = team && document.team?.url === team.url; const isDisabled = - !isOwner || + (!isOwner && !isCurrentTeamDocument) || document.status !== 'PENDING' || !recipients.some((r) => r.signingStatus === SigningStatus.NOT_SIGNED); @@ -82,7 +88,7 @@ export const ResendDocumentActionItem = ({ const onFormSubmit = async ({ recipients }: TResendDocumentFormSchema) => { try { - await resendDocument({ documentId: document.id, recipients }); + await resendDocument({ documentId: document.id, recipients, teamId: team?.id }); toast({ title: 'Document re-sent', diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx index ecddf1190..78ffd0b3b 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx @@ -7,7 +7,8 @@ import { useSession } from 'next-auth/react'; import { match } from 'ts-pattern'; import { downloadPDF } from '@documenso/lib/client-only/download-pdf'; -import type { Document, Recipient, User } from '@documenso/prisma/client'; +import { formatDocumentsPath } from '@documenso/lib/utils/teams'; +import type { Document, Recipient, Team, User } from '@documenso/prisma/client'; import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import type { DocumentWithData } from '@documenso/prisma/types/document-with-data'; import { trpc as trpcClient } from '@documenso/trpc/client'; @@ -18,10 +19,12 @@ export type DataTableActionButtonProps = { row: Document & { User: Pick; Recipient: Recipient[]; + team: Pick | null; }; + team?: Pick; }; -export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => { +export const DataTableActionButton = ({ row, team }: DataTableActionButtonProps) => { const { data: session } = useSession(); const { toast } = useToast(); @@ -38,6 +41,9 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => { const isComplete = row.status === DocumentStatus.COMPLETED; const isSigned = recipient?.signingStatus === SigningStatus.SIGNED; const role = recipient?.role; + const isCurrentTeamDocument = team && row.team?.url === team.url; + + const documentsPath = formatDocumentsPath(team?.url); const onDownloadClick = async () => { try { @@ -46,6 +52,7 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => { if (!recipient) { document = await trpcClient.document.getDocumentById.query({ id: row.id, + teamId: team?.id, }); } else { document = await trpcClient.document.getDocumentByToken.query({ @@ -81,15 +88,19 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => { isPending, isComplete, isSigned, + isCurrentTeamDocument, }) - .with({ isOwner: true, isDraft: true }, () => ( - - )) + .with( + isOwner ? { isDraft: true, isOwner: true } : { isDraft: true, isCurrentTeamDocument: true }, + () => ( + + ), + ) .with({ isRecipient: true, isPending: true, isSigned: false }, () => (
)} - {remaining.documents === 0 && ( + {team?.id === undefined && remaining.documents === 0 && (

diff --git a/apps/web/src/app/(dashboard)/layout.tsx b/apps/web/src/app/(dashboard)/layout.tsx index 433aeb18c..99db66c55 100644 --- a/apps/web/src/app/(dashboard)/layout.tsx +++ b/apps/web/src/app/(dashboard)/layout.tsx @@ -7,6 +7,7 @@ import { getServerSession } from 'next-auth'; import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/server'; import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeams } from '@documenso/lib/server-only/team/get-teams'; import { Header } from '~/components/(dashboard)/layout/header'; import { VerifyEmailBanner } from '~/components/(dashboard)/layout/verify-email-banner'; @@ -26,13 +27,17 @@ export default async function AuthenticatedDashboardLayout({ redirect('/signin'); } - const { user } = await getRequiredServerComponentSession(); + const [{ user }, teams] = await Promise.all([ + getRequiredServerComponentSession(), + getTeams({ userId: session.user.id }), + ]); return ( {!user.emailVerified && } -
+ +
{children}
diff --git a/apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx b/apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx index 8fd78cae3..9ed6a2515 100644 --- a/apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx +++ b/apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx @@ -7,7 +7,11 @@ import { useToast } from '@documenso/ui/primitives/use-toast'; import { createBillingPortal } from './create-billing-portal.action'; -export const BillingPortalButton = () => { +export type BillingPortalButtonProps = { + buttonProps?: React.ComponentProps; +}; + +export const BillingPortalButton = ({ buttonProps }: BillingPortalButtonProps) => { const { toast } = useToast(); const [isFetchingPortalUrl, setIsFetchingPortalUrl] = useState(false); @@ -48,7 +52,11 @@ export const BillingPortalButton = () => { }; return ( - ); diff --git a/apps/web/src/app/(dashboard)/settings/billing/page.tsx b/apps/web/src/app/(dashboard)/settings/billing/page.tsx index e226a7e39..cee2aa2f1 100644 --- a/apps/web/src/app/(dashboard)/settings/billing/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/billing/page.tsx @@ -5,8 +5,9 @@ import { match } from 'ts-pattern'; import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer'; import { getPricesByInterval } from '@documenso/ee/server-only/stripe/get-prices-by-interval'; -import { getPricesByType } from '@documenso/ee/server-only/stripe/get-prices-by-type'; +import { getPricesByPlan } from '@documenso/ee/server-only/stripe/get-prices-by-plan'; import { getProductByPriceId } from '@documenso/ee/server-only/stripe/get-product-by-price-id'; +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; 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 { type Stripe } from '@documenso/lib/server-only/stripe'; @@ -36,23 +37,23 @@ export default async function BillingSettingsPage() { user = await getStripeCustomerByUser(user).then((result) => result.user); } - const [subscriptions, prices, individualPrices] = await Promise.all([ + const [subscriptions, prices, communityPlanPrices] = await Promise.all([ getSubscriptionsByUserId({ userId: user.id }), - getPricesByInterval({ type: 'individual' }), - getPricesByType('individual'), + getPricesByInterval({ plan: STRIPE_PLAN_TYPE.COMMUNITY }), + getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY), ]); - const individualPriceIds = individualPrices.map(({ id }) => id); + const communityPlanPriceIds = communityPlanPrices.map(({ id }) => id); let subscriptionProduct: Stripe.Product | null = null; - const individualUserSubscriptions = subscriptions.filter(({ priceId }) => - individualPriceIds.includes(priceId), + const communityPlanUserSubscriptions = subscriptions.filter(({ priceId }) => + communityPlanPriceIds.includes(priceId), ); const subscription = - individualUserSubscriptions.find(({ status }) => status === SubscriptionStatus.ACTIVE) ?? - individualUserSubscriptions[0]; + communityPlanUserSubscriptions.find(({ status }) => status === SubscriptionStatus.ACTIVE) ?? + communityPlanUserSubscriptions[0]; if (subscription?.priceId) { subscriptionProduct = await getProductByPriceId({ priceId: subscription.priceId }).catch( diff --git a/apps/web/src/app/(dashboard)/settings/profile/page.tsx b/apps/web/src/app/(dashboard)/settings/profile/page.tsx index 60f7da49c..2890eb5d5 100644 --- a/apps/web/src/app/(dashboard)/settings/profile/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/profile/page.tsx @@ -2,6 +2,7 @@ import type { Metadata } from 'next'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; import { ProfileForm } from '~/components/forms/profile'; export const metadata: Metadata = { @@ -13,11 +14,7 @@ export default async function ProfileSettingsPage() { return (
-

Profile

- -

Here you can edit your personal details.

- -
+
diff --git a/apps/web/src/app/(dashboard)/settings/security/page.tsx b/apps/web/src/app/(dashboard)/settings/security/page.tsx index 4e0a40838..f46784aed 100644 --- a/apps/web/src/app/(dashboard)/settings/security/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/security/page.tsx @@ -6,6 +6,7 @@ import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get- 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 { AuthenticatorApp } from '~/components/forms/2fa/authenticator-app'; import { RecoveryCodes } from '~/components/forms/2fa/recovery-codes'; import { PasswordForm } from '~/components/forms/password'; @@ -19,13 +20,10 @@ export default async function SecuritySettingsPage() { return (
-

Security

- -

- Here you can manage your password and security settings. -

- -
+ {user.identityProvider === 'DOCUMENSO' ? (
diff --git a/apps/web/src/app/(dashboard)/settings/teams/accept-team-invitation-button.tsx b/apps/web/src/app/(dashboard)/settings/teams/accept-team-invitation-button.tsx new file mode 100644 index 000000000..8aa81653d --- /dev/null +++ b/apps/web/src/app/(dashboard)/settings/teams/accept-team-invitation-button.tsx @@ -0,0 +1,45 @@ +'use client'; + +import { trpc } from '@documenso/trpc/react'; +import { Button } from '@documenso/ui/primitives/button'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type AcceptTeamInvitationButtonProps = { + teamId: number; +}; + +export const AcceptTeamInvitationButton = ({ teamId }: AcceptTeamInvitationButtonProps) => { + const { toast } = useToast(); + + const { + mutateAsync: acceptTeamInvitation, + isLoading, + isSuccess, + } = trpc.team.acceptTeamInvitation.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'Accepted team invitation', + duration: 5000, + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + variant: 'destructive', + duration: 10000, + description: 'Unable to join this team at this time.', + }); + }, + }); + + return ( + + ); +}; diff --git a/apps/web/src/app/(dashboard)/settings/teams/page.tsx b/apps/web/src/app/(dashboard)/settings/teams/page.tsx new file mode 100644 index 000000000..1a3d90b66 --- /dev/null +++ b/apps/web/src/app/(dashboard)/settings/teams/page.tsx @@ -0,0 +1,39 @@ +'use client'; + +import { AnimatePresence } from 'framer-motion'; + +import { trpc } from '@documenso/trpc/react'; +import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out'; + +import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; +import { CreateTeamDialog } from '~/components/(teams)/dialogs/create-team-dialog'; +import { UserSettingsTeamsPageDataTable } from '~/components/(teams)/tables/user-settings-teams-page-data-table'; + +import { TeamEmailUsage } from './team-email-usage'; +import { TeamInvitations } from './team-invitations'; + +export default function TeamsSettingsPage() { + const { data: teamEmail } = trpc.team.getTeamEmailByEmail.useQuery(); + + return ( +
+ + + + + + +
+ + {teamEmail && ( + + + + )} + + + +
+
+ ); +} diff --git a/apps/web/src/app/(dashboard)/settings/teams/team-email-usage.tsx b/apps/web/src/app/(dashboard)/settings/teams/team-email-usage.tsx new file mode 100644 index 000000000..56a7b110a --- /dev/null +++ b/apps/web/src/app/(dashboard)/settings/teams/team-email-usage.tsx @@ -0,0 +1,105 @@ +'use client'; + +import { useState } from 'react'; + +import type { TeamEmail } from '@documenso/prisma/client'; +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 { useToast } from '@documenso/ui/primitives/use-toast'; + +export type TeamEmailUsageProps = { + teamEmail: TeamEmail & { team: { name: string; url: string } }; +}; + +export const TeamEmailUsage = ({ teamEmail }: TeamEmailUsageProps) => { + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const { mutateAsync: deleteTeamEmail, isLoading: isDeletingTeamEmail } = + trpc.team.deleteTeamEmail.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'You have successfully revoked access.', + duration: 5000, + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + variant: 'destructive', + duration: 10000, + description: + 'We encountered an unknown error while attempting to revoke access. Please try again or contact support.', + }); + }, + }); + + return ( + +
+ Team Email + +

+ Your email is currently being used by team{' '} + {teamEmail.team.name} ({teamEmail.team.url} + ). +

+ +

They have permission on your behalf to:

+ +
    +
  • Display your name and email in documents
  • +
  • View all documents sent to your account
  • +
+
+
+ + !isDeletingTeamEmail && setOpen(value)}> + + + + + + + Are you sure? + + + You are about to revoke access for team{' '} + {teamEmail.team.name} ({teamEmail.team.url}) to + use your email. + + + +
+ + + + + +
+
+
+
+ ); +}; diff --git a/apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx b/apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx new file mode 100644 index 000000000..aa1be3f3f --- /dev/null +++ b/apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx @@ -0,0 +1,83 @@ +'use client'; + +import { AnimatePresence } from 'framer-motion'; +import { BellIcon } from 'lucide-react'; + +import { formatTeamUrl } from '@documenso/lib/utils/teams'; +import { trpc } from '@documenso/trpc/react'; +import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out'; +import { Alert, AlertDescription } from '@documenso/ui/primitives/alert'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogHeader, + DialogTitle, + DialogTrigger, +} from '@documenso/ui/primitives/dialog'; + +import { AcceptTeamInvitationButton } from './accept-team-invitation-button'; + +export const TeamInvitations = () => { + const { data, isInitialLoading } = trpc.team.getTeamInvitations.useQuery(); + + return ( + + {data && data.length > 0 && !isInitialLoading && ( + + +
+ + + + You have {data.length} pending team invitation + {data.length > 1 ? 's' : ''}. + + + + + + + + + + Pending invitations + + + You have {data.length} pending team invitation{data.length > 1 ? 's' : ''}. + + + +
    + {data.map((invitation) => ( +
  • + + {invitation.team.name} + + } + secondaryText={formatTeamUrl(invitation.team.url)} + rightSideComponent={ +
    + +
    + } + /> +
  • + ))} +
+
+
+
+
+
+ )} +
+ ); +}; diff --git a/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx b/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx index 7930dcd0e..0e8f822c2 100644 --- a/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx +++ b/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx @@ -83,7 +83,7 @@ export const TemplatesDataTable = ({ return (
{remaining.documents === 0 && ( - + Document Limit Exceeded! diff --git a/apps/web/src/app/(signing)/sign/[token]/layout.tsx b/apps/web/src/app/(signing)/sign/[token]/layout.tsx index cfec41cdf..9db36e8aa 100644 --- a/apps/web/src/app/(signing)/sign/[token]/layout.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/layout.tsx @@ -1,6 +1,8 @@ import React from 'react'; import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams'; +import { getTeams } from '@documenso/lib/server-only/team/get-teams'; import { Header as AuthenticatedHeader } from '~/components/(dashboard)/layout/header'; import { NextAuthProvider } from '~/providers/next-auth'; @@ -12,10 +14,16 @@ export type SigningLayoutProps = { export default async function SigningLayout({ children }: SigningLayoutProps) { const { user, session } = await getServerComponentSession(); + let teams: GetTeamsResponse = []; + + if (user && session) { + teams = await getTeams({ userId: user.id }); + } + return (
- {user && } + {user && }
{children}
diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx new file mode 100644 index 000000000..b7f610cff --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx @@ -0,0 +1,20 @@ +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; + +import DocumentPageComponent from '~/app/(dashboard)/documents/[id]/document-page-view'; + +export type DocumentPageProps = { + params: { + id: string; + teamUrl: string; + }; +}; + +export default async function DocumentPage({ params }: DocumentPageProps) { + const { teamUrl } = params; + + const { user } = await getRequiredServerComponentSession(); + const team = await getTeamByUrl({ userId: user.id, teamUrl }); + + return ; +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx new file mode 100644 index 000000000..952aeeeea --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx @@ -0,0 +1,25 @@ +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; + +import type { DocumentsPageViewProps } from '~/app/(dashboard)/documents/documents-page-view'; +import DocumentsPageView from '~/app/(dashboard)/documents/documents-page-view'; + +export type TeamsDocumentPageProps = { + params: { + teamUrl: string; + }; + searchParams?: DocumentsPageViewProps['searchParams']; +}; + +export default async function TeamsDocumentPage({ + params, + searchParams = {}, +}: TeamsDocumentPageProps) { + const { teamUrl } = params; + + const { user } = await getRequiredServerComponentSession(); + + const team = await getTeamByUrl({ userId: user.id, teamUrl }); + + return ; +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/error.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/error.tsx new file mode 100644 index 000000000..1e1eb9921 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/error.tsx @@ -0,0 +1,54 @@ +'use client'; + +import Link from 'next/link'; +import { useRouter } from 'next/navigation'; + +import { ChevronLeft } from 'lucide-react'; + +import { AppErrorCode } from '@documenso/lib/errors/app-error'; +import { Button } from '@documenso/ui/primitives/button'; + +type ErrorProps = { + error: Error & { digest?: string }; +}; + +export default function ErrorPage({ error }: ErrorProps) { + const router = useRouter(); + + let errorMessage = 'Unknown error'; + let errorDetails = ''; + + if (error.message === AppErrorCode.UNAUTHORIZED) { + errorMessage = 'Unauthorized'; + errorDetails = 'You are not authorized to view this page.'; + } + + return ( +
+
+

{errorMessage}

+ +

Oops! Something went wrong.

+ +

{errorDetails}

+ +
+ + + +
+
+
+ ); +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx new file mode 100644 index 000000000..3b4f43031 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx @@ -0,0 +1,130 @@ +'use client'; + +import { useState } from 'react'; + +import { AlertTriangle } from 'lucide-react'; +import { match } from 'ts-pattern'; + +import { canExecuteTeamAction } from '@documenso/lib/utils/teams'; +import type { TeamMemberRole } from '@documenso/prisma/client'; +import { type Subscription, SubscriptionStatus } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +import { cn } from '@documenso/ui/lib/utils'; +import { Button } from '@documenso/ui/primitives/button'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogTitle, +} from '@documenso/ui/primitives/dialog'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type LayoutBillingBannerProps = { + subscription: Subscription; + teamId: number; + userRole: TeamMemberRole; +}; + +export const LayoutBillingBanner = ({ + subscription, + teamId, + userRole, +}: LayoutBillingBannerProps) => { + const { toast } = useToast(); + + const [isOpen, setIsOpen] = useState(false); + + const { mutateAsync: createBillingPortal, isLoading } = + trpc.team.createBillingPortal.useMutation(); + + const handleCreatePortal = async () => { + try { + const sessionUrl = await createBillingPortal({ teamId }); + + window.open(sessionUrl, '_blank'); + + setIsOpen(false); + } catch (err) { + toast({ + title: 'Something went wrong', + description: + 'We are unable to proceed to the billing portal at this time. Please try again, or contact support.', + variant: 'destructive', + duration: 10000, + }); + } + }; + + if (subscription.status === SubscriptionStatus.ACTIVE) { + return null; + } + + return ( + <> +
+
+
+ + + {match(subscription.status) + .with(SubscriptionStatus.PAST_DUE, () => 'Payment overdue') + .with(SubscriptionStatus.INACTIVE, () => 'Teams restricted') + .exhaustive()} +
+ + +
+
+ + !isLoading && setIsOpen(value)}> + + Payment overdue + + {match(subscription.status) + .with(SubscriptionStatus.PAST_DUE, () => ( + + Your payment for teams is overdue. Please settle the payment to avoid any service + disruptions. + + )) + .with(SubscriptionStatus.INACTIVE, () => ( + + Due to an unpaid invoice, your team has been restricted. Please settle the payment + to restore full access to your team. + + )) + .otherwise(() => null)} + + {canExecuteTeamAction('MANAGE_BILLING', userRole) && ( + + + + )} + + + + ); +}; diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/layout.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/layout.tsx new file mode 100644 index 000000000..2883abc21 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/layout.tsx @@ -0,0 +1,65 @@ +import React from 'react'; + +import { RedirectType, redirect } from 'next/navigation'; + +import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/server'; +import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; +import { getTeams } from '@documenso/lib/server-only/team/get-teams'; +import { SubscriptionStatus } from '@documenso/prisma/client'; + +import { Header } from '~/components/(dashboard)/layout/header'; +import { RefreshOnFocus } from '~/components/(dashboard)/refresh-on-focus/refresh-on-focus'; +import { NextAuthProvider } from '~/providers/next-auth'; + +import { LayoutBillingBanner } from './layout-billing-banner'; + +export type AuthenticatedTeamsLayoutProps = { + children: React.ReactNode; + params: { + teamUrl: string; + }; +}; + +export default async function AuthenticatedTeamsLayout({ + children, + params, +}: AuthenticatedTeamsLayoutProps) { + const { session, user } = await getServerComponentSession(); + + if (!session || !user) { + redirect('/signin'); + } + + const [getTeamsPromise, getTeamPromise] = await Promise.allSettled([ + getTeams({ userId: user.id }), + getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl }), + ]); + + if (getTeamPromise.status === 'rejected') { + redirect('/documents', RedirectType.replace); + } + + const team = getTeamPromise.value; + const teams = getTeamsPromise.status === 'fulfilled' ? getTeamsPromise.value : []; + + return ( + + + {team.subscription && team.subscription.status !== SubscriptionStatus.ACTIVE && ( + + )} + +
+ +
{children}
+ + + + + ); +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/not-found.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/not-found.tsx new file mode 100644 index 000000000..35962e264 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/not-found.tsx @@ -0,0 +1,32 @@ +'use client'; + +import Link from 'next/link'; + +import { ChevronLeft } from 'lucide-react'; + +import { Button } from '@documenso/ui/primitives/button'; + +export default function NotFound() { + return ( +
+
+

404 Team not found

+ +

Oops! Something went wrong.

+ +

+ The team you are looking for may have been removed, renamed or may have never existed. +

+ +
+ +
+
+
+ ); +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/billing/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/billing/page.tsx new file mode 100644 index 000000000..1d0e87f79 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/billing/page.tsx @@ -0,0 +1,84 @@ +import { DateTime } from 'luxon'; +import type Stripe from 'stripe'; + +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { stripe } from '@documenso/lib/server-only/stripe'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; +import { canExecuteTeamAction } from '@documenso/lib/utils/teams'; +import { Card, CardContent } from '@documenso/ui/primitives/card'; + +import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; +import { TeamBillingInvoicesDataTable } from '~/components/(teams)/tables/team-billing-invoices-data-table'; +import { TeamBillingPortalButton } from '~/components/(teams)/team-billing-portal-button'; + +export type TeamsSettingsBillingPageProps = { + params: { + teamUrl: string; + }; +}; + +export default async function TeamsSettingBillingPage({ params }: TeamsSettingsBillingPageProps) { + const session = await getRequiredServerComponentSession(); + + const team = await getTeamByUrl({ userId: session.user.id, teamUrl: params.teamUrl }); + + const canManageBilling = canExecuteTeamAction('MANAGE_BILLING', team.currentTeamMember.role); + + let teamSubscription: Stripe.Subscription | null = null; + + if (team.subscription) { + teamSubscription = await stripe.subscriptions.retrieve(team.subscription.planId); + } + + const formatTeamSubscriptionDetails = (subscription: Stripe.Subscription | null) => { + if (!subscription) { + return 'No payment required'; + } + + const numberOfSeats = subscription.items.data[0].quantity ?? 0; + + const formattedTeamMemberQuanity = numberOfSeats > 1 ? `${numberOfSeats} members` : '1 member'; + + const formattedDate = DateTime.fromSeconds(subscription.current_period_end).toFormat( + 'LLL dd, yyyy', + ); + + return `${formattedTeamMemberQuanity} • Monthly • Renews: ${formattedDate}`; + }; + + return ( +
+ + + + +
+

+ Current plan: {teamSubscription ? 'Team' : 'Community Team'} +

+ +

+ {formatTeamSubscriptionDetails(teamSubscription)} +

+
+ + {teamSubscription && ( +
+ +
+ )} +
+
+ +
+ +
+
+ ); +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/layout.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/layout.tsx new file mode 100644 index 000000000..fe2ee5aee --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/layout.tsx @@ -0,0 +1,54 @@ +import React from 'react'; + +import { notFound } from 'next/navigation'; + +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; +import { canExecuteTeamAction } from '@documenso/lib/utils/teams'; + +import { DesktopNav } from '~/components/(teams)/settings/layout/desktop-nav'; +import { MobileNav } from '~/components/(teams)/settings/layout/mobile-nav'; + +export type TeamSettingsLayoutProps = { + children: React.ReactNode; + params: { + teamUrl: string; + }; +}; + +export default async function TeamsSettingsLayout({ + children, + params: { teamUrl }, +}: TeamSettingsLayoutProps) { + const session = await getRequiredServerComponentSession(); + + try { + const team = await getTeamByUrl({ userId: session.user.id, teamUrl }); + + if (!canExecuteTeamAction('MANAGE_TEAM', team.currentTeamMember.role)) { + throw new Error(AppErrorCode.UNAUTHORIZED); + } + } catch (e) { + const error = AppError.parseError(e); + + if (error.code === 'P2025') { + notFound(); + } + + throw e; + } + + return ( +
+

Team Settings

+ +
+ + + +
{children}
+
+
+ ); +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/members/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/members/page.tsx new file mode 100644 index 000000000..4617b3d48 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/members/page.tsx @@ -0,0 +1,38 @@ +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; + +import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; +import { InviteTeamMembersDialog } from '~/components/(teams)/dialogs/invite-team-member-dialog'; +import { TeamsMemberPageDataTable } from '~/components/(teams)/tables/teams-member-page-data-table'; + +export type TeamsSettingsMembersPageProps = { + params: { + teamUrl: string; + }; +}; + +export default async function TeamsSettingsMembersPage({ params }: TeamsSettingsMembersPageProps) { + const { teamUrl } = params; + + const session = await getRequiredServerComponentSession(); + + const team = await getTeamByUrl({ userId: session.user.id, teamUrl }); + + return ( +
+ + + + + +
+ ); +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx new file mode 100644 index 000000000..a86797191 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx @@ -0,0 +1,186 @@ +import { CheckCircle2, Clock } from 'lucide-react'; +import { P, match } from 'ts-pattern'; + +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; +import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; +import { isTokenExpired } from '@documenso/lib/utils/token-verification'; +import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; + +import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; +import { AddTeamEmailDialog } from '~/components/(teams)/dialogs/add-team-email-dialog'; +import { DeleteTeamDialog } from '~/components/(teams)/dialogs/delete-team-dialog'; +import { TransferTeamDialog } from '~/components/(teams)/dialogs/transfer-team-dialog'; +import { UpdateTeamForm } from '~/components/(teams)/forms/update-team-form'; + +import { TeamEmailDropdown } from './team-email-dropdown'; +import { TeamTransferStatus } from './team-transfer-status'; + +export type TeamsSettingsPageProps = { + params: { + teamUrl: string; + }; +}; + +export default async function TeamsSettingsPage({ params }: TeamsSettingsPageProps) { + const { teamUrl } = params; + + const session = await getRequiredServerComponentSession(); + + const team = await getTeamByUrl({ userId: session.user.id, teamUrl }); + + const isTransferVerificationExpired = + !team.transferVerification || isTokenExpired(team.transferVerification.expiresAt); + + return ( +
+ + + + + + +
+ {(team.teamEmail || team.emailVerification) && ( + + Team email + + + You can view documents associated with this email and use this identity when sending + documents. + + +
+ +
+ + {team.teamEmail?.name || team.emailVerification?.name} + + } + secondaryText={ + + {team.teamEmail?.email || team.emailVerification?.email} + + } + /> + +
+
+ {match({ + teamEmail: team.teamEmail, + emailVerification: team.emailVerification, + }) + .with({ teamEmail: P.not(null) }, () => ( + <> + + Active + + )) + .with( + { + emailVerification: P.when( + (emailVerification) => + emailVerification && emailVerification?.expiresAt < new Date(), + ), + }, + () => ( + <> + + Expired + + ), + ) + .with({ emailVerification: P.not(null) }, () => ( + <> + + Awaiting email confirmation + + )) + .otherwise(() => null)} +
+ + +
+
+
+ )} + + {!team.teamEmail && !team.emailVerification && ( + +
+ Team email + + +
    + {/* Feature not available yet. */} + {/*
  • Display this name and email when sending documents
  • */} + {/*
  • View documents associated with this email
  • */} + + View documents associated with this email +
+
+
+ + +
+ )} + + {team.ownerUserId === session.user.id && ( + <> + {isTransferVerificationExpired && ( + +
+ Transfer team + + + Transfer the ownership of the team to another team member. + +
+ + +
+ )} + + +
+ Delete team + + + This team, and any associated data excluding billing invoices will be permanently + deleted. + +
+ + +
+ + )} +
+
+ ); +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/team-email-dropdown.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/team-email-dropdown.tsx new file mode 100644 index 000000000..e2c0a0d87 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/team-email-dropdown.tsx @@ -0,0 +1,143 @@ +'use client'; + +import { useRouter } from 'next/navigation'; + +import { Edit, Loader, Mail, MoreHorizontal, X } from 'lucide-react'; + +import type { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; +import { trpc } from '@documenso/trpc/react'; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from '@documenso/ui/primitives/dropdown-menu'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +import { UpdateTeamEmailDialog } from '~/components/(teams)/dialogs/update-team-email-dialog'; + +export type TeamsSettingsPageProps = { + team: Awaited>; +}; + +export const TeamEmailDropdown = ({ team }: TeamsSettingsPageProps) => { + const router = useRouter(); + + const { toast } = useToast(); + + const { mutateAsync: resendEmailVerification, isLoading: isResendingEmailVerification } = + trpc.team.resendTeamEmailVerification.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'Email verification has been resent', + duration: 5000, + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + variant: 'destructive', + duration: 10000, + description: 'Unable to resend verification at this time. Please try again.', + }); + }, + }); + + const { mutateAsync: deleteTeamEmail, isLoading: isDeletingTeamEmail } = + trpc.team.deleteTeamEmail.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'Team email has been removed', + duration: 5000, + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + variant: 'destructive', + duration: 10000, + description: 'Unable to remove team email at this time. Please try again.', + }); + }, + }); + + const { mutateAsync: deleteTeamEmailVerification, isLoading: isDeletingTeamEmailVerification } = + trpc.team.deleteTeamEmailVerification.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'Email verification has been removed', + duration: 5000, + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + variant: 'destructive', + duration: 10000, + description: 'Unable to remove email verification at this time. Please try again.', + }); + }, + }); + + const onRemove = async () => { + if (team.teamEmail) { + await deleteTeamEmail({ teamId: team.id }); + } + + if (team.emailVerification) { + await deleteTeamEmailVerification({ teamId: team.id }); + } + + router.refresh(); + }; + + return ( + + + + + + + {!team.teamEmail && team.emailVerification && ( + { + e.preventDefault(); + void resendEmailVerification({ teamId: team.id }); + }} + > + {isResendingEmailVerification ? ( + + ) : ( + + )} + Resend verification + + )} + + {team.teamEmail && ( + e.preventDefault()}> + + Edit + + } + /> + )} + + onRemove()} + > + + Remove + + + + ); +}; diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/team-transfer-status.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/team-transfer-status.tsx new file mode 100644 index 000000000..cba50966f --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/team-transfer-status.tsx @@ -0,0 +1,115 @@ +'use client'; + +import { useRouter } from 'next/navigation'; + +import { AnimatePresence } from 'framer-motion'; + +import { canExecuteTeamAction } from '@documenso/lib/utils/teams'; +import { isTokenExpired } from '@documenso/lib/utils/token-verification'; +import type { TeamMemberRole, TeamTransferVerification } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out'; +import { cn } from '@documenso/ui/lib/utils'; +import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert'; +import { Button } from '@documenso/ui/primitives/button'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type TeamTransferStatusProps = { + className?: string; + currentUserTeamRole: TeamMemberRole; + teamId: number; + transferVerification: TeamTransferVerification | null; +}; + +export const TeamTransferStatus = ({ + className, + currentUserTeamRole, + teamId, + transferVerification, +}: TeamTransferStatusProps) => { + const router = useRouter(); + + const { toast } = useToast(); + + const isExpired = transferVerification && isTokenExpired(transferVerification.expiresAt); + + const { mutateAsync: deleteTeamTransferRequest, isLoading } = + trpc.team.deleteTeamTransferRequest.useMutation({ + onSuccess: () => { + if (!isExpired) { + toast({ + title: 'Success', + description: 'The team transfer invitation has been successfully deleted.', + duration: 5000, + }); + } + + router.refresh(); + }, + onError: () => { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + description: + 'We encountered an unknown error while attempting to remove this transfer. Please try again or contact support.', + }); + }, + }); + + return ( + + {transferVerification && ( + + +
+ + {isExpired ? 'Team transfer request expired' : 'Team transfer in progress'} + + + + {isExpired ? ( +

+ The team transfer request to {transferVerification.name} has + expired. +

+ ) : ( +
+

+ A request to transfer the ownership of this team has been sent to{' '} + + {transferVerification.name} ({transferVerification.email}) + +

+ +

+ If they accept this request, the team will be transferred to their account. +

+
+ )} +
+
+ + {canExecuteTeamAction('DELETE_TEAM_TRANSFER_REQUEST', currentUserTeamRole) && ( + + )} +
+
+ )} +
+ ); +}; diff --git a/apps/web/src/app/(unauthenticated)/signin/page.tsx b/apps/web/src/app/(unauthenticated)/signin/page.tsx index 1332a3f37..8331e7c03 100644 --- a/apps/web/src/app/(unauthenticated)/signin/page.tsx +++ b/apps/web/src/app/(unauthenticated)/signin/page.tsx @@ -1,7 +1,9 @@ import type { Metadata } from 'next'; import Link from 'next/link'; +import { redirect } from 'next/navigation'; import { IS_GOOGLE_SSO_ENABLED } from '@documenso/lib/constants/auth'; +import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt'; import { SignInForm } from '~/components/forms/signin'; @@ -9,7 +11,20 @@ export const metadata: Metadata = { title: 'Sign In', }; -export default function SignInPage() { +type SignInPageProps = { + searchParams: { + email?: string; + }; +}; + +export default function SignInPage({ searchParams }: SignInPageProps) { + const rawEmail = typeof searchParams.email === 'string' ? searchParams.email : undefined; + const email = rawEmail ? decryptSecondaryData(rawEmail) : null; + + if (!email && rawEmail) { + redirect('/signin'); + } + return (

Sign in to your account

@@ -18,7 +33,11 @@ export default function SignInPage() { Welcome back, we are lucky to have you.

- + {process.env.NEXT_PUBLIC_DISABLE_SIGNUP !== 'true' && (

diff --git a/apps/web/src/app/(unauthenticated)/signup/page.tsx b/apps/web/src/app/(unauthenticated)/signup/page.tsx index c6d49f891..dbbbcdba9 100644 --- a/apps/web/src/app/(unauthenticated)/signup/page.tsx +++ b/apps/web/src/app/(unauthenticated)/signup/page.tsx @@ -3,6 +3,7 @@ import Link from 'next/link'; import { redirect } from 'next/navigation'; import { IS_GOOGLE_SSO_ENABLED } from '@documenso/lib/constants/auth'; +import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt'; import { SignUpForm } from '~/components/forms/signup'; @@ -10,11 +11,24 @@ export const metadata: Metadata = { title: 'Sign Up', }; -export default function SignUpPage() { +type SignUpPageProps = { + searchParams: { + email?: string; + }; +}; + +export default function SignUpPage({ searchParams }: SignUpPageProps) { if (process.env.NEXT_PUBLIC_DISABLE_SIGNUP === 'true') { redirect('/signin'); } + const rawEmail = typeof searchParams.email === 'string' ? searchParams.email : undefined; + const email = rawEmail ? decryptSecondaryData(rawEmail) : null; + + if (!email && rawEmail) { + redirect('/signup'); + } + return (

Create a new account

@@ -24,7 +38,11 @@ export default function SignUpPage() { signing is within your grasp.

- +

Already have an account?{' '} diff --git a/apps/web/src/app/(unauthenticated)/team/invite/[token]/page.tsx b/apps/web/src/app/(unauthenticated)/team/invite/[token]/page.tsx new file mode 100644 index 000000000..634416fe3 --- /dev/null +++ b/apps/web/src/app/(unauthenticated)/team/invite/[token]/page.tsx @@ -0,0 +1,121 @@ +import Link from 'next/link'; + +import { DateTime } from 'luxon'; + +import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt'; +import { acceptTeamInvitation } from '@documenso/lib/server-only/team/accept-team-invitation'; +import { getTeamById } from '@documenso/lib/server-only/team/get-team'; +import { prisma } from '@documenso/prisma'; +import { TeamMemberInviteStatus } from '@documenso/prisma/client'; +import { Button } from '@documenso/ui/primitives/button'; + +type AcceptInvitationPageProps = { + params: { + token: string; + }; +}; + +export default async function AcceptInvitationPage({ + params: { token }, +}: AcceptInvitationPageProps) { + const session = await getServerComponentSession(); + + const teamMemberInvite = await prisma.teamMemberInvite.findUnique({ + where: { + token, + }, + }); + + if (!teamMemberInvite) { + return ( +

+

Invalid token

+ +

+ This token is invalid or has expired. Please contact your team for a new invitation. +

+ + +
+ ); + } + + const team = await getTeamById({ teamId: teamMemberInvite.teamId }); + + const user = await prisma.user.findFirst({ + where: { + email: { + equals: teamMemberInvite.email, + mode: 'insensitive', + }, + }, + }); + + // Directly convert the team member invite to a team member if they already have an account. + if (user) { + await acceptTeamInvitation({ userId: user.id, teamId: team.id }); + } + + // For users who do not exist yet, set the team invite status to accepted, which is checked during + // user creation to determine if we should add the user to the team at that time. + if (!user && teamMemberInvite.status !== TeamMemberInviteStatus.ACCEPTED) { + await prisma.teamMemberInvite.update({ + where: { + id: teamMemberInvite.id, + }, + data: { + status: TeamMemberInviteStatus.ACCEPTED, + }, + }); + } + + const email = encryptSecondaryData({ + data: teamMemberInvite.email, + expiresAt: DateTime.now().plus({ days: 1 }).toMillis(), + }); + + if (!user) { + return ( +
+

Team invitation

+ +

+ You have been invited by {team.name} to join their team. +

+ +

+ To accept this invitation you must create an account. +

+ + +
+ ); + } + + const isSessionUserTheInvitedUser = user.id === session.user?.id; + + return ( +
+

Invitation accepted!

+ +

+ You have accepted an invitation from {team.name} to join their team. +

+ + {isSessionUserTheInvitedUser ? ( + + ) : ( + + )} +
+ ); +} diff --git a/apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx b/apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx new file mode 100644 index 000000000..53ad4461b --- /dev/null +++ b/apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx @@ -0,0 +1,89 @@ +import Link from 'next/link'; + +import { isTokenExpired } from '@documenso/lib/utils/token-verification'; +import { prisma } from '@documenso/prisma'; +import { Button } from '@documenso/ui/primitives/button'; + +type VerifyTeamEmailPageProps = { + params: { + token: string; + }; +}; + +export default async function VerifyTeamEmailPage({ params: { token } }: VerifyTeamEmailPageProps) { + const teamEmailVerification = await prisma.teamEmailVerification.findUnique({ + where: { + token, + }, + include: { + team: true, + }, + }); + + if (!teamEmailVerification || isTokenExpired(teamEmailVerification.expiresAt)) { + return ( +
+

Invalid link

+ +

+ This link is invalid or has expired. Please contact your team to resend a verification. +

+ + +
+ ); + } + + const { team } = teamEmailVerification; + + let isTeamEmailVerificationError = false; + + try { + await prisma.$transaction([ + prisma.teamEmailVerification.deleteMany({ + where: { + teamId: team.id, + }, + }), + prisma.teamEmail.create({ + data: { + teamId: team.id, + email: teamEmailVerification.email, + name: teamEmailVerification.name, + }, + }), + ]); + } catch (e) { + console.error(e); + isTeamEmailVerificationError = true; + } + + if (isTeamEmailVerificationError) { + return ( +
+

Team email verification

+ +

+ Something went wrong while attempting to verify your email address for{' '} + {team.name}. Please try again later. +

+
+ ); + } + + return ( +
+

Team email verified!

+ +

+ You have verified your email address for {team.name}. +

+ + +
+ ); +} diff --git a/apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx b/apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx new file mode 100644 index 000000000..819b7e970 --- /dev/null +++ b/apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx @@ -0,0 +1,80 @@ +import Link from 'next/link'; + +import { transferTeamOwnership } from '@documenso/lib/server-only/team/transfer-team-ownership'; +import { isTokenExpired } from '@documenso/lib/utils/token-verification'; +import { prisma } from '@documenso/prisma'; +import { Button } from '@documenso/ui/primitives/button'; + +type VerifyTeamTransferPage = { + params: { + token: string; + }; +}; + +export default async function VerifyTeamTransferPage({ + params: { token }, +}: VerifyTeamTransferPage) { + const teamTransferVerification = await prisma.teamTransferVerification.findUnique({ + where: { + token, + }, + include: { + team: true, + }, + }); + + if (!teamTransferVerification || isTokenExpired(teamTransferVerification.expiresAt)) { + return ( +
+

Invalid link

+ +

+ This link is invalid or has expired. Please contact your team to resend a transfer + request. +

+ + +
+ ); + } + + const { team } = teamTransferVerification; + + let isTransferError = false; + + try { + await transferTeamOwnership({ token }); + } catch (e) { + console.error(e); + isTransferError = true; + } + + if (isTransferError) { + return ( +
+

Team ownership transfer

+ +

+ Something went wrong while attempting to transfer the ownership of team{' '} + {team.name} to your. Please try again later or contact support. +

+
+ ); + } + + return ( +
+

Team ownership transferred!

+ +

+ The ownership of team {team.name} has been successfully transferred to you. +

+ + +
+ ); +} diff --git a/apps/web/src/components/(dashboard)/common/command-menu.tsx b/apps/web/src/components/(dashboard)/common/command-menu.tsx index 0312a96d2..3fe42a4c4 100644 --- a/apps/web/src/components/(dashboard)/common/command-menu.tsx +++ b/apps/web/src/components/(dashboard)/common/command-menu.tsx @@ -197,20 +197,22 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) { )} {!currentPage && ( <> - + - + - + - - addPage('theme')}>Change theme + + addPage('theme')}> + Change theme + {searchResults.length > 0 && ( - + )} @@ -231,6 +233,7 @@ const Commands = ({ }) => { return pages.map((page, idx) => ( push(page.path)} @@ -255,7 +258,7 @@ const ThemeCommands = ({ setTheme }: { setTheme: (_theme: string) => void }) => setTheme(theme.theme)} - className="mx-2 first:mt-2 last:mb-2" + className="-my-1 mx-2 rounded-lg first:mt-2 last:mb-2" > {theme.label} diff --git a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx index e04bc2818..2b11c4be2 100644 --- a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx @@ -4,10 +4,11 @@ import type { HTMLAttributes } from 'react'; import { useEffect, useState } from 'react'; import Link from 'next/link'; -import { usePathname } from 'next/navigation'; +import { useParams, usePathname } from 'next/navigation'; import { Search } from 'lucide-react'; +import { getRootHref } from '@documenso/lib/utils/params'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; @@ -28,10 +29,13 @@ export type DesktopNavProps = HTMLAttributes; export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { const pathname = usePathname(); + const params = useParams(); const [open, setOpen] = useState(false); const [modifierKey, setModifierKey] = useState(() => 'Ctrl'); + const rootHref = getRootHref(params, { returnEmptyRootString: true }); + useEffect(() => { const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : 'unknown'; const isMacOS = /Macintosh|Mac\s+OS\s+X/i.test(userAgent); @@ -48,20 +52,24 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { {...props} >
- {navigationLinks.map(({ href, label }) => ( - - {label} - - ))} + {navigationLinks + .filter(({ href }) => href !== '/templates' || rootHref === '') // Remove templates for team pages. + .map(({ href, label }) => ( + + {label} + + ))}
diff --git a/apps/web/src/components/(dashboard)/layout/header.tsx b/apps/web/src/components/(dashboard)/layout/header.tsx index ba35671e6..753f5fb11 100644 --- a/apps/web/src/components/(dashboard)/layout/header.tsx +++ b/apps/web/src/components/(dashboard)/layout/header.tsx @@ -1,23 +1,34 @@ 'use client'; -import type { HTMLAttributes } from 'react'; -import { useEffect, useState } from 'react'; +import { type HTMLAttributes, useEffect, useState } from 'react'; import Link from 'next/link'; +import { useParams } from 'next/navigation'; +import { MenuIcon, SearchIcon } from 'lucide-react'; + +import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams'; +import { getRootHref } from '@documenso/lib/utils/params'; import type { User } from '@documenso/prisma/client'; import { cn } from '@documenso/ui/lib/utils'; import { Logo } from '~/components/branding/logo'; +import { CommandMenu } from '../common/command-menu'; import { DesktopNav } from './desktop-nav'; -import { ProfileDropdown } from './profile-dropdown'; +import { MenuSwitcher } from './menu-switcher'; +import { MobileNavigation } from './mobile-navigation'; export type HeaderProps = HTMLAttributes & { user: User; + teams: GetTeamsResponse; }; -export const Header = ({ className, user, ...props }: HeaderProps) => { +export const Header = ({ className, user, teams, ...props }: HeaderProps) => { + const params = useParams(); + + const [isCommandMenuOpen, setIsCommandMenuOpen] = useState(false); + const [isHamburgerMenuOpen, setIsHamburgerMenuOpen] = useState(false); const [scrollY, setScrollY] = useState(0); useEffect(() => { @@ -41,8 +52,8 @@ export const Header = ({ className, user, ...props }: HeaderProps) => { >
@@ -50,11 +61,24 @@ export const Header = ({ className, user, ...props }: HeaderProps) => {
- + +
- {/* */} +
+ + + + + + +
diff --git a/apps/web/src/components/(dashboard)/layout/menu-switcher.tsx b/apps/web/src/components/(dashboard)/layout/menu-switcher.tsx new file mode 100644 index 000000000..35a05baf2 --- /dev/null +++ b/apps/web/src/components/(dashboard)/layout/menu-switcher.tsx @@ -0,0 +1,214 @@ +'use client'; + +import Link from 'next/link'; +import { usePathname } from 'next/navigation'; + +import { CheckCircle2, ChevronsUpDown, Plus, Settings2 } from 'lucide-react'; +import { signOut } from 'next-auth/react'; + +import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin'; +import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams'; +import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; +import { canExecuteTeamAction } from '@documenso/lib/utils/teams'; +import type { User } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +import { cn } from '@documenso/ui/lib/utils'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { Button } from '@documenso/ui/primitives/button'; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuSeparator, + DropdownMenuTrigger, +} from '@documenso/ui/primitives/dropdown-menu'; + +export type MenuSwitcherProps = { + user: User; + teams: GetTeamsResponse; +}; + +export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProps) => { + const pathname = usePathname(); + + const isUserAdmin = isAdmin(user); + + const { data: teamsQueryResult } = trpc.team.getTeams.useQuery(undefined, { + initialData: initialTeamsData, + }); + + const teams = teamsQueryResult && teamsQueryResult.length > 0 ? teamsQueryResult : null; + + const isPathTeamUrl = (teamUrl: string) => { + if (!pathname || !pathname.startsWith(`/t/`)) { + return false; + } + + return pathname.split('/')[2] === teamUrl; + }; + + const selectedTeam = teams?.find((team) => isPathTeamUrl(team.url)); + + const formatAvatarFallback = (teamName?: string) => { + if (teamName !== undefined) { + return teamName.slice(0, 1).toUpperCase(); + } + + return user.name ? extractInitials(user.name) : user.email.slice(0, 1).toUpperCase(); + }; + + const formatSecondaryAvatarText = (team?: typeof selectedTeam) => { + if (!team) { + return 'Personal Account'; + } + + if (team.ownerUserId === user.id) { + return 'Owner'; + } + + return TEAM_MEMBER_ROLE_MAP[team.currentTeamMember.role]; + }; + + return ( + + + + + + + {teams ? ( + <> + Personal + + + + + ) + } + /> + + + + + + +
+

Teams

+ +
+ + + + + + + +
+
+
+ + {teams.map((team) => ( + + + + ) + } + /> + + + ))} + + ) : ( + + + Create team + + + + )} + + + + {isUserAdmin && ( + + Admin panel + + )} + + + User settings + + + {selectedTeam && + canExecuteTeamAction('MANAGE_TEAM', selectedTeam.currentTeamMember.role) && ( + + Team settings + + )} + + + signOut({ + callbackUrl: '/', + }) + } + > + Sign Out + +
+
+ ); +}; diff --git a/apps/web/src/components/(dashboard)/layout/mobile-nav.tsx b/apps/web/src/components/(dashboard)/layout/mobile-nav.tsx deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx b/apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx new file mode 100644 index 000000000..7142de5dc --- /dev/null +++ b/apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx @@ -0,0 +1,96 @@ +'use client'; + +import Image from 'next/image'; +import Link from 'next/link'; +import { useParams } from 'next/navigation'; + +import { signOut } from 'next-auth/react'; + +import LogoImage from '@documenso/assets/logo.png'; +import { getRootHref } from '@documenso/lib/utils/params'; +import { Sheet, SheetContent } from '@documenso/ui/primitives/sheet'; +import { ThemeSwitcher } from '@documenso/ui/primitives/theme-switcher'; + +export type MobileNavigationProps = { + isMenuOpen: boolean; + onMenuOpenChange?: (_value: boolean) => void; +}; + +export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigationProps) => { + const params = useParams(); + + const handleMenuItemClick = () => { + onMenuOpenChange?.(false); + }; + + const rootHref = getRootHref(params, { returnEmptyRootString: true }); + + const menuNavigationLinks = [ + { + href: `${rootHref}/documents`, + text: 'Documents', + }, + { + href: `${rootHref}/templates`, + text: 'Templates', + }, + { + href: '/settings/teams', + text: 'Teams', + }, + { + href: '/settings/profile', + text: 'Settings', + }, + ].filter(({ text, href }) => text !== 'Templates' || href === '/templates'); // Filter out templates for teams. + + return ( + + + + Documenso Logo + + +
+ {menuNavigationLinks.map(({ href, text }) => ( + handleMenuItemClick()} + > + {text} + + ))} + + +
+ +
+
+ +
+ +

+ © {new Date().getFullYear()} Documenso, Inc. All rights reserved. +

+
+
+
+ ); +}; diff --git a/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx b/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx deleted file mode 100644 index f2432c071..000000000 --- a/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx +++ /dev/null @@ -1,169 +0,0 @@ -'use client'; - -import Link from 'next/link'; - -import { - CreditCard, - FileSpreadsheet, - Lock, - LogOut, - User as LucideUser, - Monitor, - Moon, - Palette, - Sun, - UserCog, -} from 'lucide-react'; -import { signOut } from 'next-auth/react'; -import { useTheme } from 'next-themes'; -import { LuGithub } from 'react-icons/lu'; - -import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag'; -import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin'; -import { recipientInitials } from '@documenso/lib/utils/recipient-formatter'; -import type { User } from '@documenso/prisma/client'; -import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar'; -import { Button } from '@documenso/ui/primitives/button'; -import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuLabel, - DropdownMenuPortal, - DropdownMenuRadioGroup, - DropdownMenuRadioItem, - DropdownMenuSeparator, - DropdownMenuSub, - DropdownMenuSubContent, - DropdownMenuSubTrigger, - DropdownMenuTrigger, -} from '@documenso/ui/primitives/dropdown-menu'; - -export type ProfileDropdownProps = { - user: User; -}; - -export const ProfileDropdown = ({ user }: ProfileDropdownProps) => { - const { getFlag } = useFeatureFlags(); - const { theme, setTheme } = useTheme(); - const isUserAdmin = isAdmin(user); - - const isBillingEnabled = getFlag('app_billing'); - - const avatarFallback = user.name - ? recipientInitials(user.name) - : user.email.slice(0, 1).toUpperCase(); - - return ( - - - - - - - Account - - {isUserAdmin && ( - <> - - - - Admin - - - - - - )} - - - - - Profile - - - - - - - Security - - - - {isBillingEnabled && ( - - - - Billing - - - )} - - - - - - Templates - - - - - - - - Themes - - - - - - Light - - - - Dark - - - - System - - - - - - - - - - Star on Github - - - - - - - void signOut({ - callbackUrl: '/', - }) - } - > - - Sign Out - - - - ); -}; diff --git a/apps/web/src/components/(dashboard)/period-selector/period-selector.tsx b/apps/web/src/components/(dashboard)/period-selector/period-selector.tsx index caeb780d0..a49e2f284 100644 --- a/apps/web/src/components/(dashboard)/period-selector/period-selector.tsx +++ b/apps/web/src/components/(dashboard)/period-selector/period-selector.tsx @@ -21,9 +21,9 @@ export const PeriodSelector = () => { const router = useRouter(); const period = useMemo(() => { - const p = searchParams?.get('period') ?? ''; + const p = searchParams?.get('period') ?? 'all'; - return isPeriodSelectorValue(p) ? p : ''; + return isPeriodSelectorValue(p) ? p : 'all'; }, [searchParams]); const onPeriodChange = (newPeriod: string) => { @@ -35,7 +35,7 @@ export const PeriodSelector = () => { params.set('period', newPeriod); - if (newPeriod === '') { + if (newPeriod === '' || newPeriod === 'all') { params.delete('period'); } @@ -49,7 +49,7 @@ export const PeriodSelector = () => { - All Time + All Time Last 7 days Last 14 days Last 30 days diff --git a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx index f4b2aae5e..c7ab61d8a 100644 --- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx @@ -1,11 +1,11 @@ 'use client'; -import { HTMLAttributes } from 'react'; +import type { HTMLAttributes } from 'react'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; -import { CreditCard, Lock, User } from 'lucide-react'; +import { CreditCard, Lock, User, Users } from 'lucide-react'; import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag'; import { cn } from '@documenso/ui/lib/utils'; @@ -35,6 +35,19 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { + + + + + + + + + )} + + + + + Add team email + + + A verification email will be sent to the provided email. + + + +
+ +
+ ( + + Name + + + + + + )} + /> + + ( + + Email + + + + + + )} + /> + + + + + + +
+
+ +
+ + ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/create-team-checkout-dialog.tsx b/apps/web/src/components/(teams)/dialogs/create-team-checkout-dialog.tsx new file mode 100644 index 000000000..f7ee8ca51 --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/create-team-checkout-dialog.tsx @@ -0,0 +1,177 @@ +import { useMemo, useState } from 'react'; + +import type * as DialogPrimitive from '@radix-ui/react-dialog'; +import { AnimatePresence, motion } from 'framer-motion'; +import { Loader, TagIcon } from 'lucide-react'; + +import { trpc } from '@documenso/trpc/react'; +import { Button } from '@documenso/ui/primitives/button'; +import { Card, CardContent } from '@documenso/ui/primitives/card'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, +} from '@documenso/ui/primitives/dialog'; +import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type CreateTeamCheckoutDialogProps = { + pendingTeamId: number | null; + onClose: () => void; +} & Omit; + +const MotionCard = motion(Card); + +export const CreateTeamCheckoutDialog = ({ + pendingTeamId, + onClose, + ...props +}: CreateTeamCheckoutDialogProps) => { + const { toast } = useToast(); + + const [interval, setInterval] = useState<'monthly' | 'yearly'>('monthly'); + + const { data, isLoading } = trpc.team.getTeamPrices.useQuery(); + + const { mutateAsync: createCheckout, isLoading: isCreatingCheckout } = + trpc.team.createTeamPendingCheckout.useMutation({ + onSuccess: (checkoutUrl) => { + window.open(checkoutUrl, '_blank'); + onClose(); + }, + onError: () => + toast({ + title: 'Something went wrong', + description: + 'We were unable to create a checkout session. Please try again, or contact support', + variant: 'destructive', + }), + }); + + const selectedPrice = useMemo(() => { + if (!data) { + return null; + } + + return data[interval]; + }, [data, interval]); + + const handleOnOpenChange = (open: boolean) => { + if (pendingTeamId === null) { + return; + } + + if (!open) { + onClose(); + } + }; + + if (pendingTeamId === null) { + return null; + } + + return ( + + + + Team checkout + + + Payment is required to finalise the creation of your team. + + + + {(isLoading || !data) && ( +
+ {isLoading ? ( + + ) : ( +

Something went wrong

+ )} +
+ )} + + {data && selectedPrice && !isLoading && ( +
+ setInterval(value as 'monthly' | 'yearly')} + value={interval} + className="mb-4" + > + + {[data.monthly, data.yearly].map((price) => ( + + {price.friendlyInterval} + + ))} + + + + + + + {selectedPrice.interval === 'monthly' ? ( +
+ $50 USD per month +
+ ) : ( +
+ + $480 USD per year + +
+ + 20% off +
+
+ )} + +
+

This price includes minimum 5 seats.

+ +

+ Adding and removing seats will adjust your invoice accordingly. +

+
+
+
+
+ + + + + + +
+ )} +
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/create-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/create-team-dialog.tsx new file mode 100644 index 000000000..283fd8dad --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/create-team-dialog.tsx @@ -0,0 +1,223 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { useRouter, useSearchParams } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import type * as DialogPrimitive from '@radix-ui/react-dialog'; +import { useForm } from 'react-hook-form'; +import type { z } from 'zod'; + +import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { trpc } from '@documenso/trpc/react'; +import { ZCreateTeamMutationSchema } from '@documenso/trpc/server/team-router/schema'; +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 CreateTeamDialogProps = { + trigger?: React.ReactNode; +} & Omit; + +const ZCreateTeamFormSchema = ZCreateTeamMutationSchema.pick({ + teamName: true, + teamUrl: true, +}); + +type TCreateTeamFormSchema = z.infer; + +export const CreateTeamDialog = ({ trigger, ...props }: CreateTeamDialogProps) => { + const { toast } = useToast(); + + const router = useRouter(); + const searchParams = useSearchParams(); + const updateSearchParams = useUpdateSearchParams(); + + const [open, setOpen] = useState(false); + + const actionSearchParam = searchParams?.get('action'); + + const form = useForm({ + resolver: zodResolver(ZCreateTeamFormSchema), + defaultValues: { + teamName: '', + teamUrl: '', + }, + }); + + const { mutateAsync: createTeam } = trpc.team.createTeam.useMutation(); + + const onFormSubmit = async ({ teamName, teamUrl }: TCreateTeamFormSchema) => { + try { + const response = await createTeam({ + teamName, + teamUrl, + }); + + setOpen(false); + + if (response.paymentRequired) { + router.push(`/settings/teams?tab=pending&checkout=${response.pendingTeamId}`); + return; + } + + toast({ + title: 'Success', + description: 'Your team has been created.', + duration: 5000, + }); + } catch (err) { + const error = AppError.parseError(err); + + if (error.code === AppErrorCode.ALREADY_EXISTS) { + form.setError('teamUrl', { + type: 'manual', + message: 'This URL is already in use.', + }); + + return; + } + + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + description: + 'We encountered an unknown error while attempting to create a team. Please try again later.', + }); + } + }; + + const mapTextToUrl = (text: string) => { + return text.toLowerCase().replace(/\s+/g, '-'); + }; + + useEffect(() => { + if (actionSearchParam === 'add-team') { + setOpen(true); + updateSearchParams({ action: null }); + } + }, [actionSearchParam, open, setOpen, updateSearchParams]); + + useEffect(() => { + form.reset(); + }, [open, form]); + + return ( + !form.formState.isSubmitting && setOpen(value)} + > + e.stopPropagation()} asChild={true}> + {trigger ?? ( + + )} + + + + + Create team + + + Create a team to collaborate with your team members. + + + +
+ +
+ ( + + Team Name + + { + const oldGeneratedUrl = mapTextToUrl(field.value); + const newGeneratedUrl = mapTextToUrl(event.target.value); + + const urlField = form.getValues('teamUrl'); + if (urlField === oldGeneratedUrl) { + form.setValue('teamUrl', newGeneratedUrl); + } + + field.onChange(event); + }} + /> + + + + )} + /> + + ( + + Team URL + + + + {!form.formState.errors.teamUrl && ( + + {field.value + ? `${WEBAPP_BASE_URL}/t/${field.value}` + : 'A unique URL to identify your team'} + + )} + + + + )} + /> + + + + + + +
+
+ +
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/delete-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/delete-team-dialog.tsx new file mode 100644 index 000000000..99630e57c --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/delete-team-dialog.tsx @@ -0,0 +1,160 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { useRouter } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import { AppError } from '@documenso/lib/errors/app-error'; +import { trpc } from '@documenso/trpc/react'; +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 type { Toast } from '@documenso/ui/primitives/use-toast'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type DeleteTeamDialogProps = { + teamId: number; + teamName: string; + trigger?: React.ReactNode; +}; + +export const DeleteTeamDialog = ({ trigger, teamId, teamName }: DeleteTeamDialogProps) => { + const router = useRouter(); + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const deleteMessage = `delete ${teamName}`; + + const ZDeleteTeamFormSchema = z.object({ + teamName: z.literal(deleteMessage, { + errorMap: () => ({ message: `You must enter '${deleteMessage}' to proceed` }), + }), + }); + + const form = useForm({ + resolver: zodResolver(ZDeleteTeamFormSchema), + defaultValues: { + teamName: '', + }, + }); + + const { mutateAsync: deleteTeam } = trpc.team.deleteTeam.useMutation(); + + const onFormSubmit = async () => { + try { + await deleteTeam({ teamId }); + + toast({ + title: 'Success', + description: 'Your team has been successfully deleted.', + duration: 5000, + }); + + setOpen(false); + + router.push('/settings/teams'); + } catch (err) { + const error = AppError.parseError(err); + + let toastError: Toast = { + title: 'An unknown error occurred', + variant: 'destructive', + duration: 10000, + description: + 'We encountered an unknown error while attempting to delete this team. Please try again later.', + }; + + if (error.code === 'resource_missing') { + toastError = { + title: 'Unable to delete team', + variant: 'destructive', + duration: 15000, + description: + 'Something went wrong while updating the team billing subscription, please contact support.', + }; + } + + toast(toastError); + } + }; + + useEffect(() => { + if (!open) { + form.reset(); + } + }, [open, form]); + + return ( + !form.formState.isSubmitting && setOpen(value)}> + + {trigger ?? } + + + + + Delete team + + + Are you sure? This is irreversable. + + + +
+ +
+ ( + + + Confirm by typing {deleteMessage} + + + + + + + )} + /> + + + + + + +
+
+ +
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/delete-team-member-dialog.tsx b/apps/web/src/components/(teams)/dialogs/delete-team-member-dialog.tsx new file mode 100644 index 000000000..7ae8ccf1c --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/delete-team-member-dialog.tsx @@ -0,0 +1,107 @@ +'use client'; + +import { useState } from 'react'; + +import { trpc } from '@documenso/trpc/react'; +import { Alert } from '@documenso/ui/primitives/alert'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { Button } from '@documenso/ui/primitives/button'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, + DialogTrigger, +} from '@documenso/ui/primitives/dialog'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type DeleteTeamMemberDialogProps = { + teamId: number; + teamName: string; + teamMemberId: number; + teamMemberName: string; + teamMemberEmail: string; + trigger?: React.ReactNode; +}; + +export const DeleteTeamMemberDialog = ({ + trigger, + teamId, + teamName, + teamMemberId, + teamMemberName, + teamMemberEmail, +}: DeleteTeamMemberDialogProps) => { + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const { mutateAsync: deleteTeamMembers, isLoading: isDeletingTeamMember } = + trpc.team.deleteTeamMembers.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'You have successfully removed this user from the team.', + duration: 5000, + }); + + setOpen(false); + }, + onError: () => { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + duration: 10000, + description: + 'We encountered an unknown error while attempting to remove this user. Please try again later.', + }); + }, + }); + + return ( + !isDeletingTeamMember && setOpen(value)}> + + {trigger ?? } + + + + + Are you sure? + + + You are about to remove the following user from{' '} + {teamName}. + + + + + {teamMemberName}} + secondaryText={teamMemberEmail} + /> + + +
+ + + + + +
+
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx b/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx new file mode 100644 index 000000000..482142c99 --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx @@ -0,0 +1,244 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import type * as DialogPrimitive from '@radix-ui/react-dialog'; +import { Mail, PlusCircle, Trash } from 'lucide-react'; +import { useFieldArray, useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import { TeamMemberRole } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +import { ZCreateTeamMemberInvitesMutationSchema } from '@documenso/trpc/server/team-router/schema'; +import { cn } from '@documenso/ui/lib/utils'; +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 { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from '@documenso/ui/primitives/select'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type InviteTeamMembersDialogProps = { + currentUserTeamRole: TeamMemberRole; + teamId: number; + trigger?: React.ReactNode; +} & Omit; + +const ZInviteTeamMembersFormSchema = z + .object({ + invitations: ZCreateTeamMemberInvitesMutationSchema.shape.invitations, + }) + .refine( + (schema) => { + const emails = schema.invitations.map((invitation) => invitation.email.toLowerCase()); + + return new Set(emails).size === emails.length; + }, + // Dirty hack to handle errors when .root is populated for an array type + { message: 'Members must have unique emails', path: ['members__root'] }, + ); + +type TInviteTeamMembersFormSchema = z.infer; + +export const InviteTeamMembersDialog = ({ + currentUserTeamRole, + teamId, + trigger, + ...props +}: InviteTeamMembersDialogProps) => { + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const form = useForm({ + resolver: zodResolver(ZInviteTeamMembersFormSchema), + defaultValues: { + invitations: [ + { + email: '', + role: TeamMemberRole.MEMBER, + }, + ], + }, + }); + + const { + append: appendTeamMemberInvite, + fields: teamMemberInvites, + remove: removeTeamMemberInvite, + } = useFieldArray({ + control: form.control, + name: 'invitations', + }); + + const { mutateAsync: createTeamMemberInvites } = trpc.team.createTeamMemberInvites.useMutation(); + + const onAddTeamMemberInvite = () => { + appendTeamMemberInvite({ + email: '', + role: TeamMemberRole.MEMBER, + }); + }; + + const onFormSubmit = async ({ invitations }: TInviteTeamMembersFormSchema) => { + try { + await createTeamMemberInvites({ + teamId, + invitations, + }); + + toast({ + title: 'Success', + description: 'Team invitations have been sent.', + duration: 5000, + }); + + setOpen(false); + } catch { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + description: + 'We encountered an unknown error while attempting to invite team members. Please try again later.', + }); + } + }; + + useEffect(() => { + if (!open) { + form.reset(); + } + }, [open, form]); + + return ( + !form.formState.isSubmitting && setOpen(value)} + > + e.stopPropagation()} asChild> + {trigger ?? } + + + + + Invite team members + + + An email containing an invitation will be sent to each member. + + + +
+ +
+ {teamMemberInvites.map((teamMemberInvite, index) => ( +
+ ( + + {index === 0 && Email address} + + + + + + )} + /> + + ( + + {index === 0 && Role} + + + + + + )} + /> + + +
+ ))} + + + + + + + + +
+
+ +
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx new file mode 100644 index 000000000..27384d680 --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx @@ -0,0 +1,98 @@ +'use client'; + +import { useState } from 'react'; + +import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import type { TeamMemberRole } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +import { Alert } from '@documenso/ui/primitives/alert'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { Button } from '@documenso/ui/primitives/button'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, + DialogTrigger, +} from '@documenso/ui/primitives/dialog'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type LeaveTeamDialogProps = { + teamId: number; + teamName: string; + role: TeamMemberRole; + trigger?: React.ReactNode; +}; + +export const LeaveTeamDialog = ({ trigger, teamId, teamName, role }: LeaveTeamDialogProps) => { + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const { mutateAsync: leaveTeam, isLoading: isLeavingTeam } = trpc.team.leaveTeam.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'You have successfully left this team.', + duration: 5000, + }); + + setOpen(false); + }, + onError: () => { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + duration: 10000, + description: + 'We encountered an unknown error while attempting to leave this team. Please try again later.', + }); + }, + }); + + return ( + !isLeavingTeam && setOpen(value)}> + + {trigger ?? } + + + + + Are you sure? + + + You are about to leave the following team. + + + + + + + +
+ + + + + +
+
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx new file mode 100644 index 000000000..e5dd8ca17 --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx @@ -0,0 +1,293 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { useRouter } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import { Loader } from 'lucide-react'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { trpc } from '@documenso/trpc/react'; +import { Alert, AlertDescription } 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 { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from '@documenso/ui/primitives/select'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type TransferTeamDialogProps = { + teamId: number; + teamName: string; + ownerUserId: number; + trigger?: React.ReactNode; +}; + +export const TransferTeamDialog = ({ + trigger, + teamId, + teamName, + ownerUserId, +}: TransferTeamDialogProps) => { + const router = useRouter(); + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const { mutateAsync: requestTeamOwnershipTransfer } = + trpc.team.requestTeamOwnershipTransfer.useMutation(); + + const { + data, + refetch: refetchTeamMembers, + isLoading: loadingTeamMembers, + isLoadingError: loadingTeamMembersError, + } = trpc.team.getTeamMembers.useQuery({ + teamId, + }); + + const confirmTransferMessage = `transfer ${teamName}`; + + const ZTransferTeamFormSchema = z.object({ + teamName: z.literal(confirmTransferMessage, { + errorMap: () => ({ message: `You must enter '${confirmTransferMessage}' to proceed` }), + }), + newOwnerUserId: z.string(), + clearPaymentMethods: z.boolean(), + }); + + const form = useForm>({ + resolver: zodResolver(ZTransferTeamFormSchema), + defaultValues: { + teamName: '', + clearPaymentMethods: false, + }, + }); + + const onFormSubmit = async ({ + newOwnerUserId, + clearPaymentMethods, + }: z.infer) => { + try { + await requestTeamOwnershipTransfer({ + teamId, + newOwnerUserId: Number.parseInt(newOwnerUserId), + clearPaymentMethods, + }); + + router.refresh(); + + toast({ + title: 'Success', + description: 'An email requesting the transfer of this team has been sent.', + duration: 5000, + }); + + setOpen(false); + } catch (err) { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + duration: 10000, + description: + 'We encountered an unknown error while attempting to request a transfer of this team. Please try again later.', + }); + } + }; + + useEffect(() => { + if (!open) { + form.reset(); + } + }, [open, form]); + + useEffect(() => { + if (open && loadingTeamMembersError) { + void refetchTeamMembers(); + } + }, [open, loadingTeamMembersError, refetchTeamMembers]); + + const teamMembers = data + ? data.filter((teamMember) => teamMember.userId !== ownerUserId) + : undefined; + + return ( + !form.formState.isSubmitting && setOpen(value)}> + + {trigger ?? ( + + )} + + + {teamMembers && teamMembers.length > 0 ? ( + + + Transfer team + + + Transfer ownership of this team to a selected team member. + + + +
+ +
+ ( + + New team owner + + + + + + )} + /> + + ( + + + Confirm by typing{' '} + {confirmTransferMessage} + + + + + + + )} + /> + + {/* Temporary removed. */} + {/* {IS_BILLING_ENABLED && ( + ( + +
+ + + +
+
+ )} + /> + )} */} + + + +
    + {IS_BILLING_ENABLED && ( + // Temporary removed. + //
  • + // {form.getValues('clearPaymentMethods') + // ? 'You will not be billed for any upcoming invoices' + // : 'We will continue to bill current payment methods if required'} + //
  • + +
  • + Any payment methods attached to this team will remain attached to this + team. Please contact us if you need to update this information. +
  • + )} +
  • + The selected team member will receive an email which they must accept before + the team is transferred +
  • +
+
+
+ + + + + + +
+
+ +
+ ) : ( + + {loadingTeamMembers ? ( + + ) : ( +

+ {loadingTeamMembersError + ? 'An error occurred while loading team members. Please try again later.' + : 'You must have at least one other team member to transfer ownership.'} +

+ )} +
+ )} +
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/update-team-email-dialog.tsx b/apps/web/src/components/(teams)/dialogs/update-team-email-dialog.tsx new file mode 100644 index 000000000..c6ab8890a --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/update-team-email-dialog.tsx @@ -0,0 +1,165 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { useRouter } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import type * as DialogPrimitive from '@radix-ui/react-dialog'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import type { TeamEmail } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +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 UpdateTeamEmailDialogProps = { + teamEmail: TeamEmail; + trigger?: React.ReactNode; +} & Omit; + +const ZUpdateTeamEmailFormSchema = z.object({ + name: z.string().trim().min(1, { message: 'Please enter a valid name.' }), +}); + +type TUpdateTeamEmailFormSchema = z.infer; + +export const UpdateTeamEmailDialog = ({ + teamEmail, + trigger, + ...props +}: UpdateTeamEmailDialogProps) => { + const router = useRouter(); + + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const form = useForm({ + resolver: zodResolver(ZUpdateTeamEmailFormSchema), + defaultValues: { + name: teamEmail.name, + }, + }); + + const { mutateAsync: updateTeamEmail } = trpc.team.updateTeamEmail.useMutation(); + + const onFormSubmit = async ({ name }: TUpdateTeamEmailFormSchema) => { + try { + await updateTeamEmail({ + teamId: teamEmail.teamId, + data: { + name, + }, + }); + + toast({ + title: 'Success', + description: 'Team email was updated.', + duration: 5000, + }); + + router.refresh(); + + setOpen(false); + } catch (err) { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + description: + 'We encountered an unknown error while attempting update the team email. Please try again later.', + }); + } + }; + + useEffect(() => { + if (!open) { + form.reset(); + } + }, [open, form]); + + return ( + !form.formState.isSubmitting && setOpen(value)} + > + e.stopPropagation()} asChild> + {trigger ?? ( + + )} + + + + + Update team email + + + To change the email you must remove and add a new email address. + + + +
+ +
+ ( + + Name + + + + + + )} + /> + + + Email + + + + + + + + + + +
+
+ +
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/dialogs/update-team-member-dialog.tsx b/apps/web/src/components/(teams)/dialogs/update-team-member-dialog.tsx new file mode 100644 index 000000000..cc8ea675f --- /dev/null +++ b/apps/web/src/components/(teams)/dialogs/update-team-member-dialog.tsx @@ -0,0 +1,185 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import type * as DialogPrimitive from '@radix-ui/react-dialog'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams'; +import { TeamMemberRole } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +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 { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from '@documenso/ui/primitives/select'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type UpdateTeamMemberDialogProps = { + currentUserTeamRole: TeamMemberRole; + trigger?: React.ReactNode; + teamId: number; + teamMemberId: number; + teamMemberName: string; + teamMemberRole: TeamMemberRole; +} & Omit; + +const ZUpdateTeamMemberFormSchema = z.object({ + role: z.nativeEnum(TeamMemberRole), +}); + +type ZUpdateTeamMemberSchema = z.infer; + +export const UpdateTeamMemberDialog = ({ + currentUserTeamRole, + trigger, + teamId, + teamMemberId, + teamMemberName, + teamMemberRole, + ...props +}: UpdateTeamMemberDialogProps) => { + const [open, setOpen] = useState(false); + + const { toast } = useToast(); + + const form = useForm({ + resolver: zodResolver(ZUpdateTeamMemberFormSchema), + defaultValues: { + role: teamMemberRole, + }, + }); + + const { mutateAsync: updateTeamMember } = trpc.team.updateTeamMember.useMutation(); + + const onFormSubmit = async ({ role }: ZUpdateTeamMemberSchema) => { + try { + await updateTeamMember({ + teamId, + teamMemberId, + data: { + role, + }, + }); + + toast({ + title: 'Success', + description: `You have updated ${teamMemberName}.`, + duration: 5000, + }); + + setOpen(false); + } catch { + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + description: + 'We encountered an unknown error while attempting to update this team member. Please try again later.', + }); + } + }; + + useEffect(() => { + if (!open) { + return; + } + + form.reset(); + + if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, teamMemberRole)) { + setOpen(false); + + toast({ + title: 'You cannot modify a team member who has a higher role than you.', + variant: 'destructive', + }); + } + }, [open, currentUserTeamRole, teamMemberRole, form, toast]); + + return ( + !form.formState.isSubmitting && setOpen(value)} + > + e.stopPropagation()} asChild> + {trigger ?? } + + + + + Update team member + + + You are currently updating {teamMemberName}. + + + +
+ +
+ ( + + Role + + + + + + )} + /> + + + + + + +
+
+ +
+
+ ); +}; diff --git a/apps/web/src/components/(teams)/forms/update-team-form.tsx b/apps/web/src/components/(teams)/forms/update-team-form.tsx new file mode 100644 index 000000000..142914b8c --- /dev/null +++ b/apps/web/src/components/(teams)/forms/update-team-form.tsx @@ -0,0 +1,173 @@ +'use client'; + +import { useRouter } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import { AnimatePresence, motion } from 'framer-motion'; +import { useForm } from 'react-hook-form'; +import type { z } from 'zod'; + +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { trpc } from '@documenso/trpc/react'; +import { ZUpdateTeamMutationSchema } from '@documenso/trpc/server/team-router/schema'; +import { Button } from '@documenso/ui/primitives/button'; +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 UpdateTeamDialogProps = { + teamId: number; + teamName: string; + teamUrl: string; +}; + +const ZUpdateTeamFormSchema = ZUpdateTeamMutationSchema.shape.data.pick({ + name: true, + url: true, +}); + +type TUpdateTeamFormSchema = z.infer; + +export const UpdateTeamForm = ({ teamId, teamName, teamUrl }: UpdateTeamDialogProps) => { + const router = useRouter(); + + const { toast } = useToast(); + + const form = useForm({ + resolver: zodResolver(ZUpdateTeamFormSchema), + defaultValues: { + name: teamName, + url: teamUrl, + }, + }); + + const { mutateAsync: updateTeam } = trpc.team.updateTeam.useMutation(); + + const onFormSubmit = async ({ name, url }: TUpdateTeamFormSchema) => { + try { + await updateTeam({ + data: { + name, + url, + }, + teamId, + }); + + toast({ + title: 'Success', + description: 'Your team has been successfully updated.', + duration: 5000, + }); + + form.reset({ + name, + url, + }); + + if (url !== teamUrl) { + router.push(`${WEBAPP_BASE_URL}/t/${url}/settings`); + } + } catch (err) { + const error = AppError.parseError(err); + + if (error.code === AppErrorCode.ALREADY_EXISTS) { + form.setError('url', { + type: 'manual', + message: 'This URL is already in use.', + }); + + return; + } + + toast({ + title: 'An unknown error occurred', + variant: 'destructive', + description: + 'We encountered an unknown error while attempting to update your team. Please try again later.', + }); + } + }; + + return ( +
+ +
+ ( + + Team Name + + + + + + )} + /> + + ( + + Team URL + + + + {!form.formState.errors.url && ( + + {field.value + ? `${WEBAPP_BASE_URL}/t/${field.value}` + : 'A unique URL to identify your team'} + + )} + + + + )} + /> + +
+ + {form.formState.isDirty && ( + + + + )} + + + +
+
+
+ + ); +}; diff --git a/apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx new file mode 100644 index 000000000..be68f6c03 --- /dev/null +++ b/apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx @@ -0,0 +1,67 @@ +'use client'; + +import type { HTMLAttributes } from 'react'; + +import Link from 'next/link'; +import { useParams, usePathname } from 'next/navigation'; + +import { CreditCard, Settings, Users } from 'lucide-react'; + +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { cn } from '@documenso/ui/lib/utils'; +import { Button } from '@documenso/ui/primitives/button'; + +export type DesktopNavProps = HTMLAttributes; + +export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { + const pathname = usePathname(); + const params = useParams(); + + const teamUrl = typeof params?.teamUrl === 'string' ? params?.teamUrl : ''; + + const settingsPath = `/t/${teamUrl}/settings`; + const membersPath = `/t/${teamUrl}/settings/members`; + const billingPath = `/t/${teamUrl}/settings/billing`; + + return ( +
+ + + + + + + + + {IS_BILLING_ENABLED && ( + + + + )} +
+ ); +}; diff --git a/apps/web/src/components/(teams)/settings/layout/mobile-nav.tsx b/apps/web/src/components/(teams)/settings/layout/mobile-nav.tsx new file mode 100644 index 000000000..de01ca9bf --- /dev/null +++ b/apps/web/src/components/(teams)/settings/layout/mobile-nav.tsx @@ -0,0 +1,75 @@ +'use client'; + +import type { HTMLAttributes } from 'react'; + +import Link from 'next/link'; +import { useParams, usePathname } from 'next/navigation'; + +import { CreditCard, Key, User } from 'lucide-react'; + +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { cn } from '@documenso/ui/lib/utils'; +import { Button } from '@documenso/ui/primitives/button'; + +export type MobileNavProps = HTMLAttributes; + +export const MobileNav = ({ className, ...props }: MobileNavProps) => { + const pathname = usePathname(); + const params = useParams(); + + const teamUrl = typeof params?.teamUrl === 'string' ? params?.teamUrl : ''; + + const settingsPath = `/t/${teamUrl}/settings`; + const membersPath = `/t/${teamUrl}/settings/members`; + const billingPath = `/t/${teamUrl}/settings/billing`; + + return ( +
+ + + + + + + + + {IS_BILLING_ENABLED && ( + + + + )} +
+ ); +}; diff --git a/apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx b/apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx new file mode 100644 index 000000000..0dd4bcf4c --- /dev/null +++ b/apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx @@ -0,0 +1,158 @@ +'use client'; + +import Link from 'next/link'; +import { useSearchParams } from 'next/navigation'; + +import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params'; +import { canExecuteTeamAction } from '@documenso/lib/utils/teams'; +import { trpc } from '@documenso/trpc/react'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { Button } from '@documenso/ui/primitives/button'; +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 { LocaleDate } from '~/components/formatter/locale-date'; + +import { LeaveTeamDialog } from '../dialogs/leave-team-dialog'; + +export const CurrentUserTeamsDataTable = () => { + const searchParams = useSearchParams(); + const updateSearchParams = useUpdateSearchParams(); + + const parsedSearchParams = ZBaseTableSearchParamsSchema.parse( + Object.fromEntries(searchParams ?? []), + ); + + const { data, isLoading, isInitialLoading, isLoadingError } = trpc.team.findTeams.useQuery( + { + term: parsedSearchParams.query, + 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 ( + ( + + {row.original.name} + } + secondaryText={`${WEBAPP_BASE_URL}/t/${row.original.url}`} + /> + + ), + }, + { + header: 'Role', + accessorKey: 'role', + cell: ({ row }) => + row.original.ownerUserId === row.original.currentTeamMember.userId + ? 'Owner' + : TEAM_MEMBER_ROLE_MAP[row.original.currentTeamMember.role], + }, + { + header: 'Member Since', + accessorKey: 'createdAt', + cell: ({ row }) => , + }, + { + id: 'actions', + cell: ({ row }) => ( +
+ {canExecuteTeamAction('MANAGE_TEAM', row.original.currentTeamMember.role) && ( + + )} + + e.preventDefault()} + > + Leave + + } + /> +
+ ), + }, + ]} + data={results.data} + perPage={results.perPage} + currentPage={results.currentPage} + totalPages={results.totalPages} + onPaginationChange={onPaginationChange} + error={{ + enable: isLoadingError, + }} + skeleton={{ + enable: isLoading && isInitialLoading, + rows: 3, + component: ( + <> + +
+ + +
+ + +
+
+
+ + + + + + + +
+ + +
+
+ + ), + }} + > + {(table) => } +
+ ); +}; diff --git a/apps/web/src/components/(teams)/tables/pending-user-teams-data-table-actions.tsx b/apps/web/src/components/(teams)/tables/pending-user-teams-data-table-actions.tsx new file mode 100644 index 000000000..64a58375c --- /dev/null +++ b/apps/web/src/components/(teams)/tables/pending-user-teams-data-table-actions.tsx @@ -0,0 +1,53 @@ +import { trpc } from '@documenso/trpc/react'; +import { cn } from '@documenso/ui/lib/utils'; +import { Button } from '@documenso/ui/primitives/button'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type PendingUserTeamsDataTableActionsProps = { + className?: string; + pendingTeamId: number; + onPayClick: (pendingTeamId: number) => void; +}; + +export const PendingUserTeamsDataTableActions = ({ + className, + pendingTeamId, + onPayClick, +}: PendingUserTeamsDataTableActionsProps) => { + const { toast } = useToast(); + + const { mutateAsync: deleteTeamPending, isLoading: deletingTeam } = + trpc.team.deleteTeamPending.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'Pending team deleted.', + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + description: + 'We encountered an unknown error while attempting to delete the pending team. Please try again later.', + duration: 10000, + variant: 'destructive', + }); + }, + }); + + return ( +
+ + + +
+ ); +}; diff --git a/apps/web/src/components/(teams)/tables/pending-user-teams-data-table.tsx b/apps/web/src/components/(teams)/tables/pending-user-teams-data-table.tsx new file mode 100644 index 000000000..84d4e38df --- /dev/null +++ b/apps/web/src/components/(teams)/tables/pending-user-teams-data-table.tsx @@ -0,0 +1,145 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { useSearchParams } from 'next/navigation'; + +import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params'; +import { trpc } from '@documenso/trpc/react'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +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 { LocaleDate } from '~/components/formatter/locale-date'; + +import { CreateTeamCheckoutDialog } from '../dialogs/create-team-checkout-dialog'; +import { PendingUserTeamsDataTableActions } from './pending-user-teams-data-table-actions'; + +export const PendingUserTeamsDataTable = () => { + const searchParams = useSearchParams(); + const updateSearchParams = useUpdateSearchParams(); + + const parsedSearchParams = ZBaseTableSearchParamsSchema.parse( + Object.fromEntries(searchParams ?? []), + ); + + const [checkoutPendingTeamId, setCheckoutPendingTeamId] = useState(null); + + const { data, isLoading, isInitialLoading, isLoadingError } = trpc.team.findTeamsPending.useQuery( + { + term: parsedSearchParams.query, + 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, + }; + + useEffect(() => { + const searchParamCheckout = searchParams?.get('checkout'); + + if (searchParamCheckout && !isNaN(parseInt(searchParamCheckout))) { + setCheckoutPendingTeamId(parseInt(searchParamCheckout)); + updateSearchParams({ checkout: null }); + } + }, [searchParams, updateSearchParams]); + + return ( + <> + ( + {row.original.name} + } + secondaryText={`${WEBAPP_BASE_URL}/t/${row.original.url}`} + /> + ), + }, + { + header: 'Created on', + accessorKey: 'createdAt', + cell: ({ row }) => , + }, + { + id: 'actions', + cell: ({ row }) => ( + + ), + }, + ]} + data={results.data} + perPage={results.perPage} + currentPage={results.currentPage} + totalPages={results.totalPages} + onPaginationChange={onPaginationChange} + error={{ + enable: isLoadingError, + }} + skeleton={{ + enable: isLoading && isInitialLoading, + rows: 3, + component: ( + <> + +
+ + +
+ + +
+
+
+ + + + +
+ + +
+
+ + ), + }} + > + {(table) => } +
+ + setCheckoutPendingTeamId(null)} + /> + + ); +}; diff --git a/apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx b/apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx new file mode 100644 index 000000000..a860ac6d9 --- /dev/null +++ b/apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx @@ -0,0 +1,152 @@ +'use client'; + +import Link from 'next/link'; + +import { File } from 'lucide-react'; +import { DateTime } from 'luxon'; + +import { trpc } from '@documenso/trpc/react'; +import { Button } from '@documenso/ui/primitives/button'; +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'; + +export type TeamBillingInvoicesDataTableProps = { + teamId: number; +}; + +export const TeamBillingInvoicesDataTable = ({ teamId }: TeamBillingInvoicesDataTableProps) => { + const { data, isLoading, isInitialLoading, isLoadingError } = trpc.team.findTeamInvoices.useQuery( + { + teamId, + }, + { + keepPreviousData: true, + }, + ); + + const formatCurrency = (currency: string, amount: number) => { + const formatter = new Intl.NumberFormat('en-US', { + style: 'currency', + currency, + }); + + return formatter.format(amount); + }; + + const results = { + data: data?.data ?? [], + perPage: 100, + currentPage: 1, + totalPages: 1, + }; + + return ( + ( +
+ + +
+ + {DateTime.fromSeconds(row.original.created).toFormat('MMMM yyyy')} + + + {row.original.quantity} {row.original.quantity > 1 ? 'Seats' : 'Seat'} + +
+
+ ), + }, + { + header: 'Status', + accessorKey: 'status', + cell: ({ row }) => { + const { status, paid } = row.original; + + if (!status) { + return paid ? 'Paid' : 'Unpaid'; + } + + return status.charAt(0).toUpperCase() + status.slice(1); + }, + }, + { + header: 'Amount', + accessorKey: 'total', + cell: ({ row }) => formatCurrency(row.original.currency, row.original.total / 100), + }, + { + id: 'actions', + cell: ({ row }) => ( +
+ + + +
+ ), + }, + ]} + data={results.data} + perPage={results.perPage} + currentPage={results.currentPage} + totalPages={results.totalPages} + error={{ + enable: isLoadingError, + }} + skeleton={{ + enable: isLoading && isInitialLoading, + rows: 3, + component: ( + <> + +
+ + +
+ + +
+
+
+ + + + + + + +
+ + +
+
+ + ), + }} + > + {(table) => } +
+ ); +}; diff --git a/apps/web/src/components/(teams)/tables/team-member-invites-data-table.tsx b/apps/web/src/components/(teams)/tables/team-member-invites-data-table.tsx new file mode 100644 index 000000000..f0e3580e3 --- /dev/null +++ b/apps/web/src/components/(teams)/tables/team-member-invites-data-table.tsx @@ -0,0 +1,203 @@ +'use client'; + +import { useSearchParams } from 'next/navigation'; + +import { History, MoreHorizontal, Trash2 } from 'lucide-react'; + +import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; +import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params'; +import { trpc } from '@documenso/trpc/react'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { DataTable } from '@documenso/ui/primitives/data-table'; +import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination'; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuTrigger, +} from '@documenso/ui/primitives/dropdown-menu'; +import { Skeleton } from '@documenso/ui/primitives/skeleton'; +import { TableCell } from '@documenso/ui/primitives/table'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +import { LocaleDate } from '~/components/formatter/locale-date'; + +export type TeamMemberInvitesDataTableProps = { + teamId: number; +}; + +export const TeamMemberInvitesDataTable = ({ teamId }: TeamMemberInvitesDataTableProps) => { + const searchParams = useSearchParams(); + const updateSearchParams = useUpdateSearchParams(); + + const { toast } = useToast(); + + const parsedSearchParams = ZBaseTableSearchParamsSchema.parse( + Object.fromEntries(searchParams ?? []), + ); + + const { data, isLoading, isInitialLoading, isLoadingError } = + trpc.team.findTeamMemberInvites.useQuery( + { + teamId, + term: parsedSearchParams.query, + page: parsedSearchParams.page, + perPage: parsedSearchParams.perPage, + }, + { + keepPreviousData: true, + }, + ); + + const { mutateAsync: resendTeamMemberInvitation } = + trpc.team.resendTeamMemberInvitation.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'Invitation has been resent', + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + description: 'Unable to resend invitation. Please try again.', + variant: 'destructive', + }); + }, + }); + + const { mutateAsync: deleteTeamMemberInvitations } = + trpc.team.deleteTeamMemberInvitations.useMutation({ + onSuccess: () => { + toast({ + title: 'Success', + description: 'Invitation has been deleted', + }); + }, + onError: () => { + toast({ + title: 'Something went wrong', + description: 'Unable to delete invitation. Please try again.', + variant: 'destructive', + }); + }, + }); + + const onPaginationChange = (page: number, perPage: number) => { + updateSearchParams({ + page, + perPage, + }); + }; + + const results = data ?? { + data: [], + perPage: 10, + currentPage: 1, + totalPages: 1, + }; + + return ( + { + return ( + {row.original.email} + } + /> + ); + }, + }, + { + header: 'Role', + accessorKey: 'role', + cell: ({ row }) => TEAM_MEMBER_ROLE_MAP[row.original.role] ?? row.original.role, + }, + { + header: 'Invited At', + accessorKey: 'createdAt', + cell: ({ row }) => , + }, + { + header: 'Actions', + cell: ({ row }) => ( + + + + + + + Actions + + + resendTeamMemberInvitation({ + teamId, + invitationId: row.original.id, + }) + } + > + + Resend + + + + deleteTeamMemberInvitations({ + teamId, + invitationIds: [row.original.id], + }) + } + > + + Remove + + + + ), + }, + ]} + data={results.data} + perPage={results.perPage} + currentPage={results.currentPage} + totalPages={results.totalPages} + onPaginationChange={onPaginationChange} + error={{ + enable: isLoadingError, + }} + skeleton={{ + enable: isLoading && isInitialLoading, + rows: 3, + component: ( + <> + +
+ + +
+
+ + + + + + + + + + + ), + }} + > + {(table) => } +
+ ); +}; diff --git a/apps/web/src/components/(teams)/tables/team-members-data-table.tsx b/apps/web/src/components/(teams)/tables/team-members-data-table.tsx new file mode 100644 index 000000000..3002ecbb0 --- /dev/null +++ b/apps/web/src/components/(teams)/tables/team-members-data-table.tsx @@ -0,0 +1,209 @@ +'use client'; + +import { useSearchParams } from 'next/navigation'; + +import { Edit, MoreHorizontal, Trash2 } from 'lucide-react'; + +import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; +import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params'; +import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; +import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams'; +import type { TeamMemberRole } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { DataTable } from '@documenso/ui/primitives/data-table'; +import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination'; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuTrigger, +} from '@documenso/ui/primitives/dropdown-menu'; +import { Skeleton } from '@documenso/ui/primitives/skeleton'; +import { TableCell } from '@documenso/ui/primitives/table'; + +import { LocaleDate } from '~/components/formatter/locale-date'; + +import { DeleteTeamMemberDialog } from '../dialogs/delete-team-member-dialog'; +import { UpdateTeamMemberDialog } from '../dialogs/update-team-member-dialog'; + +export type TeamMembersDataTableProps = { + currentUserTeamRole: TeamMemberRole; + teamOwnerUserId: number; + teamId: number; + teamName: string; +}; + +export const TeamMembersDataTable = ({ + currentUserTeamRole, + teamOwnerUserId, + teamId, + teamName, +}: TeamMembersDataTableProps) => { + const searchParams = useSearchParams(); + const updateSearchParams = useUpdateSearchParams(); + + const parsedSearchParams = ZBaseTableSearchParamsSchema.parse( + Object.fromEntries(searchParams ?? []), + ); + + const { data, isLoading, isInitialLoading, isLoadingError } = trpc.team.findTeamMembers.useQuery( + { + teamId, + term: parsedSearchParams.query, + 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 ( + { + const avatarFallbackText = row.original.user.name + ? extractInitials(row.original.user.name) + : row.original.user.email.slice(0, 1).toUpperCase(); + + return ( + {row.original.user.name} + } + secondaryText={row.original.user.email} + /> + ); + }, + }, + { + header: 'Role', + accessorKey: 'role', + cell: ({ row }) => + teamOwnerUserId === row.original.userId + ? 'Owner' + : TEAM_MEMBER_ROLE_MAP[row.original.role], + }, + { + header: 'Member Since', + accessorKey: 'createdAt', + cell: ({ row }) => , + }, + { + header: 'Actions', + cell: ({ row }) => ( + + + + + + + Actions + + e.preventDefault()} + title="Update team member role" + > + + Update role + + } + /> + + e.preventDefault()} + disabled={ + teamOwnerUserId === row.original.userId || + !isTeamRoleWithinUserHierarchy(currentUserTeamRole, row.original.role) + } + title="Remove team member" + > + + Remove + + } + /> + + + ), + }, + ]} + data={results.data} + perPage={results.perPage} + currentPage={results.currentPage} + totalPages={results.totalPages} + onPaginationChange={onPaginationChange} + error={{ + enable: isLoadingError, + }} + skeleton={{ + enable: isLoading && isInitialLoading, + rows: 3, + component: ( + <> + +
+ + +
+ + +
+
+
+ + + + + + + + + + + ), + }} + > + {(table) => } +
+ ); +}; diff --git a/apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx b/apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx new file mode 100644 index 000000000..316c4373f --- /dev/null +++ b/apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx @@ -0,0 +1,93 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import Link from 'next/link'; +import { usePathname, useRouter, useSearchParams } from 'next/navigation'; + +import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value'; +import type { TeamMemberRole } from '@documenso/prisma/client'; +import { Input } from '@documenso/ui/primitives/input'; +import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs'; + +import { TeamMemberInvitesDataTable } from '~/components/(teams)/tables/team-member-invites-data-table'; +import { TeamMembersDataTable } from '~/components/(teams)/tables/team-members-data-table'; + +export type TeamsMemberPageDataTableProps = { + currentUserTeamRole: TeamMemberRole; + teamId: number; + teamName: string; + teamOwnerUserId: number; +}; + +export const TeamsMemberPageDataTable = ({ + currentUserTeamRole, + teamId, + teamName, + teamOwnerUserId, +}: TeamsMemberPageDataTableProps) => { + const searchParams = useSearchParams(); + const router = useRouter(); + const pathname = usePathname(); + + const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? ''); + + const debouncedSearchQuery = useDebouncedValue(searchQuery, 500); + + const currentTab = searchParams?.get('tab') === 'invites' ? 'invites' : 'members'; + + /** + * Handle debouncing the search query. + */ + useEffect(() => { + if (!pathname) { + return; + } + + const params = new URLSearchParams(searchParams?.toString()); + + params.set('query', debouncedSearchQuery); + + if (debouncedSearchQuery === '') { + params.delete('query'); + } + + router.push(`${pathname}?${params.toString()}`); + }, [debouncedSearchQuery, pathname, router, searchParams]); + + return ( +
+
+ setSearchQuery(e.target.value)} + placeholder="Search" + /> + + + + + All + + + + Pending + + + +
+ + {currentTab === 'invites' ? ( + + ) : ( + + )} +
+ ); +}; diff --git a/apps/web/src/components/(teams)/tables/user-settings-teams-page-data-table.tsx b/apps/web/src/components/(teams)/tables/user-settings-teams-page-data-table.tsx new file mode 100644 index 000000000..277421263 --- /dev/null +++ b/apps/web/src/components/(teams)/tables/user-settings-teams-page-data-table.tsx @@ -0,0 +1,83 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import Link from 'next/link'; +import { usePathname, useRouter, useSearchParams } from 'next/navigation'; + +import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value'; +import { trpc } from '@documenso/trpc/react'; +import { Input } from '@documenso/ui/primitives/input'; +import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs'; + +import { CurrentUserTeamsDataTable } from './current-user-teams-data-table'; +import { PendingUserTeamsDataTable } from './pending-user-teams-data-table'; + +export const UserSettingsTeamsPageDataTable = () => { + const searchParams = useSearchParams(); + const router = useRouter(); + const pathname = usePathname(); + + const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? ''); + + const debouncedSearchQuery = useDebouncedValue(searchQuery, 500); + + const currentTab = searchParams?.get('tab') === 'pending' ? 'pending' : 'active'; + + const { data } = trpc.team.findTeamsPending.useQuery( + {}, + { + keepPreviousData: true, + }, + ); + + /** + * Handle debouncing the search query. + */ + useEffect(() => { + if (!pathname) { + return; + } + + const params = new URLSearchParams(searchParams?.toString()); + + params.set('query', debouncedSearchQuery); + + if (debouncedSearchQuery === '') { + params.delete('query'); + } + + router.push(`${pathname}?${params.toString()}`); + }, [debouncedSearchQuery, pathname, router, searchParams]); + + return ( +
+
+ setSearchQuery(e.target.value)} + placeholder="Search" + /> + + + + + Active + + + + + Pending + {data && data.count > 0 && ( + {data.count} + )} + + + + +
+ + {currentTab === 'pending' ? : } +
+ ); +}; diff --git a/apps/web/src/components/(teams)/team-billing-portal-button.tsx b/apps/web/src/components/(teams)/team-billing-portal-button.tsx new file mode 100644 index 000000000..808b9b9ba --- /dev/null +++ b/apps/web/src/components/(teams)/team-billing-portal-button.tsx @@ -0,0 +1,39 @@ +'use client'; + +import { trpc } from '@documenso/trpc/react'; +import { Button } from '@documenso/ui/primitives/button'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +export type TeamBillingPortalButtonProps = { + buttonProps?: React.ComponentProps; + teamId: number; +}; + +export const TeamBillingPortalButton = ({ buttonProps, teamId }: TeamBillingPortalButtonProps) => { + const { toast } = useToast(); + + const { mutateAsync: createBillingPortal, isLoading } = + trpc.team.createBillingPortal.useMutation(); + + const handleCreatePortal = async () => { + try { + const sessionUrl = await createBillingPortal({ teamId }); + + window.open(sessionUrl, '_blank'); + } catch (err) { + toast({ + title: 'Something went wrong', + description: + 'We are unable to proceed to the billing portal at this time. Please try again, or contact support.', + variant: 'destructive', + duration: 10000, + }); + } + }; + + return ( + + ); +}; diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx index b3e4ea019..b21e9621b 100644 --- a/apps/web/src/components/forms/signin.tsx +++ b/apps/web/src/components/forms/signin.tsx @@ -55,10 +55,11 @@ export type TSignInFormSchema = z.infer; export type SignInFormProps = { className?: string; + initialEmail?: string; isGoogleSSOEnabled?: boolean; }; -export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) => { +export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: SignInFormProps) => { const { toast } = useToast(); const [isTwoFactorAuthenticationDialogOpen, setIsTwoFactorAuthenticationDialogOpen] = useState(false); @@ -69,7 +70,7 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) = const form = useForm({ values: { - email: '', + email: initialEmail ?? '', password: '', totpCode: '', backupCode: '', diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index f38ab15d1..430c7ebdf 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -48,17 +48,18 @@ export type TSignUpFormSchema = z.infer; export type SignUpFormProps = { className?: string; + initialEmail?: string; isGoogleSSOEnabled?: boolean; }; -export const SignUpForm = ({ className, isGoogleSSOEnabled }: SignUpFormProps) => { +export const SignUpForm = ({ className, initialEmail, isGoogleSSOEnabled }: SignUpFormProps) => { const { toast } = useToast(); const analytics = useAnalytics(); const form = useForm({ values: { name: '', - email: '', + email: initialEmail ?? '', password: '', signature: '', }, diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts index 25bfbbb40..46ee93fdf 100644 --- a/apps/web/src/middleware.ts +++ b/apps/web/src/middleware.ts @@ -1,14 +1,62 @@ -import { NextRequest, NextResponse } from 'next/server'; +import { cookies } from 'next/headers'; +import type { NextRequest } from 'next/server'; +import { NextResponse } from 'next/server'; import { getToken } from 'next-auth/jwt'; +import { TEAM_URL_ROOT_REGEX } from '@documenso/lib/constants/teams'; +import { formatDocumentsPath } from '@documenso/lib/utils/teams'; + export default async function middleware(req: NextRequest) { + const preferredTeamUrl = cookies().get('preferred-team-url'); + + const referrer = req.headers.get('referer'); + const referrerUrl = referrer ? new URL(referrer) : null; + const referrerPathname = referrerUrl ? referrerUrl.pathname : null; + + // Whether to reset the preferred team url cookie if the user accesses a non team page from a team page. + const resetPreferredTeamUrl = + referrerPathname && + referrerPathname.startsWith('/t/') && + (!req.nextUrl.pathname.startsWith('/t/') || req.nextUrl.pathname === '/'); + + // Redirect root page to `/documents` or `/t/{preferredTeamUrl}/documents`. if (req.nextUrl.pathname === '/') { - const redirectUrl = new URL('/documents', req.url); + const redirectUrlPath = formatDocumentsPath( + resetPreferredTeamUrl ? undefined : preferredTeamUrl?.value, + ); + + const redirectUrl = new URL(redirectUrlPath, req.url); + const response = NextResponse.redirect(redirectUrl); + + return response; + } + + // Redirect `/t` to `/settings/teams`. + if (req.nextUrl.pathname === '/t') { + const redirectUrl = new URL('/settings/teams', req.url); return NextResponse.redirect(redirectUrl); } + // Redirect `/t/` to `/t//documents`. + if (TEAM_URL_ROOT_REGEX.test(req.nextUrl.pathname)) { + const redirectUrl = new URL(`${req.nextUrl.pathname}/documents`, req.url); + + const response = NextResponse.redirect(redirectUrl); + response.cookies.set('preferred-team-url', req.nextUrl.pathname.replace('/t/', '')); + + return response; + } + + // Set the preferred team url cookie if user accesses a team page. + if (req.nextUrl.pathname.startsWith('/t/')) { + const response = NextResponse.next(); + response.cookies.set('preferred-team-url', req.nextUrl.pathname.split('/')[2]); + + return response; + } + if (req.nextUrl.pathname.startsWith('/signin')) { const token = await getToken({ req }); @@ -19,5 +67,34 @@ export default async function middleware(req: NextRequest) { } } + // Clear preferred team url cookie if user accesses a non team page from a team page. + if (resetPreferredTeamUrl || req.nextUrl.pathname === '/documents') { + const response = NextResponse.next(); + response.cookies.set('preferred-team-url', ''); + + return response; + } + return NextResponse.next(); } + +export const config = { + matcher: [ + /* + * Match all request paths except for the ones starting with: + * - api (API routes) + * - _next/static (static files) + * - _next/image (image optimization files) + * - favicon.ico (favicon file) + * - ingest (analytics) + * - site.webmanifest + */ + { + source: '/((?!api|_next/static|_next/image|ingest|favicon|site.webmanifest).*)', + missing: [ + { type: 'header', key: 'next-router-prefetch' }, + { type: 'header', key: 'purpose', value: 'prefetch' }, + ], + }, + ], +}; diff --git a/package-lock.json b/package-lock.json index 9012d3f29..aae034c57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4886,9 +4886,9 @@ } }, "node_modules/@radix-ui/react-select": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-1.2.2.tgz", - "integrity": "sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.0.0.tgz", + "integrity": "sha512-RH5b7af4oHtkcHS7pG6Sgv5rk5Wxa7XI8W5gvB1N/yiuDGZxko1ynvOiVhFM7Cis2A8zxF9bTOUVbRDzPepe6w==", "dependencies": { "@babel/runtime": "^7.13.10", "@radix-ui/number": "1.0.1", @@ -4897,12 +4897,12 @@ "@radix-ui/react-compose-refs": "1.0.1", "@radix-ui/react-context": "1.0.1", "@radix-ui/react-direction": "1.0.1", - "@radix-ui/react-dismissable-layer": "1.0.4", + "@radix-ui/react-dismissable-layer": "1.0.5", "@radix-ui/react-focus-guards": "1.0.1", - "@radix-ui/react-focus-scope": "1.0.3", + "@radix-ui/react-focus-scope": "1.0.4", "@radix-ui/react-id": "1.0.1", - "@radix-ui/react-popper": "1.1.2", - "@radix-ui/react-portal": "1.0.3", + "@radix-ui/react-popper": "1.1.3", + "@radix-ui/react-portal": "1.0.4", "@radix-ui/react-primitive": "1.0.3", "@radix-ui/react-slot": "1.0.2", "@radix-ui/react-use-callback-ref": "1.0.1", @@ -4928,113 +4928,6 @@ } } }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.4.tgz", - "integrity": "sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@radix-ui/primitive": "1.0.1", - "@radix-ui/react-compose-refs": "1.0.1", - "@radix-ui/react-primitive": "1.0.3", - "@radix-ui/react-use-callback-ref": "1.0.1", - "@radix-ui/react-use-escape-keydown": "1.0.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0", - "react-dom": "^16.8 || ^17.0 || ^18.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-focus-scope": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz", - "integrity": "sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@radix-ui/react-compose-refs": "1.0.1", - "@radix-ui/react-primitive": "1.0.3", - "@radix-ui/react-use-callback-ref": "1.0.1" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0", - "react-dom": "^16.8 || ^17.0 || ^18.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-popper": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.2.tgz", - "integrity": "sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.0.3", - "@radix-ui/react-compose-refs": "1.0.1", - "@radix-ui/react-context": "1.0.1", - "@radix-ui/react-primitive": "1.0.3", - "@radix-ui/react-use-callback-ref": "1.0.1", - "@radix-ui/react-use-layout-effect": "1.0.1", - "@radix-ui/react-use-rect": "1.0.1", - "@radix-ui/react-use-size": "1.0.1", - "@radix-ui/rect": "1.0.1" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0", - "react-dom": "^16.8 || ^17.0 || ^18.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-portal": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.3.tgz", - "integrity": "sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@radix-ui/react-primitive": "1.0.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0", - "react-dom": "^16.8 || ^17.0 || ^18.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-separator": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.0.3.tgz", @@ -19750,13 +19643,19 @@ "@prisma/client": "5.4.2", "dotenv": "^16.3.1", "dotenv-cli": "^7.3.0", - "prisma": "5.4.2" + "prisma": "5.4.2", + "ts-pattern": "^5.0.6" }, "devDependencies": { "ts-node": "^10.9.1", "typescript": "5.2.2" } }, + "packages/prisma/node_modules/ts-pattern": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.0.6.tgz", + "integrity": "sha512-Y+jOjihlFriWzcBjncPCf2/am+Hgz7LtsWs77pWg5vQQKLQj07oNrJryo/wK2G0ndNaoVn2ownFMeoeAuReu3Q==" + }, "packages/prisma/node_modules/typescript": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", @@ -19864,7 +19763,7 @@ "@radix-ui/react-checkbox": "^1.0.3", "@radix-ui/react-collapsible": "^1.0.2", "@radix-ui/react-context-menu": "^2.1.3", - "@radix-ui/react-dialog": "^1.0.3", + "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-dropdown-menu": "^2.0.4", "@radix-ui/react-hover-card": "^1.0.5", "@radix-ui/react-label": "^2.0.1", @@ -19874,7 +19773,7 @@ "@radix-ui/react-progress": "^1.0.2", "@radix-ui/react-radio-group": "^1.1.2", "@radix-ui/react-scroll-area": "^1.0.3", - "@radix-ui/react-select": "^1.2.1", + "@radix-ui/react-select": "^2.0.0", "@radix-ui/react-separator": "^1.0.2", "@radix-ui/react-slider": "^1.1.1", "@radix-ui/react-slot": "^1.0.2", diff --git a/packages/app-tests/e2e/fixtures/authentication.ts b/packages/app-tests/e2e/fixtures/authentication.ts new file mode 100644 index 000000000..f1926fb2a --- /dev/null +++ b/packages/app-tests/e2e/fixtures/authentication.ts @@ -0,0 +1,40 @@ +import type { Page } from '@playwright/test'; + +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; + +type ManualLoginOptions = { + page: Page; + email?: string; + password?: string; + + /** + * Where to navigate after login. + */ + redirectPath?: string; +}; + +export const manualLogin = async ({ + page, + email = 'example@documenso.com', + password = 'password', + redirectPath, +}: ManualLoginOptions) => { + await page.goto(`${WEBAPP_BASE_URL}/signin`); + + await page.getByLabel('Email').click(); + await page.getByLabel('Email').fill(email); + + await page.getByLabel('Password', { exact: true }).fill(password); + await page.getByLabel('Password', { exact: true }).press('Enter'); + + if (redirectPath) { + await page.waitForURL(`${WEBAPP_BASE_URL}/documents`); + await page.goto(`${WEBAPP_BASE_URL}${redirectPath}`); + } +}; + +export const manualSignout = async ({ page }: ManualLoginOptions) => { + await page.getByTestId('menu-switcher').click(); + await page.getByRole('menuitem', { name: 'Sign Out' }).click(); + await page.waitForURL(`${WEBAPP_BASE_URL}/signin`); +}; diff --git a/packages/app-tests/e2e/pr-711-deletion-of-documents.spec.ts b/packages/app-tests/e2e/pr-711-deletion-of-documents.spec.ts index 12a099bbf..da95c66f0 100644 --- a/packages/app-tests/e2e/pr-711-deletion-of-documents.spec.ts +++ b/packages/app-tests/e2e/pr-711-deletion-of-documents.spec.ts @@ -2,6 +2,8 @@ import { expect, test } from '@playwright/test'; import { TEST_USERS } from '@documenso/prisma/seed/pr-711-deletion-of-documents'; +import { manualLogin, manualSignout } from './fixtures/authentication'; + test.describe.configure({ mode: 'serial' }); test('[PR-711]: seeded documents should be visible', async ({ page }) => { @@ -19,17 +21,11 @@ test('[PR-711]: seeded documents should be visible', async ({ page }) => { await expect(page.getByRole('link', { name: 'Document 1 - Pending' })).toBeVisible(); await expect(page.getByRole('link', { name: 'Document 1 - Draft' })).toBeVisible(); - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); - - await page.waitForURL('/signin'); + await manualSignout({ page }); for (const recipient of recipients) { - await page.goto('/signin'); - - await page.getByLabel('Email').fill(recipient.email); - await page.getByLabel('Password', { exact: true }).fill(recipient.password); - await page.getByRole('button', { name: 'Sign In' }).click(); + await page.waitForURL('/signin'); + await manualLogin({ page, email: recipient.email, password: recipient.password }); await page.waitForURL('/documents'); @@ -38,10 +34,7 @@ test('[PR-711]: seeded documents should be visible', async ({ page }) => { await expect(page.getByRole('link', { name: 'Document 1 - Draft' })).not.toBeVisible(); - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); - - await page.waitForURL('/signin'); + await manualSignout({ page }); } }); @@ -74,13 +67,10 @@ test('[PR-711]: deleting a completed document should not remove it from recipien await expect(page.getByRole('row', { name: /Document 1 - Completed/ })).not.toBeVisible(); - // signout - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); - - await page.waitForURL('/signin'); + await manualSignout({ page }); for (const recipient of recipients) { + await page.waitForURL('/signin'); await page.goto('/signin'); // sign in @@ -96,11 +86,7 @@ test('[PR-711]: deleting a completed document should not remove it from recipien await expect(page.getByText('Everyone has signed').nth(0)).toBeVisible(); await page.goto('/documents'); - - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); - - await page.waitForURL('/signin'); + await manualSignout({ page }); } }); @@ -115,11 +101,7 @@ test('[PR-711]: deleting a pending document should remove it from recipients', a await page.goto('/signin'); - // sign in - await page.getByLabel('Email').fill(sender.email); - await page.getByLabel('Password', { exact: true }).fill(sender.password); - await page.getByRole('button', { name: 'Sign In' }).click(); - + await manualLogin({ page, email: sender.email, password: sender.password }); await page.waitForURL('/documents'); // open actions menu @@ -133,19 +115,12 @@ test('[PR-711]: deleting a pending document should remove it from recipients', a await expect(page.getByRole('row', { name: /Document 1 - Pending/ })).not.toBeVisible(); // signout - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); - - await page.waitForURL('/signin'); + await manualSignout({ page }); for (const recipient of recipients) { - await page.goto('/signin'); - - // sign in - await page.getByLabel('Email').fill(recipient.email); - await page.getByLabel('Password', { exact: true }).fill(recipient.password); - await page.getByRole('button', { name: 'Sign In' }).click(); + await page.waitForURL('/signin'); + await manualLogin({ page, email: recipient.email, password: recipient.password }); await page.waitForURL('/documents'); await expect(page.getByRole('link', { name: 'Document 1 - Pending' })).not.toBeVisible(); @@ -154,11 +129,9 @@ test('[PR-711]: deleting a pending document should remove it from recipients', a await expect(page.getByText(/document.*cancelled/i).nth(0)).toBeVisible(); await page.goto('/documents'); + await page.waitForURL('/documents'); - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); - - await page.waitForURL('/signin'); + await manualSignout({ page }); } }); @@ -167,13 +140,7 @@ test('[PR-711]: deleting a draft document should remove it without additional pr }) => { const [sender] = TEST_USERS; - await page.goto('/signin'); - - // sign in - await page.getByLabel('Email').fill(sender.email); - await page.getByLabel('Password', { exact: true }).fill(sender.password); - await page.getByRole('button', { name: 'Sign In' }).click(); - + await manualLogin({ page, email: sender.email, password: sender.password }); await page.waitForURL('/documents'); // open actions menu diff --git a/packages/app-tests/e2e/pr-713-add-document-search-to-command-menu.spec.ts b/packages/app-tests/e2e/pr-713-add-document-search-to-command-menu.spec.ts index e9ae60d0e..160113f95 100644 --- a/packages/app-tests/e2e/pr-713-add-document-search-to-command-menu.spec.ts +++ b/packages/app-tests/e2e/pr-713-add-document-search-to-command-menu.spec.ts @@ -17,12 +17,6 @@ test('[PR-713]: should see sent documents', async ({ page }) => { await page.getByPlaceholder('Type a command or search...').fill('sent'); await expect(page.getByRole('option', { name: '[713] Document - Sent' })).toBeVisible(); - - await page.keyboard.press('Escape'); - - // signout - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); }); test('[PR-713]: should see received documents', async ({ page }) => { @@ -40,12 +34,6 @@ test('[PR-713]: should see received documents', async ({ page }) => { await page.getByPlaceholder('Type a command or search...').fill('received'); await expect(page.getByRole('option', { name: '[713] Document - Received' })).toBeVisible(); - - await page.keyboard.press('Escape'); - - // signout - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); }); test('[PR-713]: should be able to search by recipient', async ({ page }) => { @@ -63,10 +51,4 @@ test('[PR-713]: should be able to search by recipient', async ({ page }) => { await page.getByPlaceholder('Type a command or search...').fill(recipient.email); await expect(page.getByRole('option', { name: '[713] Document - Sent' })).toBeVisible(); - - await page.keyboard.press('Escape'); - - // signout - await page.getByTitle('Profile Dropdown').click(); - await page.getByRole('menuitem', { name: 'Sign Out' }).click(); }); diff --git a/packages/app-tests/e2e/teams/manage-team.spec.ts b/packages/app-tests/e2e/teams/manage-team.spec.ts new file mode 100644 index 000000000..aed56b2bc --- /dev/null +++ b/packages/app-tests/e2e/teams/manage-team.spec.ts @@ -0,0 +1,87 @@ +import { test } from '@playwright/test'; + +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { seedTeam, unseedTeam } from '@documenso/prisma/seed/teams'; +import { seedUser } from '@documenso/prisma/seed/users'; + +import { manualLogin } from '../fixtures/authentication'; + +test.describe.configure({ mode: 'parallel' }); + +test('[TEAMS]: create team', async ({ page }) => { + const user = await seedUser(); + + await manualLogin({ + page, + email: user.email, + redirectPath: '/settings/teams', + }); + + const teamId = `team-${Date.now()}`; + + // Create team. + await page.getByRole('button', { name: 'Create team' }).click(); + await page.getByLabel('Team Name*').fill(teamId); + await page.getByTestId('dialog-create-team-button').click(); + + await page.getByTestId('dialog-create-team-button').waitFor({ state: 'hidden' }); + + const isCheckoutRequired = page.url().includes('pending'); + test.skip(isCheckoutRequired, 'Test skipped because billing is enabled.'); + + // Goto new team settings page. + await page.getByRole('row').filter({ hasText: teamId }).getByRole('link').nth(1).click(); + + await unseedTeam(teamId); +}); + +test('[TEAMS]: delete team', async ({ page }) => { + const team = await seedTeam(); + + await manualLogin({ + page, + email: team.owner.email, + redirectPath: `/t/${team.url}/settings`, + }); + + // Delete team. + await page.getByRole('button', { name: 'Delete team' }).click(); + await page.getByLabel(`Confirm by typing delete ${team.url}`).fill(`delete ${team.url}`); + await page.getByRole('button', { name: 'Delete' }).click(); + + // Check that we have been redirected to the teams page. + await page.waitForURL(`${WEBAPP_BASE_URL}/settings/teams`); +}); + +test('[TEAMS]: update team', async ({ page }) => { + const team = await seedTeam(); + + await manualLogin({ + page, + email: team.owner.email, + }); + + // Navigate to create team page. + await page.getByTestId('menu-switcher').click(); + await page.getByRole('menuitem', { name: 'Manage teams' }).click(); + + // Goto team settings page. + await page.getByRole('row').filter({ hasText: team.url }).getByRole('link').nth(1).click(); + + const updatedTeamId = `team-${Date.now()}`; + + // Update team. + await page.getByLabel('Team Name*').click(); + await page.getByLabel('Team Name*').clear(); + await page.getByLabel('Team Name*').fill(updatedTeamId); + await page.getByLabel('Team URL*').click(); + await page.getByLabel('Team URL*').clear(); + await page.getByLabel('Team URL*').fill(updatedTeamId); + + await page.getByRole('button', { name: 'Update team' }).click(); + + // Check we have been redirected to the new team URL and the name is updated. + await page.waitForURL(`${WEBAPP_BASE_URL}/t/${updatedTeamId}/settings`); + + await unseedTeam(updatedTeamId); +}); diff --git a/packages/app-tests/e2e/teams/team-documents.spec.ts b/packages/app-tests/e2e/teams/team-documents.spec.ts new file mode 100644 index 000000000..210189ca7 --- /dev/null +++ b/packages/app-tests/e2e/teams/team-documents.spec.ts @@ -0,0 +1,282 @@ +import type { Page } from '@playwright/test'; +import { expect, test } from '@playwright/test'; + +import { DocumentStatus } from '@documenso/prisma/client'; +import { seedDocuments, seedTeamDocuments } from '@documenso/prisma/seed/documents'; +import { seedTeamEmail, unseedTeam, unseedTeamEmail } from '@documenso/prisma/seed/teams'; +import { seedUser } from '@documenso/prisma/seed/users'; + +import { manualLogin, manualSignout } from '../fixtures/authentication'; + +test.describe.configure({ mode: 'parallel' }); + +const checkDocumentTabCount = async (page: Page, tabName: string, count: number) => { + await page.getByRole('tab', { name: tabName }).click(); + + if (tabName !== 'All') { + await expect(page.getByRole('tab', { name: tabName })).toContainText(count.toString()); + } + + if (count === 0) { + await expect(page.getByRole('main')).toContainText(`Nothing to do`); + return; + } + + await expect(page.getByRole('main')).toContainText(`Showing ${count}`); +}; + +test('[TEAMS]: check team documents count', async ({ page }) => { + const { team, teamMember2 } = await seedTeamDocuments(); + + // Run the test twice, once with the team owner and once with a team member to ensure the counts are the same. + for (const user of [team.owner, teamMember2]) { + await manualLogin({ + page, + email: user.email, + redirectPath: `/t/${team.url}/documents`, + }); + + // Check document counts. + await checkDocumentTabCount(page, 'Inbox', 0); + await checkDocumentTabCount(page, 'Pending', 2); + await checkDocumentTabCount(page, 'Completed', 1); + await checkDocumentTabCount(page, 'Draft', 2); + await checkDocumentTabCount(page, 'All', 5); + + // Apply filter. + await page.locator('button').filter({ hasText: 'Sender: All' }).click(); + await page.getByRole('option', { name: teamMember2.name ?? '' }).click(); + await page.waitForURL(/senderIds/); + + // Check counts after filtering. + await checkDocumentTabCount(page, 'Inbox', 0); + await checkDocumentTabCount(page, 'Pending', 2); + await checkDocumentTabCount(page, 'Completed', 0); + await checkDocumentTabCount(page, 'Draft', 1); + await checkDocumentTabCount(page, 'All', 3); + + await manualSignout({ page }); + } + + await unseedTeam(team.url); +}); + +test('[TEAMS]: check team documents count with internal team email', async ({ page }) => { + const { team, teamMember2, teamMember4 } = await seedTeamDocuments(); + const { team: team2, teamMember2: team2Member2 } = await seedTeamDocuments(); + + const teamEmailMember = teamMember4; + + await seedTeamEmail({ + email: teamEmailMember.email, + teamId: team.id, + }); + + const testUser1 = await seedUser(); + + await seedDocuments([ + // Documents sent from the team email account. + { + sender: teamEmailMember, + recipients: [testUser1], + type: DocumentStatus.COMPLETED, + documentOptions: { + teamId: team.id, + }, + }, + { + sender: teamEmailMember, + recipients: [testUser1], + type: DocumentStatus.PENDING, + documentOptions: { + teamId: team.id, + }, + }, + { + sender: teamMember4, + recipients: [testUser1], + type: DocumentStatus.DRAFT, + }, + // Documents sent to the team email account. + { + sender: testUser1, + recipients: [teamEmailMember], + type: DocumentStatus.COMPLETED, + }, + { + sender: testUser1, + recipients: [teamEmailMember], + type: DocumentStatus.PENDING, + }, + { + sender: testUser1, + recipients: [teamEmailMember], + type: DocumentStatus.DRAFT, + }, + // Document sent to the team email account from another team. + { + sender: team2Member2, + recipients: [teamEmailMember], + type: DocumentStatus.PENDING, + documentOptions: { + teamId: team2.id, + }, + }, + ]); + + // Run the test twice, one with the team owner and once with the team member email to ensure the counts are the same. + for (const user of [team.owner, teamEmailMember]) { + await manualLogin({ + page, + email: user.email, + redirectPath: `/t/${team.url}/documents`, + }); + + // Check document counts. + await checkDocumentTabCount(page, 'Inbox', 2); + await checkDocumentTabCount(page, 'Pending', 3); + await checkDocumentTabCount(page, 'Completed', 3); + await checkDocumentTabCount(page, 'Draft', 3); + await checkDocumentTabCount(page, 'All', 11); + + // Apply filter. + await page.locator('button').filter({ hasText: 'Sender: All' }).click(); + await page.getByRole('option', { name: teamMember2.name ?? '' }).click(); + await page.waitForURL(/senderIds/); + + // Check counts after filtering. + await checkDocumentTabCount(page, 'Inbox', 0); + await checkDocumentTabCount(page, 'Pending', 2); + await checkDocumentTabCount(page, 'Completed', 0); + await checkDocumentTabCount(page, 'Draft', 1); + await checkDocumentTabCount(page, 'All', 3); + + await manualSignout({ page }); + } + + await unseedTeamEmail({ teamId: team.id }); + await unseedTeam(team.url); +}); + +test('[TEAMS]: check team documents count with external team email', async ({ page }) => { + const { team, teamMember2 } = await seedTeamDocuments(); + const { team: team2, teamMember2: team2Member2 } = await seedTeamDocuments(); + + const teamEmail = `external-team-email-${team.id}@test.documenso.com`; + + await seedTeamEmail({ + email: teamEmail, + teamId: team.id, + }); + + const testUser1 = await seedUser(); + + await seedDocuments([ + // Documents sent to the team email account. + { + sender: testUser1, + recipients: [teamEmail], + type: DocumentStatus.COMPLETED, + }, + { + sender: testUser1, + recipients: [teamEmail], + type: DocumentStatus.PENDING, + }, + { + sender: testUser1, + recipients: [teamEmail], + type: DocumentStatus.DRAFT, + }, + // Document sent to the team email account from another team. + { + sender: team2Member2, + recipients: [teamEmail], + type: DocumentStatus.PENDING, + documentOptions: { + teamId: team2.id, + }, + }, + // Document sent to the team email account from an individual user. + { + sender: testUser1, + recipients: [teamEmail], + type: DocumentStatus.PENDING, + documentOptions: { + teamId: team2.id, + }, + }, + { + sender: testUser1, + recipients: [teamEmail], + type: DocumentStatus.DRAFT, + documentOptions: { + teamId: team2.id, + }, + }, + ]); + + await manualLogin({ + page, + email: teamMember2.email, + redirectPath: `/t/${team.url}/documents`, + }); + + // Check document counts. + await checkDocumentTabCount(page, 'Inbox', 3); + await checkDocumentTabCount(page, 'Pending', 2); + await checkDocumentTabCount(page, 'Completed', 2); + await checkDocumentTabCount(page, 'Draft', 2); + await checkDocumentTabCount(page, 'All', 9); + + // Apply filter. + await page.locator('button').filter({ hasText: 'Sender: All' }).click(); + await page.getByRole('option', { name: teamMember2.name ?? '' }).click(); + await page.waitForURL(/senderIds/); + + // Check counts after filtering. + await checkDocumentTabCount(page, 'Inbox', 0); + await checkDocumentTabCount(page, 'Pending', 2); + await checkDocumentTabCount(page, 'Completed', 0); + await checkDocumentTabCount(page, 'Draft', 1); + await checkDocumentTabCount(page, 'All', 3); + + await unseedTeamEmail({ teamId: team.id }); + await unseedTeam(team.url); +}); + +test('[TEAMS]: delete pending team document', async ({ page }) => { + const { team, teamMember2: currentUser } = await seedTeamDocuments(); + + await manualLogin({ + page, + email: currentUser.email, + redirectPath: `/t/${team.url}/documents?status=PENDING`, + }); + + await page.getByRole('row').getByRole('button').nth(1).click(); + + await page.getByRole('menuitem', { name: 'Delete' }).click(); + await page.getByPlaceholder("Type 'delete' to confirm").fill('delete'); + await page.getByRole('button', { name: 'Delete' }).click(); + + await checkDocumentTabCount(page, 'Pending', 1); +}); + +test('[TEAMS]: resend pending team document', async ({ page }) => { + const { team, teamMember2: currentUser } = await seedTeamDocuments(); + + await manualLogin({ + page, + email: currentUser.email, + redirectPath: `/t/${team.url}/documents?status=PENDING`, + }); + + await page.getByRole('row').getByRole('button').nth(1).click(); + await page.getByRole('menuitem', { name: 'Resend' }).click(); + + await page.getByLabel('test.documenso.com').first().click(); + await page.getByRole('button', { name: 'Send reminder' }).click(); + + await expect(page.getByRole('status')).toContainText('Document re-sent'); +}); diff --git a/packages/app-tests/e2e/teams/team-email.spec.ts b/packages/app-tests/e2e/teams/team-email.spec.ts new file mode 100644 index 000000000..953be5aaf --- /dev/null +++ b/packages/app-tests/e2e/teams/team-email.spec.ts @@ -0,0 +1,102 @@ +import { expect, test } from '@playwright/test'; + +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { seedTeam, seedTeamEmailVerification, unseedTeam } from '@documenso/prisma/seed/teams'; +import { seedUser, unseedUser } from '@documenso/prisma/seed/users'; + +import { manualLogin } from '../fixtures/authentication'; + +test.describe.configure({ mode: 'parallel' }); + +test('[TEAMS]: send team email request', async ({ page }) => { + const team = await seedTeam(); + + await manualLogin({ + page, + email: team.owner.email, + password: 'password', + redirectPath: `/t/${team.url}/settings`, + }); + + await page.getByRole('button', { name: 'Add email' }).click(); + await page.getByPlaceholder('eg. Legal').click(); + await page.getByPlaceholder('eg. Legal').fill('test@test.documenso.com'); + await page.getByPlaceholder('example@example.com').click(); + await page.getByPlaceholder('example@example.com').fill('test@test.documenso.com'); + await page.getByRole('button', { name: 'Add' }).click(); + + await expect( + page + .getByRole('status') + .filter({ hasText: 'We have sent a confirmation email for verification.' }) + .first(), + ).toBeVisible(); + + await unseedTeam(team.url); +}); + +test('[TEAMS]: accept team email request', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const teamEmailVerification = await seedTeamEmailVerification({ + email: 'team-email-verification@test.documenso.com', + teamId: team.id, + }); + + await page.goto(`${WEBAPP_BASE_URL}/team/verify/email/${teamEmailVerification.token}`); + await expect(page.getByRole('heading')).toContainText('Team email verified!'); + + await unseedTeam(team.url); +}); + +test('[TEAMS]: delete team email', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + createTeamEmail: true, + }); + + await manualLogin({ + page, + email: team.owner.email, + redirectPath: `/t/${team.url}/settings`, + }); + + await page.locator('section div').filter({ hasText: 'Team email' }).getByRole('button').click(); + + await page.getByRole('menuitem', { name: 'Remove' }).click(); + + await expect(page.getByText('Team email has been removed').first()).toBeVisible(); + + await unseedTeam(team.url); +}); + +test('[TEAMS]: team email owner removes access', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + createTeamEmail: true, + }); + + if (!team.teamEmail) { + throw new Error('Not possible'); + } + + const teamEmailOwner = await seedUser({ + email: team.teamEmail.email, + }); + + await manualLogin({ + page, + email: teamEmailOwner.email, + redirectPath: `/settings/teams`, + }); + + await page.getByRole('button', { name: 'Revoke access' }).click(); + await page.getByRole('button', { name: 'Revoke' }).click(); + + await expect(page.getByText('You have successfully revoked').first()).toBeVisible(); + + await unseedTeam(team.url); + await unseedUser(teamEmailOwner.id); +}); diff --git a/packages/app-tests/e2e/teams/team-members.spec.ts b/packages/app-tests/e2e/teams/team-members.spec.ts new file mode 100644 index 000000000..05f096c09 --- /dev/null +++ b/packages/app-tests/e2e/teams/team-members.spec.ts @@ -0,0 +1,110 @@ +import { expect, test } from '@playwright/test'; + +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { seedTeam, seedTeamInvite, unseedTeam } from '@documenso/prisma/seed/teams'; +import { seedUser } from '@documenso/prisma/seed/users'; + +import { manualLogin } from '../fixtures/authentication'; + +test.describe.configure({ mode: 'parallel' }); + +test('[TEAMS]: update team member role', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + await manualLogin({ + page, + email: team.owner.email, + password: 'password', + redirectPath: `/t/${team.url}/settings/members`, + }); + + const teamMemberToUpdate = team.members[1]; + + await page + .getByRole('row') + .filter({ hasText: teamMemberToUpdate.user.email }) + .getByRole('button') + .click(); + + await page.getByRole('menuitem', { name: 'Update role' }).click(); + await page.getByRole('combobox').click(); + await page.getByLabel('Manager').click(); + await page.getByRole('button', { name: 'Update' }).click(); + await expect( + page.getByRole('row').filter({ hasText: teamMemberToUpdate.user.email }), + ).toContainText('Manager'); + + await unseedTeam(team.url); +}); + +test('[TEAMS]: accept team invitation without account', async ({ page }) => { + const team = await seedTeam(); + + const teamInvite = await seedTeamInvite({ + email: `team-invite-test-${Date.now()}@test.documenso.com`, + teamId: team.id, + }); + + await page.goto(`${WEBAPP_BASE_URL}/team/invite/${teamInvite.token}`); + await expect(page.getByRole('heading')).toContainText('Team invitation'); + + await unseedTeam(team.url); +}); + +test('[TEAMS]: accept team invitation with account', async ({ page }) => { + const team = await seedTeam(); + const user = await seedUser(); + + const teamInvite = await seedTeamInvite({ + email: user.email, + teamId: team.id, + }); + + await page.goto(`${WEBAPP_BASE_URL}/team/invite/${teamInvite.token}`); + await expect(page.getByRole('heading')).toContainText('Invitation accepted!'); + + await unseedTeam(team.url); +}); + +test('[TEAMS]: member can leave team', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const teamMember = team.members[1]; + + await manualLogin({ + page, + email: teamMember.user.email, + password: 'password', + redirectPath: `/settings/teams`, + }); + + await page.getByRole('button', { name: 'Leave' }).click(); + await page.getByRole('button', { name: 'Leave' }).click(); + + await expect(page.getByRole('status').first()).toContainText( + 'You have successfully left this team.', + ); + + await unseedTeam(team.url); +}); + +test('[TEAMS]: owner cannot leave team', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + await manualLogin({ + page, + email: team.owner.email, + password: 'password', + redirectPath: `/settings/teams`, + }); + + await expect(page.getByRole('button').getByText('Leave')).toBeDisabled(); + + await unseedTeam(team.url); +}); diff --git a/packages/app-tests/e2e/teams/transfer-team.spec.ts b/packages/app-tests/e2e/teams/transfer-team.spec.ts new file mode 100644 index 000000000..a5d95b720 --- /dev/null +++ b/packages/app-tests/e2e/teams/transfer-team.spec.ts @@ -0,0 +1,69 @@ +import { expect, test } from '@playwright/test'; + +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { seedTeam, seedTeamTransfer, unseedTeam } from '@documenso/prisma/seed/teams'; + +import { manualLogin } from '../fixtures/authentication'; + +test.describe.configure({ mode: 'parallel' }); + +test('[TEAMS]: initiate and cancel team transfer', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const teamMember = team.members[1]; + + await manualLogin({ + page, + email: team.owner.email, + password: 'password', + redirectPath: `/t/${team.url}/settings`, + }); + + await page.getByRole('button', { name: 'Transfer team' }).click(); + + await page.getByRole('combobox').click(); + await page.getByLabel(teamMember.user.name ?? '').click(); + await page.getByLabel('Confirm by typing transfer').click(); + await page.getByLabel('Confirm by typing transfer').fill('transfer'); + await page.getByRole('button', { name: 'Transfer' }).click(); + + await expect(page.locator('[id="\\:r2\\:-form-item-message"]')).toContainText( + `You must enter 'transfer ${team.name}' to proceed`, + ); + + await page.getByLabel('Confirm by typing transfer').click(); + await page.getByLabel('Confirm by typing transfer').fill(`transfer ${team.name}`); + await page.getByRole('button', { name: 'Transfer' }).click(); + + await expect(page.getByRole('heading', { name: 'Team transfer in progress' })).toBeVisible(); + await page.getByRole('button', { name: 'Cancel' }).click(); + + await expect(page.getByRole('status').first()).toContainText( + 'The team transfer invitation has been successfully deleted.', + ); + + await unseedTeam(team.url); +}); + +/** + * Current skipped until we disable billing during tests. + */ +test.skip('[TEAMS]: accept team transfer', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const newOwnerMember = team.members[1]; + + const teamTransferRequest = await seedTeamTransfer({ + teamId: team.id, + newOwnerUserId: newOwnerMember.userId, + }); + + await page.goto(`${WEBAPP_BASE_URL}/team/verify/transfer/${teamTransferRequest.token}`); + await expect(page.getByRole('heading')).toContainText('Team ownership transferred!'); + + await unseedTeam(team.url); +}); diff --git a/packages/app-tests/e2e/test-auth-flow.spec.ts b/packages/app-tests/e2e/test-auth-flow.spec.ts index 45b6dea03..40ee5e768 100644 --- a/packages/app-tests/e2e/test-auth-flow.spec.ts +++ b/packages/app-tests/e2e/test-auth-flow.spec.ts @@ -30,7 +30,7 @@ test('user can sign up with email and password', async ({ page }: { page: Page } await page.mouse.up(); } - await page.getByRole('button', { name: 'Sign Up' }).click(); + await page.getByRole('button', { name: 'Sign Up', exact: true }).click(); await page.waitForURL('/documents'); await expect(page).toHaveURL('/documents'); diff --git a/packages/ee/server-only/limits/client.ts b/packages/ee/server-only/limits/client.ts index 7f48e6856..9a36928b1 100644 --- a/packages/ee/server-only/limits/client.ts +++ b/packages/ee/server-only/limits/client.ts @@ -1,17 +1,23 @@ import { APP_BASE_URL } from '@documenso/lib/constants/app'; import { FREE_PLAN_LIMITS } from './constants'; -import { TLimitsResponseSchema, ZLimitsResponseSchema } from './schema'; +import type { TLimitsResponseSchema } from './schema'; +import { ZLimitsResponseSchema } from './schema'; export type GetLimitsOptions = { headers?: Record; + teamId?: number | null; }; -export const getLimits = async ({ headers }: GetLimitsOptions = {}) => { +export const getLimits = async ({ headers, teamId }: GetLimitsOptions = {}) => { const requestHeaders = headers ?? {}; const url = new URL(`${APP_BASE_URL}/api/limits`); + if (teamId) { + requestHeaders['team-id'] = teamId.toString(); + } + return fetch(url, { headers: { ...requestHeaders, diff --git a/packages/ee/server-only/limits/constants.ts b/packages/ee/server-only/limits/constants.ts index 71ff29d9d..4c428f34f 100644 --- a/packages/ee/server-only/limits/constants.ts +++ b/packages/ee/server-only/limits/constants.ts @@ -1,10 +1,15 @@ -import { TLimitsSchema } from './schema'; +import type { TLimitsSchema } from './schema'; export const FREE_PLAN_LIMITS: TLimitsSchema = { documents: 5, recipients: 10, }; +export const TEAM_PLAN_LIMITS: TLimitsSchema = { + documents: Infinity, + recipients: Infinity, +}; + export const SELFHOSTED_PLAN_LIMITS: TLimitsSchema = { documents: Infinity, recipients: Infinity, diff --git a/packages/ee/server-only/limits/handler.ts b/packages/ee/server-only/limits/handler.ts index 69f77db75..a497b2314 100644 --- a/packages/ee/server-only/limits/handler.ts +++ b/packages/ee/server-only/limits/handler.ts @@ -1,10 +1,10 @@ -import { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from 'next'; import { getToken } from 'next-auth/jwt'; import { match } from 'ts-pattern'; import { ERROR_CODES } from './errors'; -import { TLimitsErrorResponseSchema, TLimitsResponseSchema } from './schema'; +import type { TLimitsErrorResponseSchema, TLimitsResponseSchema } from './schema'; import { getServerLimits } from './server'; export const limitsHandler = async ( @@ -14,7 +14,19 @@ export const limitsHandler = async ( try { const token = await getToken({ req }); - const limits = await getServerLimits({ email: token?.email }); + const rawTeamId = req.headers['team-id']; + + let teamId: number | null = null; + + if (typeof rawTeamId === 'string' && !isNaN(parseInt(rawTeamId, 10))) { + teamId = parseInt(rawTeamId, 10); + } + + if (!teamId && rawTeamId) { + throw new Error(ERROR_CODES.INVALID_TEAM_ID); + } + + const limits = await getServerLimits({ email: token?.email, teamId }); return res.status(200).json(limits); } catch (err) { diff --git a/packages/ee/server-only/limits/provider/client.tsx b/packages/ee/server-only/limits/provider/client.tsx index 07a085750..fdc00b439 100644 --- a/packages/ee/server-only/limits/provider/client.tsx +++ b/packages/ee/server-only/limits/provider/client.tsx @@ -6,7 +6,7 @@ import { equals } from 'remeda'; import { getLimits } from '../client'; import { FREE_PLAN_LIMITS } from '../constants'; -import { TLimitsResponseSchema } from '../schema'; +import type { TLimitsResponseSchema } from '../schema'; export type LimitsContextValue = TLimitsResponseSchema; @@ -24,19 +24,22 @@ export const useLimits = () => { export type LimitsProviderProps = { initialValue?: LimitsContextValue; + teamId?: number; children?: React.ReactNode; }; -export const LimitsProvider = ({ initialValue, children }: LimitsProviderProps) => { - const defaultValue: TLimitsResponseSchema = { +export const LimitsProvider = ({ + initialValue = { quota: FREE_PLAN_LIMITS, remaining: FREE_PLAN_LIMITS, - }; - - const [limits, setLimits] = useState(() => initialValue ?? defaultValue); + }, + teamId, + children, +}: LimitsProviderProps) => { + const [limits, setLimits] = useState(() => initialValue); const refreshLimits = async () => { - const newLimits = await getLimits(); + const newLimits = await getLimits({ teamId }); setLimits((oldLimits) => { if (equals(oldLimits, newLimits)) { diff --git a/packages/ee/server-only/limits/provider/server.tsx b/packages/ee/server-only/limits/provider/server.tsx index c9295483a..b7cde3573 100644 --- a/packages/ee/server-only/limits/provider/server.tsx +++ b/packages/ee/server-only/limits/provider/server.tsx @@ -3,16 +3,22 @@ import { headers } from 'next/headers'; import { getLimits } from '../client'; +import type { LimitsContextValue } from './client'; import { LimitsProvider as ClientLimitsProvider } from './client'; export type LimitsProviderProps = { children?: React.ReactNode; + teamId?: number; }; -export const LimitsProvider = async ({ children }: LimitsProviderProps) => { +export const LimitsProvider = async ({ children, teamId }: LimitsProviderProps) => { const requestHeaders = Object.fromEntries(headers().entries()); - const limits = await getLimits({ headers: requestHeaders }); + const limits: LimitsContextValue = await getLimits({ headers: requestHeaders, teamId }); - return {children}; + return ( + + {children} + + ); }; diff --git a/packages/ee/server-only/limits/server.ts b/packages/ee/server-only/limits/server.ts index f256c6356..e48eb7187 100644 --- a/packages/ee/server-only/limits/server.ts +++ b/packages/ee/server-only/limits/server.ts @@ -1,22 +1,22 @@ import { DateTime } from 'luxon'; -import { getFlag } from '@documenso/lib/universal/get-feature-flag'; +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; import { prisma } from '@documenso/prisma'; import { SubscriptionStatus } from '@documenso/prisma/client'; -import { getPricesByType } from '../stripe/get-prices-by-type'; -import { FREE_PLAN_LIMITS, SELFHOSTED_PLAN_LIMITS } from './constants'; +import { getPricesByPlan } from '../stripe/get-prices-by-plan'; +import { FREE_PLAN_LIMITS, SELFHOSTED_PLAN_LIMITS, TEAM_PLAN_LIMITS } from './constants'; import { ERROR_CODES } from './errors'; import { ZLimitsSchema } from './schema'; export type GetServerLimitsOptions = { email?: string | null; + teamId?: number | null; }; -export const getServerLimits = async ({ email }: GetServerLimitsOptions) => { - const isBillingEnabled = await getFlag('app_billing'); - - if (!isBillingEnabled) { +export const getServerLimits = async ({ email, teamId }: GetServerLimitsOptions) => { + if (!IS_BILLING_ENABLED) { return { quota: SELFHOSTED_PLAN_LIMITS, remaining: SELFHOSTED_PLAN_LIMITS, @@ -27,6 +27,14 @@ export const getServerLimits = async ({ email }: GetServerLimitsOptions) => { throw new Error(ERROR_CODES.UNAUTHORIZED); } + return teamId ? handleTeamLimits({ email, teamId }) : handleUserLimits({ email }); +}; + +type HandleUserLimitsOptions = { + email: string; +}; + +const handleUserLimits = async ({ email }: HandleUserLimitsOptions) => { const user = await prisma.user.findFirst({ where: { email, @@ -48,10 +56,10 @@ export const getServerLimits = async ({ email }: GetServerLimitsOptions) => { ); if (activeSubscriptions.length > 0) { - const individualPrices = await getPricesByType('individual'); + const communityPlanPrices = await getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY); for (const subscription of activeSubscriptions) { - const price = individualPrices.find((price) => price.id === subscription.priceId); + const price = communityPlanPrices.find((price) => price.id === subscription.priceId); if (!price || typeof price.product === 'string' || price.product.deleted) { continue; } @@ -71,6 +79,7 @@ export const getServerLimits = async ({ email }: GetServerLimitsOptions) => { const documents = await prisma.document.count({ where: { userId: user.id, + teamId: null, createdAt: { gte: DateTime.utc().startOf('month').toJSDate(), }, @@ -84,3 +93,50 @@ export const getServerLimits = async ({ email }: GetServerLimitsOptions) => { remaining, }; }; + +type HandleTeamLimitsOptions = { + email: string; + teamId: number; +}; + +const handleTeamLimits = async ({ email, teamId }: HandleTeamLimitsOptions) => { + const team = await prisma.team.findFirst({ + where: { + id: teamId, + members: { + some: { + user: { + email, + }, + }, + }, + }, + include: { + subscription: true, + }, + }); + + if (!team) { + throw new Error('Team not found'); + } + + const { subscription } = team; + + if (subscription && subscription.status === SubscriptionStatus.INACTIVE) { + return { + quota: { + documents: 0, + recipients: 0, + }, + remaining: { + documents: 0, + recipients: 0, + }, + }; + } + + return { + quota: structuredClone(TEAM_PLAN_LIMITS), + remaining: structuredClone(TEAM_PLAN_LIMITS), + }; +}; diff --git a/packages/ee/server-only/stripe/create-team-customer.ts b/packages/ee/server-only/stripe/create-team-customer.ts new file mode 100644 index 000000000..591c445af --- /dev/null +++ b/packages/ee/server-only/stripe/create-team-customer.ts @@ -0,0 +1,20 @@ +import { STRIPE_CUSTOMER_TYPE } from '@documenso/lib/constants/billing'; +import { stripe } from '@documenso/lib/server-only/stripe'; + +type CreateTeamCustomerOptions = { + name: string; + email: string; +}; + +/** + * Create a Stripe customer for a given team. + */ +export const createTeamCustomer = async ({ name, email }: CreateTeamCustomerOptions) => { + return await stripe.customers.create({ + name, + email, + metadata: { + type: STRIPE_CUSTOMER_TYPE.TEAM, + }, + }); +}; diff --git a/packages/ee/server-only/stripe/delete-customer-payment-methods.ts b/packages/ee/server-only/stripe/delete-customer-payment-methods.ts new file mode 100644 index 000000000..749c15763 --- /dev/null +++ b/packages/ee/server-only/stripe/delete-customer-payment-methods.ts @@ -0,0 +1,22 @@ +import { stripe } from '@documenso/lib/server-only/stripe'; + +type DeleteCustomerPaymentMethodsOptions = { + customerId: string; +}; + +/** + * Delete all attached payment methods for a given customer. + */ +export const deleteCustomerPaymentMethods = async ({ + customerId, +}: DeleteCustomerPaymentMethodsOptions) => { + const paymentMethods = await stripe.paymentMethods.list({ + customer: customerId, + }); + + await Promise.all( + paymentMethods.data.map(async (paymentMethod) => + stripe.paymentMethods.detach(paymentMethod.id), + ), + ); +}; diff --git a/packages/ee/server-only/stripe/get-checkout-session.ts b/packages/ee/server-only/stripe/get-checkout-session.ts index fd15d538a..7c89c1f8c 100644 --- a/packages/ee/server-only/stripe/get-checkout-session.ts +++ b/packages/ee/server-only/stripe/get-checkout-session.ts @@ -1,17 +1,21 @@ 'use server'; +import type Stripe from 'stripe'; + import { stripe } from '@documenso/lib/server-only/stripe'; export type GetCheckoutSessionOptions = { customerId: string; priceId: string; returnUrl: string; + subscriptionMetadata?: Stripe.Metadata; }; export const getCheckoutSession = async ({ customerId, priceId, returnUrl, + subscriptionMetadata, }: GetCheckoutSessionOptions) => { 'use server'; @@ -26,6 +30,9 @@ export const getCheckoutSession = async ({ ], success_url: `${returnUrl}?success=true`, cancel_url: `${returnUrl}?canceled=true`, + subscription_data: { + metadata: subscriptionMetadata, + }, }); return session.url; diff --git a/packages/ee/server-only/stripe/get-community-plan-prices.ts b/packages/ee/server-only/stripe/get-community-plan-prices.ts new file mode 100644 index 000000000..86c7f61bd --- /dev/null +++ b/packages/ee/server-only/stripe/get-community-plan-prices.ts @@ -0,0 +1,13 @@ +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; + +import { getPricesByPlan } from './get-prices-by-plan'; + +export const getCommunityPlanPrices = async () => { + return await getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY); +}; + +export const getCommunityPlanPriceIds = async () => { + const prices = await getCommunityPlanPrices(); + + return prices.map((price) => price.id); +}; diff --git a/packages/ee/server-only/stripe/get-customer.ts b/packages/ee/server-only/stripe/get-customer.ts index c85488e6f..6e2d4f088 100644 --- a/packages/ee/server-only/stripe/get-customer.ts +++ b/packages/ee/server-only/stripe/get-customer.ts @@ -1,15 +1,19 @@ +import { STRIPE_CUSTOMER_TYPE } from '@documenso/lib/constants/billing'; import { stripe } from '@documenso/lib/server-only/stripe'; import { prisma } from '@documenso/prisma'; import type { User } from '@documenso/prisma/client'; import { onSubscriptionUpdated } from './webhook/on-subscription-updated'; +/** + * Get a non team Stripe customer by email. + */ export const getStripeCustomerByEmail = async (email: string) => { const foundStripeCustomers = await stripe.customers.list({ email, }); - return foundStripeCustomers.data[0] ?? null; + return foundStripeCustomers.data.find((customer) => customer.metadata.type !== 'team') ?? null; }; export const getStripeCustomerById = async (stripeCustomerId: string) => { @@ -51,6 +55,7 @@ export const getStripeCustomerByUser = async (user: User) => { email: user.email, metadata: { userId: user.id, + type: STRIPE_CUSTOMER_TYPE.INDIVIDUAL, }, }); } @@ -78,6 +83,14 @@ export const getStripeCustomerByUser = async (user: User) => { }; }; +export const getStripeCustomerIdByUser = async (user: User) => { + if (user.customerId !== null) { + return user.customerId; + } + + return await getStripeCustomerByUser(user).then((session) => session.stripeCustomer.id); +}; + const syncStripeCustomerSubscriptions = async (userId: number, stripeCustomerId: string) => { const stripeSubscriptions = await stripe.subscriptions.list({ customer: stripeCustomerId, diff --git a/packages/ee/server-only/stripe/get-invoices.ts b/packages/ee/server-only/stripe/get-invoices.ts new file mode 100644 index 000000000..f8f383921 --- /dev/null +++ b/packages/ee/server-only/stripe/get-invoices.ts @@ -0,0 +1,11 @@ +import { stripe } from '@documenso/lib/server-only/stripe'; + +export type GetInvoicesOptions = { + customerId: string; +}; + +export const getInvoices = async ({ customerId }: GetInvoicesOptions) => { + return await stripe.invoices.list({ + customer: customerId, + }); +}; diff --git a/packages/ee/server-only/stripe/get-portal-session.ts b/packages/ee/server-only/stripe/get-portal-session.ts index 310cc1e47..275d166d8 100644 --- a/packages/ee/server-only/stripe/get-portal-session.ts +++ b/packages/ee/server-only/stripe/get-portal-session.ts @@ -4,7 +4,7 @@ import { stripe } from '@documenso/lib/server-only/stripe'; export type GetPortalSessionOptions = { customerId: string; - returnUrl: string; + returnUrl?: string; }; export const getPortalSession = async ({ customerId, returnUrl }: GetPortalSessionOptions) => { diff --git a/packages/ee/server-only/stripe/get-prices-by-interval.ts b/packages/ee/server-only/stripe/get-prices-by-interval.ts index a5578a813..1b528706a 100644 --- a/packages/ee/server-only/stripe/get-prices-by-interval.ts +++ b/packages/ee/server-only/stripe/get-prices-by-interval.ts @@ -9,12 +9,12 @@ export type PriceIntervals = Record { +export const getPricesByInterval = async ({ plan }: GetPricesByIntervalOptions = {}) => { let { data: prices } = await stripe.prices.search({ query: `active:'true' type:'recurring'`, expand: ['data.product'], @@ -26,7 +26,7 @@ export const getPricesByInterval = async ({ type }: GetPricesByIntervalOptions = // eslint-disable-next-line @typescript-eslint/consistent-type-assertions const product = price.product as Stripe.Product; - const filter = !type || product.metadata?.type === type; + const filter = !plan || product.metadata?.plan === plan; // Filter out prices for products that are not active. return product.active && filter; diff --git a/packages/ee/server-only/stripe/get-prices-by-plan.ts b/packages/ee/server-only/stripe/get-prices-by-plan.ts new file mode 100644 index 000000000..5c390b35a --- /dev/null +++ b/packages/ee/server-only/stripe/get-prices-by-plan.ts @@ -0,0 +1,14 @@ +import type { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; +import { stripe } from '@documenso/lib/server-only/stripe'; + +export const getPricesByPlan = async ( + plan: (typeof STRIPE_PLAN_TYPE)[keyof typeof STRIPE_PLAN_TYPE], +) => { + const { data: prices } = await stripe.prices.search({ + query: `metadata['plan']:'${plan}' type:'recurring'`, + expand: ['data.product'], + limit: 100, + }); + + return prices; +}; diff --git a/packages/ee/server-only/stripe/get-prices-by-type.ts b/packages/ee/server-only/stripe/get-prices-by-type.ts deleted file mode 100644 index 22124562c..000000000 --- a/packages/ee/server-only/stripe/get-prices-by-type.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { stripe } from '@documenso/lib/server-only/stripe'; - -export const getPricesByType = async (type: 'individual') => { - const { data: prices } = await stripe.prices.search({ - query: `metadata['type']:'${type}' type:'recurring'`, - expand: ['data.product'], - limit: 100, - }); - - return prices; -}; diff --git a/packages/ee/server-only/stripe/get-team-prices.ts b/packages/ee/server-only/stripe/get-team-prices.ts new file mode 100644 index 000000000..5c3021b78 --- /dev/null +++ b/packages/ee/server-only/stripe/get-team-prices.ts @@ -0,0 +1,43 @@ +import type Stripe from 'stripe'; + +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; +import { AppError } from '@documenso/lib/errors/app-error'; + +import { getPricesByPlan } from './get-prices-by-plan'; + +export const getTeamPrices = async () => { + const prices = (await getPricesByPlan(STRIPE_PLAN_TYPE.TEAM)).filter((price) => price.active); + + const monthlyPrice = prices.find((price) => price.recurring?.interval === 'month'); + const yearlyPrice = prices.find((price) => price.recurring?.interval === 'year'); + const priceIds = prices.map((price) => price.id); + + if (!monthlyPrice || !yearlyPrice) { + throw new AppError('INVALID_CONFIG', 'Missing monthly or yearly price'); + } + + return { + monthly: { + friendlyInterval: 'Monthly', + interval: 'monthly', + ...extractPriceData(monthlyPrice), + }, + yearly: { + friendlyInterval: 'Yearly', + interval: 'yearly', + ...extractPriceData(yearlyPrice), + }, + priceIds, + } as const; +}; + +const extractPriceData = (price: Stripe.Price) => { + const product = + typeof price.product !== 'string' && !price.product.deleted ? price.product : null; + + return { + priceId: price.id, + description: product?.description ?? '', + features: product?.features ?? [], + }; +}; diff --git a/packages/ee/server-only/stripe/transfer-team-subscription.ts b/packages/ee/server-only/stripe/transfer-team-subscription.ts new file mode 100644 index 000000000..b4e0bd59a --- /dev/null +++ b/packages/ee/server-only/stripe/transfer-team-subscription.ts @@ -0,0 +1,126 @@ +import type Stripe from 'stripe'; + +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { stripe } from '@documenso/lib/server-only/stripe'; +import { subscriptionsContainsActiveCommunityPlan } from '@documenso/lib/utils/billing'; +import { prisma } from '@documenso/prisma'; +import { type Subscription, type Team, type User } from '@documenso/prisma/client'; + +import { deleteCustomerPaymentMethods } from './delete-customer-payment-methods'; +import { getCommunityPlanPriceIds } from './get-community-plan-prices'; +import { getTeamPrices } from './get-team-prices'; + +type TransferStripeSubscriptionOptions = { + /** + * The user to transfer the subscription to. + */ + user: User & { Subscription: Subscription[] }; + + /** + * The team the subscription is associated with. + */ + team: Team & { subscription?: Subscription | null }; + + /** + * Whether to clear any current payment methods attached to the team. + */ + clearPaymentMethods: boolean; +}; + +/** + * Transfer the Stripe Team seats subscription from one user to another. + * + * Will create a new subscription for the new owner and cancel the old one. + * + * Returns the subscription that should be associated with the team, null if + * no subscription is needed (for community plan). + */ +export const transferTeamSubscription = async ({ + user, + team, + clearPaymentMethods, +}: TransferStripeSubscriptionOptions) => { + const teamCustomerId = team.customerId; + + if (!teamCustomerId) { + throw new AppError(AppErrorCode.NOT_FOUND, 'Missing customer ID.'); + } + + const [communityPlanIds, teamSeatPrices] = await Promise.all([ + getCommunityPlanPriceIds(), + getTeamPrices(), + ]); + + const teamSubscriptionRequired = !subscriptionsContainsActiveCommunityPlan( + user.Subscription, + communityPlanIds, + ); + + let teamSubscription: Stripe.Subscription | null = null; + + if (team.subscription) { + teamSubscription = await stripe.subscriptions.retrieve(team.subscription.planId); + + if (!teamSubscription) { + throw new Error('Could not find the current subscription.'); + } + + if (clearPaymentMethods) { + await deleteCustomerPaymentMethods({ customerId: teamCustomerId }); + } + } + + await stripe.customers.update(teamCustomerId, { + name: user.name ?? team.name, + email: user.email, + }); + + // If team subscription is required and the team does not have a subscription, create one. + if (teamSubscriptionRequired && !teamSubscription) { + const numberOfSeats = await prisma.teamMember.count({ + where: { + teamId: team.id, + }, + }); + + const teamSeatPriceId = teamSeatPrices.monthly.priceId; + + teamSubscription = await stripe.subscriptions.create({ + customer: teamCustomerId, + items: [ + { + price: teamSeatPriceId, + quantity: numberOfSeats, + }, + ], + metadata: { + teamId: team.id.toString(), + }, + }); + } + + // If no team subscription is required, cancel the current team subscription if it exists. + if (!teamSubscriptionRequired && teamSubscription) { + try { + // Set the quantity to 0 so we can refund/charge the old Stripe customer the prorated amount. + await stripe.subscriptions.update(teamSubscription.id, { + items: teamSubscription.items.data.map((item) => ({ + id: item.id, + quantity: 0, + })), + }); + + await stripe.subscriptions.cancel(teamSubscription.id, { + invoice_now: true, + prorate: false, + }); + } catch (e) { + // Do not error out since we can't easily undo the transfer. + // Todo: Teams - Alert us. + } + + return null; + } + + return teamSubscription; +}; diff --git a/packages/ee/server-only/stripe/update-customer.ts b/packages/ee/server-only/stripe/update-customer.ts new file mode 100644 index 000000000..78e223b48 --- /dev/null +++ b/packages/ee/server-only/stripe/update-customer.ts @@ -0,0 +1,18 @@ +import { stripe } from '@documenso/lib/server-only/stripe'; + +type UpdateCustomerOptions = { + customerId: string; + name?: string; + email?: string; +}; + +export const updateCustomer = async ({ customerId, name, email }: UpdateCustomerOptions) => { + if (!name && !email) { + return; + } + + return await stripe.customers.update(customerId, { + name, + email, + }); +}; diff --git a/packages/ee/server-only/stripe/update-subscription-item-quantity.ts b/packages/ee/server-only/stripe/update-subscription-item-quantity.ts new file mode 100644 index 000000000..e0fa95f3d --- /dev/null +++ b/packages/ee/server-only/stripe/update-subscription-item-quantity.ts @@ -0,0 +1,44 @@ +import type Stripe from 'stripe'; + +import { stripe } from '@documenso/lib/server-only/stripe'; + +export type UpdateSubscriptionItemQuantityOptions = { + subscriptionId: string; + quantity: number; + priceId: string; +}; + +export const updateSubscriptionItemQuantity = async ({ + subscriptionId, + quantity, + priceId, +}: UpdateSubscriptionItemQuantityOptions) => { + const subscription = await stripe.subscriptions.retrieve(subscriptionId); + + const items = subscription.items.data.filter((item) => item.price.id === priceId); + + if (items.length !== 1) { + throw new Error('Subscription does not contain required item'); + } + + const hasYearlyItem = items.find((item) => item.price.recurring?.interval === 'year'); + const oldQuantity = items[0].quantity; + + if (oldQuantity === quantity) { + return; + } + + const subscriptionUpdatePayload: Stripe.SubscriptionUpdateParams = { + items: items.map((item) => ({ + id: item.id, + quantity, + })), + }; + + // Only invoice immediately when changing the quantity of yearly item. + if (hasYearlyItem) { + subscriptionUpdatePayload.proration_behavior = 'always_invoice'; + } + + await stripe.subscriptions.update(subscriptionId, subscriptionUpdatePayload); +}; diff --git a/packages/ee/server-only/stripe/webhook/handler.ts b/packages/ee/server-only/stripe/webhook/handler.ts index 047de7962..23705438a 100644 --- a/packages/ee/server-only/stripe/webhook/handler.ts +++ b/packages/ee/server-only/stripe/webhook/handler.ts @@ -3,8 +3,10 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import { buffer } from 'micro'; import { match } from 'ts-pattern'; +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; import type { Stripe } from '@documenso/lib/server-only/stripe'; import { stripe } from '@documenso/lib/server-only/stripe'; +import { createTeamFromPendingTeam } from '@documenso/lib/server-only/team/create-team'; import { getFlag } from '@documenso/lib/universal/get-feature-flag'; import { prisma } from '@documenso/prisma'; @@ -84,14 +86,9 @@ export const stripeWebhookHandler = async ( }, }); - if (!result?.id) { - return res.status(500).json({ - success: false, - message: 'User not found', - }); + if (result?.id) { + userId = result.id; } - - userId = result.id; } const subscriptionId = @@ -99,7 +96,7 @@ export const stripeWebhookHandler = async ( ? session.subscription : session.subscription?.id; - if (!subscriptionId || Number.isNaN(userId)) { + if (!subscriptionId) { return res.status(500).json({ success: false, message: 'Invalid session', @@ -108,6 +105,24 @@ export const stripeWebhookHandler = async ( const subscription = await stripe.subscriptions.retrieve(subscriptionId); + // Handle team creation after seat checkout. + if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) { + await handleTeamSeatCheckout({ subscription }); + + return res.status(200).json({ + success: true, + message: 'Webhook received', + }); + } + + // Validate user ID. + if (!userId || Number.isNaN(userId)) { + return res.status(500).json({ + success: false, + message: 'Invalid session or missing user ID', + }); + } + await onSubscriptionUpdated({ userId, subscription }); return res.status(200).json({ @@ -124,6 +139,28 @@ export const stripeWebhookHandler = async ( ? subscription.customer : subscription.customer.id; + if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) { + const team = await prisma.team.findFirst({ + where: { + customerId, + }, + }); + + if (!team) { + return res.status(500).json({ + success: false, + message: 'No team associated with subscription found', + }); + } + + await onSubscriptionUpdated({ teamId: team.id, subscription }); + + return res.status(200).json({ + success: true, + message: 'Webhook received', + }); + } + const result = await prisma.user.findFirst({ select: { id: true, @@ -182,6 +219,28 @@ export const stripeWebhookHandler = async ( }); } + if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) { + const team = await prisma.team.findFirst({ + where: { + customerId, + }, + }); + + if (!team) { + return res.status(500).json({ + success: false, + message: 'No team associated with subscription found', + }); + } + + await onSubscriptionUpdated({ teamId: team.id, subscription }); + + return res.status(200).json({ + success: true, + message: 'Webhook received', + }); + } + const result = await prisma.user.findFirst({ select: { id: true, @@ -233,6 +292,28 @@ export const stripeWebhookHandler = async ( }); } + if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) { + const team = await prisma.team.findFirst({ + where: { + customerId, + }, + }); + + if (!team) { + return res.status(500).json({ + success: false, + message: 'No team associated with subscription found', + }); + } + + await onSubscriptionUpdated({ teamId: team.id, subscription }); + + return res.status(200).json({ + success: true, + message: 'Webhook received', + }); + } + const result = await prisma.user.findFirst({ select: { id: true, @@ -282,3 +363,21 @@ export const stripeWebhookHandler = async ( }); } }; + +export type HandleTeamSeatCheckoutOptions = { + subscription: Stripe.Subscription; +}; + +const handleTeamSeatCheckout = async ({ subscription }: HandleTeamSeatCheckoutOptions) => { + if (subscription.metadata?.pendingTeamId === undefined) { + throw new Error('Missing pending team ID'); + } + + const pendingTeamId = Number(subscription.metadata.pendingTeamId); + + if (Number.isNaN(pendingTeamId)) { + throw new Error('Invalid pending team ID'); + } + + return await createTeamFromPendingTeam({ pendingTeamId, subscription }).then((team) => team.id); +}; diff --git a/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts b/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts index d7ce7b062..8e2f00df8 100644 --- a/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts +++ b/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts @@ -2,23 +2,40 @@ import { match } from 'ts-pattern'; import type { Stripe } from '@documenso/lib/server-only/stripe'; import { prisma } from '@documenso/prisma'; +import type { Prisma } from '@documenso/prisma/client'; import { SubscriptionStatus } from '@documenso/prisma/client'; export type OnSubscriptionUpdatedOptions = { - userId: number; + userId?: number; + teamId?: number; subscription: Stripe.Subscription; }; export const onSubscriptionUpdated = async ({ userId, + teamId, subscription, }: OnSubscriptionUpdatedOptions) => { + await prisma.subscription.upsert( + mapStripeSubscriptionToPrismaUpsertAction(subscription, userId, teamId), + ); +}; + +export const mapStripeSubscriptionToPrismaUpsertAction = ( + subscription: Stripe.Subscription, + userId?: number, + teamId?: number, +): Prisma.SubscriptionUpsertArgs => { + if ((!userId && !teamId) || (userId && teamId)) { + throw new Error('Either userId or teamId must be provided.'); + } + const status = match(subscription.status) .with('active', () => SubscriptionStatus.ACTIVE) .with('past_due', () => SubscriptionStatus.PAST_DUE) .otherwise(() => SubscriptionStatus.INACTIVE); - await prisma.subscription.upsert({ + return { where: { planId: subscription.id, }, @@ -27,7 +44,8 @@ export const onSubscriptionUpdated = async ({ planId: subscription.id, priceId: subscription.items.data[0].price.id, periodEnd: new Date(subscription.current_period_end * 1000), - userId, + userId: userId ?? null, + teamId: teamId ?? null, cancelAtPeriodEnd: subscription.cancel_at_period_end, }, update: { @@ -37,5 +55,5 @@ export const onSubscriptionUpdated = async ({ periodEnd: new Date(subscription.current_period_end * 1000), cancelAtPeriodEnd: subscription.cancel_at_period_end, }, - }); + }; }; diff --git a/packages/email/static/add-user.png b/packages/email/static/add-user.png new file mode 100644 index 0000000000000000000000000000000000000000..abd337ceb70d306c70f31d07f1c74e2ca34399be GIT binary patch literal 3361 zcmV++4c_vJP)Gv`oIefP1`wEzQaL0KGNQ&`y?Uh=78W#-p`*s);-W_U zGcz;iRRRbdVk;eN}Y;suHZD8npcaxE1d`GfO#C`k`2XJ3-i082610B20TR31@FMaS~g zQ2n%>OiOwhAenH=G)1|T;zU(6q<3Os!Yh?ZBXrnj3OF?w?a@cZ9`b|AoI8>eBbe3w z`1rV{f*rztIUFe(LL2ogqL9@TWB63kXP#&vne&=xGTl}U0F_VW5Q$sS#)4i{83OWy%E!lf zlHx?(gKc$;0>$`j7Jz&pKd|m`Z1%aaw!Av7xBRfIqRoHwL66e$fA;R(8_A%4v%vHo zOa`DleSh%a!70vPT<`yBpq2zj^`PAL`Uf=l{y*$#*iNMhOx6QPitqEYq9R7AqA}Jz zGc)sxN(o5~Hk8#LwxdUnE>a;*fBN)Er3q9pdd8`tp`o{`Qkz94!K9%u)%TQ235mRj zaz&Ab484Qif{LWRV3h_Sy&#zOzd?FY@q{Ja8S8!`?Abx#p)z@9u)(``@7``|ix=L# zd#BR?=6)f4>NXul-Z)=6VBuLSpfrlKJym&zRdD`(Y;0`Pix)2@W@l&hmoHy*l0bTx zfQQ28if5CoB0|~(C(;>g43`aUIvF4TBC&aY(X~lZ)v=L`co9F+IdtgIgv^($aCsY1N^CTVyRzhx8)VlMN$i+8pD>_kq#BI8i6eHPM4%eMKcdpRW)AMg_W?f=yWO5#iHhRDI_Y?=Z zMgL0H`ZT3czQ;DMgnbaH2!mkSojGvez_3aIH9f*a{lF&93RTG3n+f1ObwZpaV*d`J zF(`p4HXxeG#yP};UMXxO@rtC@?;WG_)3l$wa^=b-r^E5GF%XcCn$L>9`x>*2$PU3iTu6bk<$wK{p>!iD4X z&?jm86Ll|+hD5zcao;DB|4&ifrm#~Wl;ZLbmoex(*c1PV_R*@^RR?(+_<6bYb>Qah|le5^QA-PRfj)?xkPc}2PtlT}$gmRYu?kBJ1iT5s%yV3JLx&_PC&B$Y{4 zIhuFXHqh(dS#ellgxSM-s3CBt*I^@Wq@GJ0>Q*Q zLpG%PhrBo{jeW`vmQGSU=OL-^Ntu@8vwFburj7IPTzm>3HVH;M+uPd<*ZiX(7Owf* z1?*RvaDQcGklM z4f7d*QF`72j@v=o^=ev0%WE*MI)Pxoc!@v8bGNgurd#&WVTSoe@@ib!Fa#Iy6SM{@YiQQntX!Fg zSEN;ZO)T$iFu=}SXgqoM(9n?IKb_@;Y)yHa<+;e%N~Kakbs(^EU#~lF$!uHPl($(o zJ#`Jj$46!hq^W7Ma;SIoXgM5}@hRbuRD`wNBW;LRrfa!c3UaL^osxEmbLB9_fbS~ll-)B$ zf_gg9g9<^3LM#S2F4LA@D_zAemaGJV_ze!ybbuqYpmddRre^jkEKQEfzOLGt)J9Q_ zps@d8(hx>+(Q?0Ejl7`i*7?8>b=joam8)Y325hNRRY(XTL|H`0LbVAF(-1+Vif~G) zP!D-w6+~HiQ|+jhW6P*6d(Gd_8Sjbf8-nrmAVV(beAsZEWdH?T*Rlz+9j)m~r)#+# zIg7Lc$O5gBhF8b`y6)E*9;bD1h#yV@@{i847CQ}2f*o=R`C4S33%ft;dQcqI?zh7P r9fzHBaBy&NaBy&NaBy&NsEOYJQ|7+=Yxnzq00000NkvXXu0mjfB)pO| literal 0 HcmV?d00001 diff --git a/packages/email/static/mail-open-alert.png b/packages/email/static/mail-open-alert.png new file mode 100644 index 0000000000000000000000000000000000000000..1511f0bc539302bf3fc9de7e18283d8882861ffb GIT binary patch literal 3818 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 BjST<* literal 0 HcmV?d00001 diff --git a/packages/email/template-components/template-image.tsx b/packages/email/template-components/template-image.tsx new file mode 100644 index 000000000..8f821c10f --- /dev/null +++ b/packages/email/template-components/template-image.tsx @@ -0,0 +1,17 @@ +import { Img } from '../components'; + +export interface TemplateImageProps { + assetBaseUrl: string; + className?: string; + staticAsset: string; +} + +export const TemplateImage = ({ assetBaseUrl, className, staticAsset }: TemplateImageProps) => { + const getAssetUrl = (path: string) => { + return new URL(path, assetBaseUrl).toString(); + }; + + return ; +}; + +export default TemplateImage; diff --git a/packages/email/templates/confirm-email.tsx b/packages/email/templates/confirm-email.tsx index b3acd1ecd..59c7add10 100644 --- a/packages/email/templates/confirm-email.tsx +++ b/packages/email/templates/confirm-email.tsx @@ -7,7 +7,7 @@ import { TemplateFooter } from '../template-components/template-footer'; export const ConfirmEmailTemplate = ({ confirmationLink, - assetBaseUrl, + assetBaseUrl = 'http://localhost:3002', }: TemplateConfirmationEmailProps) => { const previewText = `Please confirm your email address`; @@ -55,3 +55,5 @@ export const ConfirmEmailTemplate = ({ ); }; + +export default ConfirmEmailTemplate; diff --git a/packages/email/templates/confirm-team-email.tsx b/packages/email/templates/confirm-team-email.tsx new file mode 100644 index 000000000..5752f806d --- /dev/null +++ b/packages/email/templates/confirm-team-email.tsx @@ -0,0 +1,127 @@ +import { formatTeamUrl } from '@documenso/lib/utils/teams'; +import config from '@documenso/tailwind-config'; + +import { + Body, + Button, + Container, + Head, + Hr, + Html, + Link, + Preview, + Section, + Tailwind, + Text, +} from '../components'; +import { TemplateFooter } from '../template-components/template-footer'; +import TemplateImage from '../template-components/template-image'; + +export type ConfirmTeamEmailProps = { + assetBaseUrl: string; + baseUrl: string; + teamName: string; + teamUrl: string; + token: string; +}; + +export const ConfirmTeamEmailTemplate = ({ + assetBaseUrl = 'http://localhost:3002', + baseUrl = 'https://documenso.com', + teamName = 'Team Name', + teamUrl = 'demo', + token = '', +}: ConfirmTeamEmailProps) => { + const previewText = `Accept team email request for ${teamName} on Documenso`; + + return ( + + + {previewText} + + +
+ + + +
+ +
+ +
+ + Verify your team email address + + + + {teamName} has requested to use your email + address for their team on Documenso. + + +
+ {formatTeamUrl(teamUrl, baseUrl)} +
+ +
+ + By accepting this request, you will be granting {teamName}{' '} + access to: + + +
    +
  • + View all documents sent to and from this email address +
  • +
  • + Allow document recipients to reply directly to this email address +
  • +
+ + + You can revoke access at any time in your team settings on Documenso{' '} + here. + +
+ +
+ +
+
+ + Link expires in 1 hour. +
+ +
+ + + + +
+ +
+ + ); +}; + +export default ConfirmTeamEmailTemplate; diff --git a/packages/email/templates/team-email-removed.tsx b/packages/email/templates/team-email-removed.tsx new file mode 100644 index 000000000..0a143d1b9 --- /dev/null +++ b/packages/email/templates/team-email-removed.tsx @@ -0,0 +1,83 @@ +import { formatTeamUrl } from '@documenso/lib/utils/teams'; +import config from '@documenso/tailwind-config'; + +import { Body, Container, Head, Hr, Html, Preview, Section, Tailwind, Text } from '../components'; +import { TemplateFooter } from '../template-components/template-footer'; +import TemplateImage from '../template-components/template-image'; + +export type TeamEmailRemovedTemplateProps = { + assetBaseUrl: string; + baseUrl: string; + teamEmail: string; + teamName: string; + teamUrl: string; +}; + +export const TeamEmailRemovedTemplate = ({ + assetBaseUrl = 'http://localhost:3002', + baseUrl = 'https://documenso.com', + teamEmail = 'example@documenso.com', + teamName = 'Team Name', + teamUrl = 'demo', +}: TeamEmailRemovedTemplateProps) => { + const previewText = `Team email removed for ${teamName} on Documenso`; + + return ( + + + {previewText} + + +
+ + + +
+ +
+ +
+ + Team email removed + + + + The team email {teamEmail} has been removed + from the following team + + +
+ {formatTeamUrl(teamUrl, baseUrl)} +
+
+
+ +
+ + + + +
+ +
+ + ); +}; + +export default TeamEmailRemovedTemplate; diff --git a/packages/email/templates/team-invite.tsx b/packages/email/templates/team-invite.tsx new file mode 100644 index 000000000..4602b7382 --- /dev/null +++ b/packages/email/templates/team-invite.tsx @@ -0,0 +1,108 @@ +import { formatTeamUrl } from '@documenso/lib/utils/teams'; +import config from '@documenso/tailwind-config'; + +import { + Body, + Button, + Container, + Head, + Hr, + Html, + Preview, + Section, + Tailwind, + Text, +} from '../components'; +import { TemplateFooter } from '../template-components/template-footer'; +import TemplateImage from '../template-components/template-image'; + +export type TeamInviteEmailProps = { + assetBaseUrl: string; + baseUrl: string; + senderName: string; + teamName: string; + teamUrl: string; + token: string; +}; + +export const TeamInviteEmailTemplate = ({ + assetBaseUrl = 'http://localhost:3002', + baseUrl = 'https://documenso.com', + senderName = 'John Doe', + teamName = 'Team Name', + teamUrl = 'demo', + token = '', +}: TeamInviteEmailProps) => { + const previewText = `Accept invitation to join a team on Documenso`; + + return ( + + + {previewText} + + +
+ + + +
+ +
+ +
+ + Join {teamName} on Documenso + + + + You have been invited to join the following team + + +
+ {formatTeamUrl(teamUrl, baseUrl)} +
+ + + by {senderName} + + +
+ +
+
+
+ +
+ + + + +
+ +
+ + ); +}; + +export default TeamInviteEmailTemplate; diff --git a/packages/email/templates/team-transfer-request.tsx b/packages/email/templates/team-transfer-request.tsx new file mode 100644 index 000000000..82723226c --- /dev/null +++ b/packages/email/templates/team-transfer-request.tsx @@ -0,0 +1,112 @@ +import { formatTeamUrl } from '@documenso/lib/utils/teams'; +import config from '@documenso/tailwind-config'; + +import { + Body, + Button, + Container, + Head, + Hr, + Html, + Preview, + Section, + Tailwind, + Text, +} from '../components'; +import { TemplateFooter } from '../template-components/template-footer'; +import TemplateImage from '../template-components/template-image'; + +export type TeamTransferRequestTemplateProps = { + assetBaseUrl: string; + baseUrl: string; + senderName: string; + teamName: string; + teamUrl: string; + token: string; +}; + +export const TeamTransferRequestTemplate = ({ + assetBaseUrl = 'http://localhost:3002', + baseUrl = 'https://documenso.com', + senderName = 'John Doe', + teamName = 'Team Name', + teamUrl = 'demo', + token = '', +}: TeamTransferRequestTemplateProps) => { + const previewText = 'Accept team transfer request on Documenso'; + + return ( + + + {previewText} + + +
+ + + +
+ +
+ +
+ + {teamName} ownership transfer request + + + + {senderName} has requested that you take + ownership of the following team + + +
+ {formatTeamUrl(teamUrl, baseUrl)} +
+ + + By accepting this request, you will take responsibility for any billing items + associated with this team. + + +
+ +
+
+ + Link expires in 1 hour. +
+ +
+ + + + +
+ +
+ + ); +}; + +export default TeamTransferRequestTemplate; diff --git a/packages/lib/constants/app.ts b/packages/lib/constants/app.ts index a19d2bb0d..6c4d056d0 100644 --- a/packages/lib/constants/app.ts +++ b/packages/lib/constants/app.ts @@ -1,5 +1,9 @@ export const IS_APP_MARKETING = process.env.NEXT_PUBLIC_PROJECT === 'marketing'; export const IS_APP_WEB = process.env.NEXT_PUBLIC_PROJECT === 'web'; +export const IS_BILLING_ENABLED = process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true'; + +export const APP_DOCUMENT_UPLOAD_SIZE_LIMIT = + Number(process.env.NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT) || 50; export const APP_FOLDER = IS_APP_MARKETING ? 'marketing' : 'web'; @@ -7,5 +11,6 @@ export const APP_BASE_URL = IS_APP_WEB ? process.env.NEXT_PUBLIC_WEBAPP_URL : process.env.NEXT_PUBLIC_MARKETING_URL; -export const APP_DOCUMENT_UPLOAD_SIZE_LIMIT = - Number(process.env.NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT) || 50; +export const WEBAPP_BASE_URL = process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'; + +export const MARKETING_BASE_URL = process.env.NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001'; diff --git a/packages/lib/constants/billing.ts b/packages/lib/constants/billing.ts new file mode 100644 index 000000000..e6d897af8 --- /dev/null +++ b/packages/lib/constants/billing.ts @@ -0,0 +1,11 @@ +export enum STRIPE_CUSTOMER_TYPE { + INDIVIDUAL = 'individual', + TEAM = 'team', +} + +export enum STRIPE_PLAN_TYPE { + TEAM = 'team', + COMMUNITY = 'community', +} + +export const TEAM_BILLING_DOMAIN = 'billing.team.documenso.com'; diff --git a/packages/lib/constants/teams.ts b/packages/lib/constants/teams.ts new file mode 100644 index 000000000..47705bb14 --- /dev/null +++ b/packages/lib/constants/teams.ts @@ -0,0 +1,102 @@ +import { TeamMemberRole } from '@documenso/prisma/client'; + +export const TEAM_URL_ROOT_REGEX = new RegExp('^/t/[^/]+$'); + +export const TEAM_MEMBER_ROLE_MAP: Record = { + ADMIN: 'Admin', + MANAGER: 'Manager', + MEMBER: 'Member', +}; + +export const TEAM_MEMBER_ROLE_PERMISSIONS_MAP = { + /** + * Includes permissions to: + * - Manage team members + * - Manage team settings, changing name, url, etc. + */ + MANAGE_TEAM: [TeamMemberRole.ADMIN, TeamMemberRole.MANAGER], + MANAGE_BILLING: [TeamMemberRole.ADMIN], + DELETE_TEAM_TRANSFER_REQUEST: [TeamMemberRole.ADMIN], +} satisfies Record; + +/** + * A hierarchy of team member roles to determine which role has higher permission than another. + */ +export const TEAM_MEMBER_ROLE_HIERARCHY = { + [TeamMemberRole.ADMIN]: [TeamMemberRole.ADMIN, TeamMemberRole.MANAGER, TeamMemberRole.MEMBER], + [TeamMemberRole.MANAGER]: [TeamMemberRole.MANAGER, TeamMemberRole.MEMBER], + [TeamMemberRole.MEMBER]: [TeamMemberRole.MEMBER], +} satisfies Record; + +export const PROTECTED_TEAM_URLS = [ + '403', + '404', + '500', + '502', + '503', + '504', + 'about', + 'account', + 'admin', + 'administrator', + 'api', + 'app', + 'archive', + 'auth', + 'backup', + 'config', + 'configure', + 'contact', + 'contact-us', + 'copyright', + 'crime', + 'criminal', + 'dashboard', + 'docs', + 'documenso', + 'documentation', + 'document', + 'documents', + 'error', + 'exploit', + 'exploitation', + 'exploiter', + 'feedback', + 'finance', + 'forgot-password', + 'fraud', + 'fraudulent', + 'hack', + 'hacker', + 'harassment', + 'help', + 'helpdesk', + 'illegal', + 'internal', + 'legal', + 'login', + 'logout', + 'maintenance', + 'malware', + 'newsletter', + 'policy', + 'privacy', + 'profile', + 'public', + 'reset-password', + 'scam', + 'scammer', + 'settings', + 'setup', + 'sign', + 'signin', + 'signout', + 'signup', + 'spam', + 'support', + 'system', + 'team', + 'terms', + 'virus', + 'webhook', +]; diff --git a/packages/lib/errors/app-error.ts b/packages/lib/errors/app-error.ts new file mode 100644 index 000000000..3337bab4c --- /dev/null +++ b/packages/lib/errors/app-error.ts @@ -0,0 +1,144 @@ +import { TRPCError } from '@trpc/server'; +import { z } from 'zod'; + +import { TRPCClientError } from '@documenso/trpc/client'; + +/** + * Generic application error codes. + */ +export enum AppErrorCode { + 'ALREADY_EXISTS' = 'AlreadyExists', + 'EXPIRED_CODE' = 'ExpiredCode', + 'INVALID_BODY' = 'InvalidBody', + 'INVALID_REQUEST' = 'InvalidRequest', + 'NOT_FOUND' = 'NotFound', + 'NOT_SETUP' = 'NotSetup', + 'UNAUTHORIZED' = 'Unauthorized', + 'UNKNOWN_ERROR' = 'UnknownError', + 'RETRY_EXCEPTION' = 'RetryException', + 'SCHEMA_FAILED' = 'SchemaFailed', + 'TOO_MANY_REQUESTS' = 'TooManyRequests', +} + +const genericErrorCodeToTrpcErrorCodeMap: Record = { + [AppErrorCode.ALREADY_EXISTS]: 'BAD_REQUEST', + [AppErrorCode.EXPIRED_CODE]: 'BAD_REQUEST', + [AppErrorCode.INVALID_BODY]: 'BAD_REQUEST', + [AppErrorCode.INVALID_REQUEST]: 'BAD_REQUEST', + [AppErrorCode.NOT_FOUND]: 'NOT_FOUND', + [AppErrorCode.NOT_SETUP]: 'BAD_REQUEST', + [AppErrorCode.UNAUTHORIZED]: 'UNAUTHORIZED', + [AppErrorCode.UNKNOWN_ERROR]: 'INTERNAL_SERVER_ERROR', + [AppErrorCode.RETRY_EXCEPTION]: 'INTERNAL_SERVER_ERROR', + [AppErrorCode.SCHEMA_FAILED]: 'INTERNAL_SERVER_ERROR', + [AppErrorCode.TOO_MANY_REQUESTS]: 'TOO_MANY_REQUESTS', +}; + +export const ZAppErrorJsonSchema = z.object({ + code: z.string(), + message: z.string().optional(), + userMessage: z.string().optional(), +}); + +export type TAppErrorJsonSchema = z.infer; + +export class AppError extends Error { + /** + * The error code. + */ + code: string; + + /** + * An error message which can be displayed to the user. + */ + userMessage?: string; + + /** + * Create a new AppError. + * + * @param errorCode A string representing the error code. + * @param message An internal error message. + * @param userMessage A error message which can be displayed to the user. + */ + public constructor(errorCode: string, message?: string, userMessage?: string) { + super(message || errorCode); + this.code = errorCode; + this.userMessage = userMessage; + } + + /** + * Parse an unknown value into an AppError. + * + * @param error An unknown type. + */ + static parseError(error: unknown): AppError { + if (error instanceof AppError) { + return error; + } + + // Handle TRPC errors. + if (error instanceof TRPCClientError) { + const parsedJsonError = AppError.parseFromJSONString(error.message); + return parsedJsonError || new AppError('UnknownError', error.message); + } + + // Handle completely unknown errors. + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + const { code, message, userMessage } = error as { + code: unknown; + message: unknown; + status: unknown; + userMessage: unknown; + }; + + const validCode: string | null = typeof code === 'string' ? code : AppErrorCode.UNKNOWN_ERROR; + const validMessage: string | undefined = typeof message === 'string' ? message : undefined; + const validUserMessage: string | undefined = + typeof userMessage === 'string' ? userMessage : undefined; + + return new AppError(validCode, validMessage, validUserMessage); + } + + static parseErrorToTRPCError(error: unknown): TRPCError { + const appError = AppError.parseError(error); + + return new TRPCError({ + code: genericErrorCodeToTrpcErrorCodeMap[appError.code] || 'BAD_REQUEST', + message: AppError.toJSONString(appError), + }); + } + + /** + * Convert an AppError into a JSON object which represents the error. + * + * @param appError The AppError to convert to JSON. + * @returns A JSON object representing the AppError. + */ + static toJSON({ code, message, userMessage }: AppError): TAppErrorJsonSchema { + return { + code, + message, + userMessage, + }; + } + + /** + * Convert an AppError into a JSON string containing the relevant information. + * + * @param appError The AppError to stringify. + * @returns A JSON string representing the AppError. + */ + static toJSONString(appError: AppError): string { + return JSON.stringify(AppError.toJSON(appError)); + } + + static parseFromJSONString(jsonString: string): AppError | null { + const parsed = ZAppErrorJsonSchema.safeParse(JSON.parse(jsonString)); + + if (!parsed.success) { + return null; + } + + return new AppError(parsed.data.code, parsed.data.message, parsed.data.userMessage); + } +} diff --git a/packages/lib/server-only/crypto/decrypt.ts b/packages/lib/server-only/crypto/decrypt.ts index 7b4db9894..de7b82c4b 100644 --- a/packages/lib/server-only/crypto/decrypt.ts +++ b/packages/lib/server-only/crypto/decrypt.ts @@ -13,21 +13,25 @@ export const decryptSecondaryData = (encryptedData: string): string | null => { throw new Error('Missing encryption key'); } - const decryptedBufferValue = symmetricDecrypt({ - key: DOCUMENSO_ENCRYPTION_SECONDARY_KEY, - data: encryptedData, - }); + try { + const decryptedBufferValue = symmetricDecrypt({ + key: DOCUMENSO_ENCRYPTION_SECONDARY_KEY, + data: encryptedData, + }); - const decryptedValue = Buffer.from(decryptedBufferValue).toString('utf-8'); - const result = ZEncryptedDataSchema.safeParse(JSON.parse(decryptedValue)); + const decryptedValue = Buffer.from(decryptedBufferValue).toString('utf-8'); + const result = ZEncryptedDataSchema.safeParse(JSON.parse(decryptedValue)); - if (!result.success) { + if (!result.success) { + return null; + } + + if (result.data.expiresAt !== undefined && result.data.expiresAt < Date.now()) { + return null; + } + + return result.data.data; + } catch { return null; } - - if (result.data.expiresAt !== undefined && result.data.expiresAt < Date.now()) { - return null; - } - - return result.data.data; }; diff --git a/packages/lib/server-only/document-meta/upsert-document-meta.ts b/packages/lib/server-only/document-meta/upsert-document-meta.ts index b67c6848b..3e6cd75be 100644 --- a/packages/lib/server-only/document-meta/upsert-document-meta.ts +++ b/packages/lib/server-only/document-meta/upsert-document-meta.ts @@ -24,7 +24,20 @@ export const upsertDocumentMeta = async ({ await prisma.document.findFirstOrThrow({ where: { id: documentId, - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }); diff --git a/packages/lib/server-only/document/create-document.ts b/packages/lib/server-only/document/create-document.ts index b84f8e46e..93307a7b4 100644 --- a/packages/lib/server-only/document/create-document.ts +++ b/packages/lib/server-only/document/create-document.ts @@ -5,15 +5,37 @@ import { prisma } from '@documenso/prisma'; export type CreateDocumentOptions = { title: string; userId: number; + teamId?: number; documentDataId: string; }; -export const createDocument = async ({ userId, title, documentDataId }: CreateDocumentOptions) => { - return await prisma.document.create({ - data: { - title, - documentDataId, - userId, - }, +export const createDocument = async ({ + userId, + title, + documentDataId, + teamId, +}: CreateDocumentOptions) => { + return await prisma.$transaction(async (tx) => { + if (teamId !== undefined) { + await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + }, + }, + }, + }); + } + + return await tx.document.create({ + data: { + title, + documentDataId, + userId, + teamId, + }, + }); }); }; diff --git a/packages/lib/server-only/document/duplicate-document-by-id.ts b/packages/lib/server-only/document/duplicate-document-by-id.ts index ddb70b1cb..5ca848bb3 100644 --- a/packages/lib/server-only/document/duplicate-document-by-id.ts +++ b/packages/lib/server-only/document/duplicate-document-by-id.ts @@ -1,16 +1,27 @@ import { prisma } from '@documenso/prisma'; +import type { Prisma } from '@documenso/prisma/client'; + +import { getDocumentWhereInput } from './get-document-by-id'; export interface DuplicateDocumentByIdOptions { id: number; userId: number; + teamId?: number; } -export const duplicateDocumentById = async ({ id, userId }: DuplicateDocumentByIdOptions) => { +export const duplicateDocumentById = async ({ + id, + userId, + teamId, +}: DuplicateDocumentByIdOptions) => { + const documentWhereInput = await getDocumentWhereInput({ + documentId: id, + userId, + teamId, + }); + const document = await prisma.document.findUniqueOrThrow({ - where: { - id, - userId: userId, - }, + where: documentWhereInput, select: { title: true, userId: true, @@ -33,7 +44,7 @@ export const duplicateDocumentById = async ({ id, userId }: DuplicateDocumentByI }, }); - const createdDocument = await prisma.document.create({ + const createDocumentArguments: Prisma.DocumentCreateArgs = { data: { title: document.title, User: { @@ -53,7 +64,17 @@ export const duplicateDocumentById = async ({ id, userId }: DuplicateDocumentByI }, }, }, - }); + }; + + if (teamId !== undefined) { + createDocumentArguments.data.team = { + connect: { + id: teamId, + }, + }; + } + + const createdDocument = await prisma.document.create(createDocumentArguments); return createdDocument.id; }; diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts index 8d367dbe4..f34cc4c2c 100644 --- a/packages/lib/server-only/document/find-documents.ts +++ b/packages/lib/server-only/document/find-documents.ts @@ -2,8 +2,8 @@ import { DateTime } from 'luxon'; import { P, match } from 'ts-pattern'; import { prisma } from '@documenso/prisma'; -import type { Document, Prisma } from '@documenso/prisma/client'; import { RecipientRole, SigningStatus } from '@documenso/prisma/client'; +import type { Document, Prisma, Team, TeamEmail, User } from '@documenso/prisma/client'; import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status'; import type { FindResultSet } from '../../types/find-result-set'; @@ -13,6 +13,7 @@ export type PeriodSelectorValue = '' | '7d' | '14d' | '30d'; export type FindDocumentsOptions = { userId: number; + teamId?: number; term?: string; status?: ExtendedDocumentStatus; page?: number; @@ -22,21 +23,49 @@ export type FindDocumentsOptions = { direction: 'asc' | 'desc'; }; period?: PeriodSelectorValue; + senderIds?: number[]; }; export const findDocuments = async ({ userId, + teamId, term, status = ExtendedDocumentStatus.ALL, page = 1, perPage = 10, orderBy, period, + senderIds, }: FindDocumentsOptions) => { - const user = await prisma.user.findFirstOrThrow({ - where: { - id: userId, - }, + const { user, team } = await prisma.$transaction(async (tx) => { + const user = await tx.user.findFirstOrThrow({ + where: { + id: userId, + }, + }); + + let team = null; + + if (teamId !== undefined) { + team = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + }, + }, + }, + include: { + teamEmail: true, + }, + }); + } + + return { + user, + team, + }; }); const orderByColumn = orderBy?.column ?? 'createdAt'; @@ -53,96 +82,34 @@ export const findDocuments = async ({ }) .otherwise(() => undefined); - const filters = match(status) - .with(ExtendedDocumentStatus.ALL, () => ({ - OR: [ - { - userId, - deletedAt: null, - }, - { - status: ExtendedDocumentStatus.COMPLETED, - Recipient: { - some: { - email: user.email, - }, - }, - }, - { - status: ExtendedDocumentStatus.PENDING, - Recipient: { - some: { - email: user.email, - }, - }, - deletedAt: null, - }, - ], - })) - .with(ExtendedDocumentStatus.INBOX, () => ({ - status: { - not: ExtendedDocumentStatus.DRAFT, - }, - Recipient: { - some: { - email: user.email, - signingStatus: SigningStatus.NOT_SIGNED, - role: { - not: RecipientRole.CC, - }, - }, - }, - deletedAt: null, - })) - .with(ExtendedDocumentStatus.DRAFT, () => ({ - userId, - status: ExtendedDocumentStatus.DRAFT, - deletedAt: null, - })) - .with(ExtendedDocumentStatus.PENDING, () => ({ - OR: [ - { - userId, - status: ExtendedDocumentStatus.PENDING, - deletedAt: null, - }, - { - status: ExtendedDocumentStatus.PENDING, - Recipient: { - some: { - email: user.email, - signingStatus: SigningStatus.SIGNED, - role: { - not: RecipientRole.CC, - }, - }, - }, - deletedAt: null, - }, - ], - })) - .with(ExtendedDocumentStatus.COMPLETED, () => ({ - OR: [ - { - userId, - status: ExtendedDocumentStatus.COMPLETED, - deletedAt: null, - }, - { - status: ExtendedDocumentStatus.COMPLETED, - Recipient: { - some: { - email: user.email, - }, - }, - }, - ], - })) - .exhaustive(); + const filters = team ? findTeamDocumentsFilter(status, team) : findDocumentsFilter(status, user); - const whereClause = { + if (filters === null) { + return { + data: [], + count: 0, + currentPage: 1, + perPage, + totalPages: 0, + }; + } + + const whereClause: Prisma.DocumentWhereInput = { ...termFilters, ...filters, + AND: { + OR: [ + { + status: ExtendedDocumentStatus.COMPLETED, + }, + { + status: { + not: ExtendedDocumentStatus.COMPLETED, + }, + deletedAt: null, + }, + ], + }, }; if (period) { @@ -155,6 +122,12 @@ export const findDocuments = async ({ }; } + if (senderIds && senderIds.length > 0) { + whereClause.userId = { + in: senderIds, + }; + } + const [data, count] = await Promise.all([ prisma.document.findMany({ where: whereClause, @@ -172,13 +145,16 @@ export const findDocuments = async ({ }, }, Recipient: true, + team: { + select: { + id: true, + url: true, + }, + }, }, }), prisma.document.count({ - where: { - ...termFilters, - ...filters, - }, + where: whereClause, }), ]); @@ -197,3 +173,268 @@ export const findDocuments = async ({ totalPages: Math.ceil(count / perPage), } satisfies FindResultSet; }; + +const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => { + return match(status) + .with(ExtendedDocumentStatus.ALL, () => ({ + OR: [ + { + userId: user.id, + teamId: null, + }, + { + status: ExtendedDocumentStatus.COMPLETED, + Recipient: { + some: { + email: user.email, + }, + }, + }, + { + status: ExtendedDocumentStatus.PENDING, + Recipient: { + some: { + email: user.email, + }, + }, + }, + ], + })) + .with(ExtendedDocumentStatus.INBOX, () => ({ + status: { + not: ExtendedDocumentStatus.DRAFT, + }, + Recipient: { + some: { + email: user.email, + signingStatus: SigningStatus.NOT_SIGNED, + role: { + not: RecipientRole.CC, + }, + }, + }, + })) + .with(ExtendedDocumentStatus.DRAFT, () => ({ + userId: user.id, + teamId: null, + status: ExtendedDocumentStatus.DRAFT, + })) + .with(ExtendedDocumentStatus.PENDING, () => ({ + OR: [ + { + userId: user.id, + teamId: null, + status: ExtendedDocumentStatus.PENDING, + }, + { + status: ExtendedDocumentStatus.PENDING, + Recipient: { + some: { + email: user.email, + signingStatus: SigningStatus.SIGNED, + role: { + not: RecipientRole.CC, + }, + }, + }, + }, + ], + })) + .with(ExtendedDocumentStatus.COMPLETED, () => ({ + OR: [ + { + userId: user.id, + teamId: null, + status: ExtendedDocumentStatus.COMPLETED, + }, + { + status: ExtendedDocumentStatus.COMPLETED, + Recipient: { + some: { + email: user.email, + }, + }, + }, + ], + })) + .exhaustive(); +}; + +/** + * Create a Prisma filter for the Document schema to find documents for a team. + * + * Status All: + * - Documents that belong to the team + * - Documents that have been sent by the team email + * - Non draft documents that have been sent to the team email + * + * Status Inbox: + * - Non draft documents that have been sent to the team email that have not been signed + * + * Status Draft: + * - Documents that belong to the team that are draft + * - Documents that belong to the team email that are draft + * + * Status Pending: + * - Documents that belong to the team that are pending + * - Documents that have been sent by the team email that is pending to be signed by someone else + * - Documents that have been sent to the team email that is pending to be signed by someone else + * + * Status Completed: + * - Documents that belong to the team that are completed + * - Documents that have been sent to the team email that are completed + * - Documents that have been sent by the team email that are completed + * + * @param status The status of the documents to find. + * @param team The team to find the documents for. + * @returns A filter which can be applied to the Prisma Document schema. + */ +const findTeamDocumentsFilter = ( + status: ExtendedDocumentStatus, + team: Team & { teamEmail: TeamEmail | null }, +) => { + const teamEmail = team.teamEmail?.email ?? null; + + return match(status) + .with(ExtendedDocumentStatus.ALL, () => { + const filter: Prisma.DocumentWhereInput = { + // Filter to display all documents that belong to the team. + OR: [ + { + teamId: team.id, + }, + ], + }; + + if (teamEmail && filter.OR) { + // Filter to display all documents received by the team email that are not draft. + filter.OR.push({ + status: { + not: ExtendedDocumentStatus.DRAFT, + }, + Recipient: { + some: { + email: teamEmail, + }, + }, + }); + + // Filter to display all documents that have been sent by the team email. + filter.OR.push({ + User: { + email: teamEmail, + }, + }); + } + + return filter; + }) + .with(ExtendedDocumentStatus.INBOX, () => { + // Return a filter that will return nothing. + if (!teamEmail) { + return null; + } + + return { + status: { + not: ExtendedDocumentStatus.DRAFT, + }, + Recipient: { + some: { + email: teamEmail, + signingStatus: SigningStatus.NOT_SIGNED, + role: { + not: RecipientRole.CC, + }, + }, + }, + }; + }) + .with(ExtendedDocumentStatus.DRAFT, () => { + const filter: Prisma.DocumentWhereInput = { + OR: [ + { + teamId: team.id, + status: ExtendedDocumentStatus.DRAFT, + }, + ], + }; + + if (teamEmail && filter.OR) { + filter.OR.push({ + status: ExtendedDocumentStatus.DRAFT, + User: { + email: teamEmail, + }, + }); + } + + return filter; + }) + .with(ExtendedDocumentStatus.PENDING, () => { + const filter: Prisma.DocumentWhereInput = { + OR: [ + { + teamId: team.id, + status: ExtendedDocumentStatus.PENDING, + }, + ], + }; + + if (teamEmail && filter.OR) { + filter.OR.push({ + status: ExtendedDocumentStatus.PENDING, + OR: [ + { + Recipient: { + some: { + email: teamEmail, + signingStatus: SigningStatus.SIGNED, + role: { + not: RecipientRole.CC, + }, + }, + }, + }, + { + User: { + email: teamEmail, + }, + }, + ], + }); + } + + return filter; + }) + .with(ExtendedDocumentStatus.COMPLETED, () => { + const filter: Prisma.DocumentWhereInput = { + status: ExtendedDocumentStatus.COMPLETED, + OR: [ + { + teamId: team.id, + }, + ], + }; + + if (teamEmail && filter.OR) { + filter.OR.push( + { + Recipient: { + some: { + email: teamEmail, + }, + }, + }, + { + User: { + email: teamEmail, + }, + }, + ); + } + + return filter; + }) + .exhaustive(); +}; diff --git a/packages/lib/server-only/document/get-document-by-id.ts b/packages/lib/server-only/document/get-document-by-id.ts index 0b599a71c..71b614976 100644 --- a/packages/lib/server-only/document/get-document-by-id.ts +++ b/packages/lib/server-only/document/get-document-by-id.ts @@ -1,19 +1,106 @@ import { prisma } from '@documenso/prisma'; +import type { Prisma } from '@documenso/prisma/client'; -export interface GetDocumentByIdOptions { +import { getTeamById } from '../team/get-team'; + +export type GetDocumentByIdOptions = { id: number; userId: number; -} + teamId?: number; +}; + +export const getDocumentById = async ({ id, userId, teamId }: GetDocumentByIdOptions) => { + const documentWhereInput = await getDocumentWhereInput({ + documentId: id, + userId, + teamId, + }); -export const getDocumentById = async ({ id, userId }: GetDocumentByIdOptions) => { return await prisma.document.findFirstOrThrow({ - where: { - id, - userId, - }, + where: documentWhereInput, include: { documentData: true, documentMeta: true, }, }); }; + +export type GetDocumentWhereInputOptions = { + documentId: number; + userId: number; + teamId?: number; + + /** + * Whether to return a filter that allows access to both the user and team documents. + * This only applies if `teamId` is passed in. + * + * If true, and `teamId` is passed in, the filter will allow both team and user documents. + * If false, and `teamId` is passed in, the filter will only allow team documents. + * + * Defaults to false. + */ + overlapUserTeamScope?: boolean; +}; + +/** + * Generate the where input for a given Prisma document query. + * + * This will return a query that allows a user to get a document if they have valid access to it. + */ +export const getDocumentWhereInput = async ({ + documentId, + userId, + teamId, + overlapUserTeamScope = false, +}: GetDocumentWhereInputOptions) => { + const documentWhereInput: Prisma.DocumentWhereUniqueInput = { + id: documentId, + OR: [ + { + userId, + }, + ], + }; + + if (teamId === undefined || !documentWhereInput.OR) { + return documentWhereInput; + } + + const team = await getTeamById({ teamId, userId }); + + // Allow access to team and user documents. + if (overlapUserTeamScope) { + documentWhereInput.OR.push({ + teamId: team.id, + }); + } + + // Allow access to only team documents. + if (!overlapUserTeamScope) { + documentWhereInput.OR = [ + { + teamId: team.id, + }, + ]; + } + + // Allow access to documents sent to or from the team email. + if (team.teamEmail) { + documentWhereInput.OR.push( + { + Recipient: { + some: { + email: team.teamEmail.email, + }, + }, + }, + { + User: { + email: team.teamEmail.email, + }, + }, + ); + } + + return documentWhereInput; +}; diff --git a/packages/lib/server-only/document/get-stats.ts b/packages/lib/server-only/document/get-stats.ts index 6aaa9a596..db38fa79d 100644 --- a/packages/lib/server-only/document/get-stats.ts +++ b/packages/lib/server-only/document/get-stats.ts @@ -1,19 +1,19 @@ import { DateTime } from 'luxon'; +import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents'; import { prisma } from '@documenso/prisma'; import type { Prisma, User } from '@documenso/prisma/client'; import { SigningStatus } from '@documenso/prisma/client'; import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status'; import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status'; -import type { PeriodSelectorValue } from './find-documents'; - export type GetStatsInput = { user: User; + team?: Omit; period?: PeriodSelectorValue; }; -export const getStats = async ({ user, period }: GetStatsInput) => { +export const getStats = async ({ user, period, ...options }: GetStatsInput) => { let createdAt: Prisma.DocumentWhereInput['createdAt']; if (period) { @@ -26,7 +26,52 @@ export const getStats = async ({ user, period }: GetStatsInput) => { }; } - const [ownerCounts, notSignedCounts, hasSignedCounts] = await Promise.all([ + const [ownerCounts, notSignedCounts, hasSignedCounts] = await (options.team + ? getTeamCounts({ ...options.team, createdAt }) + : getCounts({ user, createdAt })); + + const stats: Record = { + [ExtendedDocumentStatus.DRAFT]: 0, + [ExtendedDocumentStatus.PENDING]: 0, + [ExtendedDocumentStatus.COMPLETED]: 0, + [ExtendedDocumentStatus.INBOX]: 0, + [ExtendedDocumentStatus.ALL]: 0, + }; + + ownerCounts.forEach((stat) => { + stats[stat.status] = stat._count._all; + }); + + notSignedCounts.forEach((stat) => { + stats[ExtendedDocumentStatus.INBOX] += stat._count._all; + }); + + hasSignedCounts.forEach((stat) => { + if (stat.status === ExtendedDocumentStatus.COMPLETED) { + stats[ExtendedDocumentStatus.COMPLETED] += stat._count._all; + } + + if (stat.status === ExtendedDocumentStatus.PENDING) { + stats[ExtendedDocumentStatus.PENDING] += stat._count._all; + } + }); + + Object.keys(stats).forEach((key) => { + if (key !== ExtendedDocumentStatus.ALL && isExtendedDocumentStatus(key)) { + stats[ExtendedDocumentStatus.ALL] += stats[key]; + } + }); + + return stats; +}; + +type GetCountsOption = { + user: User; + createdAt: Prisma.DocumentWhereInput['createdAt']; +}; + +const getCounts = async ({ user, createdAt }: GetCountsOption) => { + return Promise.all([ prisma.document.groupBy({ by: ['status'], _count: { @@ -35,6 +80,7 @@ export const getStats = async ({ user, period }: GetStatsInput) => { where: { userId: user.id, createdAt, + teamId: null, deletedAt: null, }, }), @@ -91,38 +137,116 @@ export const getStats = async ({ user, period }: GetStatsInput) => { }, }), ]); +}; - const stats: Record = { - [ExtendedDocumentStatus.DRAFT]: 0, - [ExtendedDocumentStatus.PENDING]: 0, - [ExtendedDocumentStatus.COMPLETED]: 0, - [ExtendedDocumentStatus.INBOX]: 0, - [ExtendedDocumentStatus.ALL]: 0, +type GetTeamCountsOption = { + teamId: number; + teamEmail?: string; + senderIds?: number[]; + createdAt: Prisma.DocumentWhereInput['createdAt']; +}; + +const getTeamCounts = async (options: GetTeamCountsOption) => { + const { createdAt, teamId, teamEmail } = options; + + const senderIds = options.senderIds ?? []; + + const userIdWhereClause: Prisma.DocumentWhereInput['userId'] = + senderIds.length > 0 + ? { + in: senderIds, + } + : undefined; + + let ownerCountsWhereInput: Prisma.DocumentWhereInput = { + userId: userIdWhereClause, + createdAt, + teamId, + deletedAt: null, }; - ownerCounts.forEach((stat) => { - stats[stat.status] = stat._count._all; - }); + let notSignedCountsGroupByArgs = null; + let hasSignedCountsGroupByArgs = null; - notSignedCounts.forEach((stat) => { - stats[ExtendedDocumentStatus.INBOX] += stat._count._all; - }); + if (teamEmail) { + ownerCountsWhereInput = { + userId: userIdWhereClause, + createdAt, + OR: [ + { + teamId, + }, + { + User: { + email: teamEmail, + }, + }, + ], + deletedAt: null, + }; - hasSignedCounts.forEach((stat) => { - if (stat.status === ExtendedDocumentStatus.COMPLETED) { - stats[ExtendedDocumentStatus.COMPLETED] += stat._count._all; - } + notSignedCountsGroupByArgs = { + by: ['status'], + _count: { + _all: true, + }, + where: { + userId: userIdWhereClause, + createdAt, + status: ExtendedDocumentStatus.PENDING, + Recipient: { + some: { + email: teamEmail, + signingStatus: SigningStatus.NOT_SIGNED, + }, + }, + deletedAt: null, + }, + } satisfies Prisma.DocumentGroupByArgs; - if (stat.status === ExtendedDocumentStatus.PENDING) { - stats[ExtendedDocumentStatus.PENDING] += stat._count._all; - } - }); + hasSignedCountsGroupByArgs = { + by: ['status'], + _count: { + _all: true, + }, + where: { + userId: userIdWhereClause, + createdAt, + OR: [ + { + status: ExtendedDocumentStatus.PENDING, + Recipient: { + some: { + email: teamEmail, + signingStatus: SigningStatus.SIGNED, + }, + }, + deletedAt: null, + }, + { + status: ExtendedDocumentStatus.COMPLETED, + Recipient: { + some: { + email: teamEmail, + signingStatus: SigningStatus.SIGNED, + }, + }, + deletedAt: null, + }, + ], + }, + } satisfies Prisma.DocumentGroupByArgs; + } - Object.keys(stats).forEach((key) => { - if (key !== ExtendedDocumentStatus.ALL && isExtendedDocumentStatus(key)) { - stats[ExtendedDocumentStatus.ALL] += stats[key]; - } - }); - - return stats; + return Promise.all([ + prisma.document.groupBy({ + by: ['status'], + _count: { + _all: true, + }, + where: ownerCountsWhereInput, + }), + notSignedCountsGroupByArgs ? prisma.document.groupBy(notSignedCountsGroupByArgs) : [], + hasSignedCountsGroupByArgs ? prisma.document.groupBy(hasSignedCountsGroupByArgs) : [], + ]); }; diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx index 4c7b66be8..d72da3a8d 100644 --- a/packages/lib/server-only/document/resend-document.tsx +++ b/packages/lib/server-only/document/resend-document.tsx @@ -7,27 +7,38 @@ import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template'; import { prisma } from '@documenso/prisma'; import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; +import type { Prisma } from '@documenso/prisma/client'; import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles'; +import { getDocumentWhereInput } from './get-document-by-id'; export type ResendDocumentOptions = { documentId: number; userId: number; recipients: number[]; + teamId?: number; }; -export const resendDocument = async ({ documentId, userId, recipients }: ResendDocumentOptions) => { +export const resendDocument = async ({ + documentId, + userId, + recipients, + teamId, +}: ResendDocumentOptions) => { const user = await prisma.user.findFirstOrThrow({ where: { id: userId, }, }); + const documentWhereInput: Prisma.DocumentWhereUniqueInput = await getDocumentWhereInput({ + documentId, + userId, + teamId, + }); + const document = await prisma.document.findUnique({ - where: { - id: documentId, - userId, - }, + where: documentWhereInput, include: { Recipient: { where: { diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx index 82b37852b..312b30462 100644 --- a/packages/lib/server-only/document/send-document.tsx +++ b/packages/lib/server-only/document/send-document.tsx @@ -25,7 +25,20 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) const document = await prisma.document.findUnique({ where: { id: documentId, - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, include: { Recipient: true, diff --git a/packages/lib/server-only/document/update-title.ts b/packages/lib/server-only/document/update-title.ts index ba086b9cb..19a902930 100644 --- a/packages/lib/server-only/document/update-title.ts +++ b/packages/lib/server-only/document/update-title.ts @@ -12,7 +12,20 @@ export const updateTitle = async ({ userId, documentId, title }: UpdateTitleOpti return await prisma.document.update({ where: { id: documentId, - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, data: { title, diff --git a/packages/lib/server-only/field/get-fields-for-document.ts b/packages/lib/server-only/field/get-fields-for-document.ts index ddc35b503..72a16c3f7 100644 --- a/packages/lib/server-only/field/get-fields-for-document.ts +++ b/packages/lib/server-only/field/get-fields-for-document.ts @@ -10,7 +10,20 @@ export const getFieldsForDocument = async ({ documentId, userId }: GetFieldsForD where: { documentId, Document: { - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }, orderBy: { diff --git a/packages/lib/server-only/field/set-fields-for-document.ts b/packages/lib/server-only/field/set-fields-for-document.ts index bd14d49b2..2ba592f31 100644 --- a/packages/lib/server-only/field/set-fields-for-document.ts +++ b/packages/lib/server-only/field/set-fields-for-document.ts @@ -25,7 +25,20 @@ export const setFieldsForDocument = async ({ const document = await prisma.document.findFirst({ where: { id: documentId, - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }); diff --git a/packages/lib/server-only/recipient/get-recipients-for-document.ts b/packages/lib/server-only/recipient/get-recipients-for-document.ts index 21d198d3e..80e408acc 100644 --- a/packages/lib/server-only/recipient/get-recipients-for-document.ts +++ b/packages/lib/server-only/recipient/get-recipients-for-document.ts @@ -13,7 +13,20 @@ export const getRecipientsForDocument = async ({ where: { documentId, Document: { - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }, orderBy: { diff --git a/packages/lib/server-only/recipient/set-recipients-for-document.ts b/packages/lib/server-only/recipient/set-recipients-for-document.ts index 4917b213d..d42d1d707 100644 --- a/packages/lib/server-only/recipient/set-recipients-for-document.ts +++ b/packages/lib/server-only/recipient/set-recipients-for-document.ts @@ -23,7 +23,20 @@ export const setRecipientsForDocument = async ({ const document = await prisma.document.findFirst({ where: { id: documentId, - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }); diff --git a/packages/lib/server-only/team/accept-team-invitation.ts b/packages/lib/server-only/team/accept-team-invitation.ts new file mode 100644 index 000000000..a69a79ecd --- /dev/null +++ b/packages/lib/server-only/team/accept-team-invitation.ts @@ -0,0 +1,63 @@ +import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity'; +import { prisma } from '@documenso/prisma'; + +import { IS_BILLING_ENABLED } from '../../constants/app'; + +export type AcceptTeamInvitationOptions = { + userId: number; + teamId: number; +}; + +export const acceptTeamInvitation = async ({ userId, teamId }: AcceptTeamInvitationOptions) => { + await prisma.$transaction(async (tx) => { + const user = await tx.user.findFirstOrThrow({ + where: { + id: userId, + }, + }); + + const teamMemberInvite = await tx.teamMemberInvite.findFirstOrThrow({ + where: { + teamId, + email: user.email, + }, + include: { + team: { + include: { + subscription: true, + }, + }, + }, + }); + + const { team } = teamMemberInvite; + + await tx.teamMember.create({ + data: { + teamId: teamMemberInvite.teamId, + userId: user.id, + role: teamMemberInvite.role, + }, + }); + + await tx.teamMemberInvite.delete({ + where: { + id: teamMemberInvite.id, + }, + }); + + if (IS_BILLING_ENABLED && team.subscription) { + const numberOfSeats = await tx.teamMember.count({ + where: { + teamId: teamMemberInvite.teamId, + }, + }); + + await updateSubscriptionItemQuantity({ + priceId: team.subscription.priceId, + subscriptionId: team.subscription.planId, + quantity: numberOfSeats, + }); + } + }); +}; diff --git a/packages/lib/server-only/team/create-team-billing-portal.ts b/packages/lib/server-only/team/create-team-billing-portal.ts new file mode 100644 index 000000000..d394f2720 --- /dev/null +++ b/packages/lib/server-only/team/create-team-billing-portal.ts @@ -0,0 +1,47 @@ +import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session'; +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { prisma } from '@documenso/prisma'; + +export type CreateTeamBillingPortalOptions = { + userId: number; + teamId: number; +}; + +export const createTeamBillingPortal = async ({ + userId, + teamId, +}: CreateTeamBillingPortalOptions) => { + if (!IS_BILLING_ENABLED) { + throw new Error('Billing is not enabled'); + } + + const team = await prisma.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_BILLING'], + }, + }, + }, + }, + include: { + subscription: true, + }, + }); + + if (!team.subscription) { + throw new Error('Team has no subscription'); + } + + if (!team.customerId) { + throw new Error('Team has no customerId'); + } + + return getPortalSession({ + customerId: team.customerId, + }); +}; diff --git a/packages/lib/server-only/team/create-team-checkout-session.ts b/packages/lib/server-only/team/create-team-checkout-session.ts new file mode 100644 index 000000000..b80fc260b --- /dev/null +++ b/packages/lib/server-only/team/create-team-checkout-session.ts @@ -0,0 +1,52 @@ +import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session'; +import { getTeamPrices } from '@documenso/ee/server-only/stripe/get-team-prices'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { prisma } from '@documenso/prisma'; + +export type CreateTeamPendingCheckoutSession = { + userId: number; + pendingTeamId: number; + interval: 'monthly' | 'yearly'; +}; + +export const createTeamPendingCheckoutSession = async ({ + userId, + pendingTeamId, + interval, +}: CreateTeamPendingCheckoutSession) => { + const teamPendingCreation = await prisma.teamPending.findFirstOrThrow({ + where: { + id: pendingTeamId, + ownerUserId: userId, + }, + include: { + owner: true, + }, + }); + + const prices = await getTeamPrices(); + const priceId = prices[interval].priceId; + + try { + const stripeCheckoutSession = await getCheckoutSession({ + customerId: teamPendingCreation.customerId, + priceId, + returnUrl: `${WEBAPP_BASE_URL}/settings/teams`, + subscriptionMetadata: { + pendingTeamId: pendingTeamId.toString(), + }, + }); + + if (!stripeCheckoutSession) { + throw new AppError(AppErrorCode.UNKNOWN_ERROR); + } + + return stripeCheckoutSession; + } catch (e) { + console.error(e); + + // Absorb all the errors incase Stripe throws something sensitive. + throw new AppError(AppErrorCode.UNKNOWN_ERROR, 'Something went wrong.'); + } +}; diff --git a/packages/lib/server-only/team/create-team-email-verification.ts b/packages/lib/server-only/team/create-team-email-verification.ts new file mode 100644 index 000000000..28e1538d0 --- /dev/null +++ b/packages/lib/server-only/team/create-team-email-verification.ts @@ -0,0 +1,132 @@ +import { createElement } from 'react'; + +import { z } from 'zod'; + +import { mailer } from '@documenso/email/mailer'; +import { render } from '@documenso/email/render'; +import { ConfirmTeamEmailTemplate } from '@documenso/email/templates/confirm-team-email'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { createTokenVerification } from '@documenso/lib/utils/token-verification'; +import { prisma } from '@documenso/prisma'; +import { Prisma } from '@documenso/prisma/client'; + +export type CreateTeamEmailVerificationOptions = { + userId: number; + teamId: number; + data: { + email: string; + name: string; + }; +}; + +export const createTeamEmailVerification = async ({ + userId, + teamId, + data, +}: CreateTeamEmailVerificationOptions) => { + try { + await prisma.$transaction(async (tx) => { + const team = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + include: { + teamEmail: true, + emailVerification: true, + }, + }); + + if (team.teamEmail || team.emailVerification) { + throw new AppError( + AppErrorCode.INVALID_REQUEST, + 'Team already has an email or existing email verification.', + ); + } + + const existingTeamEmail = await tx.teamEmail.findFirst({ + where: { + email: data.email, + }, + }); + + if (existingTeamEmail) { + throw new AppError(AppErrorCode.ALREADY_EXISTS, 'Email already taken by another team.'); + } + + const { token, expiresAt } = createTokenVerification({ hours: 1 }); + + await tx.teamEmailVerification.create({ + data: { + token, + expiresAt, + email: data.email, + name: data.name, + teamId, + }, + }); + + await sendTeamEmailVerificationEmail(data.email, token, team.name, team.url); + }); + } catch (err) { + console.error(err); + + if (!(err instanceof Prisma.PrismaClientKnownRequestError)) { + throw err; + } + + const target = z.array(z.string()).safeParse(err.meta?.target); + + if (err.code === 'P2002' && target.success && target.data.includes('email')) { + throw new AppError(AppErrorCode.ALREADY_EXISTS, 'Email already taken by another team.'); + } + + throw err; + } +}; + +/** + * Send an email to a user asking them to accept a team email request. + * + * @param email The email address to use for the team. + * @param token The token used to authenticate that the user has granted access. + * @param teamName The name of the team the user is being invited to. + * @param teamUrl The url of the team the user is being invited to. + */ +export const sendTeamEmailVerificationEmail = async ( + email: string, + token: string, + teamName: string, + teamUrl: string, +) => { + const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + + const template = createElement(ConfirmTeamEmailTemplate, { + assetBaseUrl, + baseUrl: WEBAPP_BASE_URL, + teamName, + teamUrl, + token, + }); + + await mailer.sendMail({ + to: email, + from: { + name: FROM_NAME, + address: FROM_ADDRESS, + }, + subject: `A request to use your email has been initiated by ${teamName} on Documenso`, + html: render(template), + text: render(template, { plainText: true }), + }); +}; diff --git a/packages/lib/server-only/team/create-team-member-invites.ts b/packages/lib/server-only/team/create-team-member-invites.ts new file mode 100644 index 000000000..f167d2112 --- /dev/null +++ b/packages/lib/server-only/team/create-team-member-invites.ts @@ -0,0 +1,161 @@ +import { createElement } from 'react'; + +import { nanoid } from 'nanoid'; + +import { mailer } from '@documenso/email/mailer'; +import { render } from '@documenso/email/render'; +import type { TeamInviteEmailProps } from '@documenso/email/templates/team-invite'; +import { TeamInviteEmailTemplate } from '@documenso/email/templates/team-invite'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams'; +import { prisma } from '@documenso/prisma'; +import { TeamMemberInviteStatus } from '@documenso/prisma/client'; +import type { TCreateTeamMemberInvitesMutationSchema } from '@documenso/trpc/server/team-router/schema'; + +export type CreateTeamMemberInvitesOptions = { + userId: number; + userName: string; + teamId: number; + invitations: TCreateTeamMemberInvitesMutationSchema['invitations']; +}; + +/** + * Invite team members via email to join a team. + */ +export const createTeamMemberInvites = async ({ + userId, + userName, + teamId, + invitations, +}: CreateTeamMemberInvitesOptions) => { + const team = await prisma.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + include: { + members: { + select: { + role: true, + user: { + select: { + id: true, + email: true, + }, + }, + }, + }, + invites: true, + }, + }); + + const teamMemberEmails = team.members.map((member) => member.user.email); + const teamMemberInviteEmails = team.invites.map((invite) => invite.email); + const currentTeamMember = team.members.find((member) => member.user.id === userId); + + if (!currentTeamMember) { + throw new AppError(AppErrorCode.UNAUTHORIZED, 'User not part of team.'); + } + + const usersToInvite = invitations.filter((invitation) => { + // Filter out users that are already members of the team. + if (teamMemberEmails.includes(invitation.email)) { + return false; + } + + // Filter out users that have already been invited to the team. + if (teamMemberInviteEmails.includes(invitation.email)) { + return false; + } + + return true; + }); + + const unauthorizedRoleAccess = usersToInvite.some( + ({ role }) => !isTeamRoleWithinUserHierarchy(currentTeamMember.role, role), + ); + + if (unauthorizedRoleAccess) { + throw new AppError( + AppErrorCode.UNAUTHORIZED, + 'User does not have permission to set high level roles', + ); + } + + const teamMemberInvites = usersToInvite.map(({ email, role }) => ({ + email, + teamId, + role, + status: TeamMemberInviteStatus.PENDING, + token: nanoid(32), + })); + + await prisma.teamMemberInvite.createMany({ + data: teamMemberInvites, + }); + + const sendEmailResult = await Promise.allSettled( + teamMemberInvites.map(async ({ email, token }) => + sendTeamMemberInviteEmail({ + email, + token, + teamName: team.name, + teamUrl: team.url, + senderName: userName, + }), + ), + ); + + const sendEmailResultErrorList = sendEmailResult.filter( + (result): result is PromiseRejectedResult => result.status === 'rejected', + ); + + if (sendEmailResultErrorList.length > 0) { + console.error(JSON.stringify(sendEmailResultErrorList)); + + throw new AppError( + 'EmailDeliveryFailed', + 'Failed to send invite emails to one or more users.', + `Failed to send invites to ${sendEmailResultErrorList.length}/${teamMemberInvites.length} users.`, + ); + } +}; + +type SendTeamMemberInviteEmailOptions = Omit & { + email: string; +}; + +/** + * Send an email to a user inviting them to join a team. + */ +export const sendTeamMemberInviteEmail = async ({ + email, + ...emailTemplateOptions +}: SendTeamMemberInviteEmailOptions) => { + const template = createElement(TeamInviteEmailTemplate, { + assetBaseUrl: WEBAPP_BASE_URL, + baseUrl: WEBAPP_BASE_URL, + ...emailTemplateOptions, + }); + + await mailer.sendMail({ + to: email, + from: { + name: FROM_NAME, + address: FROM_ADDRESS, + }, + subject: `You have been invited to join ${emailTemplateOptions.teamName} on Documenso`, + html: render(template), + text: render(template, { plainText: true }), + }); +}; diff --git a/packages/lib/server-only/team/create-team.ts b/packages/lib/server-only/team/create-team.ts new file mode 100644 index 000000000..f1d245523 --- /dev/null +++ b/packages/lib/server-only/team/create-team.ts @@ -0,0 +1,207 @@ +import type Stripe from 'stripe'; +import { z } from 'zod'; + +import { createTeamCustomer } from '@documenso/ee/server-only/stripe/create-team-customer'; +import { getCommunityPlanPriceIds } from '@documenso/ee/server-only/stripe/get-community-plan-prices'; +import { mapStripeSubscriptionToPrismaUpsertAction } from '@documenso/ee/server-only/stripe/webhook/on-subscription-updated'; +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { subscriptionsContainsActiveCommunityPlan } from '@documenso/lib/utils/billing'; +import { prisma } from '@documenso/prisma'; +import { Prisma, TeamMemberRole } from '@documenso/prisma/client'; + +import { stripe } from '../stripe'; + +export type CreateTeamOptions = { + /** + * ID of the user creating the Team. + */ + userId: number; + + /** + * Name of the team to display. + */ + teamName: string; + + /** + * Unique URL of the team. + * + * Used as the URL path, example: https://documenso.com/t/{teamUrl}/settings + */ + teamUrl: string; +}; + +export type CreateTeamResponse = + | { + paymentRequired: false; + } + | { + paymentRequired: true; + pendingTeamId: number; + }; + +/** + * Create a team or pending team depending on the user's subscription or application's billing settings. + */ +export const createTeam = async ({ + userId, + teamName, + teamUrl, +}: CreateTeamOptions): Promise => { + const user = await prisma.user.findUniqueOrThrow({ + where: { + id: userId, + }, + include: { + Subscription: true, + }, + }); + + let isPaymentRequired = IS_BILLING_ENABLED; + let customerId: string | null = null; + + if (IS_BILLING_ENABLED) { + const communityPlanPriceIds = await getCommunityPlanPriceIds(); + + isPaymentRequired = !subscriptionsContainsActiveCommunityPlan( + user.Subscription, + communityPlanPriceIds, + ); + + customerId = await createTeamCustomer({ + name: user.name ?? teamName, + email: user.email, + }).then((customer) => customer.id); + } + + try { + // Create the team directly if no payment is required. + if (!isPaymentRequired) { + await prisma.team.create({ + data: { + name: teamName, + url: teamUrl, + ownerUserId: user.id, + customerId, + members: { + create: [ + { + userId, + role: TeamMemberRole.ADMIN, + }, + ], + }, + }, + }); + + return { + paymentRequired: false, + }; + } + + // Create a pending team if payment is required. + const pendingTeam = await prisma.$transaction(async (tx) => { + const existingTeamWithUrl = await tx.team.findUnique({ + where: { + url: teamUrl, + }, + }); + + if (existingTeamWithUrl) { + throw new AppError(AppErrorCode.ALREADY_EXISTS, 'Team URL already exists.'); + } + + if (!customerId) { + throw new AppError(AppErrorCode.UNKNOWN_ERROR, 'Missing customer ID for pending teams.'); + } + + return await tx.teamPending.create({ + data: { + name: teamName, + url: teamUrl, + ownerUserId: user.id, + customerId, + }, + }); + }); + + return { + paymentRequired: true, + pendingTeamId: pendingTeam.id, + }; + } catch (err) { + console.error(err); + + if (!(err instanceof Prisma.PrismaClientKnownRequestError)) { + throw err; + } + + const target = z.array(z.string()).safeParse(err.meta?.target); + + if (err.code === 'P2002' && target.success && target.data.includes('url')) { + throw new AppError(AppErrorCode.ALREADY_EXISTS, 'Team URL already exists.'); + } + + throw err; + } +}; + +export type CreateTeamFromPendingTeamOptions = { + pendingTeamId: number; + subscription: Stripe.Subscription; +}; + +export const createTeamFromPendingTeam = async ({ + pendingTeamId, + subscription, +}: CreateTeamFromPendingTeamOptions) => { + return await prisma.$transaction(async (tx) => { + const pendingTeam = await tx.teamPending.findUniqueOrThrow({ + where: { + id: pendingTeamId, + }, + }); + + await tx.teamPending.delete({ + where: { + id: pendingTeamId, + }, + }); + + const team = await tx.team.create({ + data: { + name: pendingTeam.name, + url: pendingTeam.url, + ownerUserId: pendingTeam.ownerUserId, + customerId: pendingTeam.customerId, + members: { + create: [ + { + userId: pendingTeam.ownerUserId, + role: TeamMemberRole.ADMIN, + }, + ], + }, + }, + }); + + await tx.subscription.upsert( + mapStripeSubscriptionToPrismaUpsertAction(subscription, undefined, team.id), + ); + + // Attach the team ID to the subscription metadata for sanity reasons. + await stripe.subscriptions + .update(subscription.id, { + metadata: { + teamId: team.id.toString(), + }, + }) + .catch((e) => { + console.error(e); + // Non-critical error, but we want to log it so we can rectify it. + // Todo: Teams - Alert us. + }); + + return team; + }); +}; diff --git a/packages/lib/server-only/team/delete-team-email-verification.ts b/packages/lib/server-only/team/delete-team-email-verification.ts new file mode 100644 index 000000000..fee39553f --- /dev/null +++ b/packages/lib/server-only/team/delete-team-email-verification.ts @@ -0,0 +1,34 @@ +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { prisma } from '@documenso/prisma'; + +export type DeleteTeamEmailVerificationOptions = { + userId: number; + teamId: number; +}; + +export const deleteTeamEmailVerification = async ({ + userId, + teamId, +}: DeleteTeamEmailVerificationOptions) => { + await prisma.$transaction(async (tx) => { + await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + }); + + await tx.teamEmailVerification.delete({ + where: { + teamId, + }, + }); + }); +}; diff --git a/packages/lib/server-only/team/delete-team-email.ts b/packages/lib/server-only/team/delete-team-email.ts new file mode 100644 index 000000000..c5139a971 --- /dev/null +++ b/packages/lib/server-only/team/delete-team-email.ts @@ -0,0 +1,93 @@ +import { createElement } from 'react'; + +import { mailer } from '@documenso/email/mailer'; +import { render } from '@documenso/email/render'; +import { TeamEmailRemovedTemplate } from '@documenso/email/templates/team-email-removed'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { prisma } from '@documenso/prisma'; + +export type DeleteTeamEmailOptions = { + userId: number; + userEmail: string; + teamId: number; +}; + +/** + * Delete a team email. + * + * The user must either be part of the team with the required permissions, or the owner of the email. + */ +export const deleteTeamEmail = async ({ userId, userEmail, teamId }: DeleteTeamEmailOptions) => { + const team = await prisma.$transaction(async (tx) => { + const foundTeam = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + OR: [ + { + teamEmail: { + email: userEmail, + }, + }, + { + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + ], + }, + include: { + teamEmail: true, + owner: { + select: { + name: true, + email: true, + }, + }, + }, + }); + + await tx.teamEmail.delete({ + where: { + teamId, + }, + }); + + return foundTeam; + }); + + try { + const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000'; + + const template = createElement(TeamEmailRemovedTemplate, { + assetBaseUrl, + baseUrl: WEBAPP_BASE_URL, + teamEmail: team.teamEmail?.email ?? '', + teamName: team.name, + teamUrl: team.url, + }); + + await mailer.sendMail({ + to: { + address: team.owner.email, + name: team.owner.name ?? '', + }, + from: { + name: FROM_NAME, + address: FROM_ADDRESS, + }, + subject: `Team email has been revoked for ${team.name}`, + html: render(template), + text: render(template, { plainText: true }), + }); + } catch (e) { + // Todo: Teams - Alert us. + // We don't want to prevent a user from revoking access because an email could not be sent. + } +}; diff --git a/packages/lib/server-only/team/delete-team-invitations.ts b/packages/lib/server-only/team/delete-team-invitations.ts new file mode 100644 index 000000000..a2baf8352 --- /dev/null +++ b/packages/lib/server-only/team/delete-team-invitations.ts @@ -0,0 +1,47 @@ +import { prisma } from '@documenso/prisma'; + +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams'; + +export type DeleteTeamMemberInvitationsOptions = { + /** + * The ID of the user who is initiating this action. + */ + userId: number; + + /** + * The ID of the team to remove members from. + */ + teamId: number; + + /** + * The IDs of the invitations to remove. + */ + invitationIds: number[]; +}; + +export const deleteTeamMemberInvitations = async ({ + userId, + teamId, + invitationIds, +}: DeleteTeamMemberInvitationsOptions) => { + await prisma.$transaction(async (tx) => { + await tx.teamMember.findFirstOrThrow({ + where: { + userId, + teamId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }); + + await tx.teamMemberInvite.deleteMany({ + where: { + id: { + in: invitationIds, + }, + teamId, + }, + }); + }); +}; diff --git a/packages/lib/server-only/team/delete-team-members.ts b/packages/lib/server-only/team/delete-team-members.ts new file mode 100644 index 000000000..7e282af5a --- /dev/null +++ b/packages/lib/server-only/team/delete-team-members.ts @@ -0,0 +1,102 @@ +import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity'; +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams'; +import { prisma } from '@documenso/prisma'; + +export type DeleteTeamMembersOptions = { + /** + * The ID of the user who is initiating this action. + */ + userId: number; + + /** + * The ID of the team to remove members from. + */ + teamId: number; + + /** + * The IDs of the team members to remove. + */ + teamMemberIds: number[]; +}; + +export const deleteTeamMembers = async ({ + userId, + teamId, + teamMemberIds, +}: DeleteTeamMembersOptions) => { + await prisma.$transaction(async (tx) => { + // Find the team and validate that the user is allowed to remove members. + const team = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + include: { + members: { + select: { + id: true, + userId: true, + role: true, + }, + }, + subscription: true, + }, + }); + + const currentTeamMember = team.members.find((member) => member.userId === userId); + const teamMembersToRemove = team.members.filter((member) => teamMemberIds.includes(member.id)); + + if (!currentTeamMember) { + throw new AppError(AppErrorCode.NOT_FOUND, 'Team member record does not exist'); + } + + if (teamMembersToRemove.find((member) => member.userId === team.ownerUserId)) { + throw new AppError(AppErrorCode.UNAUTHORIZED, 'Cannot remove the team owner'); + } + + const isMemberToRemoveHigherRole = teamMembersToRemove.some( + (member) => !isTeamRoleWithinUserHierarchy(currentTeamMember.role, member.role), + ); + + if (isMemberToRemoveHigherRole) { + throw new AppError(AppErrorCode.UNAUTHORIZED, 'Cannot remove a member with a higher role'); + } + + // Remove the team members. + await tx.teamMember.deleteMany({ + where: { + id: { + in: teamMemberIds, + }, + teamId, + userId: { + not: team.ownerUserId, + }, + }, + }); + + if (IS_BILLING_ENABLED && team.subscription) { + const numberOfSeats = await tx.teamMember.count({ + where: { + teamId, + }, + }); + + await updateSubscriptionItemQuantity({ + priceId: team.subscription.priceId, + subscriptionId: team.subscription.planId, + quantity: numberOfSeats, + }); + } + }); +}; diff --git a/packages/lib/server-only/team/delete-team-pending.ts b/packages/lib/server-only/team/delete-team-pending.ts new file mode 100644 index 000000000..b339fd862 --- /dev/null +++ b/packages/lib/server-only/team/delete-team-pending.ts @@ -0,0 +1,15 @@ +import { prisma } from '@documenso/prisma'; + +export type DeleteTeamPendingOptions = { + userId: number; + pendingTeamId: number; +}; + +export const deleteTeamPending = async ({ userId, pendingTeamId }: DeleteTeamPendingOptions) => { + await prisma.teamPending.delete({ + where: { + id: pendingTeamId, + ownerUserId: userId, + }, + }); +}; diff --git a/packages/lib/server-only/team/delete-team-transfer-request.ts b/packages/lib/server-only/team/delete-team-transfer-request.ts new file mode 100644 index 000000000..245a72b5a --- /dev/null +++ b/packages/lib/server-only/team/delete-team-transfer-request.ts @@ -0,0 +1,42 @@ +import { prisma } from '@documenso/prisma'; + +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams'; + +export type DeleteTeamTransferRequestOptions = { + /** + * The ID of the user deleting the transfer. + */ + userId: number; + + /** + * The ID of the team whose team transfer request should be deleted. + */ + teamId: number; +}; + +export const deleteTeamTransferRequest = async ({ + userId, + teamId, +}: DeleteTeamTransferRequestOptions) => { + await prisma.$transaction(async (tx) => { + await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_TEAM_TRANSFER_REQUEST'], + }, + }, + }, + }, + }); + + await tx.teamTransferVerification.delete({ + where: { + teamId, + }, + }); + }); +}; diff --git a/packages/lib/server-only/team/delete-team.ts b/packages/lib/server-only/team/delete-team.ts new file mode 100644 index 000000000..dffc044d8 --- /dev/null +++ b/packages/lib/server-only/team/delete-team.ts @@ -0,0 +1,42 @@ +import { prisma } from '@documenso/prisma'; + +import { AppError } from '../../errors/app-error'; +import { stripe } from '../stripe'; + +export type DeleteTeamOptions = { + userId: number; + teamId: number; +}; + +export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => { + await prisma.$transaction(async (tx) => { + const team = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + ownerUserId: userId, + }, + include: { + subscription: true, + }, + }); + + if (team.subscription) { + await stripe.subscriptions + .cancel(team.subscription.planId, { + prorate: false, + invoice_now: true, + }) + .catch((err) => { + console.error(err); + throw AppError.parseError(err); + }); + } + + await tx.team.delete({ + where: { + id: teamId, + ownerUserId: userId, + }, + }); + }); +}; diff --git a/packages/lib/server-only/team/find-team-invoices.ts b/packages/lib/server-only/team/find-team-invoices.ts new file mode 100644 index 000000000..bbc84f3fd --- /dev/null +++ b/packages/lib/server-only/team/find-team-invoices.ts @@ -0,0 +1,52 @@ +import { getInvoices } from '@documenso/ee/server-only/stripe/get-invoices'; +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { prisma } from '@documenso/prisma'; + +export interface FindTeamInvoicesOptions { + userId: number; + teamId: number; +} + +export const findTeamInvoices = async ({ userId, teamId }: FindTeamInvoicesOptions) => { + const team = await prisma.team.findUniqueOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + }); + + if (!team.customerId) { + throw new AppError(AppErrorCode.NOT_FOUND, 'Team has no customer ID.'); + } + + const results = await getInvoices({ customerId: team.customerId }); + + if (!results) { + return null; + } + + return { + ...results, + data: results.data.map((invoice) => ({ + invoicePdf: invoice.invoice_pdf, + hostedInvoicePdf: invoice.hosted_invoice_url, + status: invoice.status, + subtotal: invoice.subtotal, + total: invoice.total, + amountPaid: invoice.amount_paid, + amountDue: invoice.amount_due, + created: invoice.created, + paid: invoice.paid, + quantity: invoice.lines.data[0].quantity ?? 0, + currency: invoice.currency, + })), + }; +}; diff --git a/packages/lib/server-only/team/find-team-member-invites.ts b/packages/lib/server-only/team/find-team-member-invites.ts new file mode 100644 index 000000000..8100008b8 --- /dev/null +++ b/packages/lib/server-only/team/find-team-member-invites.ts @@ -0,0 +1,91 @@ +import { P, match } from 'ts-pattern'; + +import { prisma } from '@documenso/prisma'; +import type { TeamMemberInvite } from '@documenso/prisma/client'; +import { Prisma } from '@documenso/prisma/client'; + +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams'; +import type { FindResultSet } from '../../types/find-result-set'; + +export interface FindTeamMemberInvitesOptions { + userId: number; + teamId: number; + term?: string; + page?: number; + perPage?: number; + orderBy?: { + column: keyof TeamMemberInvite; + direction: 'asc' | 'desc'; + }; +} + +export const findTeamMemberInvites = async ({ + userId, + teamId, + term, + page = 1, + perPage = 10, + orderBy, +}: FindTeamMemberInvitesOptions) => { + const orderByColumn = orderBy?.column ?? 'email'; + const orderByDirection = orderBy?.direction ?? 'desc'; + + // Check that the user belongs to the team they are trying to find invites in. + const userTeam = await prisma.team.findUniqueOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + }); + + const termFilters: Prisma.TeamMemberInviteWhereInput | undefined = match(term) + .with(P.string.minLength(1), () => ({ + email: { + contains: term, + mode: Prisma.QueryMode.insensitive, + }, + })) + .otherwise(() => undefined); + + const whereClause: Prisma.TeamMemberInviteWhereInput = { + ...termFilters, + teamId: userTeam.id, + }; + + const [data, count] = await Promise.all([ + prisma.teamMemberInvite.findMany({ + where: whereClause, + skip: Math.max(page - 1, 0) * perPage, + take: perPage, + orderBy: { + [orderByColumn]: orderByDirection, + }, + // Exclude token attribute. + select: { + id: true, + teamId: true, + email: true, + role: true, + createdAt: true, + }, + }), + prisma.teamMemberInvite.count({ + where: whereClause, + }), + ]); + + return { + data, + count, + currentPage: Math.max(page, 1), + perPage, + totalPages: Math.ceil(count / perPage), + } satisfies FindResultSet; +}; diff --git a/packages/lib/server-only/team/find-team-members.ts b/packages/lib/server-only/team/find-team-members.ts new file mode 100644 index 000000000..4a1ab8511 --- /dev/null +++ b/packages/lib/server-only/team/find-team-members.ts @@ -0,0 +1,100 @@ +import { P, match } from 'ts-pattern'; + +import { prisma } from '@documenso/prisma'; +import type { TeamMember } from '@documenso/prisma/client'; +import { Prisma } from '@documenso/prisma/client'; + +import type { FindResultSet } from '../../types/find-result-set'; + +export interface FindTeamMembersOptions { + userId: number; + teamId: number; + term?: string; + page?: number; + perPage?: number; + orderBy?: { + column: keyof TeamMember | 'name'; + direction: 'asc' | 'desc'; + }; +} + +export const findTeamMembers = async ({ + userId, + teamId, + term, + page = 1, + perPage = 10, + orderBy, +}: FindTeamMembersOptions) => { + const orderByColumn = orderBy?.column ?? 'name'; + const orderByDirection = orderBy?.direction ?? 'desc'; + + // Check that the user belongs to the team they are trying to find members in. + const userTeam = await prisma.team.findUniqueOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + }, + }, + }, + }); + + const termFilters: Prisma.TeamMemberWhereInput | undefined = match(term) + .with(P.string.minLength(1), () => ({ + user: { + name: { + contains: term, + mode: Prisma.QueryMode.insensitive, + }, + }, + })) + .otherwise(() => undefined); + + const whereClause: Prisma.TeamMemberWhereInput = { + ...termFilters, + teamId: userTeam.id, + }; + + let orderByClause: Prisma.TeamMemberOrderByWithRelationInput = { + [orderByColumn]: orderByDirection, + }; + + // Name field is nested in the user so we have to handle it differently. + if (orderByColumn === 'name') { + orderByClause = { + user: { + name: orderByDirection, + }, + }; + } + + const [data, count] = await Promise.all([ + prisma.teamMember.findMany({ + where: whereClause, + skip: Math.max(page - 1, 0) * perPage, + take: perPage, + orderBy: orderByClause, + include: { + user: { + select: { + name: true, + email: true, + }, + }, + }, + }), + prisma.teamMember.count({ + where: whereClause, + }), + ]); + + return { + data, + count, + currentPage: Math.max(page, 1), + perPage, + totalPages: Math.ceil(count / perPage), + } satisfies FindResultSet; +}; diff --git a/packages/lib/server-only/team/find-teams-pending.ts b/packages/lib/server-only/team/find-teams-pending.ts new file mode 100644 index 000000000..d079c6f5f --- /dev/null +++ b/packages/lib/server-only/team/find-teams-pending.ts @@ -0,0 +1,58 @@ +import { prisma } from '@documenso/prisma'; +import type { Team } from '@documenso/prisma/client'; +import { Prisma } from '@documenso/prisma/client'; + +export interface FindTeamsPendingOptions { + userId: number; + term?: string; + page?: number; + perPage?: number; + orderBy?: { + column: keyof Team; + direction: 'asc' | 'desc'; + }; +} + +export const findTeamsPending = async ({ + userId, + term, + page = 1, + perPage = 10, + orderBy, +}: FindTeamsPendingOptions) => { + const orderByColumn = orderBy?.column ?? 'name'; + const orderByDirection = orderBy?.direction ?? 'desc'; + + const whereClause: Prisma.TeamPendingWhereInput = { + ownerUserId: userId, + }; + + if (term && term.length > 0) { + whereClause.name = { + contains: term, + mode: Prisma.QueryMode.insensitive, + }; + } + + const [data, count] = await Promise.all([ + prisma.teamPending.findMany({ + where: whereClause, + skip: Math.max(page - 1, 0) * perPage, + take: perPage, + orderBy: { + [orderByColumn]: orderByDirection, + }, + }), + prisma.teamPending.count({ + where: whereClause, + }), + ]); + + return { + data, + count, + currentPage: Math.max(page, 1), + perPage, + totalPages: Math.ceil(count / perPage), + }; +}; diff --git a/packages/lib/server-only/team/find-teams.ts b/packages/lib/server-only/team/find-teams.ts new file mode 100644 index 000000000..f5376a65d --- /dev/null +++ b/packages/lib/server-only/team/find-teams.ts @@ -0,0 +1,76 @@ +import type { FindResultSet } from '@documenso/lib/types/find-result-set'; +import { prisma } from '@documenso/prisma'; +import type { Team } from '@documenso/prisma/client'; +import { Prisma } from '@documenso/prisma/client'; + +export interface FindTeamsOptions { + userId: number; + term?: string; + page?: number; + perPage?: number; + orderBy?: { + column: keyof Team; + direction: 'asc' | 'desc'; + }; +} + +export const findTeams = async ({ + userId, + term, + page = 1, + perPage = 10, + orderBy, +}: FindTeamsOptions) => { + const orderByColumn = orderBy?.column ?? 'name'; + const orderByDirection = orderBy?.direction ?? 'desc'; + + const whereClause: Prisma.TeamWhereInput = { + members: { + some: { + userId, + }, + }, + }; + + if (term && term.length > 0) { + whereClause.name = { + contains: term, + mode: Prisma.QueryMode.insensitive, + }; + } + + const [data, count] = await Promise.all([ + prisma.team.findMany({ + where: whereClause, + skip: Math.max(page - 1, 0) * perPage, + take: perPage, + orderBy: { + [orderByColumn]: orderByDirection, + }, + include: { + members: { + where: { + userId, + }, + }, + }, + }), + prisma.team.count({ + where: whereClause, + }), + ]); + + const maskedData = data.map((team) => ({ + ...team, + currentTeamMember: team.members[0], + members: undefined, + })); + + return { + data: maskedData, + count, + currentPage: Math.max(page, 1), + perPage, + totalPages: Math.ceil(count / perPage), + } satisfies FindResultSet; +}; diff --git a/packages/lib/server-only/team/get-team-email-by-email.ts b/packages/lib/server-only/team/get-team-email-by-email.ts new file mode 100644 index 000000000..665694db4 --- /dev/null +++ b/packages/lib/server-only/team/get-team-email-by-email.ts @@ -0,0 +1,22 @@ +import { prisma } from '@documenso/prisma'; + +export type GetTeamEmailByEmailOptions = { + email: string; +}; + +export const getTeamEmailByEmail = async ({ email }: GetTeamEmailByEmailOptions) => { + return await prisma.teamEmail.findFirst({ + where: { + email, + }, + include: { + team: { + select: { + id: true, + name: true, + url: true, + }, + }, + }, + }); +}; diff --git a/packages/lib/server-only/team/get-team-invitations.ts b/packages/lib/server-only/team/get-team-invitations.ts new file mode 100644 index 000000000..737f1b3f7 --- /dev/null +++ b/packages/lib/server-only/team/get-team-invitations.ts @@ -0,0 +1,22 @@ +import { prisma } from '@documenso/prisma'; + +export type GetTeamInvitationsOptions = { + email: string; +}; + +export const getTeamInvitations = async ({ email }: GetTeamInvitationsOptions) => { + return await prisma.teamMemberInvite.findMany({ + where: { + email, + }, + include: { + team: { + select: { + id: true, + name: true, + url: true, + }, + }, + }, + }); +}; diff --git a/packages/lib/server-only/team/get-team-members.ts b/packages/lib/server-only/team/get-team-members.ts new file mode 100644 index 000000000..a29ed6e1d --- /dev/null +++ b/packages/lib/server-only/team/get-team-members.ts @@ -0,0 +1,33 @@ +import { prisma } from '@documenso/prisma'; + +export type GetTeamMembersOptions = { + userId: number; + teamId: number; +}; + +/** + * Get all team members for a given team. + */ +export const getTeamMembers = async ({ userId, teamId }: GetTeamMembersOptions) => { + return await prisma.teamMember.findMany({ + where: { + team: { + id: teamId, + members: { + some: { + userId: userId, + }, + }, + }, + }, + include: { + user: { + select: { + id: true, + email: true, + name: true, + }, + }, + }, + }); +}; diff --git a/packages/lib/server-only/team/get-team.ts b/packages/lib/server-only/team/get-team.ts new file mode 100644 index 000000000..59331202e --- /dev/null +++ b/packages/lib/server-only/team/get-team.ts @@ -0,0 +1,95 @@ +import { prisma } from '@documenso/prisma'; +import type { Prisma } from '@documenso/prisma/client'; + +export type GetTeamByIdOptions = { + userId?: number; + teamId: number; +}; + +/** + * Get a team given a teamId. + * + * Provide an optional userId to check that the user is a member of the team. + */ +export const getTeamById = async ({ userId, teamId }: GetTeamByIdOptions) => { + const whereFilter: Prisma.TeamWhereUniqueInput = { + id: teamId, + }; + + if (userId !== undefined) { + whereFilter['members'] = { + some: { + userId, + }, + }; + } + + const result = await prisma.team.findUniqueOrThrow({ + where: whereFilter, + include: { + teamEmail: true, + members: { + where: { + userId, + }, + select: { + role: true, + }, + }, + }, + }); + + const { members, ...team } = result; + + return { + ...team, + currentTeamMember: userId !== undefined ? members[0] : null, + }; +}; + +export type GetTeamByUrlOptions = { + userId: number; + teamUrl: string; +}; + +/** + * Get a team given a team URL. + */ +export const getTeamByUrl = async ({ userId, teamUrl }: GetTeamByUrlOptions) => { + const whereFilter: Prisma.TeamWhereUniqueInput = { + url: teamUrl, + }; + + if (userId !== undefined) { + whereFilter['members'] = { + some: { + userId, + }, + }; + } + + const result = await prisma.team.findUniqueOrThrow({ + where: whereFilter, + include: { + teamEmail: true, + emailVerification: true, + transferVerification: true, + subscription: true, + members: { + where: { + userId, + }, + select: { + role: true, + }, + }, + }, + }); + + const { members, ...team } = result; + + return { + ...team, + currentTeamMember: members[0], + }; +}; diff --git a/packages/lib/server-only/team/get-teams.ts b/packages/lib/server-only/team/get-teams.ts new file mode 100644 index 000000000..57a9fb83e --- /dev/null +++ b/packages/lib/server-only/team/get-teams.ts @@ -0,0 +1,33 @@ +import { prisma } from '@documenso/prisma'; + +export type GetTeamsOptions = { + userId: number; +}; +export type GetTeamsResponse = Awaited>; + +export const getTeams = async ({ userId }: GetTeamsOptions) => { + const teams = await prisma.team.findMany({ + where: { + members: { + some: { + userId, + }, + }, + }, + include: { + members: { + where: { + userId, + }, + select: { + role: true, + }, + }, + }, + }); + + return teams.map(({ members, ...team }) => ({ + ...team, + currentTeamMember: members[0], + })); +}; diff --git a/packages/lib/server-only/team/leave-team.ts b/packages/lib/server-only/team/leave-team.ts new file mode 100644 index 000000000..d0c6fe145 --- /dev/null +++ b/packages/lib/server-only/team/leave-team.ts @@ -0,0 +1,59 @@ +import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity'; +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { prisma } from '@documenso/prisma'; + +export type LeaveTeamOptions = { + /** + * The ID of the user who is leaving the team. + */ + userId: number; + + /** + * The ID of the team the user is leaving. + */ + teamId: number; +}; + +export const leaveTeam = async ({ userId, teamId }: LeaveTeamOptions) => { + await prisma.$transaction(async (tx) => { + const team = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + ownerUserId: { + not: userId, + }, + }, + include: { + subscription: true, + }, + }); + + await tx.teamMember.delete({ + where: { + userId_teamId: { + userId, + teamId, + }, + team: { + ownerUserId: { + not: userId, + }, + }, + }, + }); + + if (IS_BILLING_ENABLED && team.subscription) { + const numberOfSeats = await tx.teamMember.count({ + where: { + teamId, + }, + }); + + await updateSubscriptionItemQuantity({ + priceId: team.subscription.priceId, + subscriptionId: team.subscription.planId, + quantity: numberOfSeats, + }); + } + }); +}; diff --git a/packages/lib/server-only/team/request-team-ownership-transfer.ts b/packages/lib/server-only/team/request-team-ownership-transfer.ts new file mode 100644 index 000000000..7da976ee1 --- /dev/null +++ b/packages/lib/server-only/team/request-team-ownership-transfer.ts @@ -0,0 +1,106 @@ +import { createElement } from 'react'; + +import { mailer } from '@documenso/email/mailer'; +import { render } from '@documenso/email/render'; +import { TeamTransferRequestTemplate } from '@documenso/email/templates/team-transfer-request'; +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; +import { createTokenVerification } from '@documenso/lib/utils/token-verification'; +import { prisma } from '@documenso/prisma'; + +export type RequestTeamOwnershipTransferOptions = { + /** + * The ID of the user initiating the transfer. + */ + userId: number; + + /** + * The name of the user initiating the transfer. + */ + userName: string; + + /** + * The ID of the team whose ownership is being transferred. + */ + teamId: number; + + /** + * The user ID of the new owner. + */ + newOwnerUserId: number; + + /** + * Whether to clear any current payment methods attached to the team. + */ + clearPaymentMethods: boolean; +}; + +export const requestTeamOwnershipTransfer = async ({ + userId, + userName, + teamId, + newOwnerUserId, +}: RequestTeamOwnershipTransferOptions) => { + // Todo: Clear payment methods disabled for now. + const clearPaymentMethods = false; + + await prisma.$transaction(async (tx) => { + const team = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + ownerUserId: userId, + members: { + some: { + userId: newOwnerUserId, + }, + }, + }, + }); + + const newOwnerUser = await tx.user.findFirstOrThrow({ + where: { + id: newOwnerUserId, + }, + }); + + const { token, expiresAt } = createTokenVerification({ minute: 10 }); + + const teamVerificationPayload = { + teamId, + token, + expiresAt, + userId: newOwnerUserId, + name: newOwnerUser.name ?? '', + email: newOwnerUser.email, + clearPaymentMethods, + }; + + await tx.teamTransferVerification.upsert({ + where: { + teamId, + }, + create: teamVerificationPayload, + update: teamVerificationPayload, + }); + + const template = createElement(TeamTransferRequestTemplate, { + assetBaseUrl: WEBAPP_BASE_URL, + baseUrl: WEBAPP_BASE_URL, + senderName: userName, + teamName: team.name, + teamUrl: team.url, + token, + }); + + await mailer.sendMail({ + to: newOwnerUser.email, + from: { + name: FROM_NAME, + address: FROM_ADDRESS, + }, + subject: `You have been requested to take ownership of team ${team.name} on Documenso`, + html: render(template), + text: render(template, { plainText: true }), + }); + }); +}; diff --git a/packages/lib/server-only/team/resend-team-email-verification.ts b/packages/lib/server-only/team/resend-team-email-verification.ts new file mode 100644 index 000000000..55afe61ce --- /dev/null +++ b/packages/lib/server-only/team/resend-team-email-verification.ts @@ -0,0 +1,65 @@ +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError } from '@documenso/lib/errors/app-error'; +import { createTokenVerification } from '@documenso/lib/utils/token-verification'; +import { prisma } from '@documenso/prisma'; + +import { sendTeamEmailVerificationEmail } from './create-team-email-verification'; + +export type ResendTeamMemberInvitationOptions = { + userId: number; + teamId: number; +}; + +/** + * Resend a team email verification with a new token. + */ +export const resendTeamEmailVerification = async ({ + userId, + teamId, +}: ResendTeamMemberInvitationOptions) => { + await prisma.$transaction(async (tx) => { + const team = await tx.team.findUniqueOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + include: { + emailVerification: true, + }, + }); + + if (!team) { + throw new AppError('TeamNotFound', 'User is not a member of the team.'); + } + + const { emailVerification } = team; + + if (!emailVerification) { + throw new AppError( + 'VerificationNotFound', + 'No team email verification exists for this team.', + ); + } + + const { token, expiresAt } = createTokenVerification({ hours: 1 }); + + await tx.teamEmailVerification.update({ + where: { + teamId, + }, + data: { + token, + expiresAt, + }, + }); + + await sendTeamEmailVerificationEmail(emailVerification.email, token, team.name, team.url); + }); +}; diff --git a/packages/lib/server-only/team/resend-team-member-invitation.ts b/packages/lib/server-only/team/resend-team-member-invitation.ts new file mode 100644 index 000000000..fb860ccc0 --- /dev/null +++ b/packages/lib/server-only/team/resend-team-member-invitation.ts @@ -0,0 +1,76 @@ +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError } from '@documenso/lib/errors/app-error'; +import { prisma } from '@documenso/prisma'; + +import { sendTeamMemberInviteEmail } from './create-team-member-invites'; + +export type ResendTeamMemberInvitationOptions = { + /** + * The ID of the user who is initiating this action. + */ + userId: number; + + /** + * The name of the user who is initiating this action. + */ + userName: string; + + /** + * The ID of the team. + */ + teamId: number; + + /** + * The IDs of the invitations to resend. + */ + invitationId: number; +}; + +/** + * Resend an email for a given team member invite. + */ +export const resendTeamMemberInvitation = async ({ + userId, + userName, + teamId, + invitationId, +}: ResendTeamMemberInvitationOptions) => { + await prisma.$transaction(async (tx) => { + const team = await tx.team.findUniqueOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + }); + + if (!team) { + throw new AppError('TeamNotFound', 'User is not a valid member of the team.'); + } + + const teamMemberInvite = await tx.teamMemberInvite.findUniqueOrThrow({ + where: { + id: invitationId, + teamId, + }, + }); + + if (!teamMemberInvite) { + throw new AppError('InviteNotFound', 'No invite exists for this user.'); + } + + await sendTeamMemberInviteEmail({ + email: teamMemberInvite.email, + token: teamMemberInvite.token, + teamName: team.name, + teamUrl: team.url, + senderName: userName, + }); + }); +}; diff --git a/packages/lib/server-only/team/transfer-team-ownership.ts b/packages/lib/server-only/team/transfer-team-ownership.ts new file mode 100644 index 000000000..bb14eec55 --- /dev/null +++ b/packages/lib/server-only/team/transfer-team-ownership.ts @@ -0,0 +1,88 @@ +import type Stripe from 'stripe'; + +import { transferTeamSubscription } from '@documenso/ee/server-only/stripe/transfer-team-subscription'; +import { mapStripeSubscriptionToPrismaUpsertAction } from '@documenso/ee/server-only/stripe/webhook/on-subscription-updated'; +import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; +import { prisma } from '@documenso/prisma'; +import { TeamMemberRole } from '@documenso/prisma/client'; + +export type TransferTeamOwnershipOptions = { + token: string; +}; + +export const transferTeamOwnership = async ({ token }: TransferTeamOwnershipOptions) => { + await prisma.$transaction(async (tx) => { + const teamTransferVerification = await tx.teamTransferVerification.findFirstOrThrow({ + where: { + token, + }, + include: { + team: { + include: { + subscription: true, + }, + }, + }, + }); + + const { team, userId: newOwnerUserId } = teamTransferVerification; + + await tx.teamTransferVerification.delete({ + where: { + teamId: team.id, + }, + }); + + const newOwnerUser = await tx.user.findFirstOrThrow({ + where: { + id: newOwnerUserId, + teamMembers: { + some: { + teamId: team.id, + }, + }, + }, + include: { + Subscription: true, + }, + }); + + let teamSubscription: Stripe.Subscription | null = null; + + if (IS_BILLING_ENABLED) { + teamSubscription = await transferTeamSubscription({ + user: newOwnerUser, + team, + clearPaymentMethods: teamTransferVerification.clearPaymentMethods, + }); + } + + if (teamSubscription) { + await tx.subscription.upsert( + mapStripeSubscriptionToPrismaUpsertAction(teamSubscription, undefined, team.id), + ); + } + + await tx.team.update({ + where: { + id: team.id, + }, + data: { + ownerUserId: newOwnerUserId, + members: { + update: { + where: { + userId_teamId: { + teamId: team.id, + userId: newOwnerUserId, + }, + }, + data: { + role: TeamMemberRole.ADMIN, + }, + }, + }, + }, + }); + }); +}; diff --git a/packages/lib/server-only/team/update-team-email.ts b/packages/lib/server-only/team/update-team-email.ts new file mode 100644 index 000000000..05023efc7 --- /dev/null +++ b/packages/lib/server-only/team/update-team-email.ts @@ -0,0 +1,42 @@ +import { prisma } from '@documenso/prisma'; + +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams'; + +export type UpdateTeamEmailOptions = { + userId: number; + teamId: number; + data: { + name: string; + }; +}; + +export const updateTeamEmail = async ({ userId, teamId, data }: UpdateTeamEmailOptions) => { + await prisma.$transaction(async (tx) => { + await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + teamEmail: { + isNot: null, + }, + }, + }); + + await tx.teamEmail.update({ + where: { + teamId, + }, + data: { + // Note: Never allow the email to be updated without re-verifying via email. + name: data.name, + }, + }); + }); +}; diff --git a/packages/lib/server-only/team/update-team-member.ts b/packages/lib/server-only/team/update-team-member.ts new file mode 100644 index 000000000..9a4a85f85 --- /dev/null +++ b/packages/lib/server-only/team/update-team-member.ts @@ -0,0 +1,92 @@ +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams'; +import { prisma } from '@documenso/prisma'; +import type { TeamMemberRole } from '@documenso/prisma/client'; + +export type UpdateTeamMemberOptions = { + userId: number; + teamId: number; + teamMemberId: number; + data: { + role: TeamMemberRole; + }; +}; + +export const updateTeamMember = async ({ + userId, + teamId, + teamMemberId, + data, +}: UpdateTeamMemberOptions) => { + await prisma.$transaction(async (tx) => { + // Find the team and validate that the user is allowed to update members. + const team = await tx.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + include: { + members: { + select: { + id: true, + userId: true, + role: true, + }, + }, + }, + }); + + const currentTeamMember = team.members.find((member) => member.userId === userId); + const teamMemberToUpdate = team.members.find((member) => member.id === teamMemberId); + + if (!teamMemberToUpdate || !currentTeamMember) { + throw new AppError(AppErrorCode.NOT_FOUND, 'Team member does not exist'); + } + + if (teamMemberToUpdate.userId === team.ownerUserId) { + throw new AppError(AppErrorCode.UNAUTHORIZED, 'Cannot update the owner'); + } + + const isMemberToUpdateHigherRole = !isTeamRoleWithinUserHierarchy( + currentTeamMember.role, + teamMemberToUpdate.role, + ); + + if (isMemberToUpdateHigherRole) { + throw new AppError(AppErrorCode.UNAUTHORIZED, 'Cannot update a member with a higher role'); + } + + const isNewMemberRoleHigherThanCurrentRole = !isTeamRoleWithinUserHierarchy( + currentTeamMember.role, + data.role, + ); + + if (isNewMemberRoleHigherThanCurrentRole) { + throw new AppError( + AppErrorCode.UNAUTHORIZED, + 'Cannot give a member a role higher than the user initating the update', + ); + } + + return await tx.teamMember.update({ + where: { + id: teamMemberId, + teamId, + userId: { + not: team.ownerUserId, + }, + }, + data: { + role: data.role, + }, + }); + }); +}; diff --git a/packages/lib/server-only/team/update-team.ts b/packages/lib/server-only/team/update-team.ts new file mode 100644 index 000000000..b172d3359 --- /dev/null +++ b/packages/lib/server-only/team/update-team.ts @@ -0,0 +1,65 @@ +import { z } from 'zod'; + +import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { prisma } from '@documenso/prisma'; +import { Prisma } from '@documenso/prisma/client'; + +export type UpdateTeamOptions = { + userId: number; + teamId: number; + data: { + name?: string; + url?: string; + }; +}; + +export const updateTeam = async ({ userId, teamId, data }: UpdateTeamOptions) => { + try { + await prisma.$transaction(async (tx) => { + const foundPendingTeamWithUrl = await tx.teamPending.findFirst({ + where: { + url: data.url, + }, + }); + + if (foundPendingTeamWithUrl) { + throw new AppError(AppErrorCode.ALREADY_EXISTS, 'Team URL already exists.'); + } + + const team = await tx.team.update({ + where: { + id: teamId, + members: { + some: { + userId, + role: { + in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'], + }, + }, + }, + }, + data: { + url: data.url, + name: data.name, + }, + }); + + return team; + }); + } catch (err) { + console.error(err); + + if (!(err instanceof Prisma.PrismaClientKnownRequestError)) { + throw err; + } + + const target = z.array(z.string()).safeParse(err.meta?.target); + + if (err.code === 'P2002' && target.success && target.data.includes('url')) { + throw new AppError(AppErrorCode.ALREADY_EXISTS, 'Team URL already exists.'); + } + + throw err; + } +}; diff --git a/packages/lib/server-only/user/create-user.ts b/packages/lib/server-only/user/create-user.ts index f7db60c85..42a9f128c 100644 --- a/packages/lib/server-only/user/create-user.ts +++ b/packages/lib/server-only/user/create-user.ts @@ -1,11 +1,12 @@ import { hash } from 'bcrypt'; import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer'; +import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity'; import { prisma } from '@documenso/prisma'; -import { IdentityProvider } from '@documenso/prisma/client'; +import { IdentityProvider, Prisma, TeamMemberInviteStatus } from '@documenso/prisma/client'; +import { IS_BILLING_ENABLED } from '../../constants/app'; import { SALT_ROUNDS } from '../../constants/auth'; -import { getFlag } from '../../universal/get-feature-flag'; export interface CreateUserOptions { name: string; @@ -15,8 +16,6 @@ export interface CreateUserOptions { } export const createUser = async ({ name, email, password, signature }: CreateUserOptions) => { - const isBillingEnabled = await getFlag('app_billing'); - const hashedPassword = await hash(password, SALT_ROUNDS); const userExists = await prisma.user.findFirst({ @@ -29,7 +28,7 @@ export const createUser = async ({ name, email, password, signature }: CreateUse throw new Error('User already exists'); } - let user = await prisma.user.create({ + const user = await prisma.user.create({ data: { name, email: email.toLowerCase(), @@ -39,12 +38,81 @@ export const createUser = async ({ name, email, password, signature }: CreateUse }, }); - if (isBillingEnabled) { + const acceptedTeamInvites = await prisma.teamMemberInvite.findMany({ + where: { + email: { + equals: email, + mode: Prisma.QueryMode.insensitive, + }, + status: TeamMemberInviteStatus.ACCEPTED, + }, + }); + + // For each team invite, add the user to the team and delete the team invite. + // If an error occurs, reset the invitation to not accepted. + await Promise.allSettled( + acceptedTeamInvites.map(async (invite) => + prisma + .$transaction(async (tx) => { + await tx.teamMember.create({ + data: { + teamId: invite.teamId, + userId: user.id, + role: invite.role, + }, + }); + + await tx.teamMemberInvite.delete({ + where: { + id: invite.id, + }, + }); + + if (!IS_BILLING_ENABLED) { + return; + } + + const team = await tx.team.findFirstOrThrow({ + where: { + id: invite.teamId, + }, + include: { + members: { + select: { + id: true, + }, + }, + subscription: true, + }, + }); + + if (team.subscription) { + await updateSubscriptionItemQuantity({ + priceId: team.subscription.priceId, + subscriptionId: team.subscription.planId, + quantity: team.members.length, + }); + } + }) + .catch(async () => { + await prisma.teamMemberInvite.update({ + where: { + id: invite.id, + }, + data: { + status: TeamMemberInviteStatus.PENDING, + }, + }); + }), + ), + ); + + // Update the user record with a new or existing Stripe customer record. + if (IS_BILLING_ENABLED) { try { - const stripeSession = await getStripeCustomerByUser(user); - user = stripeSession.user; - } catch (e) { - console.error(e); + return await getStripeCustomerByUser(user).then((session) => session.user); + } catch (err) { + console.error(err); } } diff --git a/packages/lib/utils/billing.ts b/packages/lib/utils/billing.ts new file mode 100644 index 000000000..ca85addbb --- /dev/null +++ b/packages/lib/utils/billing.ts @@ -0,0 +1,16 @@ +import type { Subscription } from '.prisma/client'; +import { SubscriptionStatus } from '.prisma/client'; + +/** + * Returns true if there is a subscription that is active and is a community plan. + */ +export const subscriptionsContainsActiveCommunityPlan = ( + subscriptions: Subscription[], + communityPlanPriceIds: string[], +) => { + return subscriptions.some( + (subscription) => + subscription.status === SubscriptionStatus.ACTIVE && + communityPlanPriceIds.includes(subscription.priceId), + ); +}; diff --git a/packages/lib/utils/params.ts b/packages/lib/utils/params.ts new file mode 100644 index 000000000..a8d799400 --- /dev/null +++ b/packages/lib/utils/params.ts @@ -0,0 +1,30 @@ +/** + * From an unknown string, parse it into an integer array. + * + * Filter out unknown values. + */ +export const parseToIntegerArray = (value: unknown): number[] => { + if (typeof value !== 'string') { + return []; + } + + return value + .split(',') + .map((value) => parseInt(value, 10)) + .filter((value) => !isNaN(value)); +}; + +type GetRootHrefOptions = { + returnEmptyRootString?: boolean; +}; + +export const getRootHref = ( + params: Record | null, + options: GetRootHrefOptions = {}, +) => { + if (typeof params?.teamUrl === 'string') { + return `/t/${params.teamUrl}`; + } + + return options.returnEmptyRootString ? '' : '/'; +}; diff --git a/packages/lib/utils/recipient-formatter.ts b/packages/lib/utils/recipient-formatter.ts index 2e2bace3b..5fad45399 100644 --- a/packages/lib/utils/recipient-formatter.ts +++ b/packages/lib/utils/recipient-formatter.ts @@ -1,6 +1,6 @@ import type { Recipient } from '@documenso/prisma/client'; -export const recipientInitials = (text: string) => +export const extractInitials = (text: string) => text .split(' ') .map((name: string) => name.slice(0, 1).toUpperCase()) @@ -8,5 +8,5 @@ export const recipientInitials = (text: string) => .join(''); export const recipientAbbreviation = (recipient: Recipient) => { - return recipientInitials(recipient.name) || recipient.email.slice(0, 1).toUpperCase(); + return extractInitials(recipient.name) || recipient.email.slice(0, 1).toUpperCase(); }; diff --git a/packages/lib/utils/teams.ts b/packages/lib/utils/teams.ts new file mode 100644 index 000000000..eb9be2c2b --- /dev/null +++ b/packages/lib/utils/teams.ts @@ -0,0 +1,42 @@ +import { WEBAPP_BASE_URL } from '../constants/app'; +import type { TEAM_MEMBER_ROLE_MAP } from '../constants/teams'; +import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../constants/teams'; + +export const formatTeamUrl = (teamUrl: string, baseUrl?: string) => { + const formattedBaseUrl = (baseUrl ?? WEBAPP_BASE_URL).replace(/https?:\/\//, ''); + + return `${formattedBaseUrl}/t/${teamUrl}`; +}; + +export const formatDocumentsPath = (teamUrl?: string) => { + return teamUrl ? `/t/${teamUrl}/documents` : '/documents'; +}; + +/** + * Determines whether a team member can execute a given action. + * + * @param action The action the user is trying to execute. + * @param role The current role of the user. + * @returns Whether the user can execute the action. + */ +export const canExecuteTeamAction = ( + action: keyof typeof TEAM_MEMBER_ROLE_PERMISSIONS_MAP, + role: keyof typeof TEAM_MEMBER_ROLE_MAP, +) => { + return TEAM_MEMBER_ROLE_PERMISSIONS_MAP[action].some((i) => i === role); +}; + +/** + * Compares the provided `currentUserRole` with the provided `roleToCheck` to determine + * whether the `currentUserRole` has permission to modify the `roleToCheck`. + * + * @param currentUserRole Role of the current user + * @param roleToCheck Role of another user to see if the current user can modify + * @returns True if the current user can modify the other user, false otherwise + */ +export const isTeamRoleWithinUserHierarchy = ( + currentUserRole: keyof typeof TEAM_MEMBER_ROLE_MAP, + roleToCheck: keyof typeof TEAM_MEMBER_ROLE_MAP, +) => { + return TEAM_MEMBER_ROLE_HIERARCHY[currentUserRole].some((i) => i === roleToCheck); +}; diff --git a/packages/lib/utils/token-verification.ts b/packages/lib/utils/token-verification.ts new file mode 100644 index 000000000..c57ddd1e5 --- /dev/null +++ b/packages/lib/utils/token-verification.ts @@ -0,0 +1,21 @@ +import type { DurationLike } from 'luxon'; +import { DateTime } from 'luxon'; +import { nanoid } from 'nanoid'; + +/** + * Create a token verification object. + * + * @param expiry The date the token expires, or the duration until the token expires. + */ +export const createTokenVerification = (expiry: Date | DurationLike) => { + const expiresAt = expiry instanceof Date ? expiry : DateTime.now().plus(expiry).toJSDate(); + + return { + expiresAt, + token: nanoid(32), + }; +}; + +export const isTokenExpired = (expiresAt: Date) => { + return expiresAt < new Date(); +}; diff --git a/packages/prisma/migrations/20240205040421_add_teams/migration.sql b/packages/prisma/migrations/20240205040421_add_teams/migration.sql new file mode 100644 index 000000000..f80799aab --- /dev/null +++ b/packages/prisma/migrations/20240205040421_add_teams/migration.sql @@ -0,0 +1,187 @@ +/* + Warnings: + + - A unique constraint covering the columns `[teamId]` on the table `Subscription` will be added. If there are existing duplicate values, this will fail. + +*/ +-- CreateEnum +CREATE TYPE "TeamMemberRole" AS ENUM ('ADMIN', 'MANAGER', 'MEMBER'); + +-- CreateEnum +CREATE TYPE "TeamMemberInviteStatus" AS ENUM ('ACCEPTED', 'PENDING'); + +-- AlterTable +ALTER TABLE "Document" ADD COLUMN "teamId" INTEGER; + +-- AlterTable +ALTER TABLE "Subscription" ADD COLUMN "teamId" INTEGER, +ALTER COLUMN "userId" DROP NOT NULL; + +-- CreateTable +CREATE TABLE "Team" ( + "id" SERIAL NOT NULL, + "name" TEXT NOT NULL, + "url" TEXT NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "customerId" TEXT, + "ownerUserId" INTEGER NOT NULL, + + CONSTRAINT "Team_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "TeamPending" ( + "id" SERIAL NOT NULL, + "name" TEXT NOT NULL, + "url" TEXT NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "customerId" TEXT NOT NULL, + "ownerUserId" INTEGER NOT NULL, + + CONSTRAINT "TeamPending_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "TeamMember" ( + "id" SERIAL NOT NULL, + "teamId" INTEGER NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "role" "TeamMemberRole" NOT NULL, + "userId" INTEGER NOT NULL, + + CONSTRAINT "TeamMember_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "TeamEmail" ( + "teamId" INTEGER NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "name" TEXT NOT NULL, + "email" TEXT NOT NULL, + + CONSTRAINT "TeamEmail_pkey" PRIMARY KEY ("teamId") +); + +-- CreateTable +CREATE TABLE "TeamEmailVerification" ( + "teamId" INTEGER NOT NULL, + "name" TEXT NOT NULL, + "email" TEXT NOT NULL, + "token" TEXT NOT NULL, + "expiresAt" TIMESTAMP(3) NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + + CONSTRAINT "TeamEmailVerification_pkey" PRIMARY KEY ("teamId") +); + +-- CreateTable +CREATE TABLE "TeamTransferVerification" ( + "teamId" INTEGER NOT NULL, + "userId" INTEGER NOT NULL, + "name" TEXT NOT NULL, + "email" TEXT NOT NULL, + "token" TEXT NOT NULL, + "expiresAt" TIMESTAMP(3) NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "clearPaymentMethods" BOOLEAN NOT NULL DEFAULT false, + + CONSTRAINT "TeamTransferVerification_pkey" PRIMARY KEY ("teamId") +); + +-- CreateTable +CREATE TABLE "TeamMemberInvite" ( + "id" SERIAL NOT NULL, + "teamId" INTEGER NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "email" TEXT NOT NULL, + "status" "TeamMemberInviteStatus" NOT NULL DEFAULT 'PENDING', + "role" "TeamMemberRole" NOT NULL, + "token" TEXT NOT NULL, + + CONSTRAINT "TeamMemberInvite_pkey" PRIMARY KEY ("id") +); + +-- CreateIndex +CREATE UNIQUE INDEX "Team_url_key" ON "Team"("url"); + +-- CreateIndex +CREATE UNIQUE INDEX "Team_customerId_key" ON "Team"("customerId"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamPending_url_key" ON "TeamPending"("url"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamPending_customerId_key" ON "TeamPending"("customerId"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamMember_userId_teamId_key" ON "TeamMember"("userId", "teamId"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamEmail_teamId_key" ON "TeamEmail"("teamId"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamEmail_email_key" ON "TeamEmail"("email"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamEmailVerification_teamId_key" ON "TeamEmailVerification"("teamId"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamEmailVerification_token_key" ON "TeamEmailVerification"("token"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamTransferVerification_teamId_key" ON "TeamTransferVerification"("teamId"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamTransferVerification_token_key" ON "TeamTransferVerification"("token"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamMemberInvite_token_key" ON "TeamMemberInvite"("token"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamMemberInvite_teamId_email_key" ON "TeamMemberInvite"("teamId", "email"); + +-- CreateIndex +CREATE UNIQUE INDEX "Subscription_teamId_key" ON "Subscription"("teamId"); + +-- AddForeignKey +ALTER TABLE "Subscription" ADD CONSTRAINT "Subscription_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Document" ADD CONSTRAINT "Document_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE SET NULL ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Team" ADD CONSTRAINT "Team_ownerUserId_fkey" FOREIGN KEY ("ownerUserId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamPending" ADD CONSTRAINT "TeamPending_ownerUserId_fkey" FOREIGN KEY ("ownerUserId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamMember" ADD CONSTRAINT "TeamMember_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamMember" ADD CONSTRAINT "TeamMember_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamEmail" ADD CONSTRAINT "TeamEmail_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamEmailVerification" ADD CONSTRAINT "TeamEmailVerification_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamTransferVerification" ADD CONSTRAINT "TeamTransferVerification_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamMemberInvite" ADD CONSTRAINT "TeamMemberInvite_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE "Subscription" +ADD CONSTRAINT teamId_or_userId_check +CHECK ( + ( + "teamId" IS NOT NULL + AND "userId" IS NULL + ) + OR ( + "teamId" IS NULL + AND "userId" IS NOT NULL + ) +); diff --git a/packages/prisma/package.json b/packages/prisma/package.json index 2fb01a6ac..301b51dba 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -21,7 +21,8 @@ "@prisma/client": "5.4.2", "dotenv": "^16.3.1", "dotenv-cli": "^7.3.0", - "prisma": "5.4.2" + "prisma": "5.4.2", + "ts-pattern": "^5.0.6" }, "devDependencies": { "ts-node": "^10.9.1", diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 87d29d6b2..79dcdf6aa 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -37,6 +37,9 @@ model User { Document Document[] Subscription Subscription[] PasswordResetToken PasswordResetToken[] + ownedTeams Team[] + ownedPendingTeams TeamPending[] + teamMembers TeamMember[] twoFactorSecret String? twoFactorEnabled Boolean @default(false) twoFactorBackupCodes String? @@ -103,12 +106,14 @@ model Subscription { planId String @unique priceId String periodEnd DateTime? - userId Int + userId Int? + teamId Int? @unique createdAt DateTime @default(now()) updatedAt DateTime @updatedAt cancelAtPeriodEnd Boolean @default(false) - User User @relation(fields: [userId], references: [id], onDelete: Cascade) + team Team? @relation(fields: [teamId], references: [id], onDelete: Cascade) + User User? @relation(fields: [userId], references: [id], onDelete: Cascade) @@index([userId]) } @@ -162,6 +167,8 @@ model Document { updatedAt DateTime @default(now()) @updatedAt completedAt DateTime? deletedAt DateTime? + teamId Int? + team Team? @relation(fields: [teamId], references: [id]) @@unique([documentDataId]) @@index([userId]) @@ -300,6 +307,104 @@ model DocumentShareLink { @@unique([documentId, email]) } +enum TeamMemberRole { + ADMIN + MANAGER + MEMBER +} + +enum TeamMemberInviteStatus { + ACCEPTED + PENDING +} + +model Team { + id Int @id @default(autoincrement()) + name String + url String @unique + createdAt DateTime @default(now()) + customerId String? @unique + ownerUserId Int + members TeamMember[] + invites TeamMemberInvite[] + teamEmail TeamEmail? + emailVerification TeamEmailVerification? + transferVerification TeamTransferVerification? + + owner User @relation(fields: [ownerUserId], references: [id]) + subscription Subscription? + + document Document[] +} + +model TeamPending { + id Int @id @default(autoincrement()) + name String + url String @unique + createdAt DateTime @default(now()) + customerId String @unique + ownerUserId Int + + owner User @relation(fields: [ownerUserId], references: [id], onDelete: Cascade) +} + +model TeamMember { + id Int @id @default(autoincrement()) + teamId Int + createdAt DateTime @default(now()) + role TeamMemberRole + userId Int + user User @relation(fields: [userId], references: [id]) + team Team @relation(fields: [teamId], references: [id], onDelete: Cascade) + + @@unique([userId, teamId]) +} + +model TeamEmail { + teamId Int @id @unique + createdAt DateTime @default(now()) + name String + email String @unique + team Team @relation(fields: [teamId], references: [id], onDelete: Cascade) +} + +model TeamEmailVerification { + teamId Int @id @unique + name String + email String + token String @unique + expiresAt DateTime + createdAt DateTime @default(now()) + + team Team @relation(fields: [teamId], references: [id], onDelete: Cascade) +} + +model TeamTransferVerification { + teamId Int @id @unique + userId Int + name String + email String + token String @unique + expiresAt DateTime + createdAt DateTime @default(now()) + clearPaymentMethods Boolean @default(false) + + team Team @relation(fields: [teamId], references: [id], onDelete: Cascade) +} + +model TeamMemberInvite { + id Int @id @default(autoincrement()) + teamId Int + createdAt DateTime @default(now()) + email String + status TeamMemberInviteStatus @default(PENDING) + role TeamMemberRole + token String @unique + team Team @relation(fields: [teamId], references: [id], onDelete: Cascade) + + @@unique([teamId, email]) +} + enum TemplateType { PUBLIC PRIVATE diff --git a/packages/prisma/seed/documents.ts b/packages/prisma/seed/documents.ts new file mode 100644 index 000000000..1f1f5cab8 --- /dev/null +++ b/packages/prisma/seed/documents.ts @@ -0,0 +1,375 @@ +import type { User } from '@prisma/client'; +import { nanoid } from 'nanoid'; +import fs from 'node:fs'; +import path from 'node:path'; +import { match } from 'ts-pattern'; + +import { prisma } from '..'; +import { + DocumentDataType, + DocumentStatus, + FieldType, + Prisma, + ReadStatus, + SendStatus, + SigningStatus, +} from '../client'; +import { seedTeam } from './teams'; +import { seedUser } from './users'; + +const examplePdf = fs + .readFileSync(path.join(__dirname, '../../../assets/example.pdf')) + .toString('base64'); + +type DocumentToSeed = { + sender: User; + recipients: (User | string)[]; + type: DocumentStatus; + documentOptions?: Partial; +}; + +export const seedDocuments = async (documents: DocumentToSeed[]) => { + await Promise.all( + documents.map(async (document, i) => + match(document.type) + .with(DocumentStatus.DRAFT, async () => + createDraftDocument(document.sender, document.recipients, { + key: i, + createDocumentOptions: document.documentOptions, + }), + ) + .with(DocumentStatus.PENDING, async () => + createPendingDocument(document.sender, document.recipients, { + key: i, + createDocumentOptions: document.documentOptions, + }), + ) + .with(DocumentStatus.COMPLETED, async () => + createCompletedDocument(document.sender, document.recipients, { + key: i, + createDocumentOptions: document.documentOptions, + }), + ) + .exhaustive(), + ), + ); +}; + +const createDraftDocument = async ( + sender: User, + recipients: (User | string)[], + options: CreateDocumentOptions = {}, +) => { + const { key, createDocumentOptions = {} } = options; + + const documentData = await prisma.documentData.create({ + data: { + type: DocumentDataType.BYTES_64, + data: examplePdf, + initialData: examplePdf, + }, + }); + + const document = await prisma.document.create({ + data: { + title: `[TEST] Document ${key} - Draft`, + status: DocumentStatus.DRAFT, + documentDataId: documentData.id, + userId: sender.id, + ...createDocumentOptions, + }, + }); + + for (const recipient of recipients) { + const email = typeof recipient === 'string' ? recipient : recipient.email; + const name = typeof recipient === 'string' ? recipient : recipient.name ?? ''; + + await prisma.recipient.create({ + data: { + email, + name, + token: nanoid(), + readStatus: ReadStatus.NOT_OPENED, + sendStatus: SendStatus.NOT_SENT, + signingStatus: SigningStatus.NOT_SIGNED, + signedAt: new Date(), + Document: { + connect: { + id: document.id, + }, + }, + Field: { + create: { + page: 1, + type: FieldType.NAME, + inserted: true, + customText: name, + positionX: new Prisma.Decimal(1), + positionY: new Prisma.Decimal(1), + width: new Prisma.Decimal(1), + height: new Prisma.Decimal(1), + documentId: document.id, + }, + }, + }, + }); + } +}; + +type CreateDocumentOptions = { + key?: string | number; + createDocumentOptions?: Partial; +}; + +const createPendingDocument = async ( + sender: User, + recipients: (User | string)[], + options: CreateDocumentOptions = {}, +) => { + const { key, createDocumentOptions = {} } = options; + + const documentData = await prisma.documentData.create({ + data: { + type: DocumentDataType.BYTES_64, + data: examplePdf, + initialData: examplePdf, + }, + }); + + const document = await prisma.document.create({ + data: { + title: `[TEST] Document ${key} - Pending`, + status: DocumentStatus.PENDING, + documentDataId: documentData.id, + userId: sender.id, + ...createDocumentOptions, + }, + }); + + for (const recipient of recipients) { + const email = typeof recipient === 'string' ? recipient : recipient.email; + const name = typeof recipient === 'string' ? recipient : recipient.name ?? ''; + + await prisma.recipient.create({ + data: { + email, + name, + token: nanoid(), + readStatus: ReadStatus.OPENED, + sendStatus: SendStatus.SENT, + signingStatus: SigningStatus.NOT_SIGNED, + signedAt: new Date(), + Document: { + connect: { + id: document.id, + }, + }, + Field: { + create: { + page: 1, + type: FieldType.NAME, + inserted: true, + customText: name, + positionX: new Prisma.Decimal(1), + positionY: new Prisma.Decimal(1), + width: new Prisma.Decimal(1), + height: new Prisma.Decimal(1), + documentId: document.id, + }, + }, + }, + }); + } +}; + +const createCompletedDocument = async ( + sender: User, + recipients: (User | string)[], + options: CreateDocumentOptions = {}, +) => { + const { key, createDocumentOptions = {} } = options; + + const documentData = await prisma.documentData.create({ + data: { + type: DocumentDataType.BYTES_64, + data: examplePdf, + initialData: examplePdf, + }, + }); + + const document = await prisma.document.create({ + data: { + title: `[TEST] Document ${key} - Completed`, + status: DocumentStatus.COMPLETED, + documentDataId: documentData.id, + userId: sender.id, + ...createDocumentOptions, + }, + }); + + for (const recipient of recipients) { + const email = typeof recipient === 'string' ? recipient : recipient.email; + const name = typeof recipient === 'string' ? recipient : recipient.name ?? ''; + + await prisma.recipient.create({ + data: { + email, + name, + token: nanoid(), + readStatus: ReadStatus.OPENED, + sendStatus: SendStatus.SENT, + signingStatus: SigningStatus.SIGNED, + signedAt: new Date(), + Document: { + connect: { + id: document.id, + }, + }, + Field: { + create: { + page: 1, + type: FieldType.NAME, + inserted: true, + customText: name, + positionX: new Prisma.Decimal(1), + positionY: new Prisma.Decimal(1), + width: new Prisma.Decimal(1), + height: new Prisma.Decimal(1), + documentId: document.id, + }, + }, + }, + }); + } +}; + +/** + * Create 5 team documents: + * - Completed document with 2 recipients. + * - Pending document with 1 recipient. + * - Pending document with 4 recipients. + * - Draft document with 3 recipients. + * - Draft document with 2 recipients. + * + * Create 3 non team documents where the user is a team member: + * - Completed document with 2 recipients. + * - Pending document with 1 recipient. + * - Draft document with 2 recipients. + * + * Create 3 non team documents where the user is not a team member, but the recipient is: + * - Completed document with 2 recipients. + * - Pending document with 1 recipient. + * - Draft document with 2 recipients. + * + * This should result in the following team document dashboard counts: + * - 0 Inbox + * - 2 Pending + * - 1 Completed + * - 2 Draft + * - 5 All + */ +export const seedTeamDocuments = async () => { + const team = await seedTeam({ + createTeamMembers: 4, + }); + + const documentOptions = { + teamId: team.id, + }; + + const teamMember1 = team.members[1].user; + const teamMember2 = team.members[2].user; + const teamMember3 = team.members[3].user; + const teamMember4 = team.members[4].user; + + const [testUser1, testUser2, testUser3, testUser4] = await Promise.all([ + seedUser(), + seedUser(), + seedUser(), + seedUser(), + ]); + + await seedDocuments([ + /** + * Team documents. + */ + { + sender: teamMember1, + recipients: [testUser1, testUser2], + type: DocumentStatus.COMPLETED, + documentOptions, + }, + { + sender: teamMember2, + recipients: [testUser1], + type: DocumentStatus.PENDING, + documentOptions, + }, + { + sender: teamMember2, + recipients: [testUser1, testUser2, testUser3, testUser4], + type: DocumentStatus.PENDING, + documentOptions, + }, + { + sender: teamMember2, + recipients: [testUser1, testUser2, teamMember1], + type: DocumentStatus.DRAFT, + documentOptions, + }, + { + sender: team.owner, + recipients: [testUser1, testUser2], + type: DocumentStatus.DRAFT, + documentOptions, + }, + /** + * Non team documents where the sender is a team member and recipient is not. + */ + { + sender: teamMember1, + recipients: [testUser1, testUser2], + type: DocumentStatus.COMPLETED, + }, + { + sender: teamMember2, + recipients: [testUser1], + type: DocumentStatus.PENDING, + }, + { + sender: teamMember3, + recipients: [testUser1, testUser2], + type: DocumentStatus.DRAFT, + }, + /** + * Non team documents where the sender is not a team member and recipient is. + */ + { + sender: testUser1, + recipients: [teamMember1, teamMember2], + type: DocumentStatus.COMPLETED, + }, + { + sender: testUser2, + recipients: [teamMember1], + type: DocumentStatus.PENDING, + }, + { + sender: testUser3, + recipients: [teamMember1, teamMember2], + type: DocumentStatus.DRAFT, + }, + ]); + + return { + team, + teamMember1, + teamMember2, + teamMember3, + teamMember4, + testUser1, + testUser2, + testUser3, + testUser4, + }; +}; diff --git a/packages/prisma/seed/teams.ts b/packages/prisma/seed/teams.ts new file mode 100644 index 000000000..99b0df8d5 --- /dev/null +++ b/packages/prisma/seed/teams.ts @@ -0,0 +1,177 @@ +import { prisma } from '..'; +import { TeamMemberInviteStatus, TeamMemberRole } from '../client'; +import { seedUser } from './users'; + +const EMAIL_DOMAIN = `test.documenso.com`; + +type SeedTeamOptions = { + createTeamMembers?: number; + createTeamEmail?: true | string; +}; + +export const seedTeam = async ({ + createTeamMembers = 0, + createTeamEmail, +}: SeedTeamOptions = {}) => { + const teamUrl = `team-${Date.now()}`; + const teamEmail = createTeamEmail === true ? `${teamUrl}@${EMAIL_DOMAIN}` : createTeamEmail; + + const teamOwner = await seedUser({ + name: `${teamUrl}-original-owner`, + email: `${teamUrl}-original-owner@${EMAIL_DOMAIN}`, + }); + + const teamMembers = await Promise.all( + Array.from({ length: createTeamMembers }).map(async (_, i) => { + return seedUser({ + name: `${teamUrl}-member-${i + 1}`, + email: `${teamUrl}-member-${i + 1}@${EMAIL_DOMAIN}`, + }); + }), + ); + + const team = await prisma.team.create({ + data: { + name: teamUrl, + url: teamUrl, + ownerUserId: teamOwner.id, + members: { + createMany: { + data: [teamOwner, ...teamMembers].map((user) => ({ + userId: user.id, + role: TeamMemberRole.ADMIN, + })), + }, + }, + teamEmail: teamEmail + ? { + create: { + email: teamEmail, + name: teamEmail, + }, + } + : undefined, + }, + }); + + return await prisma.team.findFirstOrThrow({ + where: { + id: team.id, + }, + include: { + owner: true, + members: { + include: { + user: true, + }, + }, + teamEmail: true, + }, + }); +}; + +export const unseedTeam = async (teamUrl: string) => { + const team = await prisma.team.findUnique({ + where: { + url: teamUrl, + }, + include: { + members: true, + }, + }); + + if (!team) { + return; + } + + await prisma.team.delete({ + where: { + url: teamUrl, + }, + }); + + await prisma.user.deleteMany({ + where: { + id: { + in: team.members.map((member) => member.userId), + }, + }, + }); +}; + +export const seedTeamTransfer = async (options: { newOwnerUserId: number; teamId: number }) => { + return await prisma.teamTransferVerification.create({ + data: { + teamId: options.teamId, + token: Date.now().toString(), + expiresAt: new Date(Date.now() + 1000 * 60 * 60 * 24), + userId: options.newOwnerUserId, + name: '', + email: '', + }, + }); +}; + +export const seedTeamEmail = async ({ email, teamId }: { email: string; teamId: number }) => { + return await prisma.teamEmail.create({ + data: { + name: email, + email, + teamId, + }, + }); +}; + +export const unseedTeamEmail = async ({ teamId }: { teamId: number }) => { + return await prisma.teamEmail.delete({ + where: { + teamId, + }, + }); +}; + +export const seedTeamInvite = async ({ + email, + teamId, + role = TeamMemberRole.ADMIN, +}: { + email: string; + teamId: number; + role?: TeamMemberRole; +}) => { + return await prisma.teamMemberInvite.create({ + data: { + email, + teamId, + role, + status: TeamMemberInviteStatus.PENDING, + token: Date.now().toString(), + }, + }); +}; + +export const seedTeamEmailVerification = async ({ + email, + teamId, +}: { + email: string; + teamId: number; +}) => { + return await prisma.teamEmailVerification.create({ + data: { + teamId, + email, + name: email, + expiresAt: new Date(Date.now() + 1000 * 60 * 60 * 24), + token: Date.now().toString(), + }, + }); +}; + +export const unseedTeamEmailVerification = async ({ teamId }: { teamId: number }) => { + return await prisma.teamEmailVerification.delete({ + where: { + teamId, + }, + }); +}; diff --git a/packages/prisma/seed/users.ts b/packages/prisma/seed/users.ts new file mode 100644 index 000000000..ce3858bc6 --- /dev/null +++ b/packages/prisma/seed/users.ts @@ -0,0 +1,34 @@ +import { hashSync } from '@documenso/lib/server-only/auth/hash'; + +import { prisma } from '..'; + +type SeedUserOptions = { + name?: string; + email?: string; + password?: string; + verified?: boolean; +}; + +export const seedUser = async ({ + name = `user-${Date.now()}`, + email = `user-${Date.now()}@test.documenso.com`, + password = 'password', + verified = true, +}: SeedUserOptions = {}) => { + return await prisma.user.create({ + data: { + name, + email, + password: hashSync(password), + emailVerified: verified ? new Date() : undefined, + }, + }); +}; + +export const unseedUser = async (userId: number) => { + await prisma.user.delete({ + where: { + id: userId, + }, + }); +}; diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts index 9dba63797..5940d971d 100644 --- a/packages/trpc/server/document-router/router.ts +++ b/packages/trpc/server/document-router/router.ts @@ -36,10 +36,8 @@ export const documentRouter = router({ .input(ZGetDocumentByIdQuerySchema) .query(async ({ input, ctx }) => { try { - const { id } = input; - return await getDocumentById({ - id, + ...input, userId: ctx.user.id, }); } catch (err) { @@ -73,9 +71,9 @@ export const documentRouter = router({ .input(ZCreateDocumentMutationSchema) .mutation(async ({ input, ctx }) => { try { - const { title, documentDataId } = input; + const { title, documentDataId, teamId } = input; - const { remaining } = await getServerLimits({ email: ctx.user.email }); + const { remaining } = await getServerLimits({ email: ctx.user.email, teamId }); if (remaining.documents <= 0) { throw new TRPCError({ @@ -87,6 +85,7 @@ export const documentRouter = router({ return await createDocument({ userId: ctx.user.id, + teamId, title, documentDataId, }); @@ -245,12 +244,9 @@ export const documentRouter = router({ .input(ZResendDocumentMutationSchema) .mutation(async ({ input, ctx }) => { try { - const { documentId, recipients } = input; - return await resendDocument({ userId: ctx.user.id, - documentId, - recipients, + ...input, }); } catch (err) { console.error(err); @@ -266,14 +262,13 @@ export const documentRouter = router({ .input(ZGetDocumentByIdQuerySchema) .mutation(async ({ input, ctx }) => { try { - const { id } = input; - return await duplicateDocumentById({ - id, userId: ctx.user.id, + ...input, }); } catch (err) { console.log(err); + throw new TRPCError({ code: 'BAD_REQUEST', message: 'We are unable to duplicate this document. Please try again later.', diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts index 5d8c23c27..f8d008f50 100644 --- a/packages/trpc/server/document-router/schema.ts +++ b/packages/trpc/server/document-router/schema.ts @@ -4,6 +4,7 @@ import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/clie export const ZGetDocumentByIdQuerySchema = z.object({ id: z.number().min(1), + teamId: z.number().min(1).optional(), }); export type TGetDocumentByIdQuerySchema = z.infer; @@ -17,6 +18,7 @@ export type TGetDocumentByTokenQuerySchema = z.infer; @@ -86,6 +88,7 @@ export type TSetPasswordForDocumentMutationSchema = z.infer< export const ZResendDocumentMutationSchema = z.object({ documentId: z.number(), recipients: z.array(z.number()).min(1), + teamId: z.number().min(1).optional(), }); export type TSendDocumentMutationSchema = z.infer; diff --git a/packages/trpc/server/router.ts b/packages/trpc/server/router.ts index 3ed2a0d05..aec70fd63 100644 --- a/packages/trpc/server/router.ts +++ b/packages/trpc/server/router.ts @@ -7,6 +7,7 @@ import { profileRouter } from './profile-router/router'; import { recipientRouter } from './recipient-router/router'; import { shareLinkRouter } from './share-link-router/router'; import { singleplayerRouter } from './singleplayer-router/router'; +import { teamRouter } from './team-router/router'; import { templateRouter } from './template-router/router'; import { router } from './trpc'; import { twoFactorAuthenticationRouter } from './two-factor-authentication-router/router'; @@ -21,8 +22,9 @@ export const appRouter = router({ admin: adminRouter, shareLink: shareLinkRouter, singleplayer: singleplayerRouter, - twoFactorAuthentication: twoFactorAuthenticationRouter, + team: teamRouter, template: templateRouter, + twoFactorAuthentication: twoFactorAuthenticationRouter, }); export type AppRouter = typeof appRouter; diff --git a/packages/trpc/server/team-router/router.ts b/packages/trpc/server/team-router/router.ts new file mode 100644 index 000000000..dd2032daf --- /dev/null +++ b/packages/trpc/server/team-router/router.ts @@ -0,0 +1,508 @@ +import { getTeamPrices } from '@documenso/ee/server-only/stripe/get-team-prices'; +import { AppError } from '@documenso/lib/errors/app-error'; +import { acceptTeamInvitation } from '@documenso/lib/server-only/team/accept-team-invitation'; +import { createTeam } from '@documenso/lib/server-only/team/create-team'; +import { createTeamBillingPortal } from '@documenso/lib/server-only/team/create-team-billing-portal'; +import { createTeamPendingCheckoutSession } from '@documenso/lib/server-only/team/create-team-checkout-session'; +import { createTeamEmailVerification } from '@documenso/lib/server-only/team/create-team-email-verification'; +import { createTeamMemberInvites } from '@documenso/lib/server-only/team/create-team-member-invites'; +import { deleteTeam } from '@documenso/lib/server-only/team/delete-team'; +import { deleteTeamEmail } from '@documenso/lib/server-only/team/delete-team-email'; +import { deleteTeamEmailVerification } from '@documenso/lib/server-only/team/delete-team-email-verification'; +import { deleteTeamMemberInvitations } from '@documenso/lib/server-only/team/delete-team-invitations'; +import { deleteTeamMembers } from '@documenso/lib/server-only/team/delete-team-members'; +import { deleteTeamPending } from '@documenso/lib/server-only/team/delete-team-pending'; +import { deleteTeamTransferRequest } from '@documenso/lib/server-only/team/delete-team-transfer-request'; +import { findTeamInvoices } from '@documenso/lib/server-only/team/find-team-invoices'; +import { findTeamMemberInvites } from '@documenso/lib/server-only/team/find-team-member-invites'; +import { findTeamMembers } from '@documenso/lib/server-only/team/find-team-members'; +import { findTeams } from '@documenso/lib/server-only/team/find-teams'; +import { findTeamsPending } from '@documenso/lib/server-only/team/find-teams-pending'; +import { getTeamById } from '@documenso/lib/server-only/team/get-team'; +import { getTeamEmailByEmail } from '@documenso/lib/server-only/team/get-team-email-by-email'; +import { getTeamInvitations } from '@documenso/lib/server-only/team/get-team-invitations'; +import { getTeamMembers } from '@documenso/lib/server-only/team/get-team-members'; +import { getTeams } from '@documenso/lib/server-only/team/get-teams'; +import { leaveTeam } from '@documenso/lib/server-only/team/leave-team'; +import { requestTeamOwnershipTransfer } from '@documenso/lib/server-only/team/request-team-ownership-transfer'; +import { resendTeamEmailVerification } from '@documenso/lib/server-only/team/resend-team-email-verification'; +import { resendTeamMemberInvitation } from '@documenso/lib/server-only/team/resend-team-member-invitation'; +import { updateTeam } from '@documenso/lib/server-only/team/update-team'; +import { updateTeamEmail } from '@documenso/lib/server-only/team/update-team-email'; +import { updateTeamMember } from '@documenso/lib/server-only/team/update-team-member'; + +import { authenticatedProcedure, router } from '../trpc'; +import { + ZAcceptTeamInvitationMutationSchema, + ZCreateTeamBillingPortalMutationSchema, + ZCreateTeamEmailVerificationMutationSchema, + ZCreateTeamMemberInvitesMutationSchema, + ZCreateTeamMutationSchema, + ZCreateTeamPendingCheckoutMutationSchema, + ZDeleteTeamEmailMutationSchema, + ZDeleteTeamEmailVerificationMutationSchema, + ZDeleteTeamMemberInvitationsMutationSchema, + ZDeleteTeamMembersMutationSchema, + ZDeleteTeamMutationSchema, + ZDeleteTeamPendingMutationSchema, + ZDeleteTeamTransferRequestMutationSchema, + ZFindTeamInvoicesQuerySchema, + ZFindTeamMemberInvitesQuerySchema, + ZFindTeamMembersQuerySchema, + ZFindTeamsPendingQuerySchema, + ZFindTeamsQuerySchema, + ZGetTeamMembersQuerySchema, + ZGetTeamQuerySchema, + ZLeaveTeamMutationSchema, + ZRequestTeamOwnerhsipTransferMutationSchema, + ZResendTeamEmailVerificationMutationSchema, + ZResendTeamMemberInvitationMutationSchema, + ZUpdateTeamEmailMutationSchema, + ZUpdateTeamMemberMutationSchema, + ZUpdateTeamMutationSchema, +} from './schema'; + +export const teamRouter = router({ + acceptTeamInvitation: authenticatedProcedure + .input(ZAcceptTeamInvitationMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await acceptTeamInvitation({ + teamId: input.teamId, + userId: ctx.user.id, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + createBillingPortal: authenticatedProcedure + .input(ZCreateTeamBillingPortalMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await createTeamBillingPortal({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + createTeam: authenticatedProcedure + .input(ZCreateTeamMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await createTeam({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + createTeamEmailVerification: authenticatedProcedure + .input(ZCreateTeamEmailVerificationMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await createTeamEmailVerification({ + teamId: input.teamId, + userId: ctx.user.id, + data: { + email: input.email, + name: input.name, + }, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + createTeamMemberInvites: authenticatedProcedure + .input(ZCreateTeamMemberInvitesMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await createTeamMemberInvites({ + userId: ctx.user.id, + userName: ctx.user.name ?? '', + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + createTeamPendingCheckout: authenticatedProcedure + .input(ZCreateTeamPendingCheckoutMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await createTeamPendingCheckoutSession({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + deleteTeam: authenticatedProcedure + .input(ZDeleteTeamMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await deleteTeam({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + deleteTeamEmail: authenticatedProcedure + .input(ZDeleteTeamEmailMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await deleteTeamEmail({ + userId: ctx.user.id, + userEmail: ctx.user.email, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + deleteTeamEmailVerification: authenticatedProcedure + .input(ZDeleteTeamEmailVerificationMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await deleteTeamEmailVerification({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + deleteTeamMemberInvitations: authenticatedProcedure + .input(ZDeleteTeamMemberInvitationsMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await deleteTeamMemberInvitations({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + deleteTeamMembers: authenticatedProcedure + .input(ZDeleteTeamMembersMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await deleteTeamMembers({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + deleteTeamPending: authenticatedProcedure + .input(ZDeleteTeamPendingMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await deleteTeamPending({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + deleteTeamTransferRequest: authenticatedProcedure + .input(ZDeleteTeamTransferRequestMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await deleteTeamTransferRequest({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + findTeamInvoices: authenticatedProcedure + .input(ZFindTeamInvoicesQuerySchema) + .query(async ({ input, ctx }) => { + try { + return await findTeamInvoices({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + findTeamMemberInvites: authenticatedProcedure + .input(ZFindTeamMemberInvitesQuerySchema) + .query(async ({ input, ctx }) => { + try { + return await findTeamMemberInvites({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + findTeamMembers: authenticatedProcedure + .input(ZFindTeamMembersQuerySchema) + .query(async ({ input, ctx }) => { + try { + return await findTeamMembers({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + findTeams: authenticatedProcedure.input(ZFindTeamsQuerySchema).query(async ({ input, ctx }) => { + try { + return await findTeams({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + findTeamsPending: authenticatedProcedure + .input(ZFindTeamsPendingQuerySchema) + .query(async ({ input, ctx }) => { + try { + return await findTeamsPending({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + getTeam: authenticatedProcedure.input(ZGetTeamQuerySchema).query(async ({ input, ctx }) => { + try { + return await getTeamById({ teamId: input.teamId, userId: ctx.user.id }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + getTeamEmailByEmail: authenticatedProcedure.query(async ({ ctx }) => { + try { + return await getTeamEmailByEmail({ email: ctx.user.email }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + getTeamInvitations: authenticatedProcedure.query(async ({ ctx }) => { + try { + return await getTeamInvitations({ email: ctx.user.email }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + getTeamMembers: authenticatedProcedure + .input(ZGetTeamMembersQuerySchema) + .query(async ({ input, ctx }) => { + try { + return await getTeamMembers({ teamId: input.teamId, userId: ctx.user.id }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + getTeamPrices: authenticatedProcedure.query(async () => { + try { + return await getTeamPrices(); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + getTeams: authenticatedProcedure.query(async ({ ctx }) => { + try { + return await getTeams({ userId: ctx.user.id }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + leaveTeam: authenticatedProcedure + .input(ZLeaveTeamMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await leaveTeam({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + updateTeam: authenticatedProcedure + .input(ZUpdateTeamMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await updateTeam({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + updateTeamEmail: authenticatedProcedure + .input(ZUpdateTeamEmailMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await updateTeamEmail({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + updateTeamMember: authenticatedProcedure + .input(ZUpdateTeamMemberMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await updateTeamMember({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + requestTeamOwnershipTransfer: authenticatedProcedure + .input(ZRequestTeamOwnerhsipTransferMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + return await requestTeamOwnershipTransfer({ + userId: ctx.user.id, + userName: ctx.user.name ?? '', + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + resendTeamEmailVerification: authenticatedProcedure + .input(ZResendTeamEmailVerificationMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + await resendTeamEmailVerification({ + userId: ctx.user.id, + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), + + resendTeamMemberInvitation: authenticatedProcedure + .input(ZResendTeamMemberInvitationMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + await resendTeamMemberInvitation({ + userId: ctx.user.id, + userName: ctx.user.name ?? '', + ...input, + }); + } catch (err) { + console.error(err); + + throw AppError.parseErrorToTRPCError(err); + } + }), +}); diff --git a/packages/trpc/server/team-router/schema.ts b/packages/trpc/server/team-router/schema.ts new file mode 100644 index 000000000..953b12490 --- /dev/null +++ b/packages/trpc/server/team-router/schema.ts @@ -0,0 +1,213 @@ +import { z } from 'zod'; + +import { PROTECTED_TEAM_URLS } from '@documenso/lib/constants/teams'; +import { TeamMemberRole } from '@documenso/prisma/client'; + +const GenericFindQuerySchema = z.object({ + term: z.string().optional(), + page: z.number().optional(), + perPage: z.number().optional(), +}); + +/** + * Restrict team URLs schema. + * + * Allowed characters: + * - Alphanumeric + * - Lowercase + * - Dashes + * - Underscores + * + * Conditions: + * - 3-30 characters + * - Cannot start and end with underscores or dashes. + * - Cannot contain consecutive underscores or dashes. + * - Cannot be a reserved URL in the PROTECTED_TEAM_URLS list + */ +export const ZTeamUrlSchema = z + .string() + .trim() + .min(3, { message: 'Team URL must be at least 3 characters long.' }) + .max(30, { message: 'Team URL must not exceed 30 characters.' }) + .toLowerCase() + .regex(/^[a-z0-9].*[^_-]$/, 'Team URL cannot start or end with dashes or underscores.') + .regex(/^(?!.*[-_]{2})/, 'Team URL cannot contain consecutive dashes or underscores.') + .regex( + /^[a-z0-9]+(?:[-_][a-z0-9]+)*$/, + 'Team URL can only contain letters, numbers, dashes and underscores.', + ) + .refine((value) => !PROTECTED_TEAM_URLS.includes(value), { + message: 'This URL is already in use.', + }); + +export const ZTeamNameSchema = z + .string() + .trim() + .min(3, { message: 'Team name must be at least 3 characters long.' }) + .max(30, { message: 'Team name must not exceed 30 characters.' }); + +export const ZAcceptTeamInvitationMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZCreateTeamBillingPortalMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZCreateTeamMutationSchema = z.object({ + teamName: ZTeamNameSchema, + teamUrl: ZTeamUrlSchema, +}); + +export const ZCreateTeamEmailVerificationMutationSchema = z.object({ + teamId: z.number(), + name: z.string().trim().min(1, { message: 'Please enter a valid name.' }), + email: z.string().trim().email().toLowerCase().min(1, 'Please enter a valid email.'), +}); + +export const ZCreateTeamMemberInvitesMutationSchema = z.object({ + teamId: z.number(), + invitations: z.array( + z.object({ + email: z.string().email().toLowerCase(), + role: z.nativeEnum(TeamMemberRole), + }), + ), +}); + +export const ZCreateTeamPendingCheckoutMutationSchema = z.object({ + interval: z.union([z.literal('monthly'), z.literal('yearly')]), + pendingTeamId: z.number(), +}); + +export const ZDeleteTeamEmailMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZDeleteTeamEmailVerificationMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZDeleteTeamMembersMutationSchema = z.object({ + teamId: z.number(), + teamMemberIds: z.array(z.number()), +}); + +export const ZDeleteTeamMemberInvitationsMutationSchema = z.object({ + teamId: z.number(), + invitationIds: z.array(z.number()), +}); + +export const ZDeleteTeamMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZDeleteTeamPendingMutationSchema = z.object({ + pendingTeamId: z.number(), +}); + +export const ZDeleteTeamTransferRequestMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZFindTeamInvoicesQuerySchema = z.object({ + teamId: z.number(), +}); + +export const ZFindTeamMemberInvitesQuerySchema = GenericFindQuerySchema.extend({ + teamId: z.number(), +}); + +export const ZFindTeamMembersQuerySchema = GenericFindQuerySchema.extend({ + teamId: z.number(), +}); + +export const ZFindTeamsQuerySchema = GenericFindQuerySchema; + +export const ZFindTeamsPendingQuerySchema = GenericFindQuerySchema; + +export const ZGetTeamQuerySchema = z.object({ + teamId: z.number(), +}); + +export const ZGetTeamMembersQuerySchema = z.object({ + teamId: z.number(), +}); + +export const ZLeaveTeamMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZUpdateTeamMutationSchema = z.object({ + teamId: z.number(), + data: z.object({ + name: ZTeamNameSchema, + url: ZTeamUrlSchema, + }), +}); + +export const ZUpdateTeamEmailMutationSchema = z.object({ + teamId: z.number(), + data: z.object({ + name: z.string().trim().min(1), + }), +}); + +export const ZUpdateTeamMemberMutationSchema = z.object({ + teamId: z.number(), + teamMemberId: z.number(), + data: z.object({ + role: z.nativeEnum(TeamMemberRole), + }), +}); + +export const ZRequestTeamOwnerhsipTransferMutationSchema = z.object({ + teamId: z.number(), + newOwnerUserId: z.number(), + clearPaymentMethods: z.boolean(), +}); + +export const ZResendTeamEmailVerificationMutationSchema = z.object({ + teamId: z.number(), +}); + +export const ZResendTeamMemberInvitationMutationSchema = z.object({ + teamId: z.number(), + invitationId: z.number(), +}); + +export type TCreateTeamMutationSchema = z.infer; +export type TCreateTeamEmailVerificationMutationSchema = z.infer< + typeof ZCreateTeamEmailVerificationMutationSchema +>; +export type TCreateTeamMemberInvitesMutationSchema = z.infer< + typeof ZCreateTeamMemberInvitesMutationSchema +>; +export type TCreateTeamPendingCheckoutMutationSchema = z.infer< + typeof ZCreateTeamPendingCheckoutMutationSchema +>; +export type TDeleteTeamEmailMutationSchema = z.infer; +export type TDeleteTeamMembersMutationSchema = z.infer; +export type TDeleteTeamMutationSchema = z.infer; +export type TDeleteTeamPendingMutationSchema = z.infer; +export type TDeleteTeamTransferRequestMutationSchema = z.infer< + typeof ZDeleteTeamTransferRequestMutationSchema +>; +export type TFindTeamMemberInvitesQuerySchema = z.infer; +export type TFindTeamMembersQuerySchema = z.infer; +export type TFindTeamsQuerySchema = z.infer; +export type TFindTeamsPendingQuerySchema = z.infer; +export type TGetTeamQuerySchema = z.infer; +export type TGetTeamMembersQuerySchema = z.infer; +export type TLeaveTeamMutationSchema = z.infer; +export type TUpdateTeamMutationSchema = z.infer; +export type TUpdateTeamEmailMutationSchema = z.infer; +export type TRequestTeamOwnerhsipTransferMutationSchema = z.infer< + typeof ZRequestTeamOwnerhsipTransferMutationSchema +>; +export type TResendTeamEmailVerificationMutationSchema = z.infer< + typeof ZResendTeamEmailVerificationMutationSchema +>; +export type TResendTeamMemberInvitationMutationSchema = z.infer< + typeof ZResendTeamMemberInvitationMutationSchema +>; diff --git a/packages/ui/components/animate/animate-generic-fade-in-out.tsx b/packages/ui/components/animate/animate-generic-fade-in-out.tsx new file mode 100644 index 000000000..5f57c96df --- /dev/null +++ b/packages/ui/components/animate/animate-generic-fade-in-out.tsx @@ -0,0 +1,27 @@ +'use client'; + +import { motion } from 'framer-motion'; + +type AnimateGenericFadeInOutProps = { + children: React.ReactNode; + className?: string; +}; + +export const AnimateGenericFadeInOut = ({ children, className }: AnimateGenericFadeInOutProps) => { + return ( + + {children} + + ); +}; diff --git a/packages/ui/package.json b/packages/ui/package.json index 34675ba89..44d14cb82 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -35,7 +35,7 @@ "@radix-ui/react-checkbox": "^1.0.3", "@radix-ui/react-collapsible": "^1.0.2", "@radix-ui/react-context-menu": "^2.1.3", - "@radix-ui/react-dialog": "^1.0.3", + "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-dropdown-menu": "^2.0.4", "@radix-ui/react-hover-card": "^1.0.5", "@radix-ui/react-label": "^2.0.1", @@ -45,7 +45,7 @@ "@radix-ui/react-progress": "^1.0.2", "@radix-ui/react-radio-group": "^1.1.2", "@radix-ui/react-scroll-area": "^1.0.3", - "@radix-ui/react-select": "^1.2.1", + "@radix-ui/react-select": "^2.0.0", "@radix-ui/react-separator": "^1.0.2", "@radix-ui/react-slider": "^1.1.1", "@radix-ui/react-slot": "^1.0.2", diff --git a/packages/ui/primitives/avatar.tsx b/packages/ui/primitives/avatar.tsx index 0039ad4eb..c80e3a658 100644 --- a/packages/ui/primitives/avatar.tsx +++ b/packages/ui/primitives/avatar.tsx @@ -48,4 +48,37 @@ const AvatarFallback = React.forwardRef< AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName; -export { Avatar, AvatarImage, AvatarFallback }; +type AvatarWithTextProps = { + avatarClass?: string; + avatarFallback: string; + className?: string; + primaryText: React.ReactNode; + secondaryText?: React.ReactNode; + rightSideComponent?: React.ReactNode; +}; + +const AvatarWithText = ({ + avatarClass, + avatarFallback, + className, + primaryText, + secondaryText, + rightSideComponent, +}: AvatarWithTextProps) => ( +
+ + {avatarFallback} + + +
+ {primaryText} + {secondaryText} +
+ + {rightSideComponent} +
+); + +export { Avatar, AvatarImage, AvatarFallback, AvatarWithText }; diff --git a/packages/ui/primitives/badge.tsx b/packages/ui/primitives/badge.tsx index 1ff153f79..fd56bc1ce 100644 --- a/packages/ui/primitives/badge.tsx +++ b/packages/ui/primitives/badge.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; -import { VariantProps, cva } from 'class-variance-authority'; +import type { VariantProps } from 'class-variance-authority'; +import { cva } from 'class-variance-authority'; import { cn } from '../lib/utils'; diff --git a/packages/ui/primitives/button.tsx b/packages/ui/primitives/button.tsx index 5754b35a5..5fc3fc1bb 100644 --- a/packages/ui/primitives/button.tsx +++ b/packages/ui/primitives/button.tsx @@ -18,6 +18,7 @@ const buttonVariants = cva( secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80', ghost: 'hover:bg-accent hover:text-accent-foreground', link: 'underline-offset-4 hover:underline text-primary', + none: '', }, size: { default: 'h-10 py-2 px-4', diff --git a/packages/ui/primitives/command.tsx b/packages/ui/primitives/command.tsx index 65f88fc4e..fee5321cd 100644 --- a/packages/ui/primitives/command.tsx +++ b/packages/ui/primitives/command.tsx @@ -92,7 +92,7 @@ const CommandGroup = React.forwardRef< ) => (
); diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsx index 74764df80..9c8db7918 100644 --- a/packages/ui/primitives/document-flow/add-fields.tsx +++ b/packages/ui/primitives/document-flow/add-fields.tsx @@ -403,7 +403,7 @@ export const AddFieldsFormPartial = ({ {recipients.map((recipient) => ( { @@ -439,7 +439,7 @@ export const AddFieldsFormPartial = ({ ) : ( - + diff --git a/packages/ui/primitives/multi-select-combobox.tsx b/packages/ui/primitives/multi-select-combobox.tsx new file mode 100644 index 000000000..62e5fa2cf --- /dev/null +++ b/packages/ui/primitives/multi-select-combobox.tsx @@ -0,0 +1,165 @@ +'use client'; + +import * as React from 'react'; + +import { AnimatePresence } from 'framer-motion'; +import { Check, ChevronsUpDown, Loader, XIcon } from 'lucide-react'; + +import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out'; + +import { cn } from '../lib/utils'; +import { Button } from './button'; +import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem } from './command'; +import { Popover, PopoverContent, PopoverTrigger } from './popover'; + +type OptionValue = string | number | boolean | null; + +type ComboBoxOption = { + label: string; + value: T; + disabled?: boolean; +}; + +type MultiSelectComboboxProps = { + emptySelectionPlaceholder?: React.ReactNode | string; + enableClearAllButton?: boolean; + loading?: boolean; + inputPlaceholder?: string; + onChange: (_values: T[]) => void; + options: ComboBoxOption[]; + selectedValues: T[]; +}; + +/** + * Multi select combo box component which supports: + * + * - Label/value pairs + * - Loading state + * - Clear all button + */ +export function MultiSelectCombobox({ + emptySelectionPlaceholder = 'Select values...', + enableClearAllButton, + inputPlaceholder, + loading, + onChange, + options, + selectedValues, +}: MultiSelectComboboxProps) { + const [open, setOpen] = React.useState(false); + + const handleSelect = (selectedOption: T) => { + let newSelectedOptions = [...selectedValues, selectedOption]; + + if (selectedValues.includes(selectedOption)) { + newSelectedOptions = selectedValues.filter((v) => v !== selectedOption); + } + + onChange(newSelectedOptions); + + setOpen(false); + }; + + const selectedOptions = React.useMemo(() => { + return selectedValues.map((value): ComboBoxOption => { + const foundOption = options.find((option) => option.value === value); + + if (foundOption) { + return foundOption; + } + + let label = ''; + + if (typeof value === 'string' || typeof value === 'number') { + label = value.toString(); + } + + return { + label, + value, + }; + }); + }, [selectedValues, options]); + + const buttonLabel = React.useMemo(() => { + if (loading) { + return ''; + } + + if (selectedOptions.length === 0) { + return emptySelectionPlaceholder; + } + + return selectedOptions.map((option) => option.label).join(', '); + }, [selectedOptions, emptySelectionPlaceholder, loading]); + + const showClearButton = enableClearAllButton && selectedValues.length > 0; + + return ( + +
+ + + + + {/* This is placed outside the trigger since we can't have nested buttons. */} + {showClearButton && !loading && ( +
+ +
+ )} +
+ + + + + No value found. + + {options.map((option, i) => ( + handleSelect(option.value)}> + + {option.label} + + ))} + + + +
+ ); +} diff --git a/turbo.json b/turbo.json index b0a7a0fc6..4ea966a4d 100644 --- a/turbo.json +++ b/turbo.json @@ -43,7 +43,6 @@ "NEXT_PUBLIC_POSTHOG_KEY", "NEXT_PUBLIC_FEATURE_BILLING_ENABLED", "NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID", - "NEXT_PUBLIC_STRIPE_FREE_PLAN_ID", "NEXT_PUBLIC_DISABLE_SIGNUP", "NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT", "NEXT_PRIVATE_DATABASE_URL", From fe4345eeb9f3cfc891469d901ebde22554b9f634 Mon Sep 17 00:00:00 2001 From: rajesh <71485855+rajesh-1252@users.noreply.github.com> Date: Tue, 6 Feb 2024 11:15:46 +0530 Subject: [PATCH 110/311] fix: add responsive for blog preview mobile view (#906) This Issue https://github.com/documenso/documenso/issues/904 --- apps/marketing/src/app/(marketing)/layout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/src/app/(marketing)/layout.tsx b/apps/marketing/src/app/(marketing)/layout.tsx index 248414b33..dd1a46418 100644 --- a/apps/marketing/src/app/(marketing)/layout.tsx +++ b/apps/marketing/src/app/(marketing)/layout.tsx @@ -41,7 +41,7 @@ export default function MarketingLayout({ children }: MarketingLayoutProps) {
-
{children}
+
{children}
From 2636d5fd16b53c45d8e8664f96d514160bfe60ae Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Tue, 6 Feb 2024 18:04:56 +0530 Subject: [PATCH 111/311] chore: finish and clean-up redirect post signing Signed-off-by: Adithya Krishna --- .../src/app/(signing)/sign/[token]/form.tsx | 10 +- .../src/app/(signing)/sign/[token]/page.tsx | 17 +- apps/web/src/middleware.ts | 3 +- package-lock.json | 13 +- packages/email/package.json | 4 +- packages/lib/constants/url-regex.ts | 2 + .../document/duplicate-document-by-id.ts | 1 + .../document/get-document-by-token.ts | 1 + .../migration.sql | 0 packages/prisma/schema.prisma | 2 +- .../trpc/server/document-router/schema.ts | 8 +- .../primitives/document-flow/add-subject.tsx | 151 ++++++++++-------- .../document-flow/add-subject.types.ts | 8 +- 13 files changed, 128 insertions(+), 92 deletions(-) create mode 100644 packages/lib/constants/url-regex.ts rename packages/prisma/migrations/{20240131120410_add_document_meta_redirect_url => 20240206111230_add_document_meta_redirect_url}/migration.sql (100%) diff --git a/apps/web/src/app/(signing)/sign/[token]/form.tsx b/apps/web/src/app/(signing)/sign/[token]/form.tsx index f7b96be71..7e6cf26b8 100644 --- a/apps/web/src/app/(signing)/sign/[token]/form.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/form.tsx @@ -8,7 +8,6 @@ import { useSession } from 'next-auth/react'; import { useForm } from 'react-hook-form'; import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics'; -import { getDocumentMetaByDocumentId } from '@documenso/lib/server-only/document/get-document-meta-by-document-id'; import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields'; import { type Document, type Field, type Recipient, RecipientRole } from '@documenso/prisma/client'; import { trpc } from '@documenso/trpc/react'; @@ -27,9 +26,10 @@ export type SigningFormProps = { document: Document; recipient: Recipient; fields: Field[]; + redirectUrl?: string | null; }; -export const SigningForm = ({ document, recipient, fields }: SigningFormProps) => { +export const SigningForm = ({ document, recipient, fields, redirectUrl }: SigningFormProps) => { const router = useRouter(); const analytics = useAnalytics(); const { data: session } = useSession(); @@ -56,7 +56,6 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) = }; const onFormSubmit = async () => { - const documentMeta = await getDocumentMetaByDocumentId({ id: document!.id }).catch(() => null); setValidateUninsertedFields(true); const isFieldsValid = validateFieldsInserted(fields); @@ -75,9 +74,8 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) = documentId: document.id, timestamp: new Date().toISOString(), }); - documentMeta?.redirectUrl - ? router.push(documentMeta.redirectUrl) - : router.push(`/sign/${recipient.token}/complete`); + + redirectUrl ? router.push(redirectUrl) : router.push(`/sign/${recipient.token}/complete`); }; return ( diff --git a/apps/web/src/app/(signing)/sign/[token]/page.tsx b/apps/web/src/app/(signing)/sign/[token]/page.tsx index a1e1388cd..9a7e8acbe 100644 --- a/apps/web/src/app/(signing)/sign/[token]/page.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/page.tsx @@ -8,7 +8,6 @@ import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer'; import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones'; import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token'; -import { getDocumentMetaByDocumentId } from '@documenso/lib/server-only/document/get-document-meta-by-document-id'; import { viewedDocument } from '@documenso/lib/server-only/document/viewed-document'; import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token'; import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token'; @@ -49,15 +48,13 @@ export default async function SigningPage({ params: { token } }: SigningPageProp viewedDocument({ token }).catch(() => null), ]); - const documentMeta = await getDocumentMetaByDocumentId({ id: document!.id }).catch(() => null); - if (!document || !document.documentData || !recipient) { return notFound(); } const truncatedTitle = truncateTitle(document.title); - const { documentData } = document; + const { documentData, documentMeta } = document; const { user } = await getServerComponentSession(); @@ -65,8 +62,9 @@ export default async function SigningPage({ params: { token } }: SigningPageProp document.status === DocumentStatus.COMPLETED || recipient.signingStatus === SigningStatus.SIGNED ) { - // - redirect(`/sign/${token}/complete`); + documentMeta?.redirectUrl + ? redirect(documentMeta.redirectUrl) + : redirect(`/sign/${token}/complete`); } if (documentMeta?.password) { @@ -134,7 +132,12 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
- +
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts index 25bfbbb40..23c0a38c0 100644 --- a/apps/web/src/middleware.ts +++ b/apps/web/src/middleware.ts @@ -1,4 +1,5 @@ -import { NextRequest, NextResponse } from 'next/server'; +import type { NextRequest } from 'next/server'; +import { NextResponse } from 'next/server'; import { getToken } from 'next-auth/jwt'; diff --git a/package-lock.json b/package-lock.json index 9012d3f29..618dc4ce1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14610,6 +14610,7 @@ "version": "6.9.7", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.7.tgz", "integrity": "sha512-rUtR77ksqex/eZRLmQ21LKVH5nAAsVicAtAYudK7JgwenEDZ0UIQ1adUGqErz7sMkWYxWTTU1aeP2Jga6WQyJw==", + "peer": true, "engines": { "node": ">=6.0.0" } @@ -19602,14 +19603,14 @@ "@react-email/section": "0.0.10", "@react-email/tailwind": "0.0.9", "@react-email/text": "0.0.6", - "nodemailer": "^6.9.3", + "nodemailer": "^6.9.9", "react-email": "^1.9.5", "resend": "^2.0.0" }, "devDependencies": { "@documenso/tailwind-config": "*", "@documenso/tsconfig": "*", - "@types/nodemailer": "^6.4.8", + "@types/nodemailer": "^6.4.14", "tsup": "^7.1.0" } }, @@ -19627,6 +19628,14 @@ "node": ">=16.0.0" } }, + "packages/email/node_modules/nodemailer": { + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.9.tgz", + "integrity": "sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==", + "engines": { + "node": ">=6.0.0" + } + }, "packages/eslint-config": { "name": "@documenso/eslint-config", "version": "0.0.0", diff --git a/packages/email/package.json b/packages/email/package.json index d41a4c24c..984ea3d4c 100644 --- a/packages/email/package.json +++ b/packages/email/package.json @@ -35,14 +35,14 @@ "@react-email/section": "0.0.10", "@react-email/tailwind": "0.0.9", "@react-email/text": "0.0.6", - "nodemailer": "^6.9.3", + "nodemailer": "^6.9.9", "react-email": "^1.9.5", "resend": "^2.0.0" }, "devDependencies": { "@documenso/tailwind-config": "*", "@documenso/tsconfig": "*", - "@types/nodemailer": "^6.4.8", + "@types/nodemailer": "^6.4.14", "tsup": "^7.1.0" } } diff --git a/packages/lib/constants/url-regex.ts b/packages/lib/constants/url-regex.ts new file mode 100644 index 000000000..259ce070d --- /dev/null +++ b/packages/lib/constants/url-regex.ts @@ -0,0 +1,2 @@ +export const URL_REGEX = + /^(https?):\/\/(?:www\.)?[a-zA-Z0-9-]+\.[a-zA-Z0-9()]{2,}(?:\/[a-zA-Z0-9-._?&=/]*)?$/i; diff --git a/packages/lib/server-only/document/duplicate-document-by-id.ts b/packages/lib/server-only/document/duplicate-document-by-id.ts index ddb70b1cb..146d9d8fa 100644 --- a/packages/lib/server-only/document/duplicate-document-by-id.ts +++ b/packages/lib/server-only/document/duplicate-document-by-id.ts @@ -28,6 +28,7 @@ export const duplicateDocumentById = async ({ id, userId }: DuplicateDocumentByI dateFormat: true, password: true, timezone: true, + redirectUrl: true, }, }, }, diff --git a/packages/lib/server-only/document/get-document-by-token.ts b/packages/lib/server-only/document/get-document-by-token.ts index 62c8a5ca1..18f9a5161 100644 --- a/packages/lib/server-only/document/get-document-by-token.ts +++ b/packages/lib/server-only/document/get-document-by-token.ts @@ -27,6 +27,7 @@ export const getDocumentAndSenderByToken = async ({ include: { User: true, documentData: true, + documentMeta: true, }, }); diff --git a/packages/prisma/migrations/20240131120410_add_document_meta_redirect_url/migration.sql b/packages/prisma/migrations/20240206111230_add_document_meta_redirect_url/migration.sql similarity index 100% rename from packages/prisma/migrations/20240131120410_add_document_meta_redirect_url/migration.sql rename to packages/prisma/migrations/20240206111230_add_document_meta_redirect_url/migration.sql diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 5e9706b74..7096769b8 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -192,7 +192,7 @@ model DocumentMeta { dateFormat String? @default("yyyy-MM-dd hh:mm a") @db.Text documentId Int @unique document Document @relation(fields: [documentId], references: [id], onDelete: Cascade) - redirectUrl String? @db.Text + redirectUrl String? } enum ReadStatus { diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts index 8f63ebb9d..ff2c83a48 100644 --- a/packages/trpc/server/document-router/schema.ts +++ b/packages/trpc/server/document-router/schema.ts @@ -1,5 +1,6 @@ import { z } from 'zod'; +import { URL_REGEX } from '@documenso/lib/constants/url-regex'; import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/client'; export const ZGetDocumentByIdQuerySchema = z.object({ @@ -71,7 +72,12 @@ export const ZSendDocumentMutationSchema = z.object({ message: z.string(), timezone: z.string(), dateFormat: z.string(), - redirectUrl: z.string().optional(), + redirectUrl: z + .string() + .optional() + .refine((value) => value === undefined || URL_REGEX.test(value), { + message: 'Please enter a valid URL', + }), }), }); diff --git a/packages/ui/primitives/document-flow/add-subject.tsx b/packages/ui/primitives/document-flow/add-subject.tsx index 740dad6c4..7ce77710c 100644 --- a/packages/ui/primitives/document-flow/add-subject.tsx +++ b/packages/ui/primitives/document-flow/add-subject.tsx @@ -2,6 +2,7 @@ import { useEffect } from 'react'; +import { Info } from 'lucide-react'; import { Controller, useForm } from 'react-hook-form'; import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats'; @@ -23,6 +24,7 @@ import { SelectTrigger, SelectValue, } from '@documenso/ui/primitives/select'; +import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip'; import { Combobox } from '../combobox'; import { FormErrorMessage } from '../form/form-error-message'; @@ -69,7 +71,6 @@ export const AddSubjectFormPartial = ({ message: document.documentMeta?.message ?? '', timezone: document.documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE, dateFormat: document.documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT, - redirectUrl: document.documentMeta?.redirectUrl ?? '', }, }, }); @@ -164,86 +165,94 @@ export const AddSubjectFormPartial = ({
- {hasDateField && ( - - - - Advanced Options - + + + + Advanced Options + - -
- + + {hasDateField && ( + <> +
+ - ( - + + + - - {DATE_FORMATS.map((format) => ( - - {format.label} - - ))} - - - )} - /> -
+ + {DATE_FORMATS.map((format) => ( + + {format.label} + + ))} + + + )} + /> +
-
- +
+ - ( - value && onChange(value)} - disabled={documentHasBeenSent} - /> - )} - /> -
+ ( + value && onChange(value)} + disabled={documentHasBeenSent} + /> + )} + /> +
+ + )} -
-
-
- +
+
+
+ - -
+ + +
- - - - )} +
+ + +
diff --git a/packages/ui/primitives/document-flow/add-subject.types.ts b/packages/ui/primitives/document-flow/add-subject.types.ts index 285b8f813..fd4175368 100644 --- a/packages/ui/primitives/document-flow/add-subject.types.ts +++ b/packages/ui/primitives/document-flow/add-subject.types.ts @@ -2,6 +2,7 @@ import { z } from 'zod'; import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats'; import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones'; +import { URL_REGEX } from '@documenso/lib/constants/url-regex'; export const ZAddSubjectFormSchema = z.object({ meta: z.object({ @@ -9,7 +10,12 @@ export const ZAddSubjectFormSchema = z.object({ message: z.string(), timezone: z.string().optional().default(DEFAULT_DOCUMENT_TIME_ZONE), dateFormat: z.string().optional().default(DEFAULT_DOCUMENT_DATE_FORMAT), - redirectUrl: z.string().optional(), + redirectUrl: z + .string() + .optional() + .refine((value) => value === undefined || URL_REGEX.test(value), { + message: 'Please enter a valid URL', + }), }), }); From edeeaa56518f9b9b5c5b4fe8f39bb64856e9558b Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:00:28 +0200 Subject: [PATCH 112/311] feat: implement webhooks --- .../(dashboard)/settings/webhooks/page.tsx | 71 ++++++++ .../settings/layout/desktop-nav.tsx | 15 +- .../settings/layout/mobile-nav.tsx | 15 +- .../webhooks/create-webhook-dialog.tsx | 3 + .../webhooks/delete-webhook-dialog.tsx | 167 ++++++++++++++++++ apps/web/src/components/forms/webhook.tsx | 0 .../migration.sql | 19 ++ packages/prisma/schema.prisma | 18 ++ 8 files changed, 306 insertions(+), 2 deletions(-) create mode 100644 apps/web/src/app/(dashboard)/settings/webhooks/page.tsx create mode 100644 apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx create mode 100644 apps/web/src/components/(dashboard)/settings/webhooks/delete-webhook-dialog.tsx create mode 100644 apps/web/src/components/forms/webhook.tsx create mode 100644 packages/prisma/migrations/20240206131417_add_user_webhooks/migration.sql diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx new file mode 100644 index 000000000..e7445c1d9 --- /dev/null +++ b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx @@ -0,0 +1,71 @@ +'use client'; + +import { Zap } from 'lucide-react'; + +import { Button } from '@documenso/ui/primitives/button'; + +import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; +import { DeleteWebhookDialog } from '~/components/(dashboard)/settings/webhooks/delete-webhook-dialog'; + +export default function WebhookPage() { + // TODO: Fetch webhooks from the DB after implementing the backend + const webhooks = [ + { + id: 1, + secret: 'my-secret', + webhookUrl: 'https://example.com/webhook', + eventTriggers: ['document.created', 'document.signed'], + enabled: true, + userID: 1, + }, + ]; + + return ( +
+ + + + + {webhooks.length === 0 && ( + // TODO: Perhaps add some illustrations here to make the page more engaging +
+

+ You have no webhooks yet. Your webhooks will be shown here once you create them. +

+
+ )} + + {webhooks.length > 0 && ( +
+ {webhooks.map((webhook) => ( +
+
+
+

Webhook URL

+

{webhook.webhookUrl}

+

Event triggers

+ {webhook.eventTriggers.map((trigger, index) => ( +

+ {trigger} +

+ ))} +
+
+
+ + + + +
+
+ ))} +
+ )} +
+ ); +} diff --git a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx index c7ab61d8a..5b7a1b739 100644 --- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx @@ -5,7 +5,7 @@ import type { HTMLAttributes } from 'react'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; -import { CreditCard, Lock, User, Users } from 'lucide-react'; +import { CreditCard, Lock, User, Users, Webhook } from 'lucide-react'; import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag'; import { cn } from '@documenso/ui/lib/utils'; @@ -48,6 +48,19 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { + + + + + + + + + )} + + + + + Delete Webhook + + + Please note that this action is irreversible. Once confirmed, your webhook will be + permanently deleted. + + + +
+ +
+ ( + + + Confirm by typing:{' '} + + {deleteMessage} + + + + + + + + )} + /> + + +
+ + + +
+
+
+
+ +
+ + ); +}; diff --git a/apps/web/src/components/forms/webhook.tsx b/apps/web/src/components/forms/webhook.tsx new file mode 100644 index 000000000..e69de29bb diff --git a/packages/prisma/migrations/20240206131417_add_user_webhooks/migration.sql b/packages/prisma/migrations/20240206131417_add_user_webhooks/migration.sql new file mode 100644 index 000000000..7bf4e190f --- /dev/null +++ b/packages/prisma/migrations/20240206131417_add_user_webhooks/migration.sql @@ -0,0 +1,19 @@ +-- CreateEnum +CREATE TYPE "WebhookTriggerEvents" AS ENUM ('DOCUMENT_CREATED', 'DOCUMENT_SIGNED'); + +-- CreateTable +CREATE TABLE "Webhook" ( + "id" SERIAL NOT NULL, + "webhookUrl" TEXT NOT NULL, + "eventTriggers" "WebhookTriggerEvents"[], + "secret" TEXT, + "enabled" BOOLEAN NOT NULL DEFAULT true, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "userId" INTEGER NOT NULL, + + CONSTRAINT "Webhook_pkey" PRIMARY KEY ("id") +); + +-- AddForeignKey +ALTER TABLE "Webhook" ADD CONSTRAINT "Webhook_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 79dcdf6aa..f2ce12cab 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -47,6 +47,7 @@ model User { VerificationToken VerificationToken[] Template Template[] securityAuditLogs UserSecurityAuditLog[] + Webhooks Webhook[] @@index([email]) } @@ -94,6 +95,23 @@ model VerificationToken { user User @relation(fields: [userId], references: [id], onDelete: Cascade) } +enum WebhookTriggerEvents { + DOCUMENT_CREATED + DOCUMENT_SIGNED +} + +model Webhook { + id Int @id @default(autoincrement()) + webhookUrl String + eventTriggers WebhookTriggerEvents[] + secret String? + enabled Boolean @default(true) + createdAt DateTime @default(now()) + updatedAt DateTime @default(now()) @updatedAt + userId Int + User User @relation(fields: [userId], references: [id], onDelete: Cascade) +} + enum SubscriptionStatus { ACTIVE PAST_DUE From 2f696ddd13c245c9943e3b01ce69000609a95a86 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Tue, 6 Feb 2024 18:55:16 +0100 Subject: [PATCH 113/311] feat: blog article why i started documenso --- .../content/blog/why-i-started-documenso.mdx | 67 ++++++++++++++++++ apps/marketing/public/blog/burgers.jpeg | Bin 0 -> 166613 bytes 2 files changed, 67 insertions(+) create mode 100644 apps/marketing/content/blog/why-i-started-documenso.mdx create mode 100644 apps/marketing/public/blog/burgers.jpeg diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx new file mode 100644 index 000000000..58da0956e --- /dev/null +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -0,0 +1,67 @@ +--- +title: Why I started Documenso +description: TLDR; I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption and want to help make the internet/ world more open. +authorName: 'Timur Ercan' +authorImage: '/blog/blog-author-timur.jpeg' +authorRole: 'Co-Founder' +date: 2024-02-06 +Tags: + - Founders + - Mission + - Open Source +--- + +
+ + +
+ No the burger from the story. But it could be as well, the place is pretty generic. +
+
+ +> TLDR; I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption and want to help make the world/ Internet more open + +It’s hard to pinpoint when I decided to start Documenso. I first uttered the word “Documenso” while sitting in a restaurant with @FelixM while discussing what’s next in late 2022. Shortly after i sat down with a can of caffeine and started building Documenso 0.9. Starting Documenso is the most deliberate business decision I ever made. It was deliberate from the personal side and deliberate from the business side. + +Personally I’ve had some time off and was actively looking for my next move. Looking back, my first company I stumbled into, the second one less so, but I joined my co-founders and did not come up with the concept myself. While coming up with Documenso, I was deliberatly looking for: + +- An entrepreneurial space, that was big enough opportunity +- A huge macro trend, lifting everything in it’s space +- A mode of working that fits my personal flow (which luckily for me, pretty close to the modern startup/ tech scene) +- An bigger impact to be made, that just earning lots of money (though there is nothing wrong with that) + +Quick shoutout to everyone feeling even a pinch of imposter syndrom while calling themselves a founder. It was after 10 years, slightly after starting Documenso, that I started doing it in my head without cringing. So cut yourself some slack. Considering how long I’ve been doing this, I guess I would have earned the internal title sooner and so do you probably. So after grappeling with my identity for second, as is customary for founders, my decision to start this journey came pretty quickly. + +Aside from the personal dimension, I had a pretty clear mindset of what I was looking for. The criteria I go on describing happend to click into place one after another, in no particular order. Having experienced no market demand and a very grindy market, I was looking for something more fundamental. Something basic, infrastructure-like, with a huge demand. A growing market, deeply rooted in the growing digitalization of the world. + +And to be honest, I just always liked digital signature tools. It’s a product, easy enough to comprehend and build but complex and impactful enough to satisfy a hard need. It’s a product you can build very product-driven since the market and domain are well understood at this point. So when asked about what’s next for me, I literally said “digital, um, let’s say… signatures”. As it turns out, my first gut feeling was spot on, but how spot on I only realized when I started researching the space. An open source document signing company happens to be the perfect intersection of all criteria and personal preferences I described above, it’s pretty amazing actually: + +- The global signing market is huge and rapidly growing +- The signing space is huge dominated by one outdated player, to put it bluntly. Outdated in terms of tech, pricing and ecosystem +- The signing space is also ridiculously opaque for a space that is based on open web tech, open encryption tech and open signing standards. Even by closed source standards +- We are currently seeing a renaissance for commercial open source startups, combining venture founder financial with open source mechanics +- Rebuilding a fundamental infrastructure as open source with a meaningful scale, has a profoundly transformative effect for a space +- Working in open source requires you to be open, cooperative and inclusive. It also requires quite a bit of context jumping, “going with the flow” and empathy +- Apart from fixing the signing space, making Documenso successful, would be another domino tile toward open source eating the world, which is great for everyone + +Building a company is so complex, it can’t be planned out. Basing it on great fundamentals and the expected dynmamics it the best founders can do in my humble opinion. After these fundamental decisions you are (almost) just along for the ride and need to focus on solving the “convential” problems of starting a company the best you can. With digital signatures hitting so many point of my personal and professional checklist, this already was a great fit. What got me exited at first though, apart from the perspective of drinking caffeine and coding, was this: + +Roughly 13 years ago, I was launching my first product. We obviously wanted SSL encryption on the product site, so I had to buy an SSL certificate. ~$200ish, 2 years validity, from VeriSign I think. Apart from it being ridiculously complicated to get, even back then it bothered me, that we had basically paid for $200 for what is essentially a long number, someone generated. SSL wasn’t even that widespread back then, because it was mainly considered important for ecommerce, no wonder considering it costed so much. “Why would I encrypt a blog?”. Fast forward to today, and everyone can get a free SSL cert courtesy of Let’s Encrypt and browsers basically block unencrypted sites. Mostly even build into hosting plattforms so you barely even notice as a developer. + +I had forgotten all about that story until I realized, this is where signing is today. A global need, fullfilled only by closed ecosystem, not really state-of-the-art companies, leading to, let’s call it steep prices. I had for so long considered Let’s Encrypt a pillar of the open internet, that I forgot that they weren’t always there. One day someone said, let’s make the internet better. Signing is another domain, that should have had an open ecosystem for a long time. Another parallel to that story is the fact that the cryptographic certificates you need for document signing are also stuck in the “pre Let’s Encrypt world”. Free document signing certificates via "Let’s Sign" are now another todo on the [longterm roadmap](https://documen.so/roadmap) list for open signing ecossytem. Actually effecting this change in any way, is a huge driver for me, personally. + +Apart from my personal gripes with the coporate certificate industry, I always found encryption fascinating. It’s such a fundamental force in society when you think about it: Secure Communication, Secure Commerce and even internet native money (Bitcoin) was created using a bit of smart math. All these examples are expressions of very fundamental human behaviours, that should be enabled and protected by open infrastructures. + +I never told anyone before, but since starting Documenso I realized that I underestimated the impact and importance of open source for quite some time. When I was in University, I distantly remember my mindset of “yeah open source is nice, but the great, commercially successful products used in the real world are build by closed companies (aka Microsoft)” _shudder_ It was never really a conscious thought, but enough that I started learning MS Silverlight before plain Javascript. It was slowly over time, that I realized that open web standards are superior to closed ones and even later that I understood the same holds true for all software. Open sources fixes something in the economy, I find hard to articulate. I did my best in [commodifying signing]. + +To wrap this up, Documenso happens to be the perfect storm of market opportunity, my personal interests and passions. Creating a company people actually want to work for longterm while tackleing these issues is critical side quest of Documenso. This is not only about building the next generation signing tech, it’s also about doing our part to normalize open, healthy, efficient working cultures, tackling relevant problems. + +As always, feel free to connect on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord) if you have any questions or comments. + +Best from Hamburg\ +Timur diff --git a/apps/marketing/public/blog/burgers.jpeg b/apps/marketing/public/blog/burgers.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..4fd897e759cc088eed32481a498824eeb52b48dd GIT binary patch literal 166613 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⋘wh|Ug#R0FT_^yAf}%J4zTm;y4FN&ZDwp<` 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 LF`i2+hJXLrIGefV literal 0 HcmV?d00001 From 94ddb0252b099ad47579d3a009c140b39d0fd5eb Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Tue, 6 Feb 2024 19:09:27 +0100 Subject: [PATCH 114/311] fix: stuff --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index 58da0956e..31d29a1a6 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -26,7 +26,7 @@ Tags: > TLDR; I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption and want to help make the world/ Internet more open -It’s hard to pinpoint when I decided to start Documenso. I first uttered the word “Documenso” while sitting in a restaurant with @FelixM while discussing what’s next in late 2022. Shortly after i sat down with a can of caffeine and started building Documenso 0.9. Starting Documenso is the most deliberate business decision I ever made. It was deliberate from the personal side and deliberate from the business side. +It’s hard to pinpoint when I decided to start Documenso. I first uttered the word “Documenso” while sitting in a restaurant with [Felix](https://twitter.com/flxmgdnz), eating a burger and discussing what’s next in late 2022. Shortly after i sat down with a can of caffeine and started building Documenso 0.9. Starting Documenso is the most deliberate business decision I ever made. It was deliberate from the personal side and deliberate from the business side. Personally I’ve had some time off and was actively looking for my next move. Looking back, my first company I stumbled into, the second one less so, but I joined my co-founders and did not come up with the concept myself. While coming up with Documenso, I was deliberatly looking for: From 58e2eda5e9929c91fd5ab0a904cbbec2ecb8208f Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Wed, 7 Feb 2024 14:40:15 +1100 Subject: [PATCH 115/311] fix: update field remove logic --- packages/lib/server-only/field/set-fields-for-document.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/lib/server-only/field/set-fields-for-document.ts b/packages/lib/server-only/field/set-fields-for-document.ts index 2ba592f31..ecb45d461 100644 --- a/packages/lib/server-only/field/set-fields-for-document.ts +++ b/packages/lib/server-only/field/set-fields-for-document.ts @@ -56,11 +56,7 @@ export const setFieldsForDocument = async ({ }); const removedFields = existingFields.filter( - (existingField) => - !fields.find( - (field) => - field.id === existingField.id || field.signerEmail === existingField.Recipient?.email, - ), + (existingField) => !fields.find((field) => field.id === existingField.id), ); const linkedFields = fields From bf26f2cb9d972d17c2419f9a747d7e26b7e2f74e Mon Sep 17 00:00:00 2001 From: Sumit Bisht <75713174+sumitbishti@users.noreply.github.com> Date: Wed, 7 Feb 2024 10:55:39 +0530 Subject: [PATCH 116/311] fix: empty document titles (#917) fixes: #909 --- packages/ui/primitives/document-flow/add-title.tsx | 5 ++++- packages/ui/primitives/document-flow/add-title.types.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/ui/primitives/document-flow/add-title.tsx b/packages/ui/primitives/document-flow/add-title.tsx index 730c4248f..a6390fd3a 100644 --- a/packages/ui/primitives/document-flow/add-title.tsx +++ b/packages/ui/primitives/document-flow/add-title.tsx @@ -1,5 +1,6 @@ 'use client'; +import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; import type { Field, Recipient } from '@documenso/prisma/client'; @@ -10,6 +11,7 @@ import { Input } from '../input'; import { Label } from '../label'; import { useStep } from '../stepper'; import type { TAddTitleFormSchema } from './add-title.types'; +import { ZAddTitleFormSchema } from './add-title.types'; import { DocumentFlowFormContainerActions, DocumentFlowFormContainerContent, @@ -40,6 +42,7 @@ export const AddTitleFormPartial = ({ handleSubmit, formState: { errors, isSubmitting }, } = useForm({ + resolver: zodResolver(ZAddTitleFormSchema), defaultValues: { title: document.title, }, @@ -71,7 +74,7 @@ export const AddTitleFormPartial = ({ id="title" className="bg-background my-2" disabled={isSubmitting} - {...register('title', { required: "Title can't be empty" })} + {...register('title')} /> diff --git a/packages/ui/primitives/document-flow/add-title.types.ts b/packages/ui/primitives/document-flow/add-title.types.ts index aaa8c17e4..b910c060a 100644 --- a/packages/ui/primitives/document-flow/add-title.types.ts +++ b/packages/ui/primitives/document-flow/add-title.types.ts @@ -1,7 +1,7 @@ import { z } from 'zod'; export const ZAddTitleFormSchema = z.object({ - title: z.string().min(1), + title: z.string().trim().min(1, { message: "Title can't be empty" }), }); export type TAddTitleFormSchema = z.infer; From 7d39e3d0658206b34b3f1dc85a3457783c9f09ea Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Wed, 7 Feb 2024 21:32:44 +1100 Subject: [PATCH 117/311] feat: add team feature flag (#915) ## Description Add the ability to feature flag the teams feature via UI. Also added minor UI changes ## Checklist - [X] I have tested these changes locally and they work as expected. - [X] I have added/updated tests that prove the effectiveness of these changes. - [X] I have followed the project's coding style guidelines. --- .../components/(dashboard)/layout/header.tsx | 38 +++- .../(dashboard)/layout/mobile-navigation.tsx | 2 +- .../(dashboard)/layout/profile-dropdown.tsx | 169 ++++++++++++++++++ .../settings/layout/desktop-nav.tsx | 27 +-- .../settings/layout/mobile-nav.tsx | 27 +-- .../dialogs/create-team-checkout-dialog.tsx | 3 +- .../forms/2fa/authenticator-app.tsx | 2 - packages/lib/constants/feature-flags.ts | 1 + packages/ui/primitives/sheet.tsx | 9 +- 9 files changed, 244 insertions(+), 34 deletions(-) create mode 100644 apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx diff --git a/apps/web/src/components/(dashboard)/layout/header.tsx b/apps/web/src/components/(dashboard)/layout/header.tsx index 753f5fb11..65bb63230 100644 --- a/apps/web/src/components/(dashboard)/layout/header.tsx +++ b/apps/web/src/components/(dashboard)/layout/header.tsx @@ -7,6 +7,7 @@ import { useParams } from 'next/navigation'; import { MenuIcon, SearchIcon } from 'lucide-react'; +import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag'; import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams'; import { getRootHref } from '@documenso/lib/utils/params'; import type { User } from '@documenso/prisma/client'; @@ -18,6 +19,7 @@ import { CommandMenu } from '../common/command-menu'; import { DesktopNav } from './desktop-nav'; import { MenuSwitcher } from './menu-switcher'; import { MobileNavigation } from './mobile-navigation'; +import { ProfileDropdown } from './profile-dropdown'; export type HeaderProps = HTMLAttributes & { user: User; @@ -27,6 +29,10 @@ export type HeaderProps = HTMLAttributes & { export const Header = ({ className, user, teams, ...props }: HeaderProps) => { const params = useParams(); + const { getFlag } = useFeatureFlags(); + + const isTeamsEnabled = getFlag('app_teams'); + const [isCommandMenuOpen, setIsCommandMenuOpen] = useState(false); const [isHamburgerMenuOpen, setIsHamburgerMenuOpen] = useState(false); const [scrollY, setScrollY] = useState(0); @@ -41,6 +47,34 @@ export const Header = ({ className, user, teams, ...props }: HeaderProps) => { return () => window.removeEventListener('scroll', onScroll); }, []); + if (!isTeamsEnabled) { + return ( +
5 && 'border-b-border', + className, + )} + {...props} + > +
+ + + + + + +
+ +
+
+
+ ); + } + return (
{
diff --git a/apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx b/apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx index 7142de5dc..a77300d9e 100644 --- a/apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx +++ b/apps/web/src/components/(dashboard)/layout/mobile-navigation.tsx @@ -47,7 +47,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat return ( - + Documenso Logo { + const { getFlag } = useFeatureFlags(); + const { theme, setTheme } = useTheme(); + const isUserAdmin = isAdmin(user); + + const isBillingEnabled = getFlag('app_billing'); + + const avatarFallback = user.name + ? extractInitials(user.name) + : user.email.slice(0, 1).toUpperCase(); + + return ( + + + + + + + Account + + {isUserAdmin && ( + <> + + + + Admin + + + + + + )} + + + + + Profile + + + + + + + Security + + + + {isBillingEnabled && ( + + + + Billing + + + )} + + + + + + Templates + + + + + + + + Themes + + + + + + Light + + + + Dark + + + + System + + + + + + + + + + Star on Github + + + + + + + void signOut({ + callbackUrl: '/', + }) + } + > + + Sign Out + + + + ); +}; diff --git a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx index c7ab61d8a..572c91c76 100644 --- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx @@ -19,6 +19,7 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { const { getFlag } = useFeatureFlags(); const isBillingEnabled = getFlag('app_billing'); + const isTeamsEnabled = getFlag('app_teams'); return (
@@ -35,18 +36,20 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { - - - + {isTeamsEnabled && ( + + + + )} - - - + {isTeamsEnabled && ( + + + + )}
diff --git a/apps/web/src/components/forms/2fa/authenticator-app.tsx b/apps/web/src/components/forms/2fa/authenticator-app.tsx index 316272e34..3aa0e123e 100644 --- a/apps/web/src/components/forms/2fa/authenticator-app.tsx +++ b/apps/web/src/components/forms/2fa/authenticator-app.tsx @@ -30,13 +30,11 @@ export const AuthenticatorApp = ({ isTwoFactorEnabled }: AuthenticatorAppProps)
!open && setModalState(null)} /> !open && setModalState(null)} /> diff --git a/packages/lib/constants/feature-flags.ts b/packages/lib/constants/feature-flags.ts index e972b47c2..947409be1 100644 --- a/packages/lib/constants/feature-flags.ts +++ b/packages/lib/constants/feature-flags.ts @@ -17,6 +17,7 @@ export const FEATURE_FLAG_POLL_INTERVAL = 30000; */ export const LOCAL_FEATURE_FLAGS: Record = { app_billing: process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true', + app_teams: true, marketing_header_single_player_mode: false, } as const; diff --git a/packages/ui/primitives/sheet.tsx b/packages/ui/primitives/sheet.tsx index e9f1b4401..a6326de0f 100644 --- a/packages/ui/primitives/sheet.tsx +++ b/packages/ui/primitives/sheet.tsx @@ -3,7 +3,8 @@ import * as React from 'react'; import * as SheetPrimitive from '@radix-ui/react-dialog'; -import { VariantProps, cva } from 'class-variance-authority'; +import type { VariantProps } from 'class-variance-authority'; +import { cva } from 'class-variance-authority'; import { X } from 'lucide-react'; import { cn } from '../lib/utils'; @@ -12,7 +13,7 @@ const Sheet = SheetPrimitive.Root; const SheetTrigger = SheetPrimitive.Trigger; -const portalVariants = cva('fixed inset-0 z-50 flex', { +const portalVariants = cva('fixed inset-0 z-[61] flex', { variants: { position: { top: 'items-start', @@ -42,7 +43,7 @@ const SheetOverlay = React.forwardRef< >(({ className, children: _children, ...props }, ref) => ( Date: Wed, 7 Feb 2024 11:40:11 +0100 Subject: [PATCH 118/311] Update apps/marketing/content/blog/why-i-started-documenso.mdx Co-authored-by: Adithya Krishna --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index 31d29a1a6..eb7a492fe 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -20,7 +20,7 @@ Tags: />
- No the burger from the story. But it could be as well, the place is pretty generic. + Not the burger from the story. But it could be as well, the place is pretty generic.
From 2431db06f56ae1150b5e4509459fa73982f515f4 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 7 Feb 2024 11:41:14 +0100 Subject: [PATCH 119/311] Update apps/marketing/content/blog/why-i-started-documenso.mdx Co-authored-by: Adithya Krishna --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index eb7a492fe..f270208c3 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -26,7 +26,7 @@ Tags: > TLDR; I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption and want to help make the world/ Internet more open -It’s hard to pinpoint when I decided to start Documenso. I first uttered the word “Documenso” while sitting in a restaurant with [Felix](https://twitter.com/flxmgdnz), eating a burger and discussing what’s next in late 2022. Shortly after i sat down with a can of caffeine and started building Documenso 0.9. Starting Documenso is the most deliberate business decision I ever made. It was deliberate from the personal side and deliberate from the business side. +It’s hard to pinpoint when I decided to start Documenso. I first uttered the word “Documenso” while sitting in a restaurant with [Felix](https://twitter.com/flxmgdnz), eating a burger and discussing what’s next in late 2022. Shortly after I sat down with a can of caffeine and started building Documenso 0.9. Starting Documenso is the most deliberate business decision I ever made. It was deliberate from the personal side and deliberate from the business side. Personally I’ve had some time off and was actively looking for my next move. Looking back, my first company I stumbled into, the second one less so, but I joined my co-founders and did not come up with the concept myself. While coming up with Documenso, I was deliberatly looking for: From 2e719288ffa811a1bfb3948653e487f30bd8b637 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 7 Feb 2024 11:41:32 +0100 Subject: [PATCH 120/311] Update apps/marketing/content/blog/why-i-started-documenso.mdx Co-authored-by: Adithya Krishna --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index f270208c3..dc165dad5 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -49,7 +49,7 @@ And to be honest, I just always liked digital signature tools. It’s a product, - Working in open source requires you to be open, cooperative and inclusive. It also requires quite a bit of context jumping, “going with the flow” and empathy - Apart from fixing the signing space, making Documenso successful, would be another domino tile toward open source eating the world, which is great for everyone -Building a company is so complex, it can’t be planned out. Basing it on great fundamentals and the expected dynmamics it the best founders can do in my humble opinion. After these fundamental decisions you are (almost) just along for the ride and need to focus on solving the “convential” problems of starting a company the best you can. With digital signatures hitting so many point of my personal and professional checklist, this already was a great fit. What got me exited at first though, apart from the perspective of drinking caffeine and coding, was this: +Building a company is so complex, it can’t be planned out. Basing it on great fundamentals and the expected dynamics it is the best founders can do in my humble opinion. After these fundamental decisions, you are (almost) just along for the ride and need to focus on solving the “conventional” problems of starting a company the best you can. With digital signatures hitting so many points of my personal and professional checklist, this already was a great fit. What got me excited at first though, apart from the perspective of drinking caffeine and coding, was this: Roughly 13 years ago, I was launching my first product. We obviously wanted SSL encryption on the product site, so I had to buy an SSL certificate. ~$200ish, 2 years validity, from VeriSign I think. Apart from it being ridiculously complicated to get, even back then it bothered me, that we had basically paid for $200 for what is essentially a long number, someone generated. SSL wasn’t even that widespread back then, because it was mainly considered important for ecommerce, no wonder considering it costed so much. “Why would I encrypt a blog?”. Fast forward to today, and everyone can get a free SSL cert courtesy of Let’s Encrypt and browsers basically block unencrypted sites. Mostly even build into hosting plattforms so you barely even notice as a developer. From 58477e060aba7a5f97e1aa981c79000b827cf5aa Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 7 Feb 2024 11:41:40 +0100 Subject: [PATCH 121/311] Update apps/marketing/content/blog/why-i-started-documenso.mdx Co-authored-by: Adithya Krishna --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index dc165dad5..13db38209 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -51,7 +51,7 @@ And to be honest, I just always liked digital signature tools. It’s a product, Building a company is so complex, it can’t be planned out. Basing it on great fundamentals and the expected dynamics it is the best founders can do in my humble opinion. After these fundamental decisions, you are (almost) just along for the ride and need to focus on solving the “conventional” problems of starting a company the best you can. With digital signatures hitting so many points of my personal and professional checklist, this already was a great fit. What got me excited at first though, apart from the perspective of drinking caffeine and coding, was this: -Roughly 13 years ago, I was launching my first product. We obviously wanted SSL encryption on the product site, so I had to buy an SSL certificate. ~$200ish, 2 years validity, from VeriSign I think. Apart from it being ridiculously complicated to get, even back then it bothered me, that we had basically paid for $200 for what is essentially a long number, someone generated. SSL wasn’t even that widespread back then, because it was mainly considered important for ecommerce, no wonder considering it costed so much. “Why would I encrypt a blog?”. Fast forward to today, and everyone can get a free SSL cert courtesy of Let’s Encrypt and browsers basically block unencrypted sites. Mostly even build into hosting plattforms so you barely even notice as a developer. +Roughly 13 years ago, I was launching my first product. We obviously wanted SSL encryption on the product site, so I had to buy an SSL certificate. ~$200ish, 2 years validity, from VeriSign I think. Apart from it being ridiculously complicated to get, even back then it bothered me, that we had basically paid for $200 for what is essentially a long number, someone generated. SSL wasn’t even that widespread back then, because it was mainly considered important for e-commerce, no wonder considering it cost so much. “Why would I encrypt a blog?”. Fast forward to today, and everyone can get a free SSL cert courtesy of Let’s Encrypt and browsers block unencrypted sites. Mostly even build into hosting platforms so you barely even notice as a developer. I had forgotten all about that story until I realized, this is where signing is today. A global need, fullfilled only by closed ecosystem, not really state-of-the-art companies, leading to, let’s call it steep prices. I had for so long considered Let’s Encrypt a pillar of the open internet, that I forgot that they weren’t always there. One day someone said, let’s make the internet better. Signing is another domain, that should have had an open ecosystem for a long time. Another parallel to that story is the fact that the cryptographic certificates you need for document signing are also stuck in the “pre Let’s Encrypt world”. Free document signing certificates via "Let’s Sign" are now another todo on the [longterm roadmap](https://documen.so/roadmap) list for open signing ecossytem. Actually effecting this change in any way, is a huge driver for me, personally. From 718f5664ac9ca6b38514f0a1bb1735c2681aa8f1 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 7 Feb 2024 12:00:01 +0100 Subject: [PATCH 122/311] Update apps/marketing/content/blog/why-i-started-documenso.mdx Co-authored-by: Adithya Krishna --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index 13db38209..95f750e9b 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -53,7 +53,7 @@ Building a company is so complex, it can’t be planned out. Basing it on great Roughly 13 years ago, I was launching my first product. We obviously wanted SSL encryption on the product site, so I had to buy an SSL certificate. ~$200ish, 2 years validity, from VeriSign I think. Apart from it being ridiculously complicated to get, even back then it bothered me, that we had basically paid for $200 for what is essentially a long number, someone generated. SSL wasn’t even that widespread back then, because it was mainly considered important for e-commerce, no wonder considering it cost so much. “Why would I encrypt a blog?”. Fast forward to today, and everyone can get a free SSL cert courtesy of Let’s Encrypt and browsers block unencrypted sites. Mostly even build into hosting platforms so you barely even notice as a developer. -I had forgotten all about that story until I realized, this is where signing is today. A global need, fullfilled only by closed ecosystem, not really state-of-the-art companies, leading to, let’s call it steep prices. I had for so long considered Let’s Encrypt a pillar of the open internet, that I forgot that they weren’t always there. One day someone said, let’s make the internet better. Signing is another domain, that should have had an open ecosystem for a long time. Another parallel to that story is the fact that the cryptographic certificates you need for document signing are also stuck in the “pre Let’s Encrypt world”. Free document signing certificates via "Let’s Sign" are now another todo on the [longterm roadmap](https://documen.so/roadmap) list for open signing ecossytem. Actually effecting this change in any way, is a huge driver for me, personally. +I had forgotten all about that story until I realized, this is where signing is today. A global need, fulfilled only by closed ecosystem, not really state-of-the-art companies, leading to, let’s call it steep prices. I had for so long considered Let’s Encrypt a pillar of the open internet, that I forgot that they weren’t always there. One day someone said, let’s make the internet better. Signing is another domain, that should have had an open ecosystem for a long time. Another parallel to that story is the fact that the cryptographic certificates you need for document signing are also stuck in the “pre Let’s Encrypt world”. Free document signing certificates via "Let’s Sign" are now another to-do on the [longterm roadmap](https://documen.so/roadmap) list for the open signing ecosystem. Effecting this change in any way is a huge driver for me. Apart from my personal gripes with the coporate certificate industry, I always found encryption fascinating. It’s such a fundamental force in society when you think about it: Secure Communication, Secure Commerce and even internet native money (Bitcoin) was created using a bit of smart math. All these examples are expressions of very fundamental human behaviours, that should be enabled and protected by open infrastructures. From b6bdbf72a71b59c3ebc54119b36edf5ca7e2375f Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 7 Feb 2024 12:00:12 +0100 Subject: [PATCH 123/311] Update apps/marketing/content/blog/why-i-started-documenso.mdx Co-authored-by: Adithya Krishna --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index 95f750e9b..228efdc0f 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -59,7 +59,7 @@ Apart from my personal gripes with the coporate certificate industry, I always f I never told anyone before, but since starting Documenso I realized that I underestimated the impact and importance of open source for quite some time. When I was in University, I distantly remember my mindset of “yeah open source is nice, but the great, commercially successful products used in the real world are build by closed companies (aka Microsoft)” _shudder_ It was never really a conscious thought, but enough that I started learning MS Silverlight before plain Javascript. It was slowly over time, that I realized that open web standards are superior to closed ones and even later that I understood the same holds true for all software. Open sources fixes something in the economy, I find hard to articulate. I did my best in [commodifying signing]. -To wrap this up, Documenso happens to be the perfect storm of market opportunity, my personal interests and passions. Creating a company people actually want to work for longterm while tackleing these issues is critical side quest of Documenso. This is not only about building the next generation signing tech, it’s also about doing our part to normalize open, healthy, efficient working cultures, tackling relevant problems. +To wrap this up, Documenso happens to be the perfect storm of market opportunity, my interests, and my passions. Creating a company people want to work for the long term while tackling these issues is a critical side quest of Documenso. This is not only about building the next generation of signing tech, it’s also about doing our part to normalize open, healthy, efficient working cultures, and tackling relevant problems. As always, feel free to connect on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord) if you have any questions or comments. From 33ab8797a556a5388bb38b0c55daec6c930cf214 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 7 Feb 2024 12:22:07 +0100 Subject: [PATCH 124/311] chore: text --- apps/marketing/content/blog/why-i-started-documenso.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index 228efdc0f..458a4823a 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -1,6 +1,6 @@ --- title: Why I started Documenso -description: TLDR; I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption and want to help make the internet/ world more open. +description: I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption and want to help make the internet/ world more open. authorName: 'Timur Ercan' authorImage: '/blog/blog-author-timur.jpeg' authorRole: 'Co-Founder' From e2a5638f50cdb51eb32c9070faebfbce52f67be1 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 7 Feb 2024 13:07:22 +0100 Subject: [PATCH 125/311] chore: fixed --- .../content/blog/why-i-started-documenso.mdx | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index 458a4823a..2fceddd25 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -24,44 +24,45 @@ Tags: -> TLDR; I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption and want to help make the world/ Internet more open +> TLDR; I started Documenso because I wanted to build a modern tech company in a growing space with a mission bigger than money, I overpaid for a SSL cert 13 years ago, like encryption, and wanted to help make the world/ Internet more open. -It’s hard to pinpoint when I decided to start Documenso. I first uttered the word “Documenso” while sitting in a restaurant with [Felix](https://twitter.com/flxmgdnz), eating a burger and discussing what’s next in late 2022. Shortly after I sat down with a can of caffeine and started building Documenso 0.9. Starting Documenso is the most deliberate business decision I ever made. It was deliberate from the personal side and deliberate from the business side. +It's hard to pinpoint when I decided to start Documenso. I first uttered the word "Documenso" while sitting in a restaurant with [Felix](https://twitter.com/flxmgdnz), eating a burger and discussing what's next in late 2022. Shortly after, I sat down with a can of caffeine and started building [Documenso 0.9](https://github.com/documenso/documenso/releases/tag/0.9-developer-preview). Starting Documenso is the most deliberate business decision I ever made. It was deliberate from the personal side and deliberate from the business side. -Personally I’ve had some time off and was actively looking for my next move. Looking back, my first company I stumbled into, the second one less so, but I joined my co-founders and did not come up with the concept myself. While coming up with Documenso, I was deliberatly looking for: +Looking at the personal side, I've had some time off and was actively looking for my next move. Looking back, I stumbled into my first company. Less so with the second one, but I joined my co-founders and did not develop the core concept myself. While coming up with Documenso, I was deliberately looking for a few things, based on my previous experiences: -- An entrepreneurial space, that was big enough opportunity -- A huge macro trend, lifting everything in it’s space -- A mode of working that fits my personal flow (which luckily for me, pretty close to the modern startup/ tech scene) -- An bigger impact to be made, that just earning lots of money (though there is nothing wrong with that) +- An entrepreneurial space that was a big enough opportunity +- A huge macro trend, lifting everything in it's space +- A mode of working that fits my flow (which, luckily for me, is pretty close to the modern startup/ tech scene) +- A more significant impact to be made than just earning lots of money (though there is nothing wrong with that) -Quick shoutout to everyone feeling even a pinch of imposter syndrom while calling themselves a founder. It was after 10 years, slightly after starting Documenso, that I started doing it in my head without cringing. So cut yourself some slack. Considering how long I’ve been doing this, I guess I would have earned the internal title sooner and so do you probably. So after grappeling with my identity for second, as is customary for founders, my decision to start this journey came pretty quickly. +Quick shoutout to everyone feeling even a pinch of imposter syndrome while calling themselves a founder. It was after ten years, slightly after starting Documenso, that I started doing it in my head without cringing. So cut yourself some slack. Considering how long I've been doing this, I would have earned the internal title sooner, and so do you. After grappling with my identity for a second, as is customary for founders, my decision to start this journey came quickly. -Aside from the personal dimension, I had a pretty clear mindset of what I was looking for. The criteria I go on describing happend to click into place one after another, in no particular order. Having experienced no market demand and a very grindy market, I was looking for something more fundamental. Something basic, infrastructure-like, with a huge demand. A growing market, deeply rooted in the growing digitalization of the world. +Aside from the personal dimension, I had a clear mindset of what I wanted. The criteria I describe below clicked into place one after another, in no particular order. Having experienced no market demand and a very gritty, grindy market, I was looking for something more fundamental. Something basic, infrastructure-like, with a huge demand. A growing market deeply rooted in the ever-increasing digitalization of the world. -And to be honest, I just always liked digital signature tools. It’s a product, easy enough to comprehend and build but complex and impactful enough to satisfy a hard need. It’s a product you can build very product-driven since the market and domain are well understood at this point. So when asked about what’s next for me, I literally said “digital, um, let’s say… signatures”. As it turns out, my first gut feeling was spot on, but how spot on I only realized when I started researching the space. An open source document signing company happens to be the perfect intersection of all criteria and personal preferences I described above, it’s pretty amazing actually: +And to be honest, I just always liked digital signature tools. It's a product that is easy enough to comprehend and build but complex and impactful enough to satisfy a hard need. It's a product you can build very product-driven since the market and domain are well understood. So when asked about what's next for me, I literally said, "Digital, um, let's say… signatures". As it turns out, my first gut feeling was spot on, but how spot on I only realized when I started researching the space. An open source document signing company happens to be the perfect intersection of all the criteria and personal preferences I described above; it's pretty amazing, actually: -- The global signing market is huge and rapidly growing -- The signing space is huge dominated by one outdated player, to put it bluntly. Outdated in terms of tech, pricing and ecosystem -- The signing space is also ridiculously opaque for a space that is based on open web tech, open encryption tech and open signing standards. Even by closed source standards -- We are currently seeing a renaissance for commercial open source startups, combining venture founder financial with open source mechanics -- Rebuilding a fundamental infrastructure as open source with a meaningful scale, has a profoundly transformative effect for a space -- Working in open source requires you to be open, cooperative and inclusive. It also requires quite a bit of context jumping, “going with the flow” and empathy -- Apart from fixing the signing space, making Documenso successful, would be another domino tile toward open source eating the world, which is great for everyone +- The global signing market is enormous and rapidly growing +- To put it bluntly, the signing space is vast and dominated by one outdated player. Outdated in terms of tech, pricing, and ecosystem +- The signing space is also ridiculously opaque for a space based on open web tech, open encryption tech, and open signing standards. Even by closed-source standards +- We are currently seeing a renaissance for commercial open source startups, combining venture founder financials with open source mechanics +- Rebuilding a fundamental infrastructure as open source with a meaningful scale has a profoundly transformative effect on any space +- Working in open source requires being open, cooperative, and inclusive. It also requires quite a bit of context jumping, "going with the flow," and empathy +- Apart from fixing the signing space, making Documenso successful would be another domino tile toward open source eating the world, which is great for everyone -Building a company is so complex, it can’t be planned out. Basing it on great fundamentals and the expected dynamics it is the best founders can do in my humble opinion. After these fundamental decisions, you are (almost) just along for the ride and need to focus on solving the “conventional” problems of starting a company the best you can. With digital signatures hitting so many points of my personal and professional checklist, this already was a great fit. What got me excited at first though, apart from the perspective of drinking caffeine and coding, was this: +Building a company is so complex it can't be planned out. Basing it on great fundamentals and the expected dynamics is the best founders can do, in my humble opinion. After these fundamental decisions, you are (almost) just along for the ride and need to focus on solving the "conventional" problems of starting a company the best you can. With digital signatures hitting so many points of my personal and professional checklist, this already was a great fit. What got me excited at first, though, apart from the perspective of drinking caffeine and coding, was this: -Roughly 13 years ago, I was launching my first product. We obviously wanted SSL encryption on the product site, so I had to buy an SSL certificate. ~$200ish, 2 years validity, from VeriSign I think. Apart from it being ridiculously complicated to get, even back then it bothered me, that we had basically paid for $200 for what is essentially a long number, someone generated. SSL wasn’t even that widespread back then, because it was mainly considered important for e-commerce, no wonder considering it cost so much. “Why would I encrypt a blog?”. Fast forward to today, and everyone can get a free SSL cert courtesy of Let’s Encrypt and browsers block unencrypted sites. Mostly even build into hosting platforms so you barely even notice as a developer. +Roughly 13 years ago, I was launching my first product. We obviously wanted SSL encryption on the product site, so I had to buy an SSL certificate. ~$200ish, two years validity, from VeriSign, I think. Apart from it being ridiculously complicated to get, it bothered me that we had basically paid $200 for what is essentially a long number someone generated. SSL wasn't even that widespread back then because it was mainly considered important for e-commerce, no wonder considering it cost so much. "Why would I encrypt a blog?". Fast forward to today, and everyone can get a free SSL cert courtesy of [Let's Encrypt](https://letsencrypt.org/) and browsers are basically blocking unencrypted sites. Mostly, it is even built into hosting platforms, so you barely even notice as a developer. -I had forgotten all about that story until I realized, this is where signing is today. A global need, fulfilled only by closed ecosystem, not really state-of-the-art companies, leading to, let’s call it steep prices. I had for so long considered Let’s Encrypt a pillar of the open internet, that I forgot that they weren’t always there. One day someone said, let’s make the internet better. Signing is another domain, that should have had an open ecosystem for a long time. Another parallel to that story is the fact that the cryptographic certificates you need for document signing are also stuck in the “pre Let’s Encrypt world”. Free document signing certificates via "Let’s Sign" are now another to-do on the [longterm roadmap](https://documen.so/roadmap) list for the open signing ecosystem. Effecting this change in any way is a huge driver for me. +I had forgotten all about that story until I realized this is where signing is today. A global need fulfilled only by a closed ecosystem, not really state-of-the-art companies, leading to, let's call it, steep prices. I had considered Let's Encrypt a pillar of the open internet for so long that I forgot that they weren't always there. One day, someone said, let's make the internet better. Signing is another domain that should have had an open ecosystem for a long time. Another parallel to that story is the fact that the cryptographic certificates you need for document signing are also stuck in the "pre-Let's Encrypt world." Free document signing certificates via "Let's Sign" are now another to-do on the [long-term roadmap](https://documen.so/roadmap) list for the open signing ecosystem. Effecting this change in any way is a huge driver for me. -Apart from my personal gripes with the coporate certificate industry, I always found encryption fascinating. It’s such a fundamental force in society when you think about it: Secure Communication, Secure Commerce and even internet native money (Bitcoin) was created using a bit of smart math. All these examples are expressions of very fundamental human behaviours, that should be enabled and protected by open infrastructures. +Apart from my personal gripes with the corporate certificate industry, I have always found encryption fascinating. It's such a fundamental force in society when you think about it: Secure Communication, Secure Commerce, and even [internet native, open source money (Bitcoin)](https://github.com/bitcoin/bitcoin) were created using a bit of smart math. All these examples are expressions of very fundamental human behaviors that should be enabled and protected by open infrastructures. -I never told anyone before, but since starting Documenso I realized that I underestimated the impact and importance of open source for quite some time. When I was in University, I distantly remember my mindset of “yeah open source is nice, but the great, commercially successful products used in the real world are build by closed companies (aka Microsoft)” _shudder_ It was never really a conscious thought, but enough that I started learning MS Silverlight before plain Javascript. It was slowly over time, that I realized that open web standards are superior to closed ones and even later that I understood the same holds true for all software. Open sources fixes something in the economy, I find hard to articulate. I did my best in [commodifying signing]. +I never told rthis to anyone before, but since starting Documenso, I realized that I underestimated the impact and importance of open source for quite some time. When I was in University, I distantly remember my mindset of "yeah, open source is nice, but the great, commercially successful products used in the real world are built by closed companies (aka Microsoft)" _shudder_ It was never really a conscious thought, but enough that I started learning MS Silverlight before plain Javascript. It was slowly, over time, that I realized that open web standards are superior to closed ones, and even later, I understood the same holds true for all software. Open source fixes something in the economy I find hard to articulate. I did my best in [Commodifying Signing](https://documenso.com/blog/commodifying-signing). -To wrap this up, Documenso happens to be the perfect storm of market opportunity, my interests, and my passions. Creating a company people want to work for the long term while tackling these issues is a critical side quest of Documenso. This is not only about building the next generation of signing tech, it’s also about doing our part to normalize open, healthy, efficient working cultures, and tackling relevant problems. +To wrap this up, Documenso happens to be the perfect storm of market opportunity, my interests, and my passions. Creating a company in which people want to work for the long term while tackling these issues is a critical side quest of Documenso. This is not only about building the next generation of signing tech; it's also about doing our part to normalize open, healthy, efficient working cultures and tackling relevant problems. -As always, feel free to connect on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord) if you have any questions or comments. +As always, feel free to connect on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord) if you have any questions, comments, thoughts or feelings. +\ Best from Hamburg\ Timur From b3514bd0c7ada00debf38e6609ab18d23a5a62f5 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Wed, 7 Feb 2024 16:04:12 +0200 Subject: [PATCH 126/311] add new webhook dialog --- .../(dashboard)/settings/webhooks/page.tsx | 3 +- .../webhooks/create-webhook-dialog.tsx | 156 +++++++++++++++++- .../webhooks/multiselect-combobox.tsx | 83 ++++++++++ packages/tailwind-config/index.cjs | 3 + 4 files changed, 243 insertions(+), 2 deletions(-) create mode 100644 apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx index e7445c1d9..9ca4b526e 100644 --- a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx @@ -5,6 +5,7 @@ import { Zap } from 'lucide-react'; import { Button } from '@documenso/ui/primitives/button'; import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; +import { CreateWebhookDialog } from '~/components/(dashboard)/settings/webhooks/create-webhook-dialog'; import { DeleteWebhookDialog } from '~/components/(dashboard)/settings/webhooks/delete-webhook-dialog'; export default function WebhookPage() { @@ -26,7 +27,7 @@ export default function WebhookPage() { title="Webhooks" subtitle="On this page, you can create new Webhooks and manage the existing ones." > - + {webhooks.length === 0 && ( diff --git a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx index 2924efc86..ec6d0f152 100644 --- a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx @@ -1,3 +1,157 @@ +'use client'; + +import { useState } from 'react'; +import { useRouter } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import type * as DialogPrimitive from '@radix-ui/react-dialog'; +import { useForm } from 'react-hook-form'; + +import { Button } from '@documenso/ui/primitives/button'; +import { Input } from '@documenso/ui/primitives/input'; +import { Switch } from '@documenso/ui/primitives/switch'; +import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger, DialogFooter } from '@documenso/ui/primitives/dialog'; +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from '@documenso/ui/primitives/form/form'; + +import { MultiSelectCombobox } from './multiselect-combobox'; + + +export type CreateWebhookDialogProps = { + trigger?: React.ReactNode; +} & Omit; + export const CreateWebhookDialog = ({ trigger, ...props }: CreateWebhookDialogProps) => { - return

test

; + const router = useRouter(); + const [open, setOpen] = useState(false); + + const form = useForm<>({ + resolver: zodResolver(), + values: { + webhookUrl: '', + eventTriggers: [], + secret: '', + enabled: true, + }, + }); + + const onSubmit = async () => { + console.log('submitted'); + } + + return ( + !form.formState.isSubmitting && setOpen(value)} + {...props} + > + e.stopPropagation()} asChild> + {trigger ?? } + + + + + Create webhook + On this page, you can create a new webhook. + + +
+ +
+ ( + + Webhook URL + + + + + + )} + /> + + ( + + Event triggers + + { + console.log(values); + onChange(values) + }} + /> + + + + )} + /> + + ( + + Secret + + + + + + )} + /> + + ( + + Active + + + + + + )} + /> + + +
+ + +
+
+ +
+
+ +
+
+ ); }; diff --git a/apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx b/apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx new file mode 100644 index 000000000..269b83449 --- /dev/null +++ b/apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx @@ -0,0 +1,83 @@ +import * as React from 'react'; + +import { WebhookTriggerEvents } from '@prisma/client/'; +import { Check, ChevronsUpDown } from 'lucide-react'; + +import { cn } from '@documenso/ui/lib/utils'; +import { Button } from '@documenso/ui/primitives/button'; +import { + Command, + CommandEmpty, + CommandGroup, + CommandInput, + CommandItem, +} from '@documenso/ui/primitives/command'; +import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover'; + +type ComboboxProps = { + listValues: string[]; + onChange: (_values: string[]) => void; +}; + +const MultiSelectCombobox = ({ listValues, onChange }: ComboboxProps) => { + const [isOpen, setIsOpen] = React.useState(false); + const [selectedValues, setSelectedValues] = React.useState([]); + + const triggerEvents = Object.values(WebhookTriggerEvents); + + React.useEffect(() => { + setSelectedValues(listValues); + }, [listValues]); + + const allEvents = [...new Set([...triggerEvents, ...selectedValues])]; + + const handleSelect = (currentValue: string) => { + let newSelectedValues; + if (selectedValues.includes(currentValue)) { + newSelectedValues = selectedValues.filter((value) => value !== currentValue); + } else { + newSelectedValues = [...selectedValues, currentValue]; + } + + setSelectedValues(newSelectedValues); + onChange(newSelectedValues); + setIsOpen(false); + }; + + return ( + + + + + + + + No value found. + + {allEvents.map((value: string, i: number) => ( + handleSelect(value)}> + + {value} + + ))} + + + + + ); +}; + +export { MultiSelectCombobox }; diff --git a/packages/tailwind-config/index.cjs b/packages/tailwind-config/index.cjs index 1564454d8..6dfa7d5c2 100644 --- a/packages/tailwind-config/index.cjs +++ b/packages/tailwind-config/index.cjs @@ -11,6 +11,9 @@ module.exports = { sans: ['var(--font-sans)', ...fontFamily.sans], signature: ['var(--font-signature)'], }, + zIndex: { + 9999: '9999', + }, colors: { border: 'hsl(var(--border))', input: 'hsl(var(--input))', From e97b9b4f1cd9a200e169059593737853fc351957 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Thu, 8 Feb 2024 12:33:20 +1100 Subject: [PATCH 127/311] feat: add team templates (#912) --- .../documents/[id]/document-page-view.tsx | 4 +- .../app/(dashboard)/documents/[id]/page.tsx | 2 +- .../documents/documents-page-view.tsx | 7 +- .../src/app/(dashboard)/documents/page.tsx | 2 +- .../templates/[id]/edit-template.tsx | 4 +- .../app/(dashboard)/templates/[id]/page.tsx | 81 +------ .../templates/[id]/template-page-view.tsx | 86 ++++++++ .../templates/data-table-action-dropdown.tsx | 25 ++- .../templates/data-table-templates.tsx | 15 +- .../templates/delete-template-dialog.tsx | 35 ++- .../templates/duplicate-template-dialog.tsx | 56 ++--- .../templates/new-template-dialog.tsx | 11 +- .../src/app/(dashboard)/templates/page.tsx | 50 +---- .../templates/templates-page-view.tsx | 73 +++++++ .../t/[teamUrl]/documents/[id]/page.tsx | 4 +- .../(teams)/t/[teamUrl]/documents/page.tsx | 2 +- .../t/[teamUrl]/templates/[id]/page.tsx | 22 ++ .../(teams)/t/[teamUrl]/templates/page.tsx | 26 +++ .../(dashboard)/layout/desktop-nav.tsx | 34 ++- .../(dashboard)/layout/menu-switcher.tsx | 22 +- .../(dashboard)/layout/mobile-navigation.tsx | 2 +- .../e2e/templates/manage-templates.spec.ts | 205 ++++++++++++++++++ packages/lib/constants/teams.ts | 1 + .../field/get-fields-for-template.ts | 15 +- .../field/set-fields-for-template.ts | 15 +- .../recipient/get-recipients-for-template.ts | 15 +- .../recipient/set-recipients-for-template.ts | 15 +- .../template/create-document-from-template.ts | 19 +- .../server-only/template/create-template.ts | 18 +- .../server-only/template/delete-template.ts | 20 +- .../template/duplicate-template.ts | 30 ++- .../server-only/template/find-templates.ts | 56 +++++ .../template/get-template-by-id.ts | 24 +- .../lib/server-only/template/get-templates.ts | 35 --- packages/lib/utils/teams.ts | 4 + .../migration.sql | 5 + packages/prisma/schema.prisma | 5 +- packages/prisma/seed/templates.ts | 36 +++ packages/trpc/server/field-router/router.ts | 2 +- .../trpc/server/recipient-router/router.ts | 4 +- .../trpc/server/template-router/router.ts | 12 +- .../trpc/server/template-router/schema.ts | 4 +- 42 files changed, 831 insertions(+), 272 deletions(-) create mode 100644 apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx create mode 100644 apps/web/src/app/(dashboard)/templates/templates-page-view.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/templates/[id]/page.tsx create mode 100644 apps/web/src/app/(teams)/t/[teamUrl]/templates/page.tsx create mode 100644 packages/app-tests/e2e/templates/manage-templates.spec.ts create mode 100644 packages/lib/server-only/template/find-templates.ts delete mode 100644 packages/lib/server-only/template/get-templates.ts create mode 100644 packages/prisma/migrations/20240206051948_add_teams_templates/migration.sql create mode 100644 packages/prisma/seed/templates.ts diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx index 3a46ed5e7..6759d91ac 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx @@ -25,7 +25,7 @@ export type DocumentPageViewProps = { team?: Team; }; -export default async function DocumentPageView({ params, team }: DocumentPageViewProps) { +export const DocumentPageView = async ({ params, team }: DocumentPageViewProps) => { const { id } = params; const documentId = Number(id); @@ -128,4 +128,4 @@ export default async function DocumentPageView({ params, team }: DocumentPageVie )}

); -} +}; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/page.tsx b/apps/web/src/app/(dashboard)/documents/[id]/page.tsx index e7a34889e..5ad224737 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/page.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/page.tsx @@ -1,4 +1,4 @@ -import DocumentPageView from './document-page-view'; +import { DocumentPageView } from './document-page-view'; export type DocumentPageProps = { params: { diff --git a/apps/web/src/app/(dashboard)/documents/documents-page-view.tsx b/apps/web/src/app/(dashboard)/documents/documents-page-view.tsx index ead3e8f4f..9059b8e88 100644 --- a/apps/web/src/app/(dashboard)/documents/documents-page-view.tsx +++ b/apps/web/src/app/(dashboard)/documents/documents-page-view.tsx @@ -33,10 +33,7 @@ export type DocumentsPageViewProps = { team?: Team & { teamEmail?: TeamEmail | null }; }; -export default async function DocumentsPageView({ - searchParams = {}, - team, -}: DocumentsPageViewProps) { +export const DocumentsPageView = async ({ searchParams = {}, team }: DocumentsPageViewProps) => { const { user } = await getRequiredServerComponentSession(); const status = isExtendedDocumentStatus(searchParams.status) ? searchParams.status : 'ALL'; @@ -155,4 +152,4 @@ export default async function DocumentsPageView({
); -} +}; diff --git a/apps/web/src/app/(dashboard)/documents/page.tsx b/apps/web/src/app/(dashboard)/documents/page.tsx index b67ed6f02..67f432a13 100644 --- a/apps/web/src/app/(dashboard)/documents/page.tsx +++ b/apps/web/src/app/(dashboard)/documents/page.tsx @@ -1,7 +1,7 @@ import type { Metadata } from 'next'; import type { DocumentsPageViewProps } from './documents-page-view'; -import DocumentsPageView from './documents-page-view'; +import { DocumentsPageView } from './documents-page-view'; export type DocumentsPageProps = { searchParams?: DocumentsPageViewProps['searchParams']; diff --git a/apps/web/src/app/(dashboard)/templates/[id]/edit-template.tsx b/apps/web/src/app/(dashboard)/templates/[id]/edit-template.tsx index bdc769e79..f8c7f9a43 100644 --- a/apps/web/src/app/(dashboard)/templates/[id]/edit-template.tsx +++ b/apps/web/src/app/(dashboard)/templates/[id]/edit-template.tsx @@ -28,6 +28,7 @@ export type EditTemplateFormProps = { recipients: Recipient[]; fields: Field[]; documentData: DocumentData; + templateRootPath: string; }; type EditTemplateStep = 'signers' | 'fields'; @@ -40,6 +41,7 @@ export const EditTemplateForm = ({ fields, user: _user, documentData, + templateRootPath, }: EditTemplateFormProps) => { const { toast } = useToast(); const router = useRouter(); @@ -98,7 +100,7 @@ export const EditTemplateForm = ({ duration: 5000, }); - router.push('/templates'); + router.push(templateRootPath); } catch (err) { toast({ title: 'Error', diff --git a/apps/web/src/app/(dashboard)/templates/[id]/page.tsx b/apps/web/src/app/(dashboard)/templates/[id]/page.tsx index 6d234eff2..aa55d1943 100644 --- a/apps/web/src/app/(dashboard)/templates/[id]/page.tsx +++ b/apps/web/src/app/(dashboard)/templates/[id]/page.tsx @@ -1,81 +1,10 @@ import React from 'react'; -import Link from 'next/link'; -import { redirect } from 'next/navigation'; +import type { TemplatePageViewProps } from './template-page-view'; +import { TemplatePageView } from './template-page-view'; -import { ChevronLeft } from 'lucide-react'; +type TemplatePageProps = Pick; -import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; -import { getFieldsForTemplate } from '@documenso/lib/server-only/field/get-fields-for-template'; -import { getRecipientsForTemplate } from '@documenso/lib/server-only/recipient/get-recipients-for-template'; -import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id'; - -import { TemplateType } from '~/components/formatter/template-type'; - -import { EditTemplateForm } from './edit-template'; - -export type TemplatePageProps = { - params: { - id: string; - }; -}; - -export default async function TemplatePage({ params }: TemplatePageProps) { - const { id } = params; - - const templateId = Number(id); - - if (!templateId || Number.isNaN(templateId)) { - redirect('/documents'); - } - - const { user } = await getRequiredServerComponentSession(); - - const template = await getTemplateById({ - id: templateId, - userId: user.id, - }).catch(() => null); - - if (!template || !template.templateDocumentData) { - redirect('/documents'); - } - - const { templateDocumentData } = template; - - const [templateRecipients, templateFields] = await Promise.all([ - getRecipientsForTemplate({ - templateId, - userId: user.id, - }), - getFieldsForTemplate({ - templateId, - userId: user.id, - }), - ]); - - return ( -
- - - Templates - - -

- {template.title} -

- -
- -
- - -
- ); +export default function TemplatePage({ params }: TemplatePageProps) { + return ; } diff --git a/apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx b/apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx new file mode 100644 index 000000000..899e600f1 --- /dev/null +++ b/apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx @@ -0,0 +1,86 @@ +import React from 'react'; + +import Link from 'next/link'; +import { redirect } from 'next/navigation'; + +import { ChevronLeft } from 'lucide-react'; + +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getFieldsForTemplate } from '@documenso/lib/server-only/field/get-fields-for-template'; +import { getRecipientsForTemplate } from '@documenso/lib/server-only/recipient/get-recipients-for-template'; +import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id'; +import { formatTemplatesPath } from '@documenso/lib/utils/teams'; +import type { Team } from '@documenso/prisma/client'; + +import { TemplateType } from '~/components/formatter/template-type'; + +import { EditTemplateForm } from './edit-template'; + +export type TemplatePageViewProps = { + params: { + id: string; + }; + team?: Team; +}; + +export const TemplatePageView = async ({ params, team }: TemplatePageViewProps) => { + const { id } = params; + + const templateId = Number(id); + const templateRootPath = formatTemplatesPath(team?.url); + + if (!templateId || Number.isNaN(templateId)) { + redirect(templateRootPath); + } + + const { user } = await getRequiredServerComponentSession(); + + const template = await getTemplateById({ + id: templateId, + userId: user.id, + }).catch(() => null); + + if (!template || !template.templateDocumentData) { + redirect(templateRootPath); + } + + const { templateDocumentData } = template; + + const [templateRecipients, templateFields] = await Promise.all([ + getRecipientsForTemplate({ + templateId, + userId: user.id, + }), + getFieldsForTemplate({ + templateId, + userId: user.id, + }), + ]); + + return ( +
+ + + Templates + + +

+ {template.title} +

+ +
+ +
+ + +
+ ); +}; diff --git a/apps/web/src/app/(dashboard)/templates/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/templates/data-table-action-dropdown.tsx index 9f26d632c..eee32b920 100644 --- a/apps/web/src/app/(dashboard)/templates/data-table-action-dropdown.tsx +++ b/apps/web/src/app/(dashboard)/templates/data-table-action-dropdown.tsx @@ -21,9 +21,15 @@ import { DuplicateTemplateDialog } from './duplicate-template-dialog'; export type DataTableActionDropdownProps = { row: Template; + templateRootPath: string; + teamId?: number; }; -export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) => { +export const DataTableActionDropdown = ({ + row, + templateRootPath, + teamId, +}: DataTableActionDropdownProps) => { const { data: session } = useSession(); const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false); @@ -34,6 +40,7 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) = } const isOwner = row.userId === session.user.id; + const isTeamTemplate = row.teamId === teamId; return ( @@ -44,20 +51,25 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) = Action - - + + Edit - {/* onDuplicateButtonClick(row.id)}> */} - setDuplicateDialogOpen(true)}> + setDuplicateDialogOpen(true)} + > Duplicate - setDeleteDialogOpen(true)}> + setDeleteDialogOpen(true)} + > Delete @@ -65,6 +77,7 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) = diff --git a/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx b/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx index 0e8f822c2..309695c88 100644 --- a/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx +++ b/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx @@ -28,6 +28,9 @@ type TemplatesDataTableProps = { perPage: number; page: number; totalPages: number; + documentRootPath: string; + templateRootPath: string; + teamId?: number; }; export const TemplatesDataTable = ({ @@ -35,6 +38,9 @@ export const TemplatesDataTable = ({ perPage, page, totalPages, + documentRootPath, + templateRootPath, + teamId, }: TemplatesDataTableProps) => { const [isPending, startTransition] = useTransition(); const updateSearchParams = useUpdateSearchParams(); @@ -70,7 +76,7 @@ export const TemplatesDataTable = ({ duration: 5000, }); - router.push(`/documents/${id}`); + router.push(`${documentRootPath}/${id}`); } catch (err) { toast({ title: 'Error', @@ -131,7 +137,12 @@ export const TemplatesDataTable = ({ {!isRowLoading && } Use Template - + + ); }, diff --git a/apps/web/src/app/(dashboard)/templates/delete-template-dialog.tsx b/apps/web/src/app/(dashboard)/templates/delete-template-dialog.tsx index 9075f4677..b31ad2048 100644 --- a/apps/web/src/app/(dashboard)/templates/delete-template-dialog.tsx +++ b/apps/web/src/app/(dashboard)/templates/delete-template-dialog.tsx @@ -35,20 +35,15 @@ export const DeleteTemplateDialog = ({ id, open, onOpenChange }: DeleteTemplateD onOpenChange(false); }, - }); - - const onDeleteTemplate = async () => { - try { - await deleteTemplate({ id }); - } catch { + onError: () => { toast({ title: 'Something went wrong', description: 'This template could not be deleted at this time. Please try again.', variant: 'destructive', duration: 7500, }); - } - }; + }, + }); return ( !isLoading && onOpenChange(value)}> @@ -63,20 +58,18 @@ export const DeleteTemplateDialog = ({ id, open, onOpenChange }: DeleteTemplateD
-
- + - -
+
diff --git a/apps/web/src/app/(dashboard)/templates/duplicate-template-dialog.tsx b/apps/web/src/app/(dashboard)/templates/duplicate-template-dialog.tsx index be743ff48..cdd3000c2 100644 --- a/apps/web/src/app/(dashboard)/templates/duplicate-template-dialog.tsx +++ b/apps/web/src/app/(dashboard)/templates/duplicate-template-dialog.tsx @@ -14,12 +14,14 @@ import { useToast } from '@documenso/ui/primitives/use-toast'; type DuplicateTemplateDialogProps = { id: number; + teamId?: number; open: boolean; onOpenChange: (_open: boolean) => void; }; export const DuplicateTemplateDialog = ({ id, + teamId, open, onOpenChange, }: DuplicateTemplateDialogProps) => { @@ -40,22 +42,15 @@ export const DuplicateTemplateDialog = ({ onOpenChange(false); }, + onError: () => { + toast({ + title: 'Error', + description: 'An error occurred while duplicating template.', + variant: 'destructive', + }); + }, }); - const onDuplicate = async () => { - try { - await duplicateTemplate({ - templateId: id, - }); - } catch (err) { - toast({ - title: 'Error', - description: 'An error occurred while duplicating template.', - variant: 'destructive', - }); - } - }; - return ( !isLoading && onOpenChange(value)}> @@ -66,20 +61,27 @@ export const DuplicateTemplateDialog = ({ -
- + - -
+
diff --git a/apps/web/src/app/(dashboard)/templates/new-template-dialog.tsx b/apps/web/src/app/(dashboard)/templates/new-template-dialog.tsx index a4aa9bce2..37d60f946 100644 --- a/apps/web/src/app/(dashboard)/templates/new-template-dialog.tsx +++ b/apps/web/src/app/(dashboard)/templates/new-template-dialog.tsx @@ -43,8 +43,14 @@ const ZCreateTemplateFormSchema = z.object({ type TCreateTemplateFormSchema = z.infer; -export const NewTemplateDialog = () => { +type NewTemplateDialogProps = { + teamId?: number; + templateRootPath: string; +}; + +export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialogProps) => { const router = useRouter(); + const { data: session } = useSession(); const { toast } = useToast(); @@ -99,6 +105,7 @@ export const NewTemplateDialog = () => { }); const { id } = await createTemplate({ + teamId, title: values.name ? values.name : file.name, templateDocumentDataId, }); @@ -112,7 +119,7 @@ export const NewTemplateDialog = () => { setShowNewTemplateDialog(false); - void router.push(`/templates/${id}`); + router.push(`${templateRootPath}/${id}`); } catch { toast({ title: 'Something went wrong', diff --git a/apps/web/src/app/(dashboard)/templates/page.tsx b/apps/web/src/app/(dashboard)/templates/page.tsx index d3dacd501..7c7bd4e4f 100644 --- a/apps/web/src/app/(dashboard)/templates/page.tsx +++ b/apps/web/src/app/(dashboard)/templates/page.tsx @@ -2,57 +2,17 @@ import React from 'react'; import type { Metadata } from 'next'; -import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; -import { getTemplates } from '@documenso/lib/server-only/template/get-templates'; - -import { TemplatesDataTable } from './data-table-templates'; -import { EmptyTemplateState } from './empty-state'; -import { NewTemplateDialog } from './new-template-dialog'; +import { TemplatesPageView } from './templates-page-view'; +import type { TemplatesPageViewProps } from './templates-page-view'; type TemplatesPageProps = { - searchParams?: { - page?: number; - perPage?: number; - }; + searchParams?: TemplatesPageViewProps['searchParams']; }; export const metadata: Metadata = { title: 'Templates', }; -export default async function TemplatesPage({ searchParams = {} }: TemplatesPageProps) { - const { user } = await getRequiredServerComponentSession(); - const page = Number(searchParams.page) || 1; - const perPage = Number(searchParams.perPage) || 10; - - const { templates, totalPages } = await getTemplates({ - userId: user.id, - page: page, - perPage: perPage, - }); - - return ( -
-
-

Templates

- -
- -
-
- -
- {templates.length > 0 ? ( - - ) : ( - - )} -
-
- ); +export default function TemplatesPage({ searchParams = {} }: TemplatesPageProps) { + return ; } diff --git a/apps/web/src/app/(dashboard)/templates/templates-page-view.tsx b/apps/web/src/app/(dashboard)/templates/templates-page-view.tsx new file mode 100644 index 000000000..4736f4268 --- /dev/null +++ b/apps/web/src/app/(dashboard)/templates/templates-page-view.tsx @@ -0,0 +1,73 @@ +import React from 'react'; + +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { findTemplates } from '@documenso/lib/server-only/template/find-templates'; +import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams'; +import type { Team } from '@documenso/prisma/client'; +import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar'; + +import { TemplatesDataTable } from './data-table-templates'; +import { EmptyTemplateState } from './empty-state'; +import { NewTemplateDialog } from './new-template-dialog'; + +export type TemplatesPageViewProps = { + searchParams?: { + page?: number; + perPage?: number; + }; + team?: Team; +}; + +export const TemplatesPageView = async ({ searchParams = {}, team }: TemplatesPageViewProps) => { + const { user } = await getRequiredServerComponentSession(); + const page = Number(searchParams.page) || 1; + const perPage = Number(searchParams.perPage) || 10; + + const documentRootPath = formatDocumentsPath(team?.url); + const templateRootPath = formatTemplatesPath(team?.url); + + const { templates, totalPages } = await findTemplates({ + userId: user.id, + teamId: team?.id, + page: page, + perPage: perPage, + }); + + return ( +
+
+
+ {team && ( + + + {team.name.slice(0, 1)} + + + )} + +

Templates

+
+ +
+ +
+
+ +
+ {templates.length > 0 ? ( + + ) : ( + + )} +
+
+ ); +}; diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx index b7f610cff..26b1d7c91 100644 --- a/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx +++ b/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/page.tsx @@ -1,7 +1,7 @@ import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; -import DocumentPageComponent from '~/app/(dashboard)/documents/[id]/document-page-view'; +import { DocumentPageView } from '~/app/(dashboard)/documents/[id]/document-page-view'; export type DocumentPageProps = { params: { @@ -16,5 +16,5 @@ export default async function DocumentPage({ params }: DocumentPageProps) { const { user } = await getRequiredServerComponentSession(); const team = await getTeamByUrl({ userId: user.id, teamUrl }); - return ; + return ; } diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx index 952aeeeea..d3d5b5bee 100644 --- a/apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx +++ b/apps/web/src/app/(teams)/t/[teamUrl]/documents/page.tsx @@ -2,7 +2,7 @@ import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get- import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; import type { DocumentsPageViewProps } from '~/app/(dashboard)/documents/documents-page-view'; -import DocumentsPageView from '~/app/(dashboard)/documents/documents-page-view'; +import { DocumentsPageView } from '~/app/(dashboard)/documents/documents-page-view'; export type TeamsDocumentPageProps = { params: { diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/templates/[id]/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/templates/[id]/page.tsx new file mode 100644 index 000000000..3fe7cbf67 --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/templates/[id]/page.tsx @@ -0,0 +1,22 @@ +import React from 'react'; + +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; + +import type { TemplatePageViewProps } from '~/app/(dashboard)/templates/[id]/template-page-view'; +import { TemplatePageView } from '~/app/(dashboard)/templates/[id]/template-page-view'; + +type TeamTemplatePageProps = { + params: TemplatePageViewProps['params'] & { + teamUrl: string; + }; +}; + +export default async function TeamTemplatePage({ params }: TeamTemplatePageProps) { + const { teamUrl } = params; + + const { user } = await getRequiredServerComponentSession(); + const team = await getTeamByUrl({ userId: user.id, teamUrl }); + + return ; +} diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/templates/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/templates/page.tsx new file mode 100644 index 000000000..6954d8e2d --- /dev/null +++ b/apps/web/src/app/(teams)/t/[teamUrl]/templates/page.tsx @@ -0,0 +1,26 @@ +import React from 'react'; + +import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; +import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team'; + +import type { TemplatesPageViewProps } from '~/app/(dashboard)/templates/templates-page-view'; +import { TemplatesPageView } from '~/app/(dashboard)/templates/templates-page-view'; + +type TeamTemplatesPageProps = { + searchParams?: TemplatesPageViewProps['searchParams']; + params: { + teamUrl: string; + }; +}; + +export default async function TeamTemplatesPage({ + searchParams = {}, + params, +}: TeamTemplatesPageProps) { + const { teamUrl } = params; + + const { user } = await getRequiredServerComponentSession(); + const team = await getTeamByUrl({ userId: user.id, teamUrl }); + + return ; +} diff --git a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx index 2b11c4be2..9eef1f4bd 100644 --- a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx @@ -52,24 +52,22 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { {...props} >
- {navigationLinks - .filter(({ href }) => href !== '/templates' || rootHref === '') // Remove templates for team pages. - .map(({ href, label }) => ( - - {label} - - ))} + {navigationLinks.map(({ href, label }) => ( + + {label} + + ))}
diff --git a/apps/web/src/components/(dashboard)/layout/menu-switcher.tsx b/apps/web/src/components/(dashboard)/layout/menu-switcher.tsx index 35a05baf2..195716d64 100644 --- a/apps/web/src/components/(dashboard)/layout/menu-switcher.tsx +++ b/apps/web/src/components/(dashboard)/layout/menu-switcher.tsx @@ -6,7 +6,7 @@ import { usePathname } from 'next/navigation'; import { CheckCircle2, ChevronsUpDown, Plus, Settings2 } from 'lucide-react'; import { signOut } from 'next-auth/react'; -import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; +import { TEAM_MEMBER_ROLE_MAP, TEAM_URL_REGEX } from '@documenso/lib/constants/teams'; import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin'; import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams'; import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; @@ -71,6 +71,22 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp return TEAM_MEMBER_ROLE_MAP[team.currentTeamMember.role]; }; + /** + * Formats the redirect URL so we can switch between documents and templates page + * seemlessly between teams and personal accounts. + */ + const formatRedirectUrlOnSwitch = (teamUrl?: string) => { + const baseUrl = teamUrl ? `/t/${teamUrl}/` : '/'; + + const currentPathname = (pathname ?? '/').replace(TEAM_URL_REGEX, ''); + + if (currentPathname === '/templates') { + return `${baseUrl}templates`; + } + + return baseUrl; + }; + return ( @@ -100,7 +116,7 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp Personal - + ( - + text !== 'Templates' || href === '/templates'); // Filter out templates for teams. + ]; return ( diff --git a/packages/app-tests/e2e/templates/manage-templates.spec.ts b/packages/app-tests/e2e/templates/manage-templates.spec.ts new file mode 100644 index 000000000..53edc705d --- /dev/null +++ b/packages/app-tests/e2e/templates/manage-templates.spec.ts @@ -0,0 +1,205 @@ +import { expect, test } from '@playwright/test'; + +import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app'; +import { seedTeam, unseedTeam } from '@documenso/prisma/seed/teams'; +import { seedTemplate } from '@documenso/prisma/seed/templates'; + +import { manualLogin } from '../fixtures/authentication'; + +test.describe.configure({ mode: 'parallel' }); + +test('[TEMPLATES]: view templates', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const owner = team.owner; + const teamMemberUser = team.members[1].user; + + // Should only be visible to the owner in personal templates. + await seedTemplate({ + title: 'Personal template', + userId: owner.id, + }); + + // Should be visible to team members. + await seedTemplate({ + title: 'Team template 1', + userId: owner.id, + teamId: team.id, + }); + + // Should be visible to team members. + await seedTemplate({ + title: 'Team template 2', + userId: teamMemberUser.id, + teamId: team.id, + }); + + await manualLogin({ + page, + email: owner.email, + redirectPath: '/templates', + }); + + // Owner should see both team templates. + await page.goto(`${WEBAPP_BASE_URL}/t/${team.url}/templates`); + await expect(page.getByRole('main')).toContainText('Showing 2 results'); + + // Only should only see their personal template. + await page.goto(`${WEBAPP_BASE_URL}/templates`); + await expect(page.getByRole('main')).toContainText('Showing 1 result'); + + await unseedTeam(team.url); +}); + +test('[TEMPLATES]: delete template', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const owner = team.owner; + const teamMemberUser = team.members[1].user; + + // Should only be visible to the owner in personal templates. + await seedTemplate({ + title: 'Personal template', + userId: owner.id, + }); + + // Should be visible to team members. + await seedTemplate({ + title: 'Team template 1', + userId: owner.id, + teamId: team.id, + }); + + // Should be visible to team members. + await seedTemplate({ + title: 'Team template 2', + userId: teamMemberUser.id, + teamId: team.id, + }); + + await manualLogin({ + page, + email: owner.email, + redirectPath: '/templates', + }); + + // Owner should be able to delete their personal template. + await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click(); + await page.getByRole('menuitem', { name: 'Delete' }).click(); + await page.getByRole('button', { name: 'Delete' }).click(); + await expect(page.getByText('Template deleted').first()).toBeVisible(); + + // Team member should be able to delete all templates. + await page.goto(`${WEBAPP_BASE_URL}/t/${team.url}/templates`); + + for (const template of ['Team template 1', 'Team template 2']) { + await page + .getByRole('row', { name: template }) + .getByRole('cell', { name: 'Use Template' }) + .getByRole('button') + .nth(1) + .click(); + + await page.getByRole('menuitem', { name: 'Delete' }).click(); + await page.getByRole('button', { name: 'Delete' }).click(); + await expect(page.getByText('Template deleted').first()).toBeVisible(); + } + + await unseedTeam(team.url); +}); + +test('[TEMPLATES]: duplicate template', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const owner = team.owner; + const teamMemberUser = team.members[1].user; + + // Should only be visible to the owner in personal templates. + await seedTemplate({ + title: 'Personal template', + userId: owner.id, + }); + + // Should be visible to team members. + await seedTemplate({ + title: 'Team template 1', + userId: teamMemberUser.id, + teamId: team.id, + }); + + await manualLogin({ + page, + email: owner.email, + redirectPath: '/templates', + }); + + // Duplicate personal template. + await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click(); + await page.getByRole('menuitem', { name: 'Duplicate' }).click(); + await page.getByRole('button', { name: 'Duplicate' }).click(); + await expect(page.getByText('Template duplicated').first()).toBeVisible(); + await expect(page.getByRole('main')).toContainText('Showing 2 results'); + + await page.goto(`${WEBAPP_BASE_URL}/t/${team.url}/templates`); + + // Duplicate team template. + await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click(); + await page.getByRole('menuitem', { name: 'Duplicate' }).click(); + await page.getByRole('button', { name: 'Duplicate' }).click(); + await expect(page.getByText('Template duplicated').first()).toBeVisible(); + await expect(page.getByRole('main')).toContainText('Showing 2 results'); + + await unseedTeam(team.url); +}); + +test('[TEMPLATES]: use template', async ({ page }) => { + const team = await seedTeam({ + createTeamMembers: 1, + }); + + const owner = team.owner; + const teamMemberUser = team.members[1].user; + + // Should only be visible to the owner in personal templates. + await seedTemplate({ + title: 'Personal template', + userId: owner.id, + }); + + // Should be visible to team members. + await seedTemplate({ + title: 'Team template 1', + userId: teamMemberUser.id, + teamId: team.id, + }); + + await manualLogin({ + page, + email: owner.email, + redirectPath: '/templates', + }); + + // Use personal template. + await page.getByRole('button', { name: 'Use Template' }).click(); + await page.waitForURL(/documents/); + await page.getByRole('main').getByRole('link', { name: 'Documents' }).click(); + await page.waitForURL('/documents'); + await expect(page.getByRole('main')).toContainText('Showing 1 result'); + + await page.goto(`${WEBAPP_BASE_URL}/t/${team.url}/templates`); + + // Use team template. + await page.getByRole('button', { name: 'Use Template' }).click(); + await page.waitForURL(/\/t\/.+\/documents/); + await page.getByRole('main').getByRole('link', { name: 'Documents' }).click(); + await page.waitForURL(`/t/${team.url}/documents`); + await expect(page.getByRole('main')).toContainText('Showing 1 result'); + + await unseedTeam(team.url); +}); diff --git a/packages/lib/constants/teams.ts b/packages/lib/constants/teams.ts index 47705bb14..67f3ef16f 100644 --- a/packages/lib/constants/teams.ts +++ b/packages/lib/constants/teams.ts @@ -1,6 +1,7 @@ import { TeamMemberRole } from '@documenso/prisma/client'; export const TEAM_URL_ROOT_REGEX = new RegExp('^/t/[^/]+$'); +export const TEAM_URL_REGEX = new RegExp('^/t/[^/]+'); export const TEAM_MEMBER_ROLE_MAP: Record = { ADMIN: 'Admin', diff --git a/packages/lib/server-only/field/get-fields-for-template.ts b/packages/lib/server-only/field/get-fields-for-template.ts index c174d7eff..724ec75fb 100644 --- a/packages/lib/server-only/field/get-fields-for-template.ts +++ b/packages/lib/server-only/field/get-fields-for-template.ts @@ -10,7 +10,20 @@ export const getFieldsForTemplate = async ({ templateId, userId }: GetFieldsForT where: { templateId, Template: { - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }, orderBy: { diff --git a/packages/lib/server-only/field/set-fields-for-template.ts b/packages/lib/server-only/field/set-fields-for-template.ts index 9431666bf..2062e06bc 100644 --- a/packages/lib/server-only/field/set-fields-for-template.ts +++ b/packages/lib/server-only/field/set-fields-for-template.ts @@ -27,7 +27,20 @@ export const setFieldsForTemplate = async ({ const template = await prisma.template.findFirst({ where: { id: templateId, - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }); diff --git a/packages/lib/server-only/recipient/get-recipients-for-template.ts b/packages/lib/server-only/recipient/get-recipients-for-template.ts index ab6f860eb..4b393353d 100644 --- a/packages/lib/server-only/recipient/get-recipients-for-template.ts +++ b/packages/lib/server-only/recipient/get-recipients-for-template.ts @@ -13,7 +13,20 @@ export const getRecipientsForTemplate = async ({ where: { templateId, Template: { - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }, orderBy: { diff --git a/packages/lib/server-only/recipient/set-recipients-for-template.ts b/packages/lib/server-only/recipient/set-recipients-for-template.ts index c21c8cbf9..7c96bcf44 100644 --- a/packages/lib/server-only/recipient/set-recipients-for-template.ts +++ b/packages/lib/server-only/recipient/set-recipients-for-template.ts @@ -20,7 +20,20 @@ export const setRecipientsForTemplate = async ({ const template = await prisma.template.findFirst({ where: { id: templateId, - userId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], }, }); diff --git a/packages/lib/server-only/template/create-document-from-template.ts b/packages/lib/server-only/template/create-document-from-template.ts index 1c23d8f85..c520d4ce1 100644 --- a/packages/lib/server-only/template/create-document-from-template.ts +++ b/packages/lib/server-only/template/create-document-from-template.ts @@ -11,7 +11,23 @@ export const createDocumentFromTemplate = async ({ userId, }: CreateDocumentFromTemplateOptions) => { const template = await prisma.template.findUnique({ - where: { id: templateId, userId }, + where: { + id: templateId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], + }, include: { Recipient: true, Field: true, @@ -34,6 +50,7 @@ export const createDocumentFromTemplate = async ({ const document = await prisma.document.create({ data: { userId, + teamId: template.teamId, title: template.title, documentDataId: documentData.id, Recipient: { diff --git a/packages/lib/server-only/template/create-template.ts b/packages/lib/server-only/template/create-template.ts index d00526a64..e51d69485 100644 --- a/packages/lib/server-only/template/create-template.ts +++ b/packages/lib/server-only/template/create-template.ts @@ -1,20 +1,36 @@ import { prisma } from '@documenso/prisma'; -import { TCreateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema'; +import type { TCreateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema'; export type CreateTemplateOptions = TCreateTemplateMutationSchema & { userId: number; + teamId?: number; }; export const createTemplate = async ({ title, userId, + teamId, templateDocumentDataId, }: CreateTemplateOptions) => { + if (teamId) { + await prisma.team.findFirstOrThrow({ + where: { + id: teamId, + members: { + some: { + userId, + }, + }, + }, + }); + } + return await prisma.template.create({ data: { title, userId, templateDocumentDataId, + teamId, }, }); }; diff --git a/packages/lib/server-only/template/delete-template.ts b/packages/lib/server-only/template/delete-template.ts index f693bcec0..c24cc1333 100644 --- a/packages/lib/server-only/template/delete-template.ts +++ b/packages/lib/server-only/template/delete-template.ts @@ -8,5 +8,23 @@ export type DeleteTemplateOptions = { }; export const deleteTemplate = async ({ id, userId }: DeleteTemplateOptions) => { - return await prisma.template.delete({ where: { id, userId } }); + return await prisma.template.delete({ + where: { + id, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], + }, + }); }; diff --git a/packages/lib/server-only/template/duplicate-template.ts b/packages/lib/server-only/template/duplicate-template.ts index 6078a1945..97b3f0a0b 100644 --- a/packages/lib/server-only/template/duplicate-template.ts +++ b/packages/lib/server-only/template/duplicate-template.ts @@ -1,14 +1,39 @@ import { nanoid } from '@documenso/lib/universal/id'; import { prisma } from '@documenso/prisma'; +import type { Prisma } from '@documenso/prisma/client'; import type { TDuplicateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema'; export type DuplicateTemplateOptions = TDuplicateTemplateMutationSchema & { userId: number; }; -export const duplicateTemplate = async ({ templateId, userId }: DuplicateTemplateOptions) => { +export const duplicateTemplate = async ({ + templateId, + userId, + teamId, +}: DuplicateTemplateOptions) => { + let templateWhereFilter: Prisma.TemplateWhereUniqueInput = { + id: templateId, + userId, + teamId: null, + }; + + if (teamId !== undefined) { + templateWhereFilter = { + id: templateId, + teamId, + team: { + members: { + some: { + userId, + }, + }, + }, + }; + } + const template = await prisma.template.findUnique({ - where: { id: templateId, userId }, + where: templateWhereFilter, include: { Recipient: true, Field: true, @@ -31,6 +56,7 @@ export const duplicateTemplate = async ({ templateId, userId }: DuplicateTemplat const duplicatedTemplate = await prisma.template.create({ data: { userId, + teamId, title: template.title + ' (copy)', templateDocumentDataId: documentData.id, Recipient: { diff --git a/packages/lib/server-only/template/find-templates.ts b/packages/lib/server-only/template/find-templates.ts new file mode 100644 index 000000000..d453d28a0 --- /dev/null +++ b/packages/lib/server-only/template/find-templates.ts @@ -0,0 +1,56 @@ +import { prisma } from '@documenso/prisma'; +import type { Prisma } from '@documenso/prisma/client'; + +export type FindTemplatesOptions = { + userId: number; + teamId?: number; + page: number; + perPage: number; +}; + +export const findTemplates = async ({ + userId, + teamId, + page = 1, + perPage = 10, +}: FindTemplatesOptions) => { + let whereFilter: Prisma.TemplateWhereInput = { + userId, + teamId: null, + }; + + if (teamId !== undefined) { + whereFilter = { + team: { + id: teamId, + members: { + some: { + userId, + }, + }, + }, + }; + } + + const [templates, count] = await Promise.all([ + prisma.template.findMany({ + where: whereFilter, + include: { + templateDocumentData: true, + Field: true, + }, + skip: Math.max(page - 1, 0) * perPage, + orderBy: { + createdAt: 'desc', + }, + }), + prisma.template.count({ + where: whereFilter, + }), + ]); + + return { + templates, + totalPages: Math.ceil(count / perPage), + }; +}; diff --git a/packages/lib/server-only/template/get-template-by-id.ts b/packages/lib/server-only/template/get-template-by-id.ts index 56f959a9b..c4295c3c3 100644 --- a/packages/lib/server-only/template/get-template-by-id.ts +++ b/packages/lib/server-only/template/get-template-by-id.ts @@ -1,4 +1,5 @@ import { prisma } from '@documenso/prisma'; +import type { Prisma } from '@documenso/prisma/client'; export interface GetTemplateByIdOptions { id: number; @@ -6,11 +7,26 @@ export interface GetTemplateByIdOptions { } export const getTemplateById = async ({ id, userId }: GetTemplateByIdOptions) => { + const whereFilter: Prisma.TemplateWhereInput = { + id, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], + }; + return await prisma.template.findFirstOrThrow({ - where: { - id, - userId, - }, + where: whereFilter, include: { templateDocumentData: true, }, diff --git a/packages/lib/server-only/template/get-templates.ts b/packages/lib/server-only/template/get-templates.ts deleted file mode 100644 index 5f802d278..000000000 --- a/packages/lib/server-only/template/get-templates.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { prisma } from '@documenso/prisma'; - -export type GetTemplatesOptions = { - userId: number; - page: number; - perPage: number; -}; - -export const getTemplates = async ({ userId, page = 1, perPage = 10 }: GetTemplatesOptions) => { - const [templates, count] = await Promise.all([ - prisma.template.findMany({ - where: { - userId, - }, - include: { - templateDocumentData: true, - Field: true, - }, - skip: Math.max(page - 1, 0) * perPage, - orderBy: { - createdAt: 'desc', - }, - }), - prisma.template.count({ - where: { - userId, - }, - }), - ]); - - return { - templates, - totalPages: Math.ceil(count / perPage), - }; -}; diff --git a/packages/lib/utils/teams.ts b/packages/lib/utils/teams.ts index eb9be2c2b..c6dfd27fd 100644 --- a/packages/lib/utils/teams.ts +++ b/packages/lib/utils/teams.ts @@ -12,6 +12,10 @@ export const formatDocumentsPath = (teamUrl?: string) => { return teamUrl ? `/t/${teamUrl}/documents` : '/documents'; }; +export const formatTemplatesPath = (teamUrl?: string) => { + return teamUrl ? `/t/${teamUrl}/templates` : '/templates'; +}; + /** * Determines whether a team member can execute a given action. * diff --git a/packages/prisma/migrations/20240206051948_add_teams_templates/migration.sql b/packages/prisma/migrations/20240206051948_add_teams_templates/migration.sql new file mode 100644 index 000000000..3a79168bf --- /dev/null +++ b/packages/prisma/migrations/20240206051948_add_teams_templates/migration.sql @@ -0,0 +1,5 @@ +-- AlterTable +ALTER TABLE "Template" ADD COLUMN "teamId" INTEGER; + +-- AddForeignKey +ALTER TABLE "Template" ADD CONSTRAINT "Template_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 79dcdf6aa..fc128efc1 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -334,7 +334,8 @@ model Team { owner User @relation(fields: [ownerUserId], references: [id]) subscription Subscription? - document Document[] + document Document[] + templates Template[] } model TeamPending { @@ -415,10 +416,12 @@ model Template { type TemplateType @default(PRIVATE) title String userId Int + teamId Int? templateDocumentDataId String createdAt DateTime @default(now()) updatedAt DateTime @default(now()) @updatedAt + team Team? @relation(fields: [teamId], references: [id], onDelete: Cascade) templateDocumentData DocumentData @relation(fields: [templateDocumentDataId], references: [id], onDelete: Cascade) User User @relation(fields: [userId], references: [id], onDelete: Cascade) Recipient Recipient[] diff --git a/packages/prisma/seed/templates.ts b/packages/prisma/seed/templates.ts new file mode 100644 index 000000000..7f1b2f8e9 --- /dev/null +++ b/packages/prisma/seed/templates.ts @@ -0,0 +1,36 @@ +import fs from 'node:fs'; +import path from 'node:path'; + +import { prisma } from '..'; +import { DocumentDataType } from '../client'; + +const examplePdf = fs + .readFileSync(path.join(__dirname, '../../../assets/example.pdf')) + .toString('base64'); + +type SeedTemplateOptions = { + title?: string; + userId: number; + teamId?: number; +}; + +export const seedTemplate = async (options: SeedTemplateOptions) => { + const { title = 'Untitled', userId, teamId } = options; + + const documentData = await prisma.documentData.create({ + data: { + type: DocumentDataType.BYTES_64, + data: examplePdf, + initialData: examplePdf, + }, + }); + + return await prisma.template.create({ + data: { + title, + templateDocumentDataId: documentData.id, + userId: userId, + teamId, + }, + }); +}; diff --git a/packages/trpc/server/field-router/router.ts b/packages/trpc/server/field-router/router.ts index 07cdcd347..5ae3cbe4b 100644 --- a/packages/trpc/server/field-router/router.ts +++ b/packages/trpc/server/field-router/router.ts @@ -39,7 +39,7 @@ export const fieldRouter = router({ throw new TRPCError({ code: 'BAD_REQUEST', - message: 'We were unable to sign this field. Please try again later.', + message: 'We were unable to set this field. Please try again later.', }); } }), diff --git a/packages/trpc/server/recipient-router/router.ts b/packages/trpc/server/recipient-router/router.ts index 1ada3d0d3..9553a8aae 100644 --- a/packages/trpc/server/recipient-router/router.ts +++ b/packages/trpc/server/recipient-router/router.ts @@ -33,7 +33,7 @@ export const recipientRouter = router({ throw new TRPCError({ code: 'BAD_REQUEST', - message: 'We were unable to sign this field. Please try again later.', + message: 'We were unable to set this field. Please try again later.', }); } }), @@ -58,7 +58,7 @@ export const recipientRouter = router({ throw new TRPCError({ code: 'BAD_REQUEST', - message: 'We were unable to sign this field. Please try again later.', + message: 'We were unable to set this field. Please try again later.', }); } }), diff --git a/packages/trpc/server/template-router/router.ts b/packages/trpc/server/template-router/router.ts index 28e919e92..7417e7d00 100644 --- a/packages/trpc/server/template-router/router.ts +++ b/packages/trpc/server/template-router/router.ts @@ -19,11 +19,12 @@ export const templateRouter = router({ .input(ZCreateTemplateMutationSchema) .mutation(async ({ input, ctx }) => { try { - const { title, templateDocumentDataId } = input; + const { teamId, title, templateDocumentDataId } = input; return await createTemplate({ - title, userId: ctx.user.id, + teamId, + title, templateDocumentDataId, }); } catch (err) { @@ -64,11 +65,12 @@ export const templateRouter = router({ .input(ZDuplicateTemplateMutationSchema) .mutation(async ({ input, ctx }) => { try { - const { templateId } = input; + const { teamId, templateId } = input; return await duplicateTemplate({ - templateId, userId: ctx.user.id, + teamId, + templateId, }); } catch (err) { console.error(err); @@ -88,7 +90,7 @@ export const templateRouter = router({ const userId = ctx.user.id; - return await deleteTemplate({ id, userId }); + return await deleteTemplate({ userId, id }); } catch (err) { console.error(err); diff --git a/packages/trpc/server/template-router/schema.ts b/packages/trpc/server/template-router/schema.ts index bc7161f74..3d87d4b4f 100644 --- a/packages/trpc/server/template-router/schema.ts +++ b/packages/trpc/server/template-router/schema.ts @@ -1,7 +1,8 @@ import { z } from 'zod'; export const ZCreateTemplateMutationSchema = z.object({ - title: z.string().min(1), + title: z.string().min(1).trim(), + teamId: z.number().optional(), templateDocumentDataId: z.string().min(1), }); @@ -11,6 +12,7 @@ export const ZCreateDocumentFromTemplateMutationSchema = z.object({ export const ZDuplicateTemplateMutationSchema = z.object({ templateId: z.number(), + teamId: z.number().optional(), }); export const ZDeleteTemplateMutationSchema = z.object({ From 47b8cc598ca8daecfa0478f5c85435d44abda9d8 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Thu, 8 Feb 2024 04:28:16 +0000 Subject: [PATCH 128/311] fix: add validation and error message display --- packages/ui/primitives/document-flow/add-subject.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/ui/primitives/document-flow/add-subject.tsx b/packages/ui/primitives/document-flow/add-subject.tsx index 7ce77710c..40e42e3b3 100644 --- a/packages/ui/primitives/document-flow/add-subject.tsx +++ b/packages/ui/primitives/document-flow/add-subject.tsx @@ -2,6 +2,7 @@ import { useEffect } from 'react'; +import { zodResolver } from '@hookform/resolvers/zod'; import { Info } from 'lucide-react'; import { Controller, useForm } from 'react-hook-form'; @@ -32,7 +33,7 @@ import { Input } from '../input'; import { Label } from '../label'; import { useStep } from '../stepper'; import { Textarea } from '../textarea'; -import type { TAddSubjectFormSchema } from './add-subject.types'; +import { type TAddSubjectFormSchema, ZAddSubjectFormSchema } from './add-subject.types'; import { DocumentFlowFormContainerActions, DocumentFlowFormContainerContent, @@ -71,8 +72,10 @@ export const AddSubjectFormPartial = ({ message: document.documentMeta?.message ?? '', timezone: document.documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE, dateFormat: document.documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT, + redirectUrl: document.documentMeta?.redirectUrl ?? '', }, }, + resolver: zodResolver(ZAddSubjectFormSchema), }); const onFormSubmit = handleSubmit(onSubmit); @@ -171,10 +174,10 @@ export const AddSubjectFormPartial = ({ Advanced Options - + {hasDateField && ( <> -
+
@@ -246,7 +249,7 @@ export const AddSubjectFormPartial = ({ {...register('meta.redirectUrl')} /> - +
From 98df273ebc62d2c98508da4965dba04e0f9ed0c8 Mon Sep 17 00:00:00 2001 From: Mythie Date: Mon, 29 Jan 2024 22:53:15 +1100 Subject: [PATCH 129/311] feat: add field and recipient endpoints --- packages/api/v1/contract.ts | 76 ++++ packages/api/v1/implementation.ts | 352 +++++++++++++++++- packages/api/v1/schema.ts | 69 +++- .../lib/server-only/field/create-field.ts | 41 ++ .../lib/server-only/field/delete-field.ts | 17 + .../lib/server-only/field/get-field-by-id.ts | 17 + .../lib/server-only/field/update-field.ts | 44 +++ .../server-only/recipient/delete-recipient.ts | 32 ++ .../recipient/get-recipient-by-email.ts | 21 ++ .../recipient/get-recipient-by-id.ts | 21 ++ .../server-only/recipient/update-recipient.ts | 38 ++ 11 files changed, 720 insertions(+), 8 deletions(-) create mode 100644 packages/lib/server-only/field/create-field.ts create mode 100644 packages/lib/server-only/field/delete-field.ts create mode 100644 packages/lib/server-only/field/get-field-by-id.ts create mode 100644 packages/lib/server-only/field/update-field.ts create mode 100644 packages/lib/server-only/recipient/delete-recipient.ts create mode 100644 packages/lib/server-only/recipient/get-recipient-by-email.ts create mode 100644 packages/lib/server-only/recipient/get-recipient-by-id.ts create mode 100644 packages/lib/server-only/recipient/update-recipient.ts diff --git a/packages/api/v1/contract.ts b/packages/api/v1/contract.ts index 438fa9cee..a7dd27f7c 100644 --- a/packages/api/v1/contract.ts +++ b/packages/api/v1/contract.ts @@ -4,14 +4,20 @@ import { ZSendDocumentForSigningMutationSchema as SendDocumentMutationSchema, ZAuthorizationHeadersSchema, ZCreateDocumentMutationSchema, + ZCreateFieldMutationSchema, ZCreateRecipientMutationSchema, ZDeleteDocumentMutationSchema, + ZDeleteFieldMutationSchema, + ZDeleteRecipientMutationSchema, ZGetDocumentsQuerySchema, ZSuccessfulDocumentResponseSchema, + ZSuccessfulFieldResponseSchema, ZSuccessfulRecipientResponseSchema, ZSuccessfulResponseSchema, ZSuccessfulSigningResponseSchema, ZUnsuccessfulResponseSchema, + ZUpdateFieldMutationSchema, + ZUpdateRecipientMutationSchema, ZUploadDocumentSuccessfulSchema, } from './schema'; @@ -93,6 +99,76 @@ export const ApiContractV1 = c.router( }, summary: 'Create a recipient for a document', }, + + updateRecipient: { + method: 'PATCH', + path: '/api/v1/documents/:id/recipients/:recipientId', + body: ZUpdateRecipientMutationSchema, + responses: { + 200: ZSuccessfulRecipientResponseSchema, + 400: ZUnsuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + 500: ZUnsuccessfulResponseSchema, + }, + summary: 'Update a recipient for a document', + }, + + deleteRecipient: { + method: 'DELETE', + path: '/api/v1/documents/:id/recipients/:recipientId', + body: ZDeleteRecipientMutationSchema, + responses: { + 200: ZSuccessfulRecipientResponseSchema, + 400: ZUnsuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + 500: ZUnsuccessfulResponseSchema, + }, + summary: 'Delete a recipient from a document', + }, + + createField: { + method: 'POST', + path: '/api/v1/documents/:id/fields', + body: ZCreateFieldMutationSchema, + responses: { + 200: ZSuccessfulFieldResponseSchema, + 400: ZUnsuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + 500: ZUnsuccessfulResponseSchema, + }, + summary: 'Create a field for a document', + }, + + updateField: { + method: 'PATCH', + path: '/api/v1/documents/:id/fields/:fieldId', + body: ZUpdateFieldMutationSchema, + responses: { + 200: ZSuccessfulFieldResponseSchema, + 400: ZUnsuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + 500: ZUnsuccessfulResponseSchema, + }, + summary: 'Update a field for a document', + }, + + deleteField: { + method: 'DELETE', + path: '/api/v1/documents/:id/fields/:fieldId', + body: ZDeleteFieldMutationSchema, + responses: { + 200: ZSuccessfulFieldResponseSchema, + 400: ZUnsuccessfulResponseSchema, + 401: ZUnsuccessfulResponseSchema, + 404: ZUnsuccessfulResponseSchema, + 500: ZUnsuccessfulResponseSchema, + }, + summary: 'Delete a field from a document', + }, }, { baseHeaders: ZAuthorizationHeadersSchema, diff --git a/packages/api/v1/implementation.ts b/packages/api/v1/implementation.ts index 4dd709246..e9b710c46 100644 --- a/packages/api/v1/implementation.ts +++ b/packages/api/v1/implementation.ts @@ -4,10 +4,17 @@ import { deleteDocument } from '@documenso/lib/server-only/document/delete-docum import { findDocuments } from '@documenso/lib/server-only/document/find-documents'; import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; import { sendDocument } from '@documenso/lib/server-only/document/send-document'; +import { createField } from '@documenso/lib/server-only/field/create-field'; +import { deleteField } from '@documenso/lib/server-only/field/delete-field'; +import { getFieldById } from '@documenso/lib/server-only/field/get-field-by-id'; +import { updateField } from '@documenso/lib/server-only/field/update-field'; +import { deleteRecipient } from '@documenso/lib/server-only/recipient/delete-recipient'; +import { getRecipientById } from '@documenso/lib/server-only/recipient/get-recipient-by-id'; import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document'; import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document'; +import { updateRecipient } from '@documenso/lib/server-only/recipient/update-recipient'; import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions'; -import { DocumentStatus } from '@documenso/prisma/client'; +import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; import { ApiContractV1 } from './contract'; import { authenticatedMiddleware } from './middleware/authenticated'; @@ -250,4 +257,347 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, { }; } }), + + updateRecipient: authenticatedMiddleware(async (args, user) => { + const { id: documentId, recipientId } = args.params; + const { name, email } = args.body; + + const document = await getDocumentById({ + id: Number(documentId), + userId: user.id, + }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === DocumentStatus.COMPLETED) { + return { + status: 400, + body: { + message: 'Document is already completed', + }, + }; + } + + const updatedRecipient = await updateRecipient({ + documentId: Number(documentId), + recipientId: Number(recipientId), + email, + name, + }).catch(() => null); + + if (!updatedRecipient) { + return { + status: 404, + body: { + message: 'Recipient not found', + }, + }; + } + + return { + status: 200, + body: updatedRecipient, + }; + }), + + deleteRecipient: authenticatedMiddleware(async (args, user) => { + const { id: documentId, recipientId } = args.params; + + const document = await getDocumentById({ + id: Number(documentId), + userId: user.id, + }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === DocumentStatus.COMPLETED) { + return { + status: 400, + body: { + message: 'Document is already completed', + }, + }; + } + + const deletedRecipient = await deleteRecipient({ + documentId: Number(documentId), + recipientId: Number(recipientId), + }).catch(() => null); + + if (!deletedRecipient) { + return { + status: 400, + body: { + message: 'Unable to delete recipient', + }, + }; + } + + return { + status: 200, + body: deletedRecipient, + }; + }), + + createField: authenticatedMiddleware(async (args, user) => { + const { id: documentId } = args.params; + const { recipientId, type, pageNumber, pageWidth, pageHeight, pageX, pageY } = args.body; + + const document = await getDocumentById({ + id: Number(documentId), + userId: user.id, + }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === DocumentStatus.COMPLETED) { + return { + status: 400, + body: { + message: 'Document is already completed', + }, + }; + } + + const recipient = await getRecipientById({ + id: Number(recipientId), + documentId: Number(documentId), + }).catch(() => null); + + if (!recipient) { + return { + status: 404, + body: { + message: 'Recipient not found', + }, + }; + } + + if (recipient.signingStatus === SigningStatus.SIGNED) { + return { + status: 400, + body: { + message: 'Recipient has already signed the document', + }, + }; + } + + const field = await createField({ + documentId: Number(documentId), + recipientId: Number(recipientId), + type, + pageNumber, + pageX, + pageY, + pageWidth, + pageHeight, + }); + + const remappedField = { + documentId: field.documentId, + recipientId: field.recipientId ?? -1, + type: field.type, + pageNumber: field.page, + pageX: Number(field.positionX), + pageY: Number(field.positionY), + pageWidth: Number(field.width), + pageHeight: Number(field.height), + customText: field.customText, + inserted: field.inserted, + }; + + return { + status: 200, + body: remappedField, + }; + }), + + updateField: authenticatedMiddleware(async (args, user) => { + const { id: documentId, fieldId } = args.params; + const { recipientId, type, pageNumber, pageWidth, pageHeight, pageX, pageY } = args.body; + + const document = await getDocumentById({ + id: Number(documentId), + userId: user.id, + }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === DocumentStatus.COMPLETED) { + return { + status: 400, + body: { + message: 'Document is already completed', + }, + }; + } + + const recipient = await getRecipientById({ + id: Number(recipientId), + documentId: Number(documentId), + }).catch(() => null); + + if (!recipient) { + return { + status: 404, + body: { + message: 'Recipient not found', + }, + }; + } + + if (recipient.signingStatus === SigningStatus.SIGNED) { + return { + status: 400, + body: { + message: 'Recipient has already signed the document', + }, + }; + } + + const updatedField = await updateField({ + fieldId: Number(fieldId), + documentId: Number(documentId), + recipientId: recipientId ? Number(recipientId) : undefined, + type, + pageNumber, + pageX, + pageY, + pageWidth, + pageHeight, + }); + + const remappedField = { + documentId: updatedField.documentId, + recipientId: updatedField.recipientId ?? -1, + type: updatedField.type, + pageNumber: updatedField.page, + pageX: Number(updatedField.positionX), + pageY: Number(updatedField.positionY), + pageWidth: Number(updatedField.width), + pageHeight: Number(updatedField.height), + customText: updatedField.customText, + inserted: updatedField.inserted, + }; + + return { + status: 200, + body: remappedField, + }; + }), + + deleteField: authenticatedMiddleware(async (args, user) => { + const { id: documentId, fieldId } = args.params; + + const document = await getDocumentById({ + id: Number(documentId), + userId: user.id, + }); + + if (!document) { + return { + status: 404, + body: { + message: 'Document not found', + }, + }; + } + + if (document.status === DocumentStatus.COMPLETED) { + return { + status: 400, + body: { + message: 'Document is already completed', + }, + }; + } + + const field = await getFieldById({ + fieldId: Number(fieldId), + documentId: Number(documentId), + }).catch(() => null); + + if (!field) { + return { + status: 404, + body: { + message: 'Field not found', + }, + }; + } + + const recipient = await getRecipientById({ + id: Number(field.recipientId), + documentId: Number(documentId), + }).catch(() => null); + + if (recipient?.signingStatus === SigningStatus.SIGNED) { + return { + status: 400, + body: { + message: 'Recipient has already signed the document', + }, + }; + } + + const deletedField = await deleteField({ + documentId: Number(documentId), + fieldId: Number(fieldId), + }).catch(() => null); + + if (!deletedField) { + return { + status: 400, + body: { + message: 'Unable to delete field', + }, + }; + } + + const remappedField = { + documentId: deletedField.documentId, + recipientId: deletedField.recipientId ?? -1, + type: deletedField.type, + pageNumber: deletedField.page, + pageX: Number(deletedField.positionX), + pageY: Number(deletedField.positionY), + pageWidth: Number(deletedField.width), + pageHeight: Number(deletedField.height), + customText: deletedField.customText, + inserted: deletedField.inserted, + }; + + return { + status: 200, + body: remappedField, + }; + }), }); diff --git a/packages/api/v1/schema.ts b/packages/api/v1/schema.ts index 91c35ce28..f6fba2f0f 100644 --- a/packages/api/v1/schema.ts +++ b/packages/api/v1/schema.ts @@ -1,7 +1,10 @@ import { z } from 'zod'; -import { ReadStatus, SendStatus, SigningStatus } from '@documenso/prisma/client'; +import { FieldType, ReadStatus, SendStatus, SigningStatus } from '@documenso/prisma/client'; +/** + * Documents + */ export const ZGetDocumentsQuerySchema = z.object({ page: z.string().optional(), perPage: z.string().optional(), @@ -49,8 +52,19 @@ export const ZCreateRecipientMutationSchema = z.object({ email: z.string().email().min(1), }); +/** + * Recipients + */ export type TCreateRecipientMutationSchema = z.infer; +export const ZUpdateRecipientMutationSchema = ZCreateRecipientMutationSchema.partial(); + +export type TUpdateRecipientMutationSchema = z.infer; + +export const ZDeleteRecipientMutationSchema = null; + +export type TDeleteRecipientMutationSchema = typeof ZDeleteRecipientMutationSchema; + export const ZSuccessfulRecipientResponseSchema = z.object({ id: z.number(), documentId: z.number(), @@ -67,6 +81,44 @@ export const ZSuccessfulRecipientResponseSchema = z.object({ export type TSuccessfulRecipientResponseSchema = z.infer; +/** + * Fields + */ +export const ZCreateFieldMutationSchema = z.object({ + recipientId: z.number(), + type: z.nativeEnum(FieldType), + pageNumber: z.number(), + pageX: z.number(), + pageY: z.number(), + pageWidth: z.number(), + pageHeight: z.number(), +}); + +export type TCreateFieldMutationSchema = z.infer; + +export const ZUpdateFieldMutationSchema = ZCreateFieldMutationSchema.partial(); + +export type TUpdateFieldMutationSchema = z.infer; + +export const ZDeleteFieldMutationSchema = null; + +export type TDeleteFieldMutationSchema = typeof ZDeleteFieldMutationSchema; + +export const ZSuccessfulFieldResponseSchema = z.object({ + documentId: z.number(), + recipientId: z.number(), + type: z.nativeEnum(FieldType), + pageNumber: z.number(), + pageX: z.number(), + pageY: z.number(), + pageWidth: z.number(), + pageHeight: z.number(), + customText: z.string(), + inserted: z.boolean(), +}); + +export type TSuccessfulFieldResponseSchema = z.infer; + export const ZSuccessfulResponseSchema = z.object({ documents: ZSuccessfulDocumentResponseSchema.array(), totalPages: z.number(), @@ -80,14 +132,17 @@ export const ZSuccessfulSigningResponseSchema = z.object({ export type TSuccessfulSigningResponseSchema = z.infer; -export const ZUnsuccessfulResponseSchema = z.object({ - message: z.string(), -}); - -export type TUnsuccessfulResponseSchema = z.infer; - +/** + * General + */ export const ZAuthorizationHeadersSchema = z.object({ authorization: z.string(), }); export type TAuthorizationHeadersSchema = z.infer; + +export const ZUnsuccessfulResponseSchema = z.object({ + message: z.string(), +}); + +export type TUnsuccessfulResponseSchema = z.infer; diff --git a/packages/lib/server-only/field/create-field.ts b/packages/lib/server-only/field/create-field.ts new file mode 100644 index 000000000..c61e36340 --- /dev/null +++ b/packages/lib/server-only/field/create-field.ts @@ -0,0 +1,41 @@ +import { prisma } from '@documenso/prisma'; +import type { FieldType } from '@documenso/prisma/client'; + +export type CreateFieldOptions = { + documentId: number; + recipientId: number; + type: FieldType; + pageNumber: number; + pageX: number; + pageY: number; + pageWidth: number; + pageHeight: number; +}; + +export const createField = async ({ + documentId, + recipientId, + type, + pageNumber, + pageX, + pageY, + pageWidth, + pageHeight, +}: CreateFieldOptions) => { + const field = await prisma.field.create({ + data: { + documentId, + recipientId, + type, + page: pageNumber, + positionX: pageX, + positionY: pageY, + width: pageWidth, + height: pageHeight, + customText: '', + inserted: false, + }, + }); + + return field; +}; diff --git a/packages/lib/server-only/field/delete-field.ts b/packages/lib/server-only/field/delete-field.ts new file mode 100644 index 000000000..d775c84bd --- /dev/null +++ b/packages/lib/server-only/field/delete-field.ts @@ -0,0 +1,17 @@ +import { prisma } from '@documenso/prisma'; + +export type DeleteFieldOptions = { + fieldId: number; + documentId: number; +}; + +export const deleteField = async ({ fieldId, documentId }: DeleteFieldOptions) => { + const field = await prisma.field.delete({ + where: { + id: fieldId, + documentId, + }, + }); + + return field; +}; diff --git a/packages/lib/server-only/field/get-field-by-id.ts b/packages/lib/server-only/field/get-field-by-id.ts new file mode 100644 index 000000000..0e0f9b2dd --- /dev/null +++ b/packages/lib/server-only/field/get-field-by-id.ts @@ -0,0 +1,17 @@ +import { prisma } from '@documenso/prisma'; + +export type GetFieldByIdOptions = { + fieldId: number; + documentId: number; +}; + +export const getFieldById = async ({ fieldId, documentId }: GetFieldByIdOptions) => { + const field = await prisma.field.findFirst({ + where: { + id: fieldId, + documentId, + }, + }); + + return field; +}; diff --git a/packages/lib/server-only/field/update-field.ts b/packages/lib/server-only/field/update-field.ts new file mode 100644 index 000000000..4d949a8cb --- /dev/null +++ b/packages/lib/server-only/field/update-field.ts @@ -0,0 +1,44 @@ +import { prisma } from '@documenso/prisma'; +import type { FieldType } from '@documenso/prisma/client'; + +export type UpdateFieldOptions = { + fieldId: number; + documentId: number; + recipientId?: number; + type?: FieldType; + pageNumber?: number; + pageX?: number; + pageY?: number; + pageWidth?: number; + pageHeight?: number; +}; + +export const updateField = async ({ + fieldId, + documentId, + recipientId, + type, + pageNumber, + pageX, + pageY, + pageWidth, + pageHeight, +}: UpdateFieldOptions) => { + const field = await prisma.field.update({ + where: { + id: fieldId, + documentId, + }, + data: { + recipientId, + type, + page: pageNumber, + positionX: pageX, + positionY: pageY, + width: pageWidth, + height: pageHeight, + }, + }); + + return field; +}; diff --git a/packages/lib/server-only/recipient/delete-recipient.ts b/packages/lib/server-only/recipient/delete-recipient.ts new file mode 100644 index 000000000..67b948f6a --- /dev/null +++ b/packages/lib/server-only/recipient/delete-recipient.ts @@ -0,0 +1,32 @@ +import { prisma } from '@documenso/prisma'; +import { SendStatus } from '@documenso/prisma/client'; + +export type DeleteRecipientOptions = { + documentId: number; + recipientId: number; +}; + +export const deleteRecipient = async ({ documentId, recipientId }: DeleteRecipientOptions) => { + const recipient = await prisma.recipient.findFirst({ + where: { + id: recipientId, + documentId, + }, + }); + + if (!recipient) { + throw new Error('Recipient not found'); + } + + if (recipient.sendStatus !== SendStatus.NOT_SENT) { + throw new Error('Can not delete a recipient that has already been sent a document'); + } + + const deletedRecipient = await prisma.recipient.delete({ + where: { + id: recipient.id, + }, + }); + + return deletedRecipient; +}; diff --git a/packages/lib/server-only/recipient/get-recipient-by-email.ts b/packages/lib/server-only/recipient/get-recipient-by-email.ts new file mode 100644 index 000000000..349149105 --- /dev/null +++ b/packages/lib/server-only/recipient/get-recipient-by-email.ts @@ -0,0 +1,21 @@ +import { prisma } from '@documenso/prisma'; + +export type GetRecipientByEmailOptions = { + documentId: number; + email: string; +}; + +export const getRecipientByEmail = async ({ documentId, email }: GetRecipientByEmailOptions) => { + const recipient = await prisma.recipient.findFirst({ + where: { + documentId, + email: email.toLowerCase(), + }, + }); + + if (!recipient) { + throw new Error('Recipient not found'); + } + + return recipient; +}; diff --git a/packages/lib/server-only/recipient/get-recipient-by-id.ts b/packages/lib/server-only/recipient/get-recipient-by-id.ts new file mode 100644 index 000000000..0db306b80 --- /dev/null +++ b/packages/lib/server-only/recipient/get-recipient-by-id.ts @@ -0,0 +1,21 @@ +import { prisma } from '@documenso/prisma'; + +export type GetRecipientByIdOptions = { + id: number; + documentId: number; +}; + +export const getRecipientById = async ({ documentId, id }: GetRecipientByIdOptions) => { + const recipient = await prisma.recipient.findFirst({ + where: { + documentId, + id, + }, + }); + + if (!recipient) { + throw new Error('Recipient not found'); + } + + return recipient; +}; diff --git a/packages/lib/server-only/recipient/update-recipient.ts b/packages/lib/server-only/recipient/update-recipient.ts new file mode 100644 index 000000000..0b1fa046d --- /dev/null +++ b/packages/lib/server-only/recipient/update-recipient.ts @@ -0,0 +1,38 @@ +import { prisma } from '@documenso/prisma'; + +export type UpdateRecipientOptions = { + documentId: number; + recipientId: number; + email?: string; + name?: string; +}; + +export const updateRecipient = async ({ + documentId, + recipientId, + email, + name, +}: UpdateRecipientOptions) => { + const recipient = await prisma.recipient.findFirst({ + where: { + id: recipientId, + documentId, + }, + }); + + if (!recipient) { + throw new Error('Recipient not found'); + } + + const updatedRecipient = await prisma.recipient.update({ + where: { + id: recipient.id, + }, + data: { + email: email?.toLowerCase() ?? recipient.email, + name: name ?? recipient.name, + }, + }); + + return updatedRecipient; +}; From 748bf6de6b4a37ce42de728c2ad99085959ba550 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Thu, 8 Feb 2024 22:12:04 +1100 Subject: [PATCH 130/311] fix: add dropped constants from merge --- packages/lib/constants/app.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/lib/constants/app.ts b/packages/lib/constants/app.ts index 71f227764..2355c4b07 100644 --- a/packages/lib/constants/app.ts +++ b/packages/lib/constants/app.ts @@ -9,6 +9,7 @@ export const NEXT_PUBLIC_MARKETING_URL = () => env('NEXT_PUBLIC_MARKETING_URL'); export const IS_APP_MARKETING = () => NEXT_PUBLIC_PROJECT() === 'marketing'; export const IS_APP_WEB = () => NEXT_PUBLIC_PROJECT() === 'web'; +export const IS_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED'); export const APP_FOLDER = () => (IS_APP_MARKETING() ? 'marketing' : 'web'); From 8641884515a9799e1a57c0c555bf720644ad4cc7 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Fri, 9 Feb 2024 12:37:17 +1100 Subject: [PATCH 131/311] fix: recipients with CC role not being editable (#918) ## Description Fixed issue where setting a recipient role as CC will prevent any further changes as it is considered as "sent" and "signed". ## Other changes - Prevent editing document after completed - Removed CC and Viewers from the field recipient list since they will never be filled - Minor UI issues ## Checklist - [X] I have tested these changes locally and they work as expected. - [X] I have added/updated tests that prove the effectiveness of these changes. - [X] I have followed the project's coding style guidelines. --- .../documents/data-table-action-dropdown.tsx | 2 +- .../app/(signing)/sign/[token]/name-field.tsx | 2 +- .../field/set-fields-for-document.ts | 4 ++++ .../recipient/set-recipients-for-document.ts | 10 ++++++++-- .../ui/primitives/document-flow/add-fields.tsx | 18 +++++++++++------- .../primitives/document-flow/add-signers.tsx | 5 ++++- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx index b7d2cf452..2bd888bb0 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx @@ -114,7 +114,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr Action - {recipient?.role !== RecipientRole.CC && ( + {recipient && recipient?.role !== RecipientRole.CC && ( {recipient?.role === RecipientRole.VIEWER && ( diff --git a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx b/apps/web/src/app/(signing)/sign/[token]/name-field.tsx index 6e661e77a..44de2fc36 100644 --- a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/name-field.tsx @@ -118,7 +118,7 @@ export const NameField = ({ field, recipient }: NameFieldProps) => { ({recipient.email}) -
+
({ ...recipient, email: recipient.email.toLowerCase(), @@ -77,8 +81,9 @@ export const setRecipientsForDocument = async ({ }) .filter((recipient) => { return ( - recipient._persisted?.sendStatus !== SendStatus.SENT && - recipient._persisted?.signingStatus !== SigningStatus.SIGNED + recipient._persisted?.role === RecipientRole.CC || + (recipient._persisted?.sendStatus !== SendStatus.SENT && + recipient._persisted?.signingStatus !== SigningStatus.SIGNED) ); }); @@ -96,6 +101,7 @@ export const setRecipientsForDocument = async ({ email: recipient.email, role: recipient.role, documentId, + sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT, signingStatus: recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED, }, diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsx index 9c8db7918..be7d451f7 100644 --- a/packages/ui/primitives/document-flow/add-fields.tsx +++ b/packages/ui/primitives/document-flow/add-fields.tsx @@ -304,6 +304,13 @@ export const AddFieldsFormPartial = ({ return recipientsByRole; }, [recipients]); + const recipientsByRoleToDisplay = useMemo(() => { + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + return (Object.entries(recipientsByRole) as [RecipientRole, Recipient[]][]).filter( + ([role]) => role !== RecipientRole.CC && role !== RecipientRole.VIEWER, + ); + }, [recipientsByRole]); + return ( <> - {Object.entries(recipientsByRole).map(([role, recipients], roleIndex) => ( + {recipientsByRoleToDisplay.map(([role, recipients], roleIndex) => (
- { - // eslint-disable-next-line @typescript-eslint/consistent-type-assertions - RECIPIENT_ROLES_DESCRIPTION[role as RecipientRole].roleName - } + {`${RECIPIENT_ROLES_DESCRIPTION[role].roleName}s`}
{recipients.length === 0 && ( @@ -403,7 +407,7 @@ export const AddFieldsFormPartial = ({ {recipients.map((recipient) => ( { @@ -413,7 +417,7 @@ export const AddFieldsFormPartial = ({ > {recipient.name && ( diff --git a/packages/ui/primitives/document-flow/add-signers.tsx b/packages/ui/primitives/document-flow/add-signers.tsx index 26aedcae7..b1341c6ca 100644 --- a/packages/ui/primitives/document-flow/add-signers.tsx +++ b/packages/ui/primitives/document-flow/add-signers.tsx @@ -105,7 +105,10 @@ export const AddSignersFormPartial = ({ } return recipients.some( - (recipient) => recipient.id === id && recipient.sendStatus === SendStatus.SENT, + (recipient) => + recipient.id === id && + recipient.sendStatus === SendStatus.SENT && + recipient.role !== RecipientRole.CC, ); }; From b3ba77dfed53cb9ecf4b9393635d558c18c602ed Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:32:54 +0200 Subject: [PATCH 132/311] feat: allow user to choose expiry date --- .../app/(dashboard)/settings/tokens/page.tsx | 12 +- .../(dashboard)/settings/token/contants.ts | 7 ++ apps/web/src/components/forms/token.tsx | 108 +++++++++++++++--- packages/lib/constants/time.ts | 8 +- .../public-api/create-api-token.ts | 22 +++- .../migration.sql | 2 + packages/prisma/schema.prisma | 2 +- .../trpc/server/api-token-router/router.ts | 4 +- .../trpc/server/api-token-router/schema.ts | 1 + 9 files changed, 140 insertions(+), 26 deletions(-) create mode 100644 apps/web/src/components/(dashboard)/settings/token/contants.ts create mode 100644 packages/prisma/migrations/20240208135802_make_expiry_date_optional_api_tokens/migration.sql diff --git a/apps/web/src/app/(dashboard)/settings/tokens/page.tsx b/apps/web/src/app/(dashboard)/settings/tokens/page.tsx index 86143c633..8951098c4 100644 --- a/apps/web/src/app/(dashboard)/settings/tokens/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/tokens/page.tsx @@ -48,9 +48,15 @@ export default async function ApiTokensPage() {

Created on

-

- Expires on -

+ {token.expires ? ( +

+ Expires on +

+ ) : ( +

+ Token doesn't have an expiration date +

+ )}
diff --git a/apps/web/src/components/(dashboard)/settings/token/contants.ts b/apps/web/src/components/(dashboard)/settings/token/contants.ts new file mode 100644 index 000000000..232c37644 --- /dev/null +++ b/apps/web/src/components/(dashboard)/settings/token/contants.ts @@ -0,0 +1,7 @@ +export const EXPIRATION_DATES = { + ONE_WEEK: '7 days', + ONE_MONTH: '1 month', + THREE_MONTHS: '3 months', + SIX_MONTHS: '6 months', + ONE_YEAR: '12 months', +} as const; diff --git a/apps/web/src/components/forms/token.tsx b/apps/web/src/components/forms/token.tsx index 97e1c17ad..688ff47ca 100644 --- a/apps/web/src/components/forms/token.tsx +++ b/apps/web/src/components/forms/token.tsx @@ -1,12 +1,12 @@ 'use client'; -import { useState } from 'react'; +import { useEffect, useState } from 'react'; import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; -import type { z } from 'zod'; +import { z } from 'zod'; import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard'; import { TRPCClientError } from '@documenso/trpc/client'; @@ -26,9 +26,21 @@ import { FormMessage, } from '@documenso/ui/primitives/form/form'; import { Input } from '@documenso/ui/primitives/input'; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from '@documenso/ui/primitives/select'; +import { Switch } from '@documenso/ui/primitives/switch'; import { useToast } from '@documenso/ui/primitives/use-toast'; -const ZCreateTokenFormSchema = ZCreateTokenMutationSchema; +import { EXPIRATION_DATES } from '../(dashboard)/settings/token/contants'; + +const ZCreateTokenFormSchema = ZCreateTokenMutationSchema.extend({ + enabled: z.boolean(), +}); type TCreateTokenFormSchema = z.infer; @@ -43,6 +55,7 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { const { toast } = useToast(); const [newlyCreatedToken, setNewlyCreatedToken] = useState(''); + const [noExpirationDate, setNoExpirationDate] = useState(false); const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation({ onSuccess(data) { @@ -54,9 +67,21 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { resolver: zodResolver(ZCreateTokenFormSchema), defaultValues: { tokenName: '', + expirationDate: '', + enabled: false, }, }); + useEffect(() => { + if (newlyCreatedToken) { + const timer = setTimeout(() => { + setNewlyCreatedToken(''); + }, 30000); + + return () => clearTimeout(timer); + } + }, [newlyCreatedToken]); + const copyToken = async (token: string) => { try { const copied = await copy(token); @@ -78,10 +103,11 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { } }; - const onSubmit = async ({ tokenName }: TCreateTokenMutationSchema) => { + const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenMutationSchema) => { try { await createTokenMutation({ tokenName, + expirationDate: noExpirationDate ? null : expirationDate, }); toast({ @@ -116,30 +142,21 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => {
-
+
( - Token Name + Token name
- -
- + Please enter a meaningful name for your token. This will help you identify it later. @@ -149,6 +166,65 @@ export const ApiTokenForm = ({ className }: ApiTokenFormProps) => { )} /> + ( + + Token expiration date + +
+ + + +
+ + +
+ )} + /> + + ( + + Never expire + + { + setNoExpirationDate((prev) => !prev); + field.onChange(val); + }} + /> + + + + )} + /> + + +
-
diff --git a/packages/lib/server-only/webhooks/create-webhook.ts b/packages/lib/server-only/webhooks/create-webhook.ts new file mode 100644 index 000000000..ee352c49f --- /dev/null +++ b/packages/lib/server-only/webhooks/create-webhook.ts @@ -0,0 +1,28 @@ +import { prisma } from '@documenso/prisma'; +import type { WebhookTriggerEvents } from '@documenso/prisma/client'; + +export interface CreateWebhookOptions { + webhookUrl: string; + eventTriggers: WebhookTriggerEvents[]; + secret: string | null; + enabled: boolean; + userId: number; +} + +export const createWebhook = async ({ + webhookUrl, + eventTriggers, + secret, + enabled, + userId, +}: CreateWebhookOptions) => { + return await prisma.webhook.create({ + data: { + webhookUrl, + eventTriggers, + secret, + enabled, + userId, + }, + }); +}; diff --git a/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts b/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts new file mode 100644 index 000000000..a775ac30c --- /dev/null +++ b/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts @@ -0,0 +1,9 @@ +import { prisma } from '@documenso/prisma'; + +export const getWebhooksByUserId = async (userId: number) => { + return await prisma.webhook.findMany({ + where: { + userId, + }, + }); +}; diff --git a/packages/trpc/server/router.ts b/packages/trpc/server/router.ts index aec70fd63..571d43669 100644 --- a/packages/trpc/server/router.ts +++ b/packages/trpc/server/router.ts @@ -11,6 +11,7 @@ import { teamRouter } from './team-router/router'; import { templateRouter } from './template-router/router'; import { router } from './trpc'; import { twoFactorAuthenticationRouter } from './two-factor-authentication-router/router'; +import { webhookRouter } from './webhook-router/router'; export const appRouter = router({ auth: authRouter, @@ -24,6 +25,7 @@ export const appRouter = router({ singleplayer: singleplayerRouter, team: teamRouter, template: templateRouter, + webhook: webhookRouter, twoFactorAuthentication: twoFactorAuthenticationRouter, }); diff --git a/packages/trpc/server/webhook-router/router.ts b/packages/trpc/server/webhook-router/router.ts new file mode 100644 index 000000000..ffdd7c4bf --- /dev/null +++ b/packages/trpc/server/webhook-router/router.ts @@ -0,0 +1,35 @@ +import { TRPCError } from '@trpc/server'; + +import { createWebhook } from '@documenso/lib/server-only/webhooks/create-webhook'; +import { getWebhooksByUserId } from '@documenso/lib/server-only/webhooks/get-webhooks-by-user-id'; + +import { authenticatedProcedure, router } from '../trpc'; +import { ZCreateWebhookFormSchema } from './schema'; + +export const webhookRouter = router({ + getWebhooks: authenticatedProcedure.query(async ({ ctx }) => { + try { + return await getWebhooksByUserId(ctx.user.id); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to fetch your webhooks. Please try again later.', + }); + } + }), + createWebhook: authenticatedProcedure + .input(ZCreateWebhookFormSchema) + .mutation(async ({ input, ctx }) => { + try { + return await createWebhook({ + ...input, + userId: ctx.user.id, + }); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to create this webhook. Please try again later.', + }); + } + }), +}); diff --git a/packages/trpc/server/webhook-router/schema.ts b/packages/trpc/server/webhook-router/schema.ts new file mode 100644 index 000000000..feceac054 --- /dev/null +++ b/packages/trpc/server/webhook-router/schema.ts @@ -0,0 +1,14 @@ +import { z } from 'zod'; + +import { WebhookTriggerEvents } from '@documenso/prisma/client'; + +export const ZCreateWebhookFormSchema = z.object({ + webhookUrl: z.string().url(), + eventTriggers: z + .array(z.nativeEnum(WebhookTriggerEvents)) + .min(1, { message: 'At least one event trigger is required' }), + secret: z.string().nullable(), + enabled: z.boolean(), +}); + +export type TCreateWebhookFormSchema = z.infer; From 0209127136556074cc026fb621b513b1c258e186 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:28:18 +0200 Subject: [PATCH 134/311] feat: delete webhook functionality --- .../(dashboard)/settings/webhooks/page.tsx | 29 ++++++++++--------- .../webhooks/create-webhook-dialog.tsx | 1 - .../webhooks/delete-webhook-dialog.tsx | 2 +- .../webhooks/delete-webhook-by-id.ts | 15 ++++++++++ packages/trpc/server/webhook-router/router.ts | 19 ++++++++++++ packages/trpc/server/webhook-router/schema.ts | 6 ++++ 6 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 packages/lib/server-only/webhooks/delete-webhook-by-id.ts diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx index 9ca4b526e..060257d72 100644 --- a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx @@ -1,7 +1,9 @@ 'use client'; import { Zap } from 'lucide-react'; +import { ToggleLeft, ToggleRight } from 'lucide-react'; +import { trpc } from '@documenso/trpc/react'; import { Button } from '@documenso/ui/primitives/button'; import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; @@ -9,17 +11,7 @@ import { CreateWebhookDialog } from '~/components/(dashboard)/settings/webhooks/ import { DeleteWebhookDialog } from '~/components/(dashboard)/settings/webhooks/delete-webhook-dialog'; export default function WebhookPage() { - // TODO: Fetch webhooks from the DB after implementing the backend - const webhooks = [ - { - id: 1, - secret: 'my-secret', - webhookUrl: 'https://example.com/webhook', - eventTriggers: ['document.created', 'document.signed'], - enabled: true, - userID: 1, - }, - ]; + const { data: webhooks } = trpc.webhook.getWebhooks.useQuery(); return (
@@ -30,7 +22,7 @@ export default function WebhookPage() { - {webhooks.length === 0 && ( + {webhooks?.length === 0 && ( // TODO: Perhaps add some illustrations here to make the page more engaging

@@ -39,9 +31,9 @@ export default function WebhookPage() {

)} - {webhooks.length > 0 && ( + {webhooks?.length > 0 && (
- {webhooks.map((webhook) => ( + {webhooks?.map((webhook) => (
@@ -53,6 +45,15 @@ export default function WebhookPage() { {trigger}

))} + {webhook.enabled ? ( +

+ Active +

+ ) : ( +

+ Inactive +

+ )}
diff --git a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx index 7d4003fb5..0e24b04a7 100644 --- a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx @@ -127,7 +127,6 @@ export const CreateWebhookDialog = ({ trigger, ...props }: CreateWebhookDialogPr { - console.log(values); onChange(values); }} /> diff --git a/apps/web/src/components/(dashboard)/settings/webhooks/delete-webhook-dialog.tsx b/apps/web/src/components/(dashboard)/settings/webhooks/delete-webhook-dialog.tsx index 540bcf657..8f4a4008f 100644 --- a/apps/web/src/components/(dashboard)/settings/webhooks/delete-webhook-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/webhooks/delete-webhook-dialog.tsx @@ -52,7 +52,7 @@ export const DeleteWebhookDialog = ({ webhook, children }: DeleteWebhookDialogPr type TDeleteWebhookFormSchema = z.infer; - const { mutateAsync: deleteWebhook } = trpc.webhook.deleteWebhookById.useMutation(); + const { mutateAsync: deleteWebhook } = trpc.webhook.deleteWebhook.useMutation(); const form = useForm({ resolver: zodResolver(ZDeleteWebhookFormSchema), diff --git a/packages/lib/server-only/webhooks/delete-webhook-by-id.ts b/packages/lib/server-only/webhooks/delete-webhook-by-id.ts new file mode 100644 index 000000000..306d0ca9c --- /dev/null +++ b/packages/lib/server-only/webhooks/delete-webhook-by-id.ts @@ -0,0 +1,15 @@ +import { prisma } from '@documenso/prisma'; + +export type DeleteWebhookByIdOptions = { + id: number; + userId: number; +}; + +export const deleteWebhookById = async ({ id, userId }: DeleteWebhookByIdOptions) => { + return await prisma.webhook.delete({ + where: { + id, + userId, + }, + }); +}; diff --git a/packages/trpc/server/webhook-router/router.ts b/packages/trpc/server/webhook-router/router.ts index ffdd7c4bf..6598b856a 100644 --- a/packages/trpc/server/webhook-router/router.ts +++ b/packages/trpc/server/webhook-router/router.ts @@ -1,10 +1,12 @@ import { TRPCError } from '@trpc/server'; import { createWebhook } from '@documenso/lib/server-only/webhooks/create-webhook'; +import { deleteWebhookById } from '@documenso/lib/server-only/webhooks/delete-webhook-by-id'; import { getWebhooksByUserId } from '@documenso/lib/server-only/webhooks/get-webhooks-by-user-id'; import { authenticatedProcedure, router } from '../trpc'; import { ZCreateWebhookFormSchema } from './schema'; +import { ZDeleteWebhookSchema } from './schema'; export const webhookRouter = router({ getWebhooks: authenticatedProcedure.query(async ({ ctx }) => { @@ -32,4 +34,21 @@ export const webhookRouter = router({ }); } }), + deleteWebhook: authenticatedProcedure + .input(ZDeleteWebhookSchema) + .mutation(async ({ input, ctx }) => { + try { + const { id } = input; + + return await deleteWebhookById({ + id, + userId: ctx.user.id, + }); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to create this webhook. Please try again later.', + }); + } + }), }); diff --git a/packages/trpc/server/webhook-router/schema.ts b/packages/trpc/server/webhook-router/schema.ts index feceac054..aba409c2f 100644 --- a/packages/trpc/server/webhook-router/schema.ts +++ b/packages/trpc/server/webhook-router/schema.ts @@ -11,4 +11,10 @@ export const ZCreateWebhookFormSchema = z.object({ enabled: z.boolean(), }); +export const ZDeleteWebhookSchema = z.object({ + id: z.number(), +}); + export type TCreateWebhookFormSchema = z.infer; + +export type TDeleteWebhookSchema = z.infer; From 3a32bc62c520ed17cb0d8aa465b63f221523ebca Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Mon, 12 Feb 2024 12:04:53 +1100 Subject: [PATCH 135/311] feat: initial document audit logs implementation (#922) Added initial implementation of document audit logs. --- .../app/(marketing)/singleplayer/client.tsx | 1 + .../src/app/(signing)/sign/[token]/page.tsx | 8 +- packages/lib/constants/recipient-roles.ts | 6 + .../document-data/create-document-data.ts | 2 +- .../document-meta/upsert-document-meta.ts | 88 +++-- .../document/complete-document-with-token.ts | 25 +- .../server-only/document/create-document.ts | 53 ++- .../server-only/document/resend-document.tsx | 59 ++- .../lib/server-only/document/seal-document.ts | 40 +- .../document/send-completed-email.ts | 59 ++- .../server-only/document/send-document.tsx | 86 +++-- .../lib/server-only/document/update-title.ts | 76 +++- .../server-only/document/viewed-document.ts | 44 ++- .../field/remove-signed-field-with-token.ts | 34 +- .../field/set-fields-for-document.ts | 170 ++++++--- .../field/sign-field-with-token.ts | 42 +++ .../recipient/set-recipients-for-document.ts | 168 +++++++-- packages/lib/types/document-audit-logs.ts | 350 ++++++++++++++++++ .../lib/universal/extract-request-metadata.ts | 10 +- packages/lib/utils/document-audit-logs.ts | 205 ++++++++++ .../migration.sql | 37 ++ packages/prisma/schema.prisma | 20 + .../trpc/server/document-router/router.ts | 9 + packages/trpc/server/field-router/router.ts | 8 +- .../trpc/server/recipient-router/router.ts | 5 +- .../trpc/server/singleplayer-router/router.ts | 1 + 26 files changed, 1382 insertions(+), 224 deletions(-) create mode 100644 packages/lib/types/document-audit-logs.ts create mode 100644 packages/lib/utils/document-audit-logs.ts create mode 100644 packages/prisma/migrations/20240209023519_add_document_audit_logs/migration.sql diff --git a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx b/apps/marketing/src/app/(marketing)/singleplayer/client.tsx index a1b56257a..f4be02d7b 100644 --- a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx +++ b/apps/marketing/src/app/(marketing)/singleplayer/client.tsx @@ -85,6 +85,7 @@ export const SinglePlayerClient = () => { setFields( data.fields.map((field, i) => ({ id: i, + secondaryId: i.toString(), documentId: -1, templateId: null, recipientId: -1, diff --git a/apps/web/src/app/(signing)/sign/[token]/page.tsx b/apps/web/src/app/(signing)/sign/[token]/page.tsx index 9a7e8acbe..99b9d1dd7 100644 --- a/apps/web/src/app/(signing)/sign/[token]/page.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/page.tsx @@ -1,3 +1,4 @@ +import { headers } from 'next/headers'; import { notFound, redirect } from 'next/navigation'; import { match } from 'ts-pattern'; @@ -13,6 +14,7 @@ import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-f import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token'; import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures'; import { symmetricDecrypt } from '@documenso/lib/universal/crypto'; +import { extractNextHeaderRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { DocumentStatus, FieldType, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import { Card, CardContent } from '@documenso/ui/primitives/card'; import { ElementVisible } from '@documenso/ui/primitives/element-visible'; @@ -39,13 +41,17 @@ export default async function SigningPage({ params: { token } }: SigningPageProp return notFound(); } + const requestHeaders = Object.fromEntries(headers().entries()); + + const requestMetadata = extractNextHeaderRequestMetadata(requestHeaders); + const [document, fields, recipient] = await Promise.all([ getDocumentAndSenderByToken({ token, }).catch(() => null), getFieldsForToken({ token }), getRecipientByToken({ token }).catch(() => null), - viewedDocument({ token }).catch(() => null), + viewedDocument({ token, requestMetadata }).catch(() => null), ]); if (!document || !document.documentData || !recipient) { diff --git a/packages/lib/constants/recipient-roles.ts b/packages/lib/constants/recipient-roles.ts index 920cf1f32..48d9d611b 100644 --- a/packages/lib/constants/recipient-roles.ts +++ b/packages/lib/constants/recipient-roles.ts @@ -24,3 +24,9 @@ export const RECIPIENT_ROLES_DESCRIPTION: { roleName: 'Viewer', }, }; + +export const RECIPIENT_ROLE_TO_EMAIL_TYPE = { + [RecipientRole.SIGNER]: 'SIGNING_REQUEST', + [RecipientRole.VIEWER]: 'VIEW_REQUEST', + [RecipientRole.APPROVER]: 'APPROVE_REQUEST', +} as const; diff --git a/packages/lib/server-only/document-data/create-document-data.ts b/packages/lib/server-only/document-data/create-document-data.ts index e41f00fe7..7f3a7db9d 100644 --- a/packages/lib/server-only/document-data/create-document-data.ts +++ b/packages/lib/server-only/document-data/create-document-data.ts @@ -1,7 +1,7 @@ 'use server'; import { prisma } from '@documenso/prisma'; -import { DocumentDataType } from '@documenso/prisma/client'; +import type { DocumentDataType } from '@documenso/prisma/client'; export type CreateDocumentDataOptions = { type: DocumentDataType; diff --git a/packages/lib/server-only/document-meta/upsert-document-meta.ts b/packages/lib/server-only/document-meta/upsert-document-meta.ts index 7bd6d93cc..5a1c1594e 100644 --- a/packages/lib/server-only/document-meta/upsert-document-meta.ts +++ b/packages/lib/server-only/document-meta/upsert-document-meta.ts @@ -1,5 +1,11 @@ 'use server'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { + createDocumentAuditLogData, + diffDocumentMetaChanges, +} from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; export type CreateDocumentMetaOptions = { @@ -11,6 +17,7 @@ export type CreateDocumentMetaOptions = { dateFormat?: string; redirectUrl?: string; userId: number; + requestMetadata: RequestMetadata; }; export const upsertDocumentMeta = async ({ @@ -19,50 +26,81 @@ export const upsertDocumentMeta = async ({ timezone, dateFormat, documentId, - userId, password, + userId, redirectUrl, + requestMetadata, }: CreateDocumentMetaOptions) => { - await prisma.document.findFirstOrThrow({ + const user = await prisma.user.findFirstOrThrow({ + where: { + id: userId, + }, + select: { + id: true, + email: true, + name: true, + }, + }); + + const { documentMeta: originalDocumentMeta } = await prisma.document.findFirstOrThrow({ where: { id: documentId, OR: [ { - userId, + userId: user.id, }, { team: { members: { some: { - userId, + userId: user.id, }, }, }, }, ], }, + include: { + documentMeta: true, + }, }); - return await prisma.documentMeta.upsert({ - where: { - documentId, - }, - create: { - subject, - message, - password, - dateFormat, - timezone, - documentId, - redirectUrl, - }, - update: { - subject, - message, - password, - dateFormat, - timezone, - redirectUrl, - }, + return await prisma.$transaction(async (tx) => { + const upsertedDocumentMeta = await tx.documentMeta.upsert({ + where: { + documentId, + }, + create: { + subject, + message, + password, + dateFormat, + timezone, + documentId, + redirectUrl, + }, + update: { + subject, + message, + password, + dateFormat, + timezone, + redirectUrl, + }, + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_META_UPDATED, + documentId, + user, + requestMetadata, + data: { + changes: diffDocumentMetaChanges(originalDocumentMeta ?? {}, upsertedDocumentMeta), + }, + }), + }); + + return upsertedDocumentMeta; }); }; diff --git a/packages/lib/server-only/document/complete-document-with-token.ts b/packages/lib/server-only/document/complete-document-with-token.ts index 62db516fa..b0e7e024f 100644 --- a/packages/lib/server-only/document/complete-document-with-token.ts +++ b/packages/lib/server-only/document/complete-document-with-token.ts @@ -1,5 +1,8 @@ 'use server'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; @@ -9,11 +12,13 @@ import { sendPendingEmail } from './send-pending-email'; export type CompleteDocumentWithTokenOptions = { token: string; documentId: number; + requestMetadata?: RequestMetadata; }; export const completeDocumentWithToken = async ({ token, documentId, + requestMetadata, }: CompleteDocumentWithTokenOptions) => { 'use server'; @@ -70,6 +75,24 @@ export const completeDocumentWithToken = async ({ }, }); + await prisma.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED, + documentId: document.id, + user: { + name: recipient.name, + email: recipient.email, + }, + requestMetadata, + data: { + recipientEmail: recipient.email, + recipientName: recipient.name, + recipientId: recipient.id, + recipientRole: recipient.role, + }, + }), + }); + const pendingRecipients = await prisma.recipient.count({ where: { documentId: document.id, @@ -99,6 +122,6 @@ export const completeDocumentWithToken = async ({ }); if (documents.count > 0) { - await sealDocument({ documentId: document.id }); + await sealDocument({ documentId: document.id, requestMetadata }); } }; diff --git a/packages/lib/server-only/document/create-document.ts b/packages/lib/server-only/document/create-document.ts index 93307a7b4..7243652f0 100644 --- a/packages/lib/server-only/document/create-document.ts +++ b/packages/lib/server-only/document/create-document.ts @@ -1,5 +1,9 @@ 'use server'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; export type CreateDocumentOptions = { @@ -7,6 +11,7 @@ export type CreateDocumentOptions = { userId: number; teamId?: number; documentDataId: string; + requestMetadata?: RequestMetadata; }; export const createDocument = async ({ @@ -14,22 +19,30 @@ export const createDocument = async ({ title, documentDataId, teamId, + requestMetadata, }: CreateDocumentOptions) => { - return await prisma.$transaction(async (tx) => { - if (teamId !== undefined) { - await tx.team.findFirstOrThrow({ - where: { - id: teamId, - members: { - some: { - userId, - }, - }, + const user = await prisma.user.findFirstOrThrow({ + where: { + id: userId, + }, + include: { + teamMembers: { + select: { + teamId: true, }, - }); - } + }, + }, + }); - return await tx.document.create({ + if ( + teamId !== undefined && + !user.teamMembers.some((teamMember) => teamMember.teamId === teamId) + ) { + throw new AppError(AppErrorCode.NOT_FOUND, 'Team not found'); + } + + return await prisma.$transaction(async (tx) => { + const document = await tx.document.create({ data: { title, documentDataId, @@ -37,5 +50,19 @@ export const createDocument = async ({ teamId, }, }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED, + documentId: document.id, + user, + requestMetadata, + data: { + title, + }, + }), + }); + + return document; }); }; diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx index d72da3a8d..1acc684b9 100644 --- a/packages/lib/server-only/document/resend-document.tsx +++ b/packages/lib/server-only/document/resend-document.tsx @@ -4,12 +4,18 @@ import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite'; import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; +import { + RECIPIENT_ROLES_DESCRIPTION, + RECIPIENT_ROLE_TO_EMAIL_TYPE, +} from '@documenso/lib/constants/recipient-roles'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template'; import { prisma } from '@documenso/prisma'; import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import type { Prisma } from '@documenso/prisma/client'; -import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles'; import { getDocumentWhereInput } from './get-document-by-id'; export type ResendDocumentOptions = { @@ -17,6 +23,7 @@ export type ResendDocumentOptions = { userId: number; recipients: number[]; teamId?: number; + requestMetadata: RequestMetadata; }; export const resendDocument = async ({ @@ -24,6 +31,7 @@ export const resendDocument = async ({ userId, recipients, teamId, + requestMetadata, }: ResendDocumentOptions) => { const user = await prisma.user.findFirstOrThrow({ where: { @@ -76,6 +84,8 @@ export const resendDocument = async ({ return; } + const recipientEmailType = RECIPIENT_ROLE_TO_EMAIL_TYPE[recipient.role]; + const { email, name } = recipient; const customEmailTemplate = { @@ -99,20 +109,39 @@ export const resendDocument = async ({ const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role]; - await mailer.sendMail({ - to: { - address: email, - name, - }, - from: { - name: FROM_NAME, - address: FROM_ADDRESS, - }, - subject: customEmail?.subject - ? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate) - : `Please ${actionVerb.toLowerCase()} this document`, - html: render(template), - text: render(template, { plainText: true }), + await prisma.$transaction(async (tx) => { + await mailer.sendMail({ + to: { + address: email, + name, + }, + from: { + name: FROM_NAME, + address: FROM_ADDRESS, + }, + subject: customEmail?.subject + ? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate) + : `Please ${actionVerb.toLowerCase()} this document`, + html: render(template), + text: render(template, { plainText: true }), + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT, + documentId: document.id, + user, + requestMetadata, + data: { + emailType: recipientEmailType, + recipientEmail: recipient.email, + recipientName: recipient.name, + recipientRole: recipient.role, + recipientId: recipient.id, + isResending: true, + }, + }), + }); }); }), ); diff --git a/packages/lib/server-only/document/seal-document.ts b/packages/lib/server-only/document/seal-document.ts index b24288c3e..09832db7d 100644 --- a/packages/lib/server-only/document/seal-document.ts +++ b/packages/lib/server-only/document/seal-document.ts @@ -5,10 +5,13 @@ import path from 'node:path'; import { PDFDocument } from 'pdf-lib'; import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import { signPdf } from '@documenso/signing'; +import type { RequestMetadata } from '../../universal/extract-request-metadata'; import { getFile } from '../../universal/upload/get-file'; import { putFile } from '../../universal/upload/put-file'; import { insertFieldInPDF } from '../pdf/insert-field-in-pdf'; @@ -17,9 +20,14 @@ import { sendCompletedEmail } from './send-completed-email'; export type SealDocumentOptions = { documentId: number; sendEmail?: boolean; + requestMetadata?: RequestMetadata; }; -export const sealDocument = async ({ documentId, sendEmail = true }: SealDocumentOptions) => { +export const sealDocument = async ({ + documentId, + sendEmail = true, + requestMetadata, +}: SealDocumentOptions) => { 'use server'; const document = await prisma.document.findFirstOrThrow({ @@ -100,16 +108,30 @@ export const sealDocument = async ({ documentId, sendEmail = true }: SealDocumen }); } - await prisma.documentData.update({ - where: { - id: documentData.id, - }, - data: { - data: newData, - }, + await prisma.$transaction(async (tx) => { + await tx.documentData.update({ + where: { + id: documentData.id, + }, + data: { + data: newData, + }, + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED, + documentId: document.id, + requestMetadata, + user: null, + data: { + transactionId: nanoid(), + }, + }), + }); }); if (sendEmail) { - await sendCompletedEmail({ documentId }); + await sendCompletedEmail({ documentId, requestMetadata }); } }; diff --git a/packages/lib/server-only/document/send-completed-email.ts b/packages/lib/server-only/document/send-completed-email.ts index 226ff43ec..3ab62833c 100644 --- a/packages/lib/server-only/document/send-completed-email.ts +++ b/packages/lib/server-only/document/send-completed-email.ts @@ -5,13 +5,17 @@ import { render } from '@documenso/email/render'; import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed'; import { prisma } from '@documenso/prisma'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs'; +import type { RequestMetadata } from '../../universal/extract-request-metadata'; import { getFile } from '../../universal/upload/get-file'; +import { createDocumentAuditLogData } from '../../utils/document-audit-logs'; export interface SendDocumentOptions { documentId: number; + requestMetadata?: RequestMetadata; } -export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => { +export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDocumentOptions) => { const document = await prisma.document.findUnique({ where: { id: documentId, @@ -44,24 +48,43 @@ export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => downloadLink: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${token}/complete`, }); - await mailer.sendMail({ - to: { - address: email, - name, - }, - from: { - name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso', - address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com', - }, - subject: 'Signing Complete!', - html: render(template), - text: render(template, { plainText: true }), - attachments: [ - { - filename: document.title, - content: Buffer.from(buffer), + await prisma.$transaction(async (tx) => { + await mailer.sendMail({ + to: { + address: email, + name, }, - ], + from: { + name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso', + address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com', + }, + subject: 'Signing Complete!', + html: render(template), + text: render(template, { plainText: true }), + attachments: [ + { + filename: document.title, + content: Buffer.from(buffer), + }, + ], + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT, + documentId: document.id, + user: null, + requestMetadata, + data: { + emailType: 'DOCUMENT_COMPLETED', + recipientEmail: recipient.email, + recipientName: recipient.name, + recipientId: recipient.id, + recipientRole: recipient.role, + isResending: false, + }, + }), + }); }); }), ); diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx index 312b30462..fc174c084 100644 --- a/packages/lib/server-only/document/send-document.tsx +++ b/packages/lib/server-only/document/send-document.tsx @@ -4,22 +4,37 @@ import { mailer } from '@documenso/email/mailer'; import { render } from '@documenso/email/render'; import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite'; import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email'; +import { + RECIPIENT_ROLES_DESCRIPTION, + RECIPIENT_ROLE_TO_EMAIL_TYPE, +} from '@documenso/lib/constants/recipient-roles'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template'; import { prisma } from '@documenso/prisma'; import { DocumentStatus, RecipientRole, SendStatus } from '@documenso/prisma/client'; -import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles'; - export type SendDocumentOptions = { documentId: number; userId: number; + requestMetadata?: RequestMetadata; }; -export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) => { +export const sendDocument = async ({ + documentId, + userId, + requestMetadata, +}: SendDocumentOptions) => { const user = await prisma.user.findFirstOrThrow({ where: { id: userId, }, + select: { + id: true, + name: true, + email: true, + }, }); const document = await prisma.document.findUnique({ @@ -66,6 +81,8 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) return; } + const recipientEmailType = RECIPIENT_ROLE_TO_EMAIL_TYPE[recipient.role]; + const { email, name } = recipient; const customEmailTemplate = { @@ -89,29 +106,48 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role]; - await mailer.sendMail({ - to: { - address: email, - name, - }, - from: { - name: FROM_NAME, - address: FROM_ADDRESS, - }, - subject: customEmail?.subject - ? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate) - : `Please ${actionVerb.toLowerCase()} this document`, - html: render(template), - text: render(template, { plainText: true }), - }); + await prisma.$transaction(async (tx) => { + await mailer.sendMail({ + to: { + address: email, + name, + }, + from: { + name: FROM_NAME, + address: FROM_ADDRESS, + }, + subject: customEmail?.subject + ? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate) + : `Please ${actionVerb.toLowerCase()} this document`, + html: render(template), + text: render(template, { plainText: true }), + }); - await prisma.recipient.update({ - where: { - id: recipient.id, - }, - data: { - sendStatus: SendStatus.SENT, - }, + await tx.recipient.update({ + where: { + id: recipient.id, + }, + data: { + sendStatus: SendStatus.SENT, + }, + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT, + documentId: document.id, + user, + requestMetadata, + data: { + emailType: recipientEmailType, + recipientEmail: recipient.email, + recipientName: recipient.name, + recipientRole: recipient.role, + recipientId: recipient.id, + isResending: false, + }, + }), + }); }); }), ); diff --git a/packages/lib/server-only/document/update-title.ts b/packages/lib/server-only/document/update-title.ts index 19a902930..3e934e7be 100644 --- a/packages/lib/server-only/document/update-title.ts +++ b/packages/lib/server-only/document/update-title.ts @@ -1,34 +1,76 @@ 'use server'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; export type UpdateTitleOptions = { userId: number; documentId: number; title: string; + requestMetadata?: RequestMetadata; }; -export const updateTitle = async ({ userId, documentId, title }: UpdateTitleOptions) => { - return await prisma.document.update({ +export const updateTitle = async ({ + userId, + documentId, + title, + requestMetadata, +}: UpdateTitleOptions) => { + const user = await prisma.user.findFirstOrThrow({ where: { - id: documentId, - OR: [ - { - userId, - }, - { - team: { - members: { - some: { - userId, + id: userId, + }, + }); + + return await prisma.$transaction(async (tx) => { + const document = await tx.document.findFirstOrThrow({ + where: { + id: documentId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, }, }, }, + ], + }, + }); + + if (document.title === title) { + return document; + } + + const updatedDocument = await tx.document.update({ + where: { + id: documentId, + }, + data: { + title, + }, + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_TITLE_UPDATED, + documentId, + user, + requestMetadata, + data: { + from: document.title, + to: updatedDocument.title, }, - ], - }, - data: { - title, - }, + }), + }); + + return updatedDocument; }); }; diff --git a/packages/lib/server-only/document/viewed-document.ts b/packages/lib/server-only/document/viewed-document.ts index 5944d4841..452da1460 100644 --- a/packages/lib/server-only/document/viewed-document.ts +++ b/packages/lib/server-only/document/viewed-document.ts @@ -1,11 +1,15 @@ +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; import { ReadStatus } from '@documenso/prisma/client'; export type ViewedDocumentOptions = { token: string; + requestMetadata?: RequestMetadata; }; -export const viewedDocument = async ({ token }: ViewedDocumentOptions) => { +export const viewedDocument = async ({ token, requestMetadata }: ViewedDocumentOptions) => { const recipient = await prisma.recipient.findFirst({ where: { token, @@ -13,16 +17,38 @@ export const viewedDocument = async ({ token }: ViewedDocumentOptions) => { }, }); - if (!recipient) { + if (!recipient || !recipient.documentId) { return; } - await prisma.recipient.update({ - where: { - id: recipient.id, - }, - data: { - readStatus: ReadStatus.OPENED, - }, + const { documentId } = recipient; + + await prisma.$transaction(async (tx) => { + await tx.recipient.update({ + where: { + id: recipient.id, + }, + data: { + readStatus: ReadStatus.OPENED, + }, + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED, + documentId, + user: { + name: recipient.name, + email: recipient.email, + }, + requestMetadata, + data: { + recipientEmail: recipient.email, + recipientId: recipient.id, + recipientName: recipient.name, + recipientRole: recipient.role, + }, + }), + }); }); }; diff --git a/packages/lib/server-only/field/remove-signed-field-with-token.ts b/packages/lib/server-only/field/remove-signed-field-with-token.ts index ee472ec9f..6548ae0f1 100644 --- a/packages/lib/server-only/field/remove-signed-field-with-token.ts +++ b/packages/lib/server-only/field/remove-signed-field-with-token.ts @@ -1,16 +1,21 @@ 'use server'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; export type RemovedSignedFieldWithTokenOptions = { token: string; fieldId: number; + requestMetadata?: RequestMetadata; }; export const removeSignedFieldWithToken = async ({ token, fieldId, + requestMetadata, }: RemovedSignedFieldWithTokenOptions) => { const field = await prisma.field.findFirstOrThrow({ where: { @@ -44,8 +49,8 @@ export const removeSignedFieldWithToken = async ({ throw new Error(`Field ${fieldId} has no recipientId`); } - await Promise.all([ - prisma.field.update({ + await prisma.$transaction(async (tx) => { + await tx.field.update({ where: { id: field.id, }, @@ -53,11 +58,28 @@ export const removeSignedFieldWithToken = async ({ customText: '', inserted: false, }, - }), - prisma.signature.deleteMany({ + }); + + await tx.signature.deleteMany({ where: { fieldId: field.id, }, - }), - ]); + }); + + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_UNINSERTED, + documentId: document.id, + user: { + name: recipient?.name, + email: recipient?.email, + }, + requestMetadata, + data: { + field: field.type, + fieldId: field.secondaryId, + }, + }), + }); + }); }; diff --git a/packages/lib/server-only/field/set-fields-for-document.ts b/packages/lib/server-only/field/set-fields-for-document.ts index 71508a9c5..7916de554 100644 --- a/packages/lib/server-only/field/set-fields-for-document.ts +++ b/packages/lib/server-only/field/set-fields-for-document.ts @@ -1,3 +1,9 @@ +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { + createDocumentAuditLogData, + diffFieldChanges, +} from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; import type { FieldType } from '@documenso/prisma/client'; import { SendStatus, SigningStatus } from '@documenso/prisma/client'; @@ -15,12 +21,14 @@ export interface SetFieldsForDocumentOptions { pageWidth: number; pageHeight: number; }[]; + requestMetadata?: RequestMetadata; } export const setFieldsForDocument = async ({ userId, documentId, fields, + requestMetadata, }: SetFieldsForDocumentOptions) => { const document = await prisma.document.findFirst({ where: { @@ -42,6 +50,17 @@ export const setFieldsForDocument = async ({ }, }); + const user = await prisma.user.findFirstOrThrow({ + where: { + id: userId, + }, + select: { + id: true, + name: true, + email: true, + }, + }); + if (!document) { throw new Error('Document not found'); } @@ -79,56 +98,123 @@ export const setFieldsForDocument = async ({ ); }); - const persistedFields = await prisma.$transaction( - // Disabling as wrapping promises here causes type issues - // eslint-disable-next-line @typescript-eslint/promise-function-async - linkedFields.map((field) => - prisma.field.upsert({ - where: { - id: field._persisted?.id ?? -1, - documentId, - }, - update: { - page: field.pageNumber, - positionX: field.pageX, - positionY: field.pageY, - width: field.pageWidth, - height: field.pageHeight, - }, - create: { - type: field.type, - page: field.pageNumber, - positionX: field.pageX, - positionY: field.pageY, - width: field.pageWidth, - height: field.pageHeight, - customText: '', - inserted: false, - Document: { - connect: { - id: documentId, - }, + const persistedFields = await prisma.$transaction(async (tx) => { + await Promise.all( + linkedFields.map(async (field) => { + const fieldSignerEmail = field.signerEmail.toLowerCase(); + + const upsertedField = await tx.field.upsert({ + where: { + id: field._persisted?.id ?? -1, + documentId, }, - Recipient: { - connect: { - documentId_email: { - documentId, - email: field.signerEmail.toLowerCase(), + update: { + page: field.pageNumber, + positionX: field.pageX, + positionY: field.pageY, + width: field.pageWidth, + height: field.pageHeight, + }, + create: { + type: field.type, + page: field.pageNumber, + positionX: field.pageX, + positionY: field.pageY, + width: field.pageWidth, + height: field.pageHeight, + customText: '', + inserted: false, + Document: { + connect: { + id: documentId, + }, + }, + Recipient: { + connect: { + documentId_email: { + documentId, + email: fieldSignerEmail, + }, }, }, }, - }, + }); + + if (upsertedField.recipientId === null) { + throw new Error('Not possible'); + } + + const baseAuditLog = { + fieldId: upsertedField.secondaryId, + fieldRecipientEmail: fieldSignerEmail, + fieldRecipientId: upsertedField.recipientId, + fieldType: upsertedField.type, + }; + + const changes = field._persisted ? diffFieldChanges(field._persisted, upsertedField) : []; + + // Handle field updated audit log. + if (field._persisted && changes.length > 0) { + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_UPDATED, + documentId: documentId, + user, + requestMetadata, + data: { + changes, + ...baseAuditLog, + }, + }), + }); + } + + // Handle field created audit log. + if (!field._persisted) { + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_CREATED, + documentId: documentId, + user, + requestMetadata, + data: { + ...baseAuditLog, + }, + }), + }); + } + + return upsertedField; }), - ), - ); + ); + }); if (removedFields.length > 0) { - await prisma.field.deleteMany({ - where: { - id: { - in: removedFields.map((field) => field.id), + await prisma.$transaction(async (tx) => { + await tx.field.deleteMany({ + where: { + id: { + in: removedFields.map((field) => field.id), + }, }, - }, + }); + + await tx.documentAuditLog.createMany({ + data: removedFields.map((field) => + createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_DELETED, + documentId: documentId, + user, + requestMetadata, + data: { + fieldId: field.secondaryId, + fieldRecipientEmail: field.Recipient?.email ?? '', + fieldRecipientId: field.recipientId ?? -1, + fieldType: field.type, + }, + }), + ), + }); }); } diff --git a/packages/lib/server-only/field/sign-field-with-token.ts b/packages/lib/server-only/field/sign-field-with-token.ts index 62deccd5a..aa3056f52 100644 --- a/packages/lib/server-only/field/sign-field-with-token.ts +++ b/packages/lib/server-only/field/sign-field-with-token.ts @@ -1,18 +1,23 @@ 'use server'; import { DateTime } from 'luxon'; +import { match } from 'ts-pattern'; import { prisma } from '@documenso/prisma'; import { DocumentStatus, FieldType, SigningStatus } from '@documenso/prisma/client'; import { DEFAULT_DOCUMENT_DATE_FORMAT } from '../../constants/date-formats'; import { DEFAULT_DOCUMENT_TIME_ZONE } from '../../constants/time-zones'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs'; +import type { RequestMetadata } from '../../universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '../../utils/document-audit-logs'; export type SignFieldWithTokenOptions = { token: string; fieldId: number; value: string; isBase64?: boolean; + requestMetadata?: RequestMetadata; }; export const signFieldWithToken = async ({ @@ -20,6 +25,7 @@ export const signFieldWithToken = async ({ fieldId, value, isBase64, + requestMetadata, }: SignFieldWithTokenOptions) => { const field = await prisma.field.findFirstOrThrow({ where: { @@ -40,6 +46,10 @@ export const signFieldWithToken = async ({ throw new Error(`Document not found for field ${field.id}`); } + if (!recipient) { + throw new Error(`Recipient not found for field ${field.id}`); + } + if (document.status === DocumentStatus.COMPLETED) { throw new Error(`Document ${document.id} has already been completed`); } @@ -123,6 +133,38 @@ export const signFieldWithToken = async ({ }); } + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED, + documentId: document.id, + user: { + email: recipient.email, + name: recipient.name, + }, + requestMetadata, + data: { + recipientEmail: recipient.email, + recipientId: recipient.id, + recipientName: recipient.name, + recipientRole: recipient.role, + fieldId: updatedField.secondaryId, + field: match(updatedField.type) + .with(FieldType.SIGNATURE, FieldType.FREE_SIGNATURE, (type) => ({ + type, + data: signatureImageAsBase64 || typedSignature || '', + })) + .with(FieldType.DATE, FieldType.EMAIL, FieldType.NAME, FieldType.TEXT, (type) => ({ + type, + data: updatedField.customText, + })) + .exhaustive(), + fieldSecurity: { + type: 'NONE', + }, + }, + }), + }); + return updatedField; }); }; diff --git a/packages/lib/server-only/recipient/set-recipients-for-document.ts b/packages/lib/server-only/recipient/set-recipients-for-document.ts index 82261a446..b18ea6420 100644 --- a/packages/lib/server-only/recipient/set-recipients-for-document.ts +++ b/packages/lib/server-only/recipient/set-recipients-for-document.ts @@ -1,9 +1,14 @@ +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; +import { nanoid } from '@documenso/lib/universal/id'; +import { + createDocumentAuditLogData, + diffRecipientChanges, +} from '@documenso/lib/utils/document-audit-logs'; import { prisma } from '@documenso/prisma'; import { RecipientRole } from '@documenso/prisma/client'; import { SendStatus, SigningStatus } from '@documenso/prisma/client'; -import { nanoid } from '../../universal/id'; - export interface SetRecipientsForDocumentOptions { userId: number; documentId: number; @@ -13,12 +18,14 @@ export interface SetRecipientsForDocumentOptions { name: string; role: RecipientRole; }[]; + requestMetadata?: RequestMetadata; } export const setRecipientsForDocument = async ({ userId, documentId, recipients, + requestMetadata, }: SetRecipientsForDocumentOptions) => { const document = await prisma.document.findFirst({ where: { @@ -40,6 +47,17 @@ export const setRecipientsForDocument = async ({ }, }); + const user = await prisma.user.findFirstOrThrow({ + where: { + id: userId, + }, + select: { + id: true, + name: true, + email: true, + }, + }); + if (!document) { throw new Error('Document not found'); } @@ -87,45 +105,121 @@ export const setRecipientsForDocument = async ({ ); }); - const persistedRecipients = await prisma.$transaction( - // Disabling as wrapping promises here causes type issues - // eslint-disable-next-line @typescript-eslint/promise-function-async - linkedRecipients.map((recipient) => - prisma.recipient.upsert({ - where: { - id: recipient._persisted?.id ?? -1, - documentId, - }, - update: { - name: recipient.name, - email: recipient.email, - role: recipient.role, - documentId, - sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT, - signingStatus: - recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED, - }, - create: { - name: recipient.name, - email: recipient.email, - role: recipient.role, - token: nanoid(), - documentId, - sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT, - signingStatus: - recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED, - }, + const persistedRecipients = await prisma.$transaction(async (tx) => { + await Promise.all( + linkedRecipients.map(async (recipient) => { + const upsertedRecipient = await tx.recipient.upsert({ + where: { + id: recipient._persisted?.id ?? -1, + documentId, + }, + update: { + name: recipient.name, + email: recipient.email, + role: recipient.role, + documentId, + sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT, + signingStatus: + recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED, + }, + create: { + name: recipient.name, + email: recipient.email, + role: recipient.role, + token: nanoid(), + documentId, + sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT, + signingStatus: + recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED, + }, + }); + + const recipientId = upsertedRecipient.id; + + // Clear all fields if the recipient role is changed to a type that cannot have fields. + if ( + recipient._persisted && + recipient._persisted.role !== recipient.role && + (recipient.role === RecipientRole.CC || recipient.role === RecipientRole.VIEWER) + ) { + await tx.field.deleteMany({ + where: { + recipientId, + }, + }); + } + + const baseAuditLog = { + recipientEmail: upsertedRecipient.email, + recipientName: upsertedRecipient.name, + recipientId, + recipientRole: upsertedRecipient.role, + }; + + const changes = recipient._persisted + ? diffRecipientChanges(recipient._persisted, upsertedRecipient) + : []; + + // Handle recipient updated audit log. + if (recipient._persisted && changes.length > 0) { + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED, + documentId: documentId, + user, + requestMetadata, + data: { + changes, + ...baseAuditLog, + }, + }), + }); + } + + // Handle recipient created audit log. + if (!recipient._persisted) { + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_CREATED, + documentId: documentId, + user, + requestMetadata, + data: baseAuditLog, + }), + }); + } + + return upsertedRecipient; }), - ), - ); + ); + }); if (removedRecipients.length > 0) { - await prisma.recipient.deleteMany({ - where: { - id: { - in: removedRecipients.map((recipient) => recipient.id), + await prisma.$transaction(async (tx) => { + await tx.recipient.deleteMany({ + where: { + id: { + in: removedRecipients.map((recipient) => recipient.id), + }, }, - }, + }); + + await tx.documentAuditLog.createMany({ + data: removedRecipients.map((recipient) => + createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_DELETED, + documentId: documentId, + user, + requestMetadata, + data: { + recipientEmail: recipient.email, + recipientName: recipient.name, + recipientId: recipient.id, + recipientRole: recipient.role, + }, + }), + ), + }); }); } diff --git a/packages/lib/types/document-audit-logs.ts b/packages/lib/types/document-audit-logs.ts new file mode 100644 index 000000000..e6a954603 --- /dev/null +++ b/packages/lib/types/document-audit-logs.ts @@ -0,0 +1,350 @@ +///////////////////////////////////////////////////////////////////////////////////////////// +// +// Be aware that any changes to this file may require migrations since we are storing JSON +// data in Prisma. +// +///////////////////////////////////////////////////////////////////////////////////////////// +import { z } from 'zod'; + +import { FieldType } from '@documenso/prisma/client'; + +export const ZDocumentAuditLogTypeSchema = z.enum([ + // Document actions. + 'EMAIL_SENT', + + // Document modification events. + 'FIELD_CREATED', + 'FIELD_DELETED', + 'FIELD_UPDATED', + 'RECIPIENT_CREATED', + 'RECIPIENT_DELETED', + 'RECIPIENT_UPDATED', + + // Document events. + 'DOCUMENT_COMPLETED', + 'DOCUMENT_CREATED', + 'DOCUMENT_DELETED', + 'DOCUMENT_FIELD_INSERTED', + 'DOCUMENT_FIELD_UNINSERTED', + 'DOCUMENT_META_UPDATED', + 'DOCUMENT_OPENED', + 'DOCUMENT_TITLE_UPDATED', + 'DOCUMENT_RECIPIENT_COMPLETED', +]); + +export const ZDocumentMetaDiffTypeSchema = z.enum([ + 'DATE_FORMAT', + 'MESSAGE', + 'PASSWORD', + 'REDIRECT_URL', + 'SUBJECT', + 'TIMEZONE', +]); +export const ZFieldDiffTypeSchema = z.enum(['DIMENSION', 'POSITION']); +export const ZRecipientDiffTypeSchema = z.enum(['NAME', 'ROLE', 'EMAIL']); + +export const DOCUMENT_AUDIT_LOG_TYPE = ZDocumentAuditLogTypeSchema.Enum; +export const DOCUMENT_META_DIFF_TYPE = ZDocumentMetaDiffTypeSchema.Enum; +export const FIELD_DIFF_TYPE = ZFieldDiffTypeSchema.Enum; +export const RECIPIENT_DIFF_TYPE = ZRecipientDiffTypeSchema.Enum; + +export const ZFieldDiffDimensionSchema = z.object({ + type: z.literal(FIELD_DIFF_TYPE.DIMENSION), + from: z.object({ + width: z.number(), + height: z.number(), + }), + to: z.object({ + width: z.number(), + height: z.number(), + }), +}); + +export const ZFieldDiffPositionSchema = z.object({ + type: z.literal(FIELD_DIFF_TYPE.POSITION), + from: z.object({ + page: z.number(), + positionX: z.number(), + positionY: z.number(), + }), + to: z.object({ + page: z.number(), + positionX: z.number(), + positionY: z.number(), + }), +}); + +export const ZDocumentAuditLogDocumentMetaSchema = z.union([ + z.object({ + type: z.union([ + z.literal(DOCUMENT_META_DIFF_TYPE.DATE_FORMAT), + z.literal(DOCUMENT_META_DIFF_TYPE.MESSAGE), + z.literal(DOCUMENT_META_DIFF_TYPE.REDIRECT_URL), + z.literal(DOCUMENT_META_DIFF_TYPE.SUBJECT), + z.literal(DOCUMENT_META_DIFF_TYPE.TIMEZONE), + ]), + from: z.string().nullable(), + to: z.string().nullable(), + }), + z.object({ + type: z.literal(DOCUMENT_META_DIFF_TYPE.PASSWORD), + }), +]); + +export const ZDocumentAuditLogFieldDiffSchema = z.union([ + ZFieldDiffDimensionSchema, + ZFieldDiffPositionSchema, +]); + +export const ZRecipientDiffNameSchema = z.object({ + type: z.literal(RECIPIENT_DIFF_TYPE.NAME), + from: z.string(), + to: z.string(), +}); + +export const ZRecipientDiffRoleSchema = z.object({ + type: z.literal(RECIPIENT_DIFF_TYPE.ROLE), + from: z.string(), + to: z.string(), +}); + +export const ZRecipientDiffEmailSchema = z.object({ + type: z.literal(RECIPIENT_DIFF_TYPE.EMAIL), + from: z.string(), + to: z.string(), +}); + +export const ZDocumentAuditLogRecipientDiffSchema = z.union([ + ZRecipientDiffNameSchema, + ZRecipientDiffRoleSchema, + ZRecipientDiffEmailSchema, +]); + +const ZBaseFieldEventDataSchema = z.object({ + fieldId: z.string(), // Note: This is the secondary field ID, which will get migrated in the future. + fieldRecipientEmail: z.string(), + fieldRecipientId: z.number(), + fieldType: z.string(), // We specifically don't want to use enums to allow for more flexibility. +}); + +const ZBaseRecipientDataSchema = z.object({ + recipientEmail: z.string(), + recipientName: z.string(), + recipientId: z.number(), + recipientRole: z.string(), +}); + +/** + * Event: Email sent. + */ +export const ZDocumentAuditLogEventEmailSentSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT), + data: ZBaseRecipientDataSchema.extend({ + emailType: z.enum([ + 'SIGNING_REQUEST', + 'VIEW_REQUEST', + 'APPROVE_REQUEST', + 'CC', + 'DOCUMENT_COMPLETED', + ]), + isResending: z.boolean(), + }), +}); + +/** + * Event: Document completed. + */ +export const ZDocumentAuditLogEventDocumentCompletedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED), + data: z.object({ + transactionId: z.string(), + }), +}); + +/** + * Event: Document created. + */ +export const ZDocumentAuditLogEventDocumentCreatedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED), + data: z.object({ + title: z.string(), + }), +}); + +/** + * Event: Document field inserted. + */ +export const ZDocumentAuditLogEventDocumentFieldInsertedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED), + data: ZBaseRecipientDataSchema.extend({ + fieldId: z.string(), + + // Organised into union to allow us to extend each field if required. + field: z.union([ + z.object({ + type: z.literal(FieldType.EMAIL), + data: z.string(), + }), + z.object({ + type: z.literal(FieldType.DATE), + data: z.string(), + }), + z.object({ + type: z.literal(FieldType.NAME), + data: z.string(), + }), + z.object({ + type: z.literal(FieldType.TEXT), + data: z.string(), + }), + z.object({ + type: z.union([z.literal(FieldType.SIGNATURE), z.literal(FieldType.FREE_SIGNATURE)]), + data: z.string(), + }), + ]), + + // Todo: Replace with union once we have more field security types. + fieldSecurity: z.object({ + type: z.literal('NONE'), + }), + }), +}); + +/** + * Event: Document field uninserted. + */ +export const ZDocumentAuditLogEventDocumentFieldUninsertedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_UNINSERTED), + data: z.object({ + field: z.nativeEnum(FieldType), + fieldId: z.string(), + }), +}); + +/** + * Event: Document meta updated. + */ +export const ZDocumentAuditLogEventDocumentMetaUpdatedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_META_UPDATED), + data: z.object({ + changes: z.array(ZDocumentAuditLogDocumentMetaSchema), + }), +}); + +/** + * Event: Document opened. + */ +export const ZDocumentAuditLogEventDocumentOpenedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED), + data: ZBaseRecipientDataSchema, +}); + +/** + * Event: Document recipient completed the document (the recipient has fully actioned and completed their required steps for the document). + */ +export const ZDocumentAuditLogEventDocumentRecipientCompleteSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED), + data: ZBaseRecipientDataSchema, +}); + +/** + * Event: Document title updated. + */ +export const ZDocumentAuditLogEventDocumentTitleUpdatedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_TITLE_UPDATED), + data: z.object({ + from: z.string(), + to: z.string(), + }), +}); + +/** + * Event: Field created. + */ +export const ZDocumentAuditLogEventFieldCreatedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.FIELD_CREATED), + data: ZBaseFieldEventDataSchema, +}); + +/** + * Event: Field deleted. + */ +export const ZDocumentAuditLogEventFieldRemovedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.FIELD_DELETED), + data: ZBaseFieldEventDataSchema, +}); + +/** + * Event: Field updated. + */ +export const ZDocumentAuditLogEventFieldUpdatedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.FIELD_UPDATED), + data: ZBaseFieldEventDataSchema.extend({ + changes: z.array(ZDocumentAuditLogFieldDiffSchema), + }), +}); + +/** + * Event: Recipient added. + */ +export const ZDocumentAuditLogEventRecipientAddedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_CREATED), + data: ZBaseRecipientDataSchema, +}); + +/** + * Event: Recipient updated. + */ +export const ZDocumentAuditLogEventRecipientUpdatedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED), + data: ZBaseRecipientDataSchema.extend({ + changes: z.array(ZDocumentAuditLogRecipientDiffSchema), + }), +}); + +/** + * Event: Recipient deleted. + */ +export const ZDocumentAuditLogEventRecipientRemovedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_DELETED), + data: ZBaseRecipientDataSchema, +}); + +export const ZDocumentAuditLogBaseSchema = z.object({ + id: z.string(), + createdAt: z.date(), + documentId: z.number(), +}); + +export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and( + z.union([ + ZDocumentAuditLogEventEmailSentSchema, + ZDocumentAuditLogEventDocumentCompletedSchema, + ZDocumentAuditLogEventDocumentCreatedSchema, + ZDocumentAuditLogEventDocumentFieldInsertedSchema, + ZDocumentAuditLogEventDocumentFieldUninsertedSchema, + ZDocumentAuditLogEventDocumentMetaUpdatedSchema, + ZDocumentAuditLogEventDocumentOpenedSchema, + ZDocumentAuditLogEventDocumentRecipientCompleteSchema, + ZDocumentAuditLogEventDocumentTitleUpdatedSchema, + ZDocumentAuditLogEventFieldCreatedSchema, + ZDocumentAuditLogEventFieldRemovedSchema, + ZDocumentAuditLogEventFieldUpdatedSchema, + ZDocumentAuditLogEventRecipientAddedSchema, + ZDocumentAuditLogEventRecipientUpdatedSchema, + ZDocumentAuditLogEventRecipientRemovedSchema, + ]), +); + +export type TDocumentAuditLog = z.infer; +export type TDocumentAuditLogType = z.infer; + +export type TDocumentAuditLogFieldDiffSchema = z.infer; + +export type TDocumentAuditLogDocumentMetaDiffSchema = z.infer< + typeof ZDocumentAuditLogDocumentMetaSchema +>; + +export type TDocumentAuditLogRecipientDiffSchema = z.infer< + typeof ZDocumentAuditLogRecipientDiffSchema +>; diff --git a/packages/lib/universal/extract-request-metadata.ts b/packages/lib/universal/extract-request-metadata.ts index 5549e5de7..d608d5f80 100644 --- a/packages/lib/universal/extract-request-metadata.ts +++ b/packages/lib/universal/extract-request-metadata.ts @@ -25,10 +25,16 @@ export const extractNextApiRequestMetadata = (req: NextApiRequest): RequestMetad export const extractNextAuthRequestMetadata = ( req: Pick, ): RequestMetadata => { - const parsedIp = ZIpSchema.safeParse(req.headers?.['x-forwarded-for']); + return extractNextHeaderRequestMetadata(req.headers ?? {}); +}; + +export const extractNextHeaderRequestMetadata = ( + headers: Record, +): RequestMetadata => { + const parsedIp = ZIpSchema.safeParse(headers?.['x-forwarded-for']); const ipAddress = parsedIp.success ? parsedIp.data : undefined; - const userAgent = req.headers?.['user-agent']; + const userAgent = headers?.['user-agent']; return { ipAddress, diff --git a/packages/lib/utils/document-audit-logs.ts b/packages/lib/utils/document-audit-logs.ts new file mode 100644 index 000000000..dcc3932e9 --- /dev/null +++ b/packages/lib/utils/document-audit-logs.ts @@ -0,0 +1,205 @@ +import type { DocumentAuditLog, DocumentMeta, Field, Recipient } from '@documenso/prisma/client'; + +import type { + TDocumentAuditLog, + TDocumentAuditLogDocumentMetaDiffSchema, + TDocumentAuditLogFieldDiffSchema, + TDocumentAuditLogRecipientDiffSchema, +} from '../types/document-audit-logs'; +import { + DOCUMENT_META_DIFF_TYPE, + FIELD_DIFF_TYPE, + RECIPIENT_DIFF_TYPE, + ZDocumentAuditLogSchema, +} from '../types/document-audit-logs'; +import type { RequestMetadata } from '../universal/extract-request-metadata'; + +type CreateDocumentAuditLogDataOptions = { + documentId: number; + type: T; + data: Extract['data']; + user: { email?: string; id?: number | null; name?: string | null } | null; + requestMetadata?: RequestMetadata; +}; + +type CreateDocumentAuditLogDataResponse = Pick< + DocumentAuditLog, + 'type' | 'ipAddress' | 'userAgent' | 'email' | 'userId' | 'name' | 'documentId' +> & { + data: TDocumentAuditLog['data']; +}; + +export const createDocumentAuditLogData = ({ + documentId, + type, + data, + user, + requestMetadata, +}: CreateDocumentAuditLogDataOptions): CreateDocumentAuditLogDataResponse => { + return { + type, + data, + documentId, + userId: user?.id ?? null, + email: user?.email ?? null, + name: user?.name ?? null, + userAgent: requestMetadata?.userAgent ?? null, + ipAddress: requestMetadata?.ipAddress ?? null, + }; +}; + +/** + * Parse a raw document audit log from Prisma, to a typed audit log. + * + * @param auditLog raw audit log from Prisma. + */ +export const parseDocumentAuditLogData = (auditLog: DocumentAuditLog): TDocumentAuditLog => { + const data = ZDocumentAuditLogSchema.safeParse(auditLog); + + // Handle any required migrations here. + if (!data.success) { + throw new Error('Migration required'); + } + + return data.data; +}; + +type PartialRecipient = Pick; + +export const diffRecipientChanges = ( + oldRecipient: PartialRecipient, + newRecipient: PartialRecipient, +): TDocumentAuditLogRecipientDiffSchema[] => { + const diffs: TDocumentAuditLogRecipientDiffSchema[] = []; + + if (oldRecipient.email !== newRecipient.email) { + diffs.push({ + type: RECIPIENT_DIFF_TYPE.EMAIL, + from: oldRecipient.email, + to: newRecipient.email, + }); + } + + if (oldRecipient.role !== newRecipient.role) { + diffs.push({ + type: RECIPIENT_DIFF_TYPE.ROLE, + from: oldRecipient.role, + to: newRecipient.role, + }); + } + + if (oldRecipient.name !== newRecipient.name) { + diffs.push({ + type: RECIPIENT_DIFF_TYPE.NAME, + from: oldRecipient.name, + to: newRecipient.name, + }); + } + + return diffs; +}; + +export const diffFieldChanges = ( + oldField: Field, + newField: Field, +): TDocumentAuditLogFieldDiffSchema[] => { + const diffs: TDocumentAuditLogFieldDiffSchema[] = []; + + if ( + oldField.page !== newField.page || + !oldField.positionX.equals(newField.positionX) || + !oldField.positionY.equals(newField.positionY) + ) { + diffs.push({ + type: FIELD_DIFF_TYPE.POSITION, + from: { + page: oldField.page, + positionX: oldField.positionX.toNumber(), + positionY: oldField.positionY.toNumber(), + }, + to: { + page: newField.page, + positionX: newField.positionX.toNumber(), + positionY: newField.positionY.toNumber(), + }, + }); + } + + if (!oldField.width.equals(newField.width) || !oldField.height.equals(newField.height)) { + diffs.push({ + type: FIELD_DIFF_TYPE.DIMENSION, + from: { + width: oldField.width.toNumber(), + height: oldField.height.toNumber(), + }, + to: { + width: newField.width.toNumber(), + height: newField.height.toNumber(), + }, + }); + } + + return diffs; +}; + +export const diffDocumentMetaChanges = ( + oldData: Partial = {}, + newData: DocumentMeta, +): TDocumentAuditLogDocumentMetaDiffSchema[] => { + const diffs: TDocumentAuditLogDocumentMetaDiffSchema[] = []; + + const oldDateFormat = oldData?.dateFormat ?? ''; + const oldMessage = oldData?.message ?? ''; + const oldSubject = oldData?.subject ?? ''; + const oldTimezone = oldData?.timezone ?? ''; + const oldPassword = oldData?.password ?? null; + const oldRedirectUrl = oldData?.redirectUrl ?? ''; + + if (oldDateFormat !== newData.dateFormat) { + diffs.push({ + type: DOCUMENT_META_DIFF_TYPE.DATE_FORMAT, + from: oldData?.dateFormat ?? '', + to: newData.dateFormat, + }); + } + + if (oldMessage !== newData.message) { + diffs.push({ + type: DOCUMENT_META_DIFF_TYPE.MESSAGE, + from: oldMessage, + to: newData.message, + }); + } + + if (oldSubject !== newData.subject) { + diffs.push({ + type: DOCUMENT_META_DIFF_TYPE.SUBJECT, + from: oldSubject, + to: newData.subject, + }); + } + + if (oldTimezone !== newData.timezone) { + diffs.push({ + type: DOCUMENT_META_DIFF_TYPE.TIMEZONE, + from: oldTimezone, + to: newData.timezone, + }); + } + + if (oldRedirectUrl !== newData.redirectUrl) { + diffs.push({ + type: DOCUMENT_META_DIFF_TYPE.REDIRECT_URL, + from: oldRedirectUrl, + to: newData.redirectUrl, + }); + } + + if (oldPassword !== newData.password) { + diffs.push({ + type: DOCUMENT_META_DIFF_TYPE.PASSWORD, + }); + } + + return diffs; +}; diff --git a/packages/prisma/migrations/20240209023519_add_document_audit_logs/migration.sql b/packages/prisma/migrations/20240209023519_add_document_audit_logs/migration.sql new file mode 100644 index 000000000..94e5fd097 --- /dev/null +++ b/packages/prisma/migrations/20240209023519_add_document_audit_logs/migration.sql @@ -0,0 +1,37 @@ +/* + Warnings: + + - A unique constraint covering the columns `[secondaryId]` on the table `Field` will be added. If there are existing duplicate values, this will fail. + - The required column `secondaryId` was added to the `Field` table with a prisma-level default value. This is not possible if the table is not empty. Please add this column as optional, then populate it before making it required. + +*/ +-- AlterTable +ALTER TABLE "Field" ADD COLUMN "secondaryId" TEXT; + +-- Set all null secondaryId fields to a uuid +UPDATE "Field" SET "secondaryId" = gen_random_uuid()::text WHERE "secondaryId" IS NULL; + +-- Restrict the Field to required +ALTER TABLE "Field" ALTER COLUMN "secondaryId" SET NOT NULL; + +-- CreateTable +CREATE TABLE "DocumentAuditLog" ( + "id" TEXT NOT NULL, + "documentId" INTEGER NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "type" TEXT NOT NULL, + "data" JSONB NOT NULL, + "name" TEXT, + "email" TEXT, + "userId" INTEGER, + "userAgent" TEXT, + "ipAddress" TEXT, + + CONSTRAINT "DocumentAuditLog_pkey" PRIMARY KEY ("id") +); + +-- CreateIndex +CREATE UNIQUE INDEX "Field_secondaryId_key" ON "Field"("secondaryId"); + +-- AddForeignKey +ALTER TABLE "DocumentAuditLog" ADD CONSTRAINT "DocumentAuditLog_documentId_fkey" FOREIGN KEY ("documentId") REFERENCES "Document"("id") ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index ff2d12319..2887cd6d2 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -170,11 +170,30 @@ model Document { teamId Int? team Team? @relation(fields: [teamId], references: [id]) + auditLogs DocumentAuditLog[] + @@unique([documentDataId]) @@index([userId]) @@index([status]) } +model DocumentAuditLog { + id String @id @default(cuid()) + documentId Int + createdAt DateTime @default(now()) + type String + data Json + + // Details of the person who performed the action which caused the audit log. + name String? + email String? + userId Int? + userAgent String? + ipAddress String? + + Document Document @relation(fields: [documentId], references: [id], onDelete: Cascade) +} + enum DocumentDataType { S3_PATH BYTES @@ -260,6 +279,7 @@ enum FieldType { model Field { id Int @id @default(autoincrement()) + secondaryId String @unique @default(cuid()) documentId Int? templateId Int? recipientId Int? diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts index d0ff48941..aebc6e505 100644 --- a/packages/trpc/server/document-router/router.ts +++ b/packages/trpc/server/document-router/router.ts @@ -15,6 +15,7 @@ import { updateTitle } from '@documenso/lib/server-only/document/update-title'; import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document'; import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document'; import { symmetricEncrypt } from '@documenso/lib/universal/crypto'; +import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { authenticatedProcedure, procedure, router } from '../trpc'; import { @@ -88,6 +89,7 @@ export const documentRouter = router({ teamId, title, documentDataId, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { if (err instanceof TRPCError) { @@ -131,6 +133,7 @@ export const documentRouter = router({ title, userId, documentId, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); }), @@ -144,6 +147,7 @@ export const documentRouter = router({ userId: ctx.user.id, documentId, recipients, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -166,6 +170,7 @@ export const documentRouter = router({ userId: ctx.user.id, documentId, fields, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -198,6 +203,7 @@ export const documentRouter = router({ documentId, password: securePassword, userId: ctx.user.id, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -224,12 +230,14 @@ export const documentRouter = router({ timezone: meta.timezone, redirectUrl: meta.redirectUrl, userId: ctx.user.id, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } return await sendDocument({ userId: ctx.user.id, documentId, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -248,6 +256,7 @@ export const documentRouter = router({ return await resendDocument({ userId: ctx.user.id, ...input, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); diff --git a/packages/trpc/server/field-router/router.ts b/packages/trpc/server/field-router/router.ts index 5ae3cbe4b..4df1b1ddc 100644 --- a/packages/trpc/server/field-router/router.ts +++ b/packages/trpc/server/field-router/router.ts @@ -4,6 +4,7 @@ import { removeSignedFieldWithToken } from '@documenso/lib/server-only/field/rem import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document'; import { setFieldsForTemplate } from '@documenso/lib/server-only/field/set-fields-for-template'; import { signFieldWithToken } from '@documenso/lib/server-only/field/sign-field-with-token'; +import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { authenticatedProcedure, procedure, router } from '../trpc'; import { @@ -33,6 +34,7 @@ export const fieldRouter = router({ pageWidth: field.pageWidth, pageHeight: field.pageHeight, })), + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -67,7 +69,7 @@ export const fieldRouter = router({ signFieldWithToken: procedure .input(ZSignFieldWithTokenMutationSchema) - .mutation(async ({ input }) => { + .mutation(async ({ input, ctx }) => { try { const { token, fieldId, value, isBase64 } = input; @@ -76,6 +78,7 @@ export const fieldRouter = router({ fieldId, value, isBase64, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -89,13 +92,14 @@ export const fieldRouter = router({ removeSignedFieldWithToken: procedure .input(ZRemovedSignedFieldWithTokenMutationSchema) - .mutation(async ({ input }) => { + .mutation(async ({ input, ctx }) => { try { const { token, fieldId } = input; return await removeSignedFieldWithToken({ token, fieldId, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); diff --git a/packages/trpc/server/recipient-router/router.ts b/packages/trpc/server/recipient-router/router.ts index 9553a8aae..c36b09ec9 100644 --- a/packages/trpc/server/recipient-router/router.ts +++ b/packages/trpc/server/recipient-router/router.ts @@ -3,6 +3,7 @@ import { TRPCError } from '@trpc/server'; import { completeDocumentWithToken } from '@documenso/lib/server-only/document/complete-document-with-token'; import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document'; import { setRecipientsForTemplate } from '@documenso/lib/server-only/recipient/set-recipients-for-template'; +import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata'; import { authenticatedProcedure, procedure, router } from '../trpc'; import { @@ -27,6 +28,7 @@ export const recipientRouter = router({ name: signer.name, role: signer.role, })), + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); @@ -65,13 +67,14 @@ export const recipientRouter = router({ completeDocumentWithToken: procedure .input(ZCompleteDocumentWithTokenMutationSchema) - .mutation(async ({ input }) => { + .mutation(async ({ input, ctx }) => { try { const { token, documentId } = input; return await completeDocumentWithToken({ token, documentId, + requestMetadata: extractNextApiRequestMetadata(ctx.req), }); } catch (err) { console.error(err); diff --git a/packages/trpc/server/singleplayer-router/router.ts b/packages/trpc/server/singleplayer-router/router.ts index 8e2266fcc..e2a6dbec0 100644 --- a/packages/trpc/server/singleplayer-router/router.ts +++ b/packages/trpc/server/singleplayer-router/router.ts @@ -62,6 +62,7 @@ export const singleplayerRouter = router({ : null, // Dummy data. id: -1, + secondaryId: '-1', documentId: -1, templateId: null, recipientId: -1, From 20e297673168b81c4fc5f807f892603e30866a28 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Mon, 12 Feb 2024 01:29:22 +0000 Subject: [PATCH 136/311] fix: build issues --- .../content/blog/commodifying-signing.mdx | 2 +- apps/marketing/content/blog/linear-gh.mdx | 2 +- .../content/blog/why-i-started-documenso.mdx | 2 +- .../src/app/(marketing)/[content]/page.tsx | 2 +- .../src/app/(marketing)/blog/[post]/page.tsx | 6 ++- .../src/app/(marketing)/claimed/page.tsx | 2 + .../src/app/(marketing)/pricing/page.tsx | 2 + .../src/app/(marketing)/singleplayer/page.tsx | 1 + apps/marketing/src/app/layout.tsx | 52 ++++++++++--------- .../web/src/app/(share)/share/[slug]/page.tsx | 6 +-- .../src/app/(unauthenticated)/signin/page.tsx | 2 +- apps/web/src/app/layout.tsx | 51 +++++++++--------- .../(teams)/dialogs/transfer-team-dialog.tsx | 2 +- .../(teams)/settings/layout/desktop-nav.tsx | 2 +- .../(teams)/settings/layout/mobile-nav.tsx | 2 +- packages/ee/server-only/limits/server.ts | 2 +- packages/lib/constants/app.ts | 2 +- .../server-only/document/send-document.tsx | 7 +-- .../team/accept-team-invitation.ts | 2 +- .../team/create-team-billing-portal.ts | 2 +- packages/lib/server-only/team/create-team.ts | 4 +- .../server-only/team/delete-team-members.ts | 2 +- packages/lib/server-only/team/leave-team.ts | 2 +- .../team/transfer-team-ownership.ts | 2 +- packages/lib/server-only/user/create-user.ts | 4 +- 25 files changed, 88 insertions(+), 77 deletions(-) diff --git a/apps/marketing/content/blog/commodifying-signing.mdx b/apps/marketing/content/blog/commodifying-signing.mdx index 0a9cf4050..2bf1b2799 100644 --- a/apps/marketing/content/blog/commodifying-signing.mdx +++ b/apps/marketing/content/blog/commodifying-signing.mdx @@ -5,7 +5,7 @@ authorName: 'Timur Ercan' authorImage: '/blog/blog-author-timur.jpeg' authorRole: 'Co-Founder' date: 2024-01-25 -Tags: +tags: - Vision - Mission - Open Source diff --git a/apps/marketing/content/blog/linear-gh.mdx b/apps/marketing/content/blog/linear-gh.mdx index 1267931d6..fc5282851 100644 --- a/apps/marketing/content/blog/linear-gh.mdx +++ b/apps/marketing/content/blog/linear-gh.mdx @@ -5,7 +5,7 @@ authorName: 'Timur Ercan' authorImage: '/blog/blog-author-timur.jpeg' authorRole: 'Co-Founder' date: 2024-01-10 -Tags: +tags: - GitHub - Backlog - Roadmap diff --git a/apps/marketing/content/blog/why-i-started-documenso.mdx b/apps/marketing/content/blog/why-i-started-documenso.mdx index 2fceddd25..9ef83b8d1 100644 --- a/apps/marketing/content/blog/why-i-started-documenso.mdx +++ b/apps/marketing/content/blog/why-i-started-documenso.mdx @@ -5,7 +5,7 @@ authorName: 'Timur Ercan' authorImage: '/blog/blog-author-timur.jpeg' authorRole: 'Co-Founder' date: 2024-02-06 -Tags: +tags: - Founders - Mission - Open Source diff --git a/apps/marketing/src/app/(marketing)/[content]/page.tsx b/apps/marketing/src/app/(marketing)/[content]/page.tsx index 62c83f400..ba23e6b81 100644 --- a/apps/marketing/src/app/(marketing)/[content]/page.tsx +++ b/apps/marketing/src/app/(marketing)/[content]/page.tsx @@ -12,7 +12,7 @@ export const generateMetadata = ({ params }: { params: { content: string } }) => const document = allDocuments.find((post) => post._raw.flattenedPath === params.content); if (!document) { - notFound(); + return { title: 'Not Found' }; } return { title: document.title }; diff --git a/apps/marketing/src/app/(marketing)/blog/[post]/page.tsx b/apps/marketing/src/app/(marketing)/blog/[post]/page.tsx index 866539a92..495b8946e 100644 --- a/apps/marketing/src/app/(marketing)/blog/[post]/page.tsx +++ b/apps/marketing/src/app/(marketing)/blog/[post]/page.tsx @@ -7,6 +7,8 @@ import { ChevronLeft } from 'lucide-react'; import type { MDXComponents } from 'mdx/types'; import { useMDXComponent } from 'next-contentlayer/hooks'; +export const dynamic = 'force-dynamic'; + export const generateStaticParams = () => allBlogPosts.map((post) => ({ post: post._raw.flattenedPath })); @@ -14,7 +16,9 @@ export const generateMetadata = ({ params }: { params: { post: string } }) => { const blogPost = allBlogPosts.find((post) => post._raw.flattenedPath === `blog/${params.post}`); if (!blogPost) { - notFound(); + return { + title: 'Not Found', + }; } return { diff --git a/apps/marketing/src/app/(marketing)/claimed/page.tsx b/apps/marketing/src/app/(marketing)/claimed/page.tsx index 7f85b5d2e..730a99377 100644 --- a/apps/marketing/src/app/(marketing)/claimed/page.tsx +++ b/apps/marketing/src/app/(marketing)/claimed/page.tsx @@ -13,6 +13,8 @@ import { Button } from '@documenso/ui/primitives/button'; import { PasswordReveal } from '~/components/(marketing)/password-reveal'; +export const dynamic = 'force-dynamic'; + const fontCaveat = Caveat({ weight: ['500'], subsets: ['latin'], diff --git a/apps/marketing/src/app/(marketing)/pricing/page.tsx b/apps/marketing/src/app/(marketing)/pricing/page.tsx index e4c7b776a..d926ec675 100644 --- a/apps/marketing/src/app/(marketing)/pricing/page.tsx +++ b/apps/marketing/src/app/(marketing)/pricing/page.tsx @@ -15,6 +15,8 @@ export const metadata: Metadata = { title: 'Pricing', }; +export const dynamic = 'force-dynamic'; + export type PricingPageProps = { searchParams?: { planId?: string; diff --git a/apps/marketing/src/app/(marketing)/singleplayer/page.tsx b/apps/marketing/src/app/(marketing)/singleplayer/page.tsx index aafad32a8..5e8a07040 100644 --- a/apps/marketing/src/app/(marketing)/singleplayer/page.tsx +++ b/apps/marketing/src/app/(marketing)/singleplayer/page.tsx @@ -7,6 +7,7 @@ export const metadata: Metadata = { }; export const revalidate = 0; +export const dynamic = 'force-dynamic'; // !: This entire file is a hack to get around failed prerendering of // !: the Single Player Mode page. This regression was introduced during diff --git a/apps/marketing/src/app/layout.tsx b/apps/marketing/src/app/layout.tsx index 1745149c6..57da42c3f 100644 --- a/apps/marketing/src/app/layout.tsx +++ b/apps/marketing/src/app/layout.tsx @@ -3,6 +3,7 @@ import { Suspense } from 'react'; import { Caveat, Inter } from 'next/font/google'; import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag'; +import { NEXT_PUBLIC_MARKETING_URL } from '@documenso/lib/constants/app'; import { getAllAnonymousFlags } from '@documenso/lib/universal/get-feature-flag'; import { TrpcProvider } from '@documenso/trpc/react'; import { cn } from '@documenso/ui/lib/utils'; @@ -17,32 +18,35 @@ import './globals.css'; const fontInter = Inter({ subsets: ['latin'], variable: '--font-sans' }); const fontCaveat = Caveat({ subsets: ['latin'], variable: '--font-signature' }); -export const metadata = { - title: { - template: '%s - Documenso', - default: 'Documenso', - }, - description: - 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', - keywords: - 'Documenso, open source, DocuSign alternative, document signing, open signing infrastructure, open-source community, fast signing, beautiful signing, smart templates', - authors: { name: 'Documenso, Inc.' }, - robots: 'index, follow', - openGraph: { - title: 'Documenso - The Open Source DocuSign Alternative', +export function generateMetadata() { + return { + title: { + template: '%s - Documenso', + default: 'Documenso', + }, description: 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', - type: 'website', - images: [`${process.env.NEXT_PUBLIC_MARKETING_URL}/opengraph-image.jpg`], - }, - twitter: { - site: '@documenso', - card: 'summary_large_image', - images: [`${process.env.NEXT_PUBLIC_MARKETING_URL}/opengraph-image.jpg`], - description: - 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', - }, -}; + keywords: + 'Documenso, open source, DocuSign alternative, document signing, open signing infrastructure, open-source community, fast signing, beautiful signing, smart templates', + authors: { name: 'Documenso, Inc.' }, + robots: 'index, follow', + metadataBase: new URL(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3000'), + openGraph: { + title: 'Documenso - The Open Source DocuSign Alternative', + description: + 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', + type: 'website', + images: ['/opengraph-image.jpg'], + }, + twitter: { + site: '@documenso', + card: 'summary_large_image', + images: ['/opengraph-image.jpg'], + description: + 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', + }, + }; +} export default async function RootLayout({ children }: { children: React.ReactNode }) { const flags = await getAllAnonymousFlags(); diff --git a/apps/web/src/app/(share)/share/[slug]/page.tsx b/apps/web/src/app/(share)/share/[slug]/page.tsx index 80d991934..efcd75a41 100644 --- a/apps/web/src/app/(share)/share/[slug]/page.tsx +++ b/apps/web/src/app/(share)/share/[slug]/page.tsx @@ -2,7 +2,7 @@ import type { Metadata } from 'next'; import { headers } from 'next/headers'; import { redirect } from 'next/navigation'; -import { APP_BASE_URL, NEXT_PUBLIC_MARKETING_URL } from '@documenso/lib/constants/app'; +import { NEXT_PUBLIC_MARKETING_URL } from '@documenso/lib/constants/app'; type SharePageProps = { params: { slug: string }; @@ -16,12 +16,12 @@ export function generateMetadata({ params: { slug } }: SharePageProps) { title: 'Documenso - Join the open source signing revolution', description: 'I just signed with Documenso!', type: 'website', - images: [`${APP_BASE_URL()}/share/${slug}/opengraph`], + images: [`/share/${slug}/opengraph`], }, twitter: { site: '@documenso', card: 'summary_large_image', - images: [`${APP_BASE_URL()}/share/${slug}/opengraph`], + images: [`/share/${slug}/opengraph`], description: 'I just signed with Documenso!', }, } satisfies Metadata; diff --git a/apps/web/src/app/(unauthenticated)/signin/page.tsx b/apps/web/src/app/(unauthenticated)/signin/page.tsx index 71a558bc0..50356a5bb 100644 --- a/apps/web/src/app/(unauthenticated)/signin/page.tsx +++ b/apps/web/src/app/(unauthenticated)/signin/page.tsx @@ -21,7 +21,7 @@ type SignInPageProps = { export default function SignInPage({ searchParams }: SignInPageProps) { const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP'); - + const rawEmail = typeof searchParams.email === 'string' ? searchParams.email : undefined; const email = rawEmail ? decryptSecondaryData(rawEmail) : null; diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx index 606aa0f10..7753e1e53 100644 --- a/apps/web/src/app/layout.tsx +++ b/apps/web/src/app/layout.tsx @@ -22,32 +22,35 @@ import './globals.css'; const fontInter = Inter({ subsets: ['latin'], variable: '--font-sans' }); const fontCaveat = Caveat({ subsets: ['latin'], variable: '--font-signature' }); -export const metadata = { - title: { - template: '%s - Documenso', - default: 'Documenso', - }, - description: - 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', - keywords: - 'Documenso, open source, DocuSign alternative, document signing, open signing infrastructure, open-source community, fast signing, beautiful signing, smart templates', - authors: { name: 'Documenso, Inc.' }, - robots: 'index, follow', - openGraph: { - title: 'Documenso - The Open Source DocuSign Alternative', +export function generateMetadata() { + return { + title: { + template: '%s - Documenso', + default: 'Documenso', + }, description: 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', - type: 'website', - images: [`${NEXT_PUBLIC_WEBAPP_URL()}/opengraph-image.jpg`], - }, - twitter: { - site: '@documenso', - card: 'summary_large_image', - images: [`${NEXT_PUBLIC_WEBAPP_URL()}/opengraph-image.jpg`], - description: - 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', - }, -}; + keywords: + 'Documenso, open source, DocuSign alternative, document signing, open signing infrastructure, open-source community, fast signing, beautiful signing, smart templates', + authors: { name: 'Documenso, Inc.' }, + robots: 'index, follow', + metadataBase: new URL(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000'), + openGraph: { + title: 'Documenso - The Open Source DocuSign Alternative', + description: + 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', + type: 'website', + images: ['/opengraph-image.jpg'], + }, + twitter: { + site: '@documenso', + card: 'summary_large_image', + images: ['/opengraph-image.jpg'], + description: + 'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.', + }, + }; +} export default async function RootLayout({ children }: { children: React.ReactNode }) { const flags = await getServerComponentAllFlags(); diff --git a/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx index e5dd8ca17..fb2d1bdfd 100644 --- a/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx +++ b/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx @@ -238,7 +238,7 @@ export const TransferTeamDialog = ({
    - {IS_BILLING_ENABLED && ( + {IS_BILLING_ENABLED() && ( // Temporary removed. //
  • // {form.getValues('clearPaymentMethods') diff --git a/apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx b/apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx index be68f6c03..98df7416e 100644 --- a/apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx +++ b/apps/web/src/components/(teams)/settings/layout/desktop-nav.tsx @@ -48,7 +48,7 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { - {IS_BILLING_ENABLED && ( + {IS_BILLING_ENABLED() && ( - {IS_BILLING_ENABLED && ( + {IS_BILLING_ENABLED() && ( + )) + .with({ isComplete: false }, () => ( + + )) + .with({ isComplete: true }, () => ( + + )) + .otherwise(() => null); +}; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx new file mode 100644 index 000000000..3e108aed5 --- /dev/null +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx @@ -0,0 +1,160 @@ +'use client'; + +import { useState } from 'react'; + +import Link from 'next/link'; + +import { Copy, Download, Edit, Loader, MoreHorizontal, Share, Trash2 } from 'lucide-react'; +import { useSession } from 'next-auth/react'; + +import { downloadPDF } from '@documenso/lib/client-only/download-pdf'; +import { formatDocumentsPath } from '@documenso/lib/utils/teams'; +import { DocumentStatus } from '@documenso/prisma/client'; +import type { Document, Recipient, Team, User } from '@documenso/prisma/client'; +import { trpc as trpcClient } from '@documenso/trpc/client'; +import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button'; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuTrigger, +} from '@documenso/ui/primitives/dropdown-menu'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +import { ResendDocumentActionItem } from '../_action-items/resend-document'; +import { DeleteDocumentDialog } from '../delete-document-dialog'; +import { DuplicateDocumentDialog } from '../duplicate-document-dialog'; + +export type DocumentPageViewDropdownProps = { + document: Document & { + User: Pick; + Recipient: Recipient[]; + team: Pick | null; + }; + team?: Pick; +}; + +export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDropdownProps) => { + const { data: session } = useSession(); + const { toast } = useToast(); + + const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false); + const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false); + + if (!session) { + return null; + } + + const recipient = document.Recipient.find((recipient) => recipient.email === session.user.email); + + const isOwner = document.User.id === session.user.id; + const isDraft = document.status === DocumentStatus.DRAFT; + const isComplete = document.status === DocumentStatus.COMPLETED; + const isDocumentDeletable = isOwner; + const isCurrentTeamDocument = team && document.team?.url === team.url; + + const documentsPath = formatDocumentsPath(team?.url); + + const onDownloadClick = async () => { + try { + const documentWithData = await trpcClient.document.getDocumentById.query({ + id: document.id, + teamId: team?.id, + }); + + const documentData = documentWithData?.documentData; + + if (!documentData) { + return; + } + + await downloadPDF({ documentData, fileName: document.title }); + } catch (err) { + toast({ + title: 'Something went wrong', + description: 'An error occurred while downloading your document.', + variant: 'destructive', + }); + } + }; + + const nonSignedRecipients = document.Recipient.filter((item) => item.signingStatus !== 'SIGNED'); + + return ( + + + + + + + Action + + {(isOwner || isCurrentTeamDocument) && !isComplete && ( + + + + Edit + + + )} + + {isComplete && ( + + + Download + + )} + + setDuplicateDialogOpen(true)}> + + Duplicate + + + setDeleteDialogOpen(true)} disabled={!isDocumentDeletable}> + + Delete + + + Share + + + + ( + e.preventDefault()}> +
    + {loading ? : } + Share Signing Card +
    +
    + )} + /> +
    + + {isDocumentDeletable && ( + + )} + {isDuplicateDialogOpen && ( + + )} +
    + ); +}; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-information.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-information.tsx new file mode 100644 index 000000000..00bbe0d83 --- /dev/null +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-information.tsx @@ -0,0 +1,71 @@ +'use client'; + +import { useMemo } from 'react'; + +import { DateTime } from 'luxon'; + +import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted'; +import { useLocale } from '@documenso/lib/client-only/providers/locale'; +import type { Document, Recipient, User } from '@documenso/prisma/client'; + +export type DocumentPageViewInformationProps = { + userId: number; + document: Document & { + User: Pick; + Recipient: Recipient[]; + }; +}; + +export const DocumentPageViewInformation = ({ + document, + userId, +}: DocumentPageViewInformationProps) => { + const isMounted = useIsMounted(); + const { locale } = useLocale(); + + const documentInformation = useMemo(() => { + let createdValue = DateTime.fromJSDate(document.createdAt).toFormat('MMMM d, yyyy'); + let lastModifiedValue = DateTime.fromJSDate(document.updatedAt).toRelative(); + + if (!isMounted) { + createdValue = DateTime.fromJSDate(document.createdAt) + .setLocale(locale) + .toFormat('MMMM d, yyyy'); + + lastModifiedValue = DateTime.fromJSDate(document.updatedAt).setLocale(locale).toRelative(); + } + + return [ + { + description: 'Uploaded by', + value: userId === document.userId ? 'You' : document.User.name ?? document.User.email, + }, + { + description: 'Created', + value: createdValue, + }, + { + description: 'Last modified', + value: lastModifiedValue, + }, + ]; + }, [isMounted, document, locale, userId]); + + return ( +
    +

    Information

    + +
      + {documentInformation.map((item) => ( +
    • + {item.description} + {item.value} +
    • + ))} +
    +
    + ); +}; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx index 6759d91ac..c821bfac8 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx @@ -1,22 +1,42 @@ import Link from 'next/link'; import { redirect } from 'next/navigation'; -import { ChevronLeft, Users2 } from 'lucide-react'; +import { + CheckIcon, + ChevronLeft, + Clock, + MailIcon, + MailOpenIcon, + PenIcon, + PlusIcon, + Users2, +} from 'lucide-react'; +import { match } from 'ts-pattern'; import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto'; +import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; 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 { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; import type { Team } from '@documenso/prisma/client'; -import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client'; +import { SignatureIcon } from '@documenso/ui/icons/signature'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { Badge } from '@documenso/ui/primitives/badge'; +import { Card, CardContent } from '@documenso/ui/primitives/card'; import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer'; -import { EditDocumentForm } from '~/app/(dashboard)/documents/[id]/edit-document'; import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip'; -import { DocumentStatus } from '~/components/formatter/document-status'; +import { + DocumentStatus as DocumentStatusComponent, + FRIENDLY_STATUS_MAP, +} from '~/components/formatter/document-status'; + +import { DocumentPageViewButton } from './document-page-view-button'; +import { DocumentPageViewDropdown } from './document-page-view-dropdown'; +import { DocumentPageViewInformation } from './document-page-view-information'; export type DocumentPageViewProps = { params: { @@ -67,65 +87,196 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps) documentMeta.password = securePassword; } - const [recipients, fields] = await Promise.all([ - getRecipientsForDocument({ - documentId, - userId: user.id, - }), - getFieldsForDocument({ - documentId, - userId: user.id, - }), - ]); + const recipients = await getRecipientsForDocument({ + documentId, + userId: user.id, + }); + + const documentWithRecipients = { + ...document, + Recipient: recipients, + }; return (
    - + Documents -

    - {document.title} -

    +
    +

    + {document.title} +

    -
    - +
    + - {recipients.length > 0 && ( -
    - + {recipients.length > 0 && ( +
    + - - {recipients.length} Recipient(s) - -
    - )} + + {recipients.length} Recipient(s) + +
    + )} +
    - {document.status !== InternalDocumentStatus.COMPLETED && ( - - )} +
    + + + + + - {document.status === InternalDocumentStatus.COMPLETED && ( -
    - +
    +
    +
    +
    +

    + Document {FRIENDLY_STATUS_MAP[document.status].label.toLowerCase()} +

    + + +
    + +

    + {match(document.status) + .with( + DocumentStatus.COMPLETED, + () => 'This document has been signed by all recipients', + ) + .with( + DocumentStatus.DRAFT, + () => 'This document is currently a draft and has not been sent', + ) + .with(DocumentStatus.PENDING, () => { + const pendingRecipients = recipients.filter( + (recipient) => recipient.signingStatus === 'NOT_SIGNED', + ); + + return `Waiting on ${pendingRecipients.length} recipient${ + pendingRecipients.length > 1 ? 's' : '' + }`; + }) + .exhaustive()} +

    + +
    + +
    +
    + + {/* Document information section. */} + + + {/* Recipients section. */} +
    +
    +

    Recipients

    + + {document.status !== DocumentStatus.COMPLETED && ( + + {recipients.length === 0 ? ( + + ) : ( + + )} + + )} +
    + +
      + {recipients.length === 0 && ( +
    • + No recipients +
    • + )} + + {recipients.map((recipient) => ( +
    • + {recipient.email}

      + } + secondaryText={ +

      + {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName} +

      + } + /> + + {document.status !== DocumentStatus.DRAFT && + recipient.signingStatus === SigningStatus.SIGNED && ( + + {match(recipient.role) + .with(RecipientRole.APPROVER, () => ( + <> + + Approved + + )) + .with(RecipientRole.CC, () => + document.status === DocumentStatus.COMPLETED ? ( + <> + + Sent + + ) : ( + <> + + Ready + + ), + ) + + .with(RecipientRole.SIGNER, () => ( + <> + + Signed + + )) + .with(RecipientRole.VIEWER, () => ( + <> + + Viewed + + )) + .exhaustive()} + + )} + + {document.status !== DocumentStatus.DRAFT && + recipient.signingStatus === SigningStatus.NOT_SIGNED && ( + + + Pending + + )} +
    • + ))} +
    +
    +
    - )} +
    ); }; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx index 813458062..fe278486e 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx @@ -2,10 +2,16 @@ import { useState } from 'react'; -import { useRouter } from 'next/navigation'; +import { useRouter, useSearchParams } from 'next/navigation'; -import type { DocumentData, DocumentMeta, Field, Recipient, User } from '@documenso/prisma/client'; -import { DocumentStatus } from '@documenso/prisma/client'; +import { + 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'; @@ -49,12 +55,9 @@ export const EditDocumentForm = ({ documentRootPath, }: EditDocumentFormProps) => { const { toast } = useToast(); - const router = useRouter(); - // controlled stepper state - const [step, setStep] = useState( - document.status === DocumentStatus.DRAFT ? 'title' : 'signers', - ); + const router = useRouter(); + const searchParams = useSearchParams(); const { mutateAsync: addTitle } = trpc.document.setTitleForDocument.useMutation(); const { mutateAsync: addFields } = trpc.field.addFields.useMutation(); @@ -86,6 +89,24 @@ export const EditDocumentForm = ({ }, }; + const [step, setStep] = useState(() => { + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + const searchParamStep = searchParams?.get('step') as EditDocumentStep | undefined; + + let initialStep: EditDocumentStep = + document.status === DocumentStatus.DRAFT ? 'title' : 'signers'; + + if ( + searchParamStep && + documentFlow[searchParamStep] !== undefined && + !(recipients.length === 0 && (searchParamStep === 'subject' || searchParamStep === 'fields')) + ) { + initialStep = searchParamStep; + } + + return initialStep; + }); + const onAddTitleFormSubmit = async (data: TAddTitleFormSchema) => { try { // Custom invocation server action diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx new file mode 100644 index 000000000..87b3738bb --- /dev/null +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx @@ -0,0 +1,121 @@ +import Link from 'next/link'; +import { redirect } from 'next/navigation'; + +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 { 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'; +import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client'; + +import { EditDocumentForm } from '~/app/(dashboard)/documents/[id]/edit-document'; +import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip'; +import { DocumentStatus } from '~/components/formatter/document-status'; + +export type DocumentEditPageViewProps = { + params: { + id: string; + }; + team?: Team; +}; + +export const DocumentEditPageView = async ({ params, team }: DocumentEditPageViewProps) => { + const { id } = params; + + const documentId = Number(id); + + const documentRootPath = formatDocumentsPath(team?.url); + + if (!documentId || Number.isNaN(documentId)) { + redirect(documentRootPath); + } + + const { user } = await getRequiredServerComponentSession(); + + const document = await getDocumentById({ + id: documentId, + userId: user.id, + teamId: team?.id, + }).catch(() => null); + + if (!document || !document.documentData) { + redirect(documentRootPath); + } + + if (document.status === InternalDocumentStatus.COMPLETED) { + redirect(`${documentRootPath}/${documentId}`); + } + + const { documentData, documentMeta } = document; + + if (documentMeta?.password) { + const key = DOCUMENSO_ENCRYPTION_KEY; + + if (!key) { + throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY'); + } + + const securePassword = Buffer.from( + symmetricDecrypt({ + key, + data: documentMeta.password, + }), + ).toString('utf-8'); + + documentMeta.password = securePassword; + } + + const [recipients, fields] = await Promise.all([ + getRecipientsForDocument({ + documentId, + userId: user.id, + }), + getFieldsForDocument({ + documentId, + userId: user.id, + }), + ]); + + return ( +
    + + + Documents + + +

    + {document.title} +

    + +
    + + + {recipients.length > 0 && ( +
    + + + + {recipients.length} Recipient(s) + +
    + )} +
    + + +
    + ); +}; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit/page.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit/page.tsx new file mode 100644 index 000000000..6c613a287 --- /dev/null +++ b/apps/web/src/app/(dashboard)/documents/[id]/edit/page.tsx @@ -0,0 +1,11 @@ +import { DocumentEditPageView } from './document-edit-page-view'; + +export type DocumentPageProps = { + params: { + id: string; + }; +}; + +export default function DocumentEditPage({ params }: DocumentPageProps) { + return ; +} diff --git a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx index e8e3d6130..ff2291c54 100644 --- a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx @@ -119,7 +119,7 @@ export const ResendDocumentActionItem = ({ - +

    Who do you want to remind?

    diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx index 78ffd0b3b..455f50be5 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx @@ -94,7 +94,7 @@ export const DataTableActionButton = ({ row, team }: DataTableActionButtonProps) isOwner ? { isDraft: true, isOwner: true } : { isDraft: true, isCurrentTeamDocument: true }, () => (
    From c432261dd8ff7756ad7bc9b1059944d7478fa1c1 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:49:31 +0200 Subject: [PATCH 143/311] chore: disable button while form is submitting --- apps/web/src/components/forms/send-confirmation-email.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/components/forms/send-confirmation-email.tsx b/apps/web/src/components/forms/send-confirmation-email.tsx index 9e669539e..ee073d063 100644 --- a/apps/web/src/components/forms/send-confirmation-email.tsx +++ b/apps/web/src/components/forms/send-confirmation-email.tsx @@ -83,7 +83,7 @@ export const SendConfirmationEmailForm = ({ className }: SendConfirmationEmailFo )} />
- From 82b87739d017fac09007e79506be747c82de2e8d Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Mon, 12 Feb 2024 19:00:47 +1100 Subject: [PATCH 144/311] fix: update document links --- .../(dashboard)/documents/data-table-title.tsx | 15 +++++++++++---- .../src/app/(dashboard)/documents/data-table.tsx | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/data-table-title.tsx b/apps/web/src/app/(dashboard)/documents/data-table-title.tsx index c04f9f13d..dc2ba154d 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table-title.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table-title.tsx @@ -5,16 +5,19 @@ import Link from 'next/link'; import { useSession } from 'next-auth/react'; import { match } from 'ts-pattern'; -import { Document, Recipient, User } from '@documenso/prisma/client'; +import { formatDocumentsPath } from '@documenso/lib/utils/teams'; +import type { Document, Recipient, Team, User } from '@documenso/prisma/client'; export type DataTableTitleProps = { row: Document & { User: Pick; + team: Pick | null; Recipient: Recipient[]; }; + teamUrl?: string; }; -export const DataTableTitle = ({ row }: DataTableTitleProps) => { +export const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => { const { data: session } = useSession(); if (!session) { @@ -25,14 +28,18 @@ export const DataTableTitle = ({ row }: DataTableTitleProps) => { const isOwner = row.User.id === session.user.id; const isRecipient = !!recipient; + const isCurrentTeamDocument = teamUrl && row.team?.url === teamUrl; + + const documentsPath = formatDocumentsPath(isCurrentTeamDocument ? teamUrl : undefined); return match({ isOwner, isRecipient, + isCurrentTeamDocument, }) - .with({ isOwner: true }, () => ( + .with({ isOwner: true }, { isCurrentTeamDocument: true }, () => ( diff --git a/apps/web/src/app/(dashboard)/documents/data-table.tsx b/apps/web/src/app/(dashboard)/documents/data-table.tsx index 13b85d526..1adaace7b 100644 --- a/apps/web/src/app/(dashboard)/documents/data-table.tsx +++ b/apps/web/src/app/(dashboard)/documents/data-table.tsx @@ -66,7 +66,7 @@ export const DocumentsDataTable = ({ }, { header: 'Title', - cell: ({ row }) => , + cell: ({ row }) => , }, { id: 'sender', From 149f416be76ef555f91a5e9bebacc5659ec826b0 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Tue, 13 Feb 2024 07:50:22 +0200 Subject: [PATCH 145/311] chore: refactor code --- .../forms/send-confirmation-email.tsx | 50 ++++++++++--------- packages/lib/next-auth/auth-options.ts | 14 ++++-- .../user/get-last-verification-token.ts | 27 ++++++++++ .../lib/server-only/user/get-user-by-email.ts | 3 -- 4 files changed, 64 insertions(+), 30 deletions(-) create mode 100644 packages/lib/server-only/user/get-last-verification-token.ts diff --git a/apps/web/src/components/forms/send-confirmation-email.tsx b/apps/web/src/components/forms/send-confirmation-email.tsx index ee073d063..33247bf9f 100644 --- a/apps/web/src/components/forms/send-confirmation-email.tsx +++ b/apps/web/src/components/forms/send-confirmation-email.tsx @@ -13,6 +13,7 @@ import { 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'; @@ -63,31 +64,32 @@ export const SendConfirmationEmailForm = ({ className }: SendConfirmationEmailFo }; return ( -
-
- -
- ( - - Email address - - - - - )} - /> -
- -
- -
+ + + ); }; diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index d28506ca3..723b9cd7b 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -13,6 +13,7 @@ import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/cl import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble'; import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa'; +import { getLastVerificationToken } from '../server-only/user/get-last-verification-token'; import { getUserByEmail } from '../server-only/user/get-user-by-email'; import { sendConfirmationToken } from '../server-only/user/send-confirmation-token'; import { extractNextAuthRequestMetadata } from '../universal/extract-request-metadata'; @@ -92,12 +93,19 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } if (!user.emailVerified) { - const totalUserVerificationTokens = user.VerificationToken.length; - const lastUserVerificationToken = user.VerificationToken[totalUserVerificationTokens - 1]; + const [lastUserVerificationToken] = await getLastVerificationToken({ userId: user.id }); + + if (!lastUserVerificationToken) { + await sendConfirmationToken({ email }); + throw new Error(ErrorCode.UNVERIFIED_EMAIL); + } + const expiredToken = DateTime.fromJSDate(lastUserVerificationToken.expires) <= DateTime.now(); + const lastSentToken = DateTime.fromJSDate(lastUserVerificationToken.createdAt); + const sentWithinLastHour = DateTime.now().minus({ hours: 1 }) <= lastSentToken; - if (totalUserVerificationTokens < 1 || expiredToken) { + if (expiredToken || !sentWithinLastHour) { await sendConfirmationToken({ email }); } diff --git a/packages/lib/server-only/user/get-last-verification-token.ts b/packages/lib/server-only/user/get-last-verification-token.ts new file mode 100644 index 000000000..279a1fcfd --- /dev/null +++ b/packages/lib/server-only/user/get-last-verification-token.ts @@ -0,0 +1,27 @@ +import { prisma } from '@documenso/prisma'; + +export interface GetLastVerificationTokenOptions { + userId: number; +} + +export const getLastVerificationToken = async ({ userId }: GetLastVerificationTokenOptions) => { + const user = await prisma.user.findFirstOrThrow({ + where: { + id: userId, + }, + include: { + VerificationToken: { + select: { + expires: true, + createdAt: true, + }, + orderBy: { + createdAt: 'desc', + }, + take: 1, + }, + }, + }); + + return user.VerificationToken; +}; diff --git a/packages/lib/server-only/user/get-user-by-email.ts b/packages/lib/server-only/user/get-user-by-email.ts index 8c61202a2..0a2ef8d16 100644 --- a/packages/lib/server-only/user/get-user-by-email.ts +++ b/packages/lib/server-only/user/get-user-by-email.ts @@ -9,8 +9,5 @@ export const getUserByEmail = async ({ email }: GetUserByEmailOptions) => { where: { email: email.toLowerCase(), }, - include: { - VerificationToken: true, - }, }); }; From 4878cf388f35feb857fd1c701868b5f97bd46476 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Tue, 13 Feb 2024 07:53:36 +0200 Subject: [PATCH 146/311] chore: add the missing signIn function --- apps/web/src/components/forms/signup.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx index 087e71fbe..7082bcee3 100644 --- a/apps/web/src/components/forms/signup.tsx +++ b/apps/web/src/components/forms/signup.tsx @@ -3,6 +3,7 @@ import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; +import { signIn } from 'next-auth/react'; import { useForm } from 'react-hook-form'; import { FcGoogle } from 'react-icons/fc'; import { z } from 'zod'; From d052f0201325d590d5066efafeefbc8f2e6a1f69 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Tue, 13 Feb 2024 06:01:25 +0000 Subject: [PATCH 147/311] chore: refactor code --- packages/lib/next-auth/auth-options.ts | 22 +++++++-------- .../user/get-last-verification-token.ts | 27 ------------------- ...st-recent-verification-token-by-user-id.ts | 18 +++++++++++++ .../user/send-confirmation-token.ts | 20 +++++++++++++- 4 files changed, 46 insertions(+), 41 deletions(-) delete mode 100644 packages/lib/server-only/user/get-last-verification-token.ts create mode 100644 packages/lib/server-only/user/get-most-recent-verification-token-by-user-id.ts diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 723b9cd7b..b944b6e7b 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -13,7 +13,7 @@ import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/cl import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble'; import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa'; -import { getLastVerificationToken } from '../server-only/user/get-last-verification-token'; +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 { extractNextAuthRequestMetadata } from '../universal/extract-request-metadata'; @@ -93,19 +93,15 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } if (!user.emailVerified) { - const [lastUserVerificationToken] = await getLastVerificationToken({ userId: user.id }); + const mostRecentToken = await getMostRecentVerificationTokenByUserId({ + userId: user.id, + }); - if (!lastUserVerificationToken) { - await sendConfirmationToken({ email }); - throw new Error(ErrorCode.UNVERIFIED_EMAIL); - } - - const expiredToken = - DateTime.fromJSDate(lastUserVerificationToken.expires) <= DateTime.now(); - const lastSentToken = DateTime.fromJSDate(lastUserVerificationToken.createdAt); - const sentWithinLastHour = DateTime.now().minus({ hours: 1 }) <= lastSentToken; - - if (expiredToken || !sentWithinLastHour) { + if ( + !mostRecentToken || + mostRecentToken.expires.valueOf() <= Date.now() || + DateTime.fromJSDate(mostRecentToken.createdAt).diffNow('minutes').minutes > -5 + ) { await sendConfirmationToken({ email }); } diff --git a/packages/lib/server-only/user/get-last-verification-token.ts b/packages/lib/server-only/user/get-last-verification-token.ts deleted file mode 100644 index 279a1fcfd..000000000 --- a/packages/lib/server-only/user/get-last-verification-token.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { prisma } from '@documenso/prisma'; - -export interface GetLastVerificationTokenOptions { - userId: number; -} - -export const getLastVerificationToken = async ({ userId }: GetLastVerificationTokenOptions) => { - const user = await prisma.user.findFirstOrThrow({ - where: { - id: userId, - }, - include: { - VerificationToken: { - select: { - expires: true, - createdAt: true, - }, - orderBy: { - createdAt: 'desc', - }, - take: 1, - }, - }, - }); - - return user.VerificationToken; -}; diff --git a/packages/lib/server-only/user/get-most-recent-verification-token-by-user-id.ts b/packages/lib/server-only/user/get-most-recent-verification-token-by-user-id.ts new file mode 100644 index 000000000..d9adc4498 --- /dev/null +++ b/packages/lib/server-only/user/get-most-recent-verification-token-by-user-id.ts @@ -0,0 +1,18 @@ +import { prisma } from '@documenso/prisma'; + +export type GetMostRecentVerificationTokenByUserIdOptions = { + userId: number; +}; + +export const getMostRecentVerificationTokenByUserId = async ({ + userId, +}: GetMostRecentVerificationTokenByUserIdOptions) => { + return await prisma.verificationToken.findFirst({ + where: { + userId, + }, + orderBy: { + createdAt: 'desc', + }, + }); +}; diff --git a/packages/lib/server-only/user/send-confirmation-token.ts b/packages/lib/server-only/user/send-confirmation-token.ts index a399dd9fc..ef7c4b104 100644 --- a/packages/lib/server-only/user/send-confirmation-token.ts +++ b/packages/lib/server-only/user/send-confirmation-token.ts @@ -1,13 +1,20 @@ import crypto from 'crypto'; +import { DateTime } from 'luxon'; import { prisma } from '@documenso/prisma'; import { ONE_HOUR } from '../../constants/time'; import { sendConfirmationEmail } from '../auth/send-confirmation-email'; +import { getMostRecentVerificationTokenByUserId } from './get-most-recent-verification-token-by-user-id'; const IDENTIFIER = 'confirmation-email'; -export const sendConfirmationToken = async ({ email }: { email: string }) => { +type SendConfirmationTokenOptions = { email: string; force?: boolean }; + +export const sendConfirmationToken = async ({ + email, + force = false, +}: SendConfirmationTokenOptions) => { const token = crypto.randomBytes(20).toString('hex'); const user = await prisma.user.findFirst({ @@ -24,6 +31,17 @@ export const sendConfirmationToken = async ({ email }: { email: string }) => { throw new Error('Email verified'); } + const mostRecentToken = await getMostRecentVerificationTokenByUserId({ userId: user.id }); + + // If we've sent a token in the last 5 minutes, don't send another one + if ( + !force && + mostRecentToken?.createdAt && + DateTime.fromJSDate(mostRecentToken.createdAt).diffNow('minutes').minutes > -5 + ) { + return; + } + const createdToken = await prisma.verificationToken.create({ data: { identifier: IDENTIFIER, From 4c5b910a5987c7843df7782d07bb6e4d31cf1d75 Mon Sep 17 00:00:00 2001 From: Mythie Date: Wed, 14 Feb 2024 13:15:35 +1100 Subject: [PATCH 148/311] chore: add examples --- .../examples/01-create-and-send-document.ts | 59 +++++++++++++++++++ packages/api/v1/examples/02-add-a-field.ts | 43 ++++++++++++++ packages/api/v1/examples/03-update-a-field.ts | 39 ++++++++++++ packages/api/v1/examples/04-remove-a-field.ts | 31 ++++++++++ .../api/v1/examples/05-add-a-recipient.ts | 38 ++++++++++++ .../api/v1/examples/06-update-a-recipient.ts | 34 +++++++++++ .../api/v1/examples/07-remove-a-recipient.ts | 31 ++++++++++ packages/api/v1/examples/08-get-a-document.ts | 31 ++++++++++ .../v1/examples/09-paginate-all-documents.ts | 37 ++++++++++++ packages/api/v1/schema.ts | 21 ++++--- 10 files changed, 355 insertions(+), 9 deletions(-) create mode 100644 packages/api/v1/examples/01-create-and-send-document.ts create mode 100644 packages/api/v1/examples/02-add-a-field.ts create mode 100644 packages/api/v1/examples/03-update-a-field.ts create mode 100644 packages/api/v1/examples/04-remove-a-field.ts create mode 100644 packages/api/v1/examples/05-add-a-recipient.ts create mode 100644 packages/api/v1/examples/06-update-a-recipient.ts create mode 100644 packages/api/v1/examples/07-remove-a-recipient.ts create mode 100644 packages/api/v1/examples/08-get-a-document.ts create mode 100644 packages/api/v1/examples/09-paginate-all-documents.ts diff --git a/packages/api/v1/examples/01-create-and-send-document.ts b/packages/api/v1/examples/01-create-and-send-document.ts new file mode 100644 index 000000000..925d86656 --- /dev/null +++ b/packages/api/v1/examples/01-create-and-send-document.ts @@ -0,0 +1,59 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const { status, body } = await client.createDocument({ + body: { + title: 'My Document', + recipients: [ + { + name: 'John Doe', + email: 'john@example.com', + role: 'SIGNER', + }, + { + name: 'Jane Doe', + email: 'jane@example.com', + role: 'APPROVER', + }, + ], + meta: { + subject: 'Please sign this document', + message: 'Hey {signer.name}, please sign the following document: {document.name}', + }, + }, + }); + + if (status !== 200) { + throw new Error('Failed to create document'); + } + + const { uploadUrl, documentId } = body; + + await fetch(uploadUrl, { + method: 'PUT', + headers: { + 'Content-Type': 'application/octet-stream', + }, + body: '', + }); + + await client.sendDocument({ + params: { + id: documentId.toString(), + }, + }); +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/02-add-a-field.ts b/packages/api/v1/examples/02-add-a-field.ts new file mode 100644 index 000000000..6b186694a --- /dev/null +++ b/packages/api/v1/examples/02-add-a-field.ts @@ -0,0 +1,43 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const documentId = '1'; + const recipientId = 1; + + const { status, body } = await client.createField({ + params: { + id: documentId, + }, + body: { + type: 'SIGNATURE', + pageHeight: 2.5, // percent of page to occupy in height + pageWidth: 5, // percent of page to occupy in width + pageX: 10, // percent from left + pageY: 10, // percent from top + pageNumber: 1, + recipientId, + }, + }); + + if (status !== 200) { + throw new Error('Failed to create field'); + } + + const { id: fieldId } = body; + + console.log(`Field created with id: ${fieldId}`); +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/03-update-a-field.ts b/packages/api/v1/examples/03-update-a-field.ts new file mode 100644 index 000000000..d93831b7c --- /dev/null +++ b/packages/api/v1/examples/03-update-a-field.ts @@ -0,0 +1,39 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const documentId = '1'; + const fieldId = '1'; + + const { status } = await client.updateField({ + params: { + id: documentId, + fieldId, + }, + body: { + type: 'SIGNATURE', + pageHeight: 2.5, // percent of page to occupy in height + pageWidth: 5, // percent of page to occupy in width + pageX: 10, // percent from left + pageY: 10, // percent from top + pageNumber: 1, + }, + }); + + if (status !== 200) { + throw new Error('Failed to update field'); + } +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/04-remove-a-field.ts b/packages/api/v1/examples/04-remove-a-field.ts new file mode 100644 index 000000000..d7f233940 --- /dev/null +++ b/packages/api/v1/examples/04-remove-a-field.ts @@ -0,0 +1,31 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const documentId = '1'; + const fieldId = '1'; + + const { status } = await client.deleteField({ + params: { + id: documentId, + fieldId, + }, + }); + + if (status !== 200) { + throw new Error('Failed to remove field'); + } +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/05-add-a-recipient.ts b/packages/api/v1/examples/05-add-a-recipient.ts new file mode 100644 index 000000000..e63abd9e5 --- /dev/null +++ b/packages/api/v1/examples/05-add-a-recipient.ts @@ -0,0 +1,38 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const documentId = '1'; + + const { status, body } = await client.createRecipient({ + params: { + id: documentId, + }, + body: { + name: 'John Doe', + email: 'john@example.com', + role: 'APPROVER', + }, + }); + + if (status !== 200) { + throw new Error('Failed to add recipient'); + } + + const { id: recipientId } = body; + + console.log(`Recipient added with id: ${recipientId}`); +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/06-update-a-recipient.ts b/packages/api/v1/examples/06-update-a-recipient.ts new file mode 100644 index 000000000..d9e8255e7 --- /dev/null +++ b/packages/api/v1/examples/06-update-a-recipient.ts @@ -0,0 +1,34 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const documentId = '1'; + const recipientId = '1'; + + const { status } = await client.updateRecipient({ + params: { + id: documentId, + recipientId, + }, + body: { + name: 'Johnathon Doe', + }, + }); + + if (status !== 200) { + throw new Error('Failed to update recipient'); + } +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/07-remove-a-recipient.ts b/packages/api/v1/examples/07-remove-a-recipient.ts new file mode 100644 index 000000000..956e7dcae --- /dev/null +++ b/packages/api/v1/examples/07-remove-a-recipient.ts @@ -0,0 +1,31 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const documentId = '1'; + const recipientId = '1'; + + const { status } = await client.deleteRecipient({ + params: { + id: documentId, + recipientId, + }, + }); + + if (status !== 200) { + throw new Error('Failed to update recipient'); + } +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/08-get-a-document.ts b/packages/api/v1/examples/08-get-a-document.ts new file mode 100644 index 000000000..eb69cc8e8 --- /dev/null +++ b/packages/api/v1/examples/08-get-a-document.ts @@ -0,0 +1,31 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const documentId = '1'; + + const { status, body } = await client.getDocument({ + params: { + id: documentId, + }, + }); + + if (status !== 200) { + throw new Error('Failed to get document'); + } + + console.log(`Got document with id: ${documentId} and title: ${body.title}`); +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/examples/09-paginate-all-documents.ts b/packages/api/v1/examples/09-paginate-all-documents.ts new file mode 100644 index 000000000..f0330b620 --- /dev/null +++ b/packages/api/v1/examples/09-paginate-all-documents.ts @@ -0,0 +1,37 @@ +import { initClient } from '@ts-rest/core'; + +import { ApiContractV1 } from '../contract'; + +const main = async () => { + const client = initClient(ApiContractV1, { + baseUrl: 'http://localhost:3000/api/v1', + baseHeaders: { + authorization: 'Bearer ', + }, + }); + + const page = 1; + const perPage = 10; + + const { status, body } = await client.getDocuments({ + query: { + page, + perPage, + }, + }); + + if (status !== 200) { + throw new Error('Failed to get documents'); + } + + for (const document of body.documents) { + console.log(`Got document with id: ${document.id} and title: ${document.title}`); + } + + console.log(`Total documents: ${body.totalPages * perPage}`); +}; + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/packages/api/v1/schema.ts b/packages/api/v1/schema.ts index 091e01fb6..511f4060b 100644 --- a/packages/api/v1/schema.ts +++ b/packages/api/v1/schema.ts @@ -12,8 +12,8 @@ import { * Documents */ export const ZGetDocumentsQuerySchema = z.object({ - page: z.string().optional(), - perPage: z.string().optional(), + page: z.number().min(1).optional().default(1), + perPage: z.number().min(1).optional().default(1), }); export type TGetDocumentsQuerySchema = z.infer; @@ -55,13 +55,15 @@ export const ZCreateDocumentMutationSchema = z.object({ role: z.nativeEnum(RecipientRole).optional().default(RecipientRole.SIGNER), }), ), - meta: z.object({ - subject: z.string(), - message: z.string(), - timezone: z.string(), - dateFormat: z.string(), - redirectUrl: z.string(), - }), + meta: z + .object({ + subject: z.string(), + message: z.string(), + timezone: z.string(), + dateFormat: z.string(), + redirectUrl: z.string(), + }) + .partial(), }); export type TCreateDocumentMutationSchema = z.infer; @@ -142,6 +144,7 @@ export const ZDeleteFieldMutationSchema = null; export type TDeleteFieldMutationSchema = typeof ZDeleteFieldMutationSchema; export const ZSuccessfulFieldResponseSchema = z.object({ + id: z.number(), documentId: z.number(), recipientId: z.number(), type: z.nativeEnum(FieldType), From 61958989b46db31efcc6fe6b6c9d711d089d26d4 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:38:58 +0200 Subject: [PATCH 149/311] feat: more webhook functionality --- .../settings/webhooks/[id]/page.tsx | 162 ++++++++++++++++++ .../(dashboard)/settings/webhooks/page.tsx | 16 +- .../webhooks/multiselect-combobox.tsx | 6 +- .../lib/server-only/user/get-user-webhooks.ts | 17 ++ .../lib/server-only/webhooks/edit-webhook.ts | 21 +++ .../server-only/webhooks/get-webhook-by-id.ts | 15 ++ packages/trpc/server/webhook-router/router.ts | 48 +++++- packages/trpc/server/webhook-router/schema.ts | 16 +- 8 files changed, 287 insertions(+), 14 deletions(-) create mode 100644 apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx create mode 100644 packages/lib/server-only/user/get-user-webhooks.ts create mode 100644 packages/lib/server-only/webhooks/edit-webhook.ts create mode 100644 packages/lib/server-only/webhooks/get-webhook-by-id.ts diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx new file mode 100644 index 000000000..56a1e90a9 --- /dev/null +++ b/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx @@ -0,0 +1,162 @@ +'use client'; + +import { useRouter } from 'next/navigation'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import type { z } from 'zod'; + +import { trpc } from '@documenso/trpc/react'; +import { ZEditWebhookMutationSchema } from '@documenso/trpc/server/webhook-router/schema'; +import { Button } from '@documenso/ui/primitives/button'; +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from '@documenso/ui/primitives/form/form'; +import { Input } from '@documenso/ui/primitives/input'; +import { Switch } from '@documenso/ui/primitives/switch'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header'; +import { MultiSelectCombobox } from '~/components/(dashboard)/settings/webhooks/multiselect-combobox'; + +const ZEditWebhookFormSchema = ZEditWebhookMutationSchema.omit({ id: true }); + +type TEditWebhookFormSchema = z.infer; + +export type WebhookPageOptions = { + params: { + id: number; + }; +}; + +export default function WebhookPage({ params }: WebhookPageOptions) { + const { toast } = useToast(); + const router = useRouter(); + + const { data: webhook } = trpc.webhook.getWebhookById.useQuery( + { + id: Number(params.id), + }, + { enabled: !!params.id }, + ); + + const { mutateAsync: updateWebhook } = trpc.webhook.editWebhook.useMutation(); + + const form = useForm({ + resolver: zodResolver(ZEditWebhookFormSchema), + values: { + webhookUrl: webhook?.webhookUrl ?? '', + eventTriggers: webhook?.eventTriggers ?? [], + secret: webhook?.secret ?? '', + enabled: webhook?.enabled ?? true, + }, + }); + + const onSubmit = async (data: TEditWebhookFormSchema) => { + try { + await updateWebhook({ + id: Number(params.id), + ...data, + }); + + toast({ + title: 'Webhook updated', + description: 'The webhook has been updated successfully.', + duration: 5000, + }); + + router.refresh(); + } catch (err) { + toast({ + title: 'Failed to update webhook', + description: 'We encountered an error while updating the webhook. Please try again later.', + variant: 'destructive', + }); + } + }; + + return ( +
+ +
+ +
+ ( + + Webhook URL + + + + )} + /> + ( + + Event triggers + + { + onChange(values); + }} + /> + + + + )} + /> + ( + + Secret + + + + + + )} + /> + + ( + + Active + + + + + + )} + /> +
+ +
+
+
+ +
+ ); +} diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx index 060257d72..638443bf9 100644 --- a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx @@ -1,5 +1,7 @@ 'use client'; +import Link from 'next/link'; + import { Zap } from 'lucide-react'; import { ToggleLeft, ToggleRight } from 'lucide-react'; @@ -22,7 +24,7 @@ export default function WebhookPage() { - {webhooks?.length === 0 && ( + {webhooks && webhooks.length === 0 && ( // TODO: Perhaps add some illustrations here to make the page more engaging

@@ -31,7 +33,7 @@ export default function WebhookPage() {

)} - {webhooks?.length > 0 && ( + {webhooks && webhooks.length > 0 && (
{webhooks?.map((webhook) => (
@@ -41,9 +43,9 @@ export default function WebhookPage() {

{webhook.webhookUrl}

Event triggers

{webhook.eventTriggers.map((trigger, index) => ( -

- {trigger} -

+ + {trigger} + ))} {webhook.enabled ? (

@@ -57,8 +59,8 @@ export default function WebhookPage() {

- diff --git a/apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx b/apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx index 269b83449..2adbaeb7a 100644 --- a/apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx +++ b/apps/web/src/components/(dashboard)/settings/webhooks/multiselect-combobox.tsx @@ -14,6 +14,8 @@ import { } from '@documenso/ui/primitives/command'; import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover'; +import { truncateTitle } from '~/helpers/truncate-title'; + type ComboboxProps = { listValues: string[]; onChange: (_values: string[]) => void; @@ -53,13 +55,13 @@ const MultiSelectCombobox = ({ listValues, onChange }: ComboboxProps) => { aria-expanded={isOpen} className="w-[200px] justify-between" > - {selectedValues.length > 0 ? selectedValues.join(', ') : 'Select values...'} + {selectedValues.length > 0 ? selectedValues.length + ' selected...' : 'Select values...'} - + No value found. {allEvents.map((value: string, i: number) => ( diff --git a/packages/lib/server-only/user/get-user-webhooks.ts b/packages/lib/server-only/user/get-user-webhooks.ts new file mode 100644 index 000000000..26c47e0f4 --- /dev/null +++ b/packages/lib/server-only/user/get-user-webhooks.ts @@ -0,0 +1,17 @@ +import { prisma } from '@documenso/prisma'; + +export interface GetUserWebhooksByIdOptions { + id: number; +} + +export const getUserWebhooksById = async ({ id }: GetUserWebhooksByIdOptions) => { + return await prisma.user.findFirstOrThrow({ + where: { + id, + }, + select: { + email: true, + Webhooks: true, + }, + }); +}; diff --git a/packages/lib/server-only/webhooks/edit-webhook.ts b/packages/lib/server-only/webhooks/edit-webhook.ts new file mode 100644 index 000000000..4177bb2bf --- /dev/null +++ b/packages/lib/server-only/webhooks/edit-webhook.ts @@ -0,0 +1,21 @@ +import type { Prisma } from '@prisma/client'; + +import { prisma } from '@documenso/prisma'; + +export type EditWebhookOptions = { + id: number; + data: Prisma.WebhookUpdateInput; + userId: number; +}; + +export const editWebhook = async ({ id, data, userId }: EditWebhookOptions) => { + return await prisma.webhook.update({ + where: { + id, + userId, + }, + data: { + ...data, + }, + }); +}; diff --git a/packages/lib/server-only/webhooks/get-webhook-by-id.ts b/packages/lib/server-only/webhooks/get-webhook-by-id.ts new file mode 100644 index 000000000..82dbb70ef --- /dev/null +++ b/packages/lib/server-only/webhooks/get-webhook-by-id.ts @@ -0,0 +1,15 @@ +import { prisma } from '@documenso/prisma'; + +export type GetWebhookByIdOptions = { + id: number; + userId: number; +}; + +export const getWebhookById = async ({ id, userId }: GetWebhookByIdOptions) => { + return await prisma.webhook.findFirstOrThrow({ + where: { + id, + userId, + }, + }); +}; diff --git a/packages/trpc/server/webhook-router/router.ts b/packages/trpc/server/webhook-router/router.ts index 6598b856a..aeb7e6f38 100644 --- a/packages/trpc/server/webhook-router/router.ts +++ b/packages/trpc/server/webhook-router/router.ts @@ -2,11 +2,17 @@ import { TRPCError } from '@trpc/server'; import { createWebhook } from '@documenso/lib/server-only/webhooks/create-webhook'; import { deleteWebhookById } from '@documenso/lib/server-only/webhooks/delete-webhook-by-id'; +import { editWebhook } from '@documenso/lib/server-only/webhooks/edit-webhook'; +import { getWebhookById } from '@documenso/lib/server-only/webhooks/get-webhook-by-id'; import { getWebhooksByUserId } from '@documenso/lib/server-only/webhooks/get-webhooks-by-user-id'; import { authenticatedProcedure, router } from '../trpc'; -import { ZCreateWebhookFormSchema } from './schema'; -import { ZDeleteWebhookSchema } from './schema'; +import { + ZCreateWebhookFormSchema, + ZDeleteWebhookMutationSchema, + ZEditWebhookMutationSchema, + ZGetWebhookByIdQuerySchema, +} from './schema'; export const webhookRouter = router({ getWebhooks: authenticatedProcedure.query(async ({ ctx }) => { @@ -19,6 +25,24 @@ export const webhookRouter = router({ }); } }), + getWebhookById: authenticatedProcedure + .input(ZGetWebhookByIdQuerySchema) + .query(async ({ input, ctx }) => { + try { + const { id } = input; + + return await getWebhookById({ + id, + userId: ctx.user.id, + }); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to fetch your webhook. Please try again later.', + }); + } + }), + createWebhook: authenticatedProcedure .input(ZCreateWebhookFormSchema) .mutation(async ({ input, ctx }) => { @@ -35,7 +59,7 @@ export const webhookRouter = router({ } }), deleteWebhook: authenticatedProcedure - .input(ZDeleteWebhookSchema) + .input(ZDeleteWebhookMutationSchema) .mutation(async ({ input, ctx }) => { try { const { id } = input; @@ -51,4 +75,22 @@ export const webhookRouter = router({ }); } }), + editWebhook: authenticatedProcedure + .input(ZEditWebhookMutationSchema) + .mutation(async ({ input, ctx }) => { + try { + const { id } = input; + + return await editWebhook({ + id, + data: input, + userId: ctx.user.id, + }); + } catch (err) { + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to create this webhook. Please try again later.', + }); + } + }), }); diff --git a/packages/trpc/server/webhook-router/schema.ts b/packages/trpc/server/webhook-router/schema.ts index aba409c2f..def654a70 100644 --- a/packages/trpc/server/webhook-router/schema.ts +++ b/packages/trpc/server/webhook-router/schema.ts @@ -11,10 +11,22 @@ export const ZCreateWebhookFormSchema = z.object({ enabled: z.boolean(), }); -export const ZDeleteWebhookSchema = z.object({ +export const ZGetWebhookByIdQuerySchema = z.object({ + id: z.number(), +}); + +export const ZEditWebhookMutationSchema = ZCreateWebhookFormSchema.extend({ + id: z.number(), +}); + +export const ZDeleteWebhookMutationSchema = z.object({ id: z.number(), }); export type TCreateWebhookFormSchema = z.infer; -export type TDeleteWebhookSchema = z.infer; +export type TGetWebhookByIdQuerySchema = z.infer; + +export type TDeleteWebhookMutationSchema = z.infer; + +export type TEditWebhookMutationSchema = z.infer; From cab875f68a70512d669622c215cecfd789878403 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Wed, 14 Feb 2024 13:20:40 +0000 Subject: [PATCH 150/311] fix: update create delete user sql script --- .../migration.sql | 53 ++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/packages/prisma/migrations/20240205120648_create_delete_account/migration.sql b/packages/prisma/migrations/20240205120648_create_delete_account/migration.sql index 72727eadb..bfb9c2c83 100644 --- a/packages/prisma/migrations/20240205120648_create_delete_account/migration.sql +++ b/packages/prisma/migrations/20240205120648_create_delete_account/migration.sql @@ -1,25 +1,30 @@ -- Create deleted@documenso.com -INSERT INTO - "public"."User" ( - "email", - "emailVerified", - "password", - "createdAt", - "updatedAt", - "lastSignedIn", - "roles", - "identityProvider", - "twoFactorEnabled" - ) -VALUES - ( - 'deleted@documenso.com', - '2024-02-05 11:58:39.668 UTC', - NULL, - '2024-02-05 11:58:39.670 UTC', - '2024-02-05 11:58:39.670 UTC', - '2024-02-05 11:58:39.670 UTC', - ARRAY['USER'::TEXT]::"public"."Role" [], - CAST('GOOGLE'::TEXT AS "public"."IdentityProvider"), - FALSE - ) +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM "public"."User" WHERE "email" = 'deleted@documenso.com') THEN + INSERT INTO + "public"."User" ( + "email", + "emailVerified", + "password", + "createdAt", + "updatedAt", + "lastSignedIn", + "roles", + "identityProvider", + "twoFactorEnabled" + ) + VALUES + ( + 'deleted@documenso.com', + NOW(), + NULL, + NOW(), + NOW(), + NOW(), + ARRAY['USER'::TEXT]::"public"."Role" [], + CAST('GOOGLE'::TEXT AS "public"."IdentityProvider"), + FALSE + ); + END IF; +END $$ From c680cfc24f54eece6a4a362bdc0d1c1ef60fa8ae Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Wed, 14 Feb 2024 14:52:18 +0000 Subject: [PATCH 151/311] chore: update pr based on review --- apps/web/src/components/forms/profile.tsx | 4 +--- packages/ee/server-only/stripe/delete-customer.ts | 10 ---------- packages/lib/server-only/user/delete-user.ts | 2 +- packages/trpc/server/auth-router/schema.ts | 6 ------ packages/trpc/server/profile-router/router.ts | 6 ++---- 5 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 packages/ee/server-only/stripe/delete-customer.ts diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index 7a4bbdb77..a44e70940 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -124,9 +124,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { duration: 5000, }); - await signOut({ callbackUrl: '/' }); - - return; + return await signOut({ callbackUrl: '/' }); } const { token } = deleteAccountTwoFactorTokenForm.getValues(); diff --git a/packages/ee/server-only/stripe/delete-customer.ts b/packages/ee/server-only/stripe/delete-customer.ts deleted file mode 100644 index 16120de68..000000000 --- a/packages/ee/server-only/stripe/delete-customer.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { stripe } from '@documenso/lib/server-only/stripe'; -import type { User } from '@documenso/prisma/client'; - -export const deleteStripeCustomer = async (user: User) => { - if (!user.customerId) { - return null; - } - - return await stripe.customers.del(user.customerId); -}; diff --git a/packages/lib/server-only/user/delete-user.ts b/packages/lib/server-only/user/delete-user.ts index 352f5c9e9..02d811b12 100644 --- a/packages/lib/server-only/user/delete-user.ts +++ b/packages/lib/server-only/user/delete-user.ts @@ -4,7 +4,7 @@ export type DeleteUserOptions = { email: string; }; -export const deleteUser = async ({ email }: DeleteUserOptions) => { +export const deletedServiceAccount = async ({ email }: DeleteUserOptions) => { const user = await prisma.user.findFirst({ where: { email: { diff --git a/packages/trpc/server/auth-router/schema.ts b/packages/trpc/server/auth-router/schema.ts index 49826d7ad..dbe42a25c 100644 --- a/packages/trpc/server/auth-router/schema.ts +++ b/packages/trpc/server/auth-router/schema.ts @@ -26,9 +26,3 @@ export const ZSignUpMutationSchema = z.object({ export type TSignUpMutationSchema = z.infer; export const ZVerifyPasswordMutationSchema = ZSignUpMutationSchema.pick({ password: true }); - -export const ZDeleteAccountMutationSchema = z.object({ - email: z.string().email(), -}); - -export type TDeleteAccountMutationSchema = z.infer; diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts index 552057bdd..56a6eea29 100644 --- a/packages/trpc/server/profile-router/router.ts +++ b/packages/trpc/server/profile-router/router.ts @@ -1,7 +1,6 @@ import { TRPCError } from '@trpc/server'; -import { deleteStripeCustomer } from '@documenso/ee/server-only/stripe/delete-customer'; -import { deleteUser } from '@documenso/lib/server-only/user/delete-user'; +import { deletedServiceAccount } from '@documenso/lib/server-only/user/delete-user'; import { findUserSecurityAuditLogs } from '@documenso/lib/server-only/user/find-user-security-audit-logs'; import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password'; import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id'; @@ -161,9 +160,8 @@ export const profileRouter = router({ deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => { try { const user = ctx.user; - await deleteStripeCustomer(user); - return await deleteUser(user); + return await deletedServiceAccount(user); } catch (err) { let message = 'We were unable to delete your account. Please try again.'; From abab0c0a22a586e22c0f50007f300ceb4e9c519d Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 14 Feb 2024 17:11:46 +0100 Subject: [PATCH 152/311] chore: grammer and format --- .well-known/security.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.well-known/security.txt b/.well-known/security.txt index 0b00c7123..1a3f685e5 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -1,6 +1,7 @@ # General Issues Contact: https://github.com/documenso/documenso/issues/new?assignees=&labels=bug&projects=&template=bug-report.yml -# Report critical issues privately, to let us take appropriate action before publishing + +# Report critical issues privately to let us take appropriate action before publishing. Contact: mailto:security@documenso.com Preferred-Languages: en -Canonical: https://documenso.com/.well-known/security.txt +Canonical: https://documenso.com/.well-known/security.txt \ No newline at end of file From 3e12a05ab8fa665bb53f9ba71c9e9b06c59817e6 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Wed, 14 Feb 2024 17:19:48 +0100 Subject: [PATCH 153/311] chore: more grammar --- apps/marketing/public/.well-known/security.txt | 5 +++-- apps/web/public/.well-known/security.txt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/marketing/public/.well-known/security.txt b/apps/marketing/public/.well-known/security.txt index 0b00c7123..1a3f685e5 100644 --- a/apps/marketing/public/.well-known/security.txt +++ b/apps/marketing/public/.well-known/security.txt @@ -1,6 +1,7 @@ # General Issues Contact: https://github.com/documenso/documenso/issues/new?assignees=&labels=bug&projects=&template=bug-report.yml -# Report critical issues privately, to let us take appropriate action before publishing + +# Report critical issues privately to let us take appropriate action before publishing. Contact: mailto:security@documenso.com Preferred-Languages: en -Canonical: https://documenso.com/.well-known/security.txt +Canonical: https://documenso.com/.well-known/security.txt \ No newline at end of file diff --git a/apps/web/public/.well-known/security.txt b/apps/web/public/.well-known/security.txt index 0b00c7123..1a3f685e5 100644 --- a/apps/web/public/.well-known/security.txt +++ b/apps/web/public/.well-known/security.txt @@ -1,6 +1,7 @@ # General Issues Contact: https://github.com/documenso/documenso/issues/new?assignees=&labels=bug&projects=&template=bug-report.yml -# Report critical issues privately, to let us take appropriate action before publishing + +# Report critical issues privately to let us take appropriate action before publishing. Contact: mailto:security@documenso.com Preferred-Languages: en -Canonical: https://documenso.com/.well-known/security.txt +Canonical: https://documenso.com/.well-known/security.txt \ No newline at end of file From 49cddfab38acdbefd5a385b105cdef8929991429 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Thu, 15 Feb 2024 06:11:50 +0000 Subject: [PATCH 154/311] chore: lint with oxc --- .../src/app/(marketing)/open/page.tsx | 7 +- .../src/app/(marketing)/pricing/page.tsx | 4 +- .../components/(marketing)/pricing-table.tsx | 8 +- .../_action-items/resend-document.tsx | 152 +++++++++--------- packages/lib/server-only/2fa/setup-2fa.ts | 2 +- 5 files changed, 91 insertions(+), 82 deletions(-) diff --git a/apps/marketing/src/app/(marketing)/open/page.tsx b/apps/marketing/src/app/(marketing)/open/page.tsx index a1fea41e4..76de85fcf 100644 --- a/apps/marketing/src/app/(marketing)/open/page.tsx +++ b/apps/marketing/src/app/(marketing)/open/page.tsx @@ -147,7 +147,12 @@ export default async function OpenPage() {

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:{' '} - + Announcing Open Metrics

diff --git a/apps/marketing/src/app/(marketing)/pricing/page.tsx b/apps/marketing/src/app/(marketing)/pricing/page.tsx index e4c7b776a..5756f9e68 100644 --- a/apps/marketing/src/app/(marketing)/pricing/page.tsx +++ b/apps/marketing/src/app/(marketing)/pricing/page.tsx @@ -53,7 +53,7 @@ export default function PricingPage() {
@@ -166,6 +166,7 @@ export default function PricingPage() { support@documenso.com @@ -175,6 +176,7 @@ export default function PricingPage() { className="text-documenso-700 font-bold" href="https://documen.so/discord" target="_blank" + rel="noreferrer" > in our Discord-Support-Channel {' '} diff --git a/apps/marketing/src/components/(marketing)/pricing-table.tsx b/apps/marketing/src/components/(marketing)/pricing-table.tsx index b65411064..80510b8e5 100644 --- a/apps/marketing/src/components/(marketing)/pricing-table.tsx +++ b/apps/marketing/src/components/(marketing)/pricing-table.tsx @@ -123,7 +123,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {

{' '} - + The Early Adopter Deal:

@@ -133,7 +133,11 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {

{' '} - + Includes all upcoming features diff --git a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx index e8e3d6130..4bcb25a6c 100644 --- a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx @@ -108,88 +108,86 @@ export const ResendDocumentActionItem = ({ }; return ( - <> -

- - e.preventDefault()}> - - Resend - - + + + e.preventDefault()}> + + Resend + + - - - -

Who do you want to remind?

-
-
+ + + +

Who do you want to remind?

+
+
-
- - ( - <> - {recipients.map((recipient) => ( - + + ( + <> + {recipients.map((recipient) => ( + + - - - {recipient.email} - + + {recipient.email} + - - - checked - ? onChange([...value, recipient.id]) - : onChange(value.filter((v) => v !== recipient.id)) - } - /> - - - ))} - - )} - /> - - + + + checked + ? onChange([...value, recipient.id]) + : onChange(value.filter((v) => v !== recipient.id)) + } + /> + + + ))} + + )} + /> + + - -
- - - - - -
-
-
-
- + + + +
+ + + ); }; diff --git a/packages/lib/server-only/2fa/setup-2fa.ts b/packages/lib/server-only/2fa/setup-2fa.ts index 23f213574..bcaa8d498 100644 --- a/packages/lib/server-only/2fa/setup-2fa.ts +++ b/packages/lib/server-only/2fa/setup-2fa.ts @@ -43,7 +43,7 @@ export const setupTwoFactorAuthentication = async ({ const secret = crypto.randomBytes(10); - const backupCodes = new Array(10) + const backupCodes = Array.from({ length: 10 }) .fill(null) .map(() => crypto.randomBytes(5).toString('hex')) .map((code) => `${code.slice(0, 5)}-${code.slice(5)}`.toUpperCase()); From 769eaa0ed99d41839e66c72649a5e05e626a78f9 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Thu, 15 Feb 2024 07:01:41 +0000 Subject: [PATCH 155/311] feat: add roles to templates recipients --- .../recipient/set-recipients-for-template.ts | 4 + .../template/create-document-from-template.ts | 1 + .../trpc/server/recipient-router/router.ts | 1 + .../trpc/server/recipient-router/schema.ts | 1 + .../primitives/document-flow/add-signers.tsx | 10 +- .../ui/primitives/recipient-role-icons.tsx | 10 ++ .../template-flow/add-template-fields.tsx | 109 ++++++++++-------- .../add-template-placeholder-recipients.tsx | 62 ++++++++-- ...d-template-placeholder-recipients.types.ts | 3 + 9 files changed, 135 insertions(+), 66 deletions(-) create mode 100644 packages/ui/primitives/recipient-role-icons.tsx diff --git a/packages/lib/server-only/recipient/set-recipients-for-template.ts b/packages/lib/server-only/recipient/set-recipients-for-template.ts index 7c96bcf44..5315711a5 100644 --- a/packages/lib/server-only/recipient/set-recipients-for-template.ts +++ b/packages/lib/server-only/recipient/set-recipients-for-template.ts @@ -1,4 +1,5 @@ import { prisma } from '@documenso/prisma'; +import type { RecipientRole } from '@documenso/prisma/client'; import { nanoid } from '../../universal/id'; @@ -9,6 +10,7 @@ export type SetRecipientsForTemplateOptions = { id?: number; email: string; name: string; + role: RecipientRole; }[]; }; @@ -84,11 +86,13 @@ export const setRecipientsForTemplate = async ({ update: { name: recipient.name, email: recipient.email, + role: recipient.role, templateId, }, create: { name: recipient.name, email: recipient.email, + role: recipient.role, token: nanoid(), templateId, }, diff --git a/packages/lib/server-only/template/create-document-from-template.ts b/packages/lib/server-only/template/create-document-from-template.ts index c520d4ce1..fc4e161e4 100644 --- a/packages/lib/server-only/template/create-document-from-template.ts +++ b/packages/lib/server-only/template/create-document-from-template.ts @@ -57,6 +57,7 @@ export const createDocumentFromTemplate = async ({ create: template.Recipient.map((recipient) => ({ email: recipient.email, name: recipient.name, + role: recipient.role, token: nanoid(), })), }, diff --git a/packages/trpc/server/recipient-router/router.ts b/packages/trpc/server/recipient-router/router.ts index c36b09ec9..d28edb6c3 100644 --- a/packages/trpc/server/recipient-router/router.ts +++ b/packages/trpc/server/recipient-router/router.ts @@ -53,6 +53,7 @@ export const recipientRouter = router({ id: signer.nativeId, email: signer.email, name: signer.name, + role: signer.role, })), }); } catch (err) { diff --git a/packages/trpc/server/recipient-router/schema.ts b/packages/trpc/server/recipient-router/schema.ts index a6b4e0d11..edcd34ed6 100644 --- a/packages/trpc/server/recipient-router/schema.ts +++ b/packages/trpc/server/recipient-router/schema.ts @@ -34,6 +34,7 @@ export const ZAddTemplateSignersMutationSchema = z nativeId: z.number().optional(), email: z.string().email().min(1), name: z.string(), + role: z.nativeEnum(RecipientRole), }), ), }) diff --git a/packages/ui/primitives/document-flow/add-signers.tsx b/packages/ui/primitives/document-flow/add-signers.tsx index b1341c6ca..b13e220f3 100644 --- a/packages/ui/primitives/document-flow/add-signers.tsx +++ b/packages/ui/primitives/document-flow/add-signers.tsx @@ -4,7 +4,7 @@ import React, { useId } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; import { AnimatePresence, motion } from 'framer-motion'; -import { BadgeCheck, Copy, Eye, PencilLine, Plus, Trash } from 'lucide-react'; +import { Plus, Trash } from 'lucide-react'; import { Controller, useFieldArray, useForm } from 'react-hook-form'; import { useLimits } from '@documenso/ee/server-only/limits/provider/client'; @@ -17,6 +17,7 @@ import { Button } from '../button'; import { FormErrorMessage } from '../form/form-error-message'; import { Input } from '../input'; import { Label } from '../label'; +import { ROLE_ICONS } from '../recipient-role-icons'; import { Select, SelectContent, SelectItem, SelectTrigger } from '../select'; import { useStep } from '../stepper'; import { useToast } from '../use-toast'; @@ -32,13 +33,6 @@ import { import { ShowFieldItem } from './show-field-item'; import type { DocumentFlowStep } from './types'; -const ROLE_ICONS: Record = { - SIGNER: , - APPROVER: , - CC: , - VIEWER: , -}; - export type AddSignersFormProps = { documentFlow: DocumentFlowStep; recipients: Recipient[]; diff --git a/packages/ui/primitives/recipient-role-icons.tsx b/packages/ui/primitives/recipient-role-icons.tsx new file mode 100644 index 000000000..5bc4f34b9 --- /dev/null +++ b/packages/ui/primitives/recipient-role-icons.tsx @@ -0,0 +1,10 @@ +import { BadgeCheck, Copy, Eye, PencilLine } from 'lucide-react'; + +import type { RecipientRole } from '.prisma/client'; + +export const ROLE_ICONS: Record = { + SIGNER: , + APPROVER: , + CC: , + VIEWER: , +}; diff --git a/packages/ui/primitives/template-flow/add-template-fields.tsx b/packages/ui/primitives/template-flow/add-template-fields.tsx index bb9c304d9..602bd749b 100644 --- a/packages/ui/primitives/template-flow/add-template-fields.tsx +++ b/packages/ui/primitives/template-flow/add-template-fields.tsx @@ -1,6 +1,6 @@ 'use client'; -import { useCallback, useEffect, useRef, useState } from 'react'; +import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Caveat } from 'next/font/google'; @@ -10,9 +10,10 @@ import { useFieldArray, useForm } from 'react-hook-form'; import { getBoundingClientRect } from '@documenso/lib/client-only/get-bounding-client-rect'; import { useDocumentElement } from '@documenso/lib/client-only/hooks/use-document-element'; import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer'; +import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles'; import { nanoid } from '@documenso/lib/universal/id'; import type { Field, Recipient } from '@documenso/prisma/client'; -import { FieldType } from '@documenso/prisma/client'; +import { FieldType, RecipientRole } from '@documenso/prisma/client'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; import { Card, CardContent } from '@documenso/ui/primitives/card'; @@ -291,6 +292,28 @@ export const AddTemplateFieldsFormPartial = ({ setSelectedSigner(recipients[0]); }, [recipients]); + const recipientsByRole = useMemo(() => { + const recipientsByRole: Record = { + CC: [], + VIEWER: [], + SIGNER: [], + APPROVER: [], + }; + + recipients.forEach((recipient) => { + recipientsByRole[recipient.role].push(recipient); + }); + + return recipientsByRole; + }, [recipients]); + + const recipientsByRoleToDisplay = useMemo(() => { + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + return (Object.entries(recipientsByRole) as [RecipientRole, Recipient[]][]).filter( + ([role]) => role !== RecipientRole.CC && role !== RecipientRole.VIEWER, + ); + }, [recipientsByRole]); + return ( <> @@ -363,55 +386,49 @@ export const AddTemplateFieldsFormPartial = ({ - - {recipients.map((recipient, index) => ( - { - setSelectedSigner(recipient); - setShowRecipientsSelector(false); - }} - > - {/* {recipient.sendStatus !== SendStatus.SENT ? ( - - ) : ( - - - - - - This document has already been sent to this recipient. You can no - longer edit this recipient. - - - )} */} + {recipientsByRoleToDisplay.map(([role, recipients], roleIndex) => ( + +
+ {`${RECIPIENT_ROLES_DESCRIPTION[role].roleName}s`} +
- {recipient.name && ( + {recipients.length === 0 && ( +
+ No recipients with this role +
+ )} + + {recipients.map((recipient) => ( + { + setSelectedSigner(recipient); + setShowRecipientsSelector(false); + }} + > - {recipient.name} ({recipient.email}) - - )} + {recipient.name && ( + + {recipient.name} ({recipient.email}) + + )} - {!recipient.name && ( - - {recipient.email} + {!recipient.name && ( + {recipient.email} + )} - )} - - ))} -
+
+ ))} +
+ ))} diff --git a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx index ebe48b562..87ec48ad1 100644 --- a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx +++ b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx @@ -5,10 +5,10 @@ import React, { useId, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; import { AnimatePresence, motion } from 'framer-motion'; import { Plus, Trash } from 'lucide-react'; -import { useFieldArray, useForm } from 'react-hook-form'; +import { Controller, useFieldArray, useForm } from 'react-hook-form'; import { nanoid } from '@documenso/lib/universal/id'; -import type { Field, Recipient } from '@documenso/prisma/client'; +import { type Field, type Recipient, RecipientRole } from '@documenso/prisma/client'; import { Button } from '@documenso/ui/primitives/button'; import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message'; import { Input } from '@documenso/ui/primitives/input'; @@ -21,6 +21,8 @@ import { DocumentFlowFormContainerStep, } from '../document-flow/document-flow-root'; import type { DocumentFlowStep } from '../document-flow/types'; +import { ROLE_ICONS } from '../recipient-role-icons'; +import { Select, SelectContent, SelectItem, SelectTrigger } from '../select'; import { useStep } from '../stepper'; import type { TAddTemplatePlacholderRecipientsFormSchema } from './add-template-placeholder-recipients.types'; import { ZAddTemplatePlacholderRecipientsFormSchema } from './add-template-placeholder-recipients.types'; @@ -59,12 +61,14 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({ formId: String(recipient.id), name: recipient.name, email: recipient.email, + role: recipient.role, })) : [ { formId: initialId, name: `Recipient 1`, email: `recipient.1@documenso.com`, + role: RecipientRole.SIGNER, }, ], }, @@ -86,6 +90,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({ formId: nanoid(12), name: `Recipient ${placeholderRecipientCount}`, email: `recipient.${placeholderRecipientCount}@documenso.com`, + role: RecipientRole.SIGNER, }); setPlaceholderRecipientCount((count) => count + 1); @@ -95,12 +100,6 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({ removeSigner(index); }; - const onKeyDown = (event: React.KeyboardEvent) => { - if (event.key === 'Enter' && event.target instanceof HTMLInputElement) { - onAddPlaceholderRecipient(); - } - }; - return ( <> @@ -113,10 +112,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({ className="flex flex-wrap items-end gap-x-4" >
- +
+
+ ( + + )} + /> +
+
+
+ )} + + + {data && ( +
    + {hasNextPage && ( +
  • +
    +
    +
    + +
    +
    +
    + + +
  • + )} + + {documentAuditLogs.map((auditLog, auditLogIndex) => ( +
  • +
    +
    +
    + +
    + {match(auditLog.type) + .with(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED, () => ( +
    +
    + )) + .with(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED, () => ( +
    +
    + )) + .with(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED, () => ( +
    +
    + )) + .otherwise(() => ( +
    + ))} +
    + +

    + + {formatDocumentAuditLogAction(auditLog, userId).prefix} + {' '} + {formatDocumentAuditLogAction(auditLog, userId).description} +

    + + +
  • + ))} +
+ )} +
+ + ); +}; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recipients.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recipients.tsx new file mode 100644 index 000000000..37d2cd35e --- /dev/null +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recipients.tsx @@ -0,0 +1,115 @@ +import Link from 'next/link'; + +import { CheckIcon, Clock, MailIcon, MailOpenIcon, PenIcon, PlusIcon } from 'lucide-react'; +import { match } from 'ts-pattern'; + +import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles'; +import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; +import type { Document, Recipient } from '@documenso/prisma/client'; +import { SignatureIcon } from '@documenso/ui/icons/signature'; +import { AvatarWithText } from '@documenso/ui/primitives/avatar'; +import { Badge } from '@documenso/ui/primitives/badge'; + +export type DocumentPageViewRecipientsProps = { + document: Document & { + Recipient: Recipient[]; + }; + documentRootPath: string; +}; + +export const DocumentPageViewRecipients = ({ + document, + documentRootPath, +}: DocumentPageViewRecipientsProps) => { + const recipients = document.Recipient; + + return ( +
+
+

Recipients

+ + {document.status !== DocumentStatus.COMPLETED && ( + + {recipients.length === 0 ? ( + + ) : ( + + )} + + )} +
+ +
    + {recipients.length === 0 && ( +
  • No recipients
  • + )} + + {recipients.map((recipient) => ( +
  • + {recipient.email}

    } + secondaryText={ +

    + {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName} +

    + } + /> + + {document.status !== DocumentStatus.DRAFT && + recipient.signingStatus === SigningStatus.SIGNED && ( + + {match(recipient.role) + .with(RecipientRole.APPROVER, () => ( + <> + + Approved + + )) + .with(RecipientRole.CC, () => + document.status === DocumentStatus.COMPLETED ? ( + <> + + Sent + + ) : ( + <> + + Ready + + ), + ) + + .with(RecipientRole.SIGNER, () => ( + <> + + Signed + + )) + .with(RecipientRole.VIEWER, () => ( + <> + + Viewed + + )) + .exhaustive()} + + )} + + {document.status !== DocumentStatus.DRAFT && + recipient.signingStatus === SigningStatus.NOT_SIGNED && ( + + + Pending + + )} +
  • + ))} +
+
+ ); +}; diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx index c821bfac8..c64b8650a 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx @@ -1,34 +1,23 @@ import Link from 'next/link'; import { redirect } from 'next/navigation'; -import { - CheckIcon, - ChevronLeft, - Clock, - MailIcon, - MailOpenIcon, - PenIcon, - PlusIcon, - Users2, -} from 'lucide-react'; +import { ChevronLeft, Clock9, Users2 } from 'lucide-react'; import { match } from 'ts-pattern'; import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto'; -import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; 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 { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client'; +import { DocumentStatus } from '@documenso/prisma/client'; import type { Team } from '@documenso/prisma/client'; -import { SignatureIcon } from '@documenso/ui/icons/signature'; -import { AvatarWithText } from '@documenso/ui/primitives/avatar'; -import { Badge } from '@documenso/ui/primitives/badge'; +import { Button } from '@documenso/ui/primitives/button'; import { Card, CardContent } from '@documenso/ui/primitives/card'; import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer'; import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip'; +import { DocumentHistorySheet } from '~/components/document/document-history-sheet'; import { DocumentStatus as DocumentStatusComponent, FRIENDLY_STATUS_MAP, @@ -37,6 +26,8 @@ import { import { DocumentPageViewButton } from './document-page-view-button'; import { DocumentPageViewDropdown } from './document-page-view-dropdown'; import { DocumentPageViewInformation } from './document-page-view-information'; +import { DocumentPageViewRecentActivity } from './document-page-view-recent-activity'; +import { DocumentPageViewRecipients } from './document-page-view-recipients'; export type DocumentPageViewProps = { params: { @@ -104,27 +95,38 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps) Documents -
-

- {document.title} -

+
+
+

+ {document.title} +

-
- +
+ - {recipients.length > 0 && ( -
- + {recipients.length > 0 && ( +
+ - - {recipients.length} Recipient(s) - -
- )} + + {recipients.length} Recipient(s) + +
+ )} +
+
+ +
+ + +
@@ -139,8 +141,8 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
-
-
+
+

Document {FRIENDLY_STATUS_MAP[document.status].label.toLowerCase()} @@ -180,100 +182,13 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps) {/* Recipients section. */} -
-
-

Recipients

+ - {document.status !== DocumentStatus.COMPLETED && ( - - {recipients.length === 0 ? ( - - ) : ( - - )} - - )} -
- -
    - {recipients.length === 0 && ( -
  • - No recipients -
  • - )} - - {recipients.map((recipient) => ( -
  • - {recipient.email}

    - } - secondaryText={ -

    - {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName} -

    - } - /> - - {document.status !== DocumentStatus.DRAFT && - recipient.signingStatus === SigningStatus.SIGNED && ( - - {match(recipient.role) - .with(RecipientRole.APPROVER, () => ( - <> - - Approved - - )) - .with(RecipientRole.CC, () => - document.status === DocumentStatus.COMPLETED ? ( - <> - - Sent - - ) : ( - <> - - Ready - - ), - ) - - .with(RecipientRole.SIGNER, () => ( - <> - - Signed - - )) - .with(RecipientRole.VIEWER, () => ( - <> - - Viewed - - )) - .exhaustive()} - - )} - - {document.status !== DocumentStatus.DRAFT && - recipient.signingStatus === SigningStatus.NOT_SIGNED && ( - - - Pending - - )} -
  • - ))} -
-
+ {/* Recent activity section. */} +

diff --git a/apps/web/src/components/document/document-history-sheet-changes.tsx b/apps/web/src/components/document/document-history-sheet-changes.tsx new file mode 100644 index 000000000..ef3985a61 --- /dev/null +++ b/apps/web/src/components/document/document-history-sheet-changes.tsx @@ -0,0 +1,28 @@ +'use client'; + +import React from 'react'; + +import { Badge } from '@documenso/ui/primitives/badge'; + +export type DocumentHistorySheetChangesProps = { + values: { + key: string | React.ReactNode; + value: string | React.ReactNode; + }[]; +}; + +export const DocumentHistorySheetChanges = ({ values }: DocumentHistorySheetChangesProps) => { + return ( + + {values.map(({ key, value }, i) => ( +

+ {key}: + {value} +

+ ))} +
+ ); +}; diff --git a/apps/web/src/components/document/document-history-sheet.tsx b/apps/web/src/components/document/document-history-sheet.tsx new file mode 100644 index 000000000..29d9a9c96 --- /dev/null +++ b/apps/web/src/components/document/document-history-sheet.tsx @@ -0,0 +1,316 @@ +'use client'; + +import { useMemo, useState } from 'react'; + +import { ArrowRightIcon, Loader } from 'lucide-react'; +import { match } from 'ts-pattern'; +import { UAParser } from 'ua-parser-js'; + +import { DOCUMENT_AUDIT_LOG_EMAIL_FORMAT } from '@documenso/lib/constants/document-audit-logs'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs'; +import { formatDocumentAuditLogActionString } from '@documenso/lib/utils/document-audit-logs'; +import { trpc } from '@documenso/trpc/react'; +import { cn } from '@documenso/ui/lib/utils'; +import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar'; +import { Badge } from '@documenso/ui/primitives/badge'; +import { Button } from '@documenso/ui/primitives/button'; +import { Sheet, SheetContent, SheetTrigger } from '@documenso/ui/primitives/sheet'; + +import { LocaleDate } from '~/components/formatter/locale-date'; + +import { DocumentHistorySheetChanges } from './document-history-sheet-changes'; + +export type DocumentHistorySheetProps = { + documentId: number; + userId: number; + isMenuOpen?: boolean; + onMenuOpenChange?: (_value: boolean) => void; + children?: React.ReactNode; +}; + +export const DocumentHistorySheet = ({ + documentId, + userId, + isMenuOpen, + onMenuOpenChange, + children, +}: DocumentHistorySheetProps) => { + const [isUserDetailsVisible, setIsUserDetailsVisible] = useState(false); + + const { + data, + isLoading, + isLoadingError, + refetch, + hasNextPage, + fetchNextPage, + isFetchingNextPage, + } = trpc.document.findDocumentAuditLogs.useInfiniteQuery( + { + documentId, + }, + { + getNextPageParam: (lastPage) => lastPage.nextCursor, + }, + ); + + const documentAuditLogs = useMemo(() => (data?.pages ?? []).flatMap((page) => page.data), [data]); + + const extractBrowser = (userAgent?: string | null) => { + if (!userAgent) { + return 'Unknown'; + } + + const parser = new UAParser(userAgent); + + parser.setUA(userAgent); + + const result = parser.getResult(); + + return result.browser.name; + }; + + /** + * Applies the following formatting for a given text: + * - Uppercase first lower, lowercase rest + * - Replace _ with spaces + * + * @param text The text to format + * @returns The formatted text + */ + const formatGenericText = (text: string) => { + return (text.charAt(0).toUpperCase() + text.slice(1).toLowerCase()).replaceAll('_', ' '); + }; + + return ( + + {children && {children}} + + +
+

Document history

+ +
+ + {isLoading && ( +
+ +
+ )} + + {isLoadingError && ( +
+

Unable to load document history

+ +
+ )} + + {data && ( +
    + {documentAuditLogs.map((auditLog) => ( +
  • +
    + + + {(auditLog?.email ?? auditLog?.name ?? '?').slice(0, 1).toUpperCase()} + + + +
    +

    + {formatDocumentAuditLogActionString(auditLog, userId)} +

    +

    + +

    +
    +
    + + {match(auditLog) + .with( + { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT }, + () => null, + ) + .with( + { type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_CREATED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_DELETED }, + ({ data }) => { + const values = [ + { + key: 'Email', + value: data.recipientEmail, + }, + { + key: 'Role', + value: formatGenericText(data.recipientRole), + }, + ]; + + if (data.recipientName) { + values.unshift({ + key: 'Name', + value: data.recipientName, + }); + } + + return ; + }, + ) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED }, ({ data }) => { + if (data.changes.length === 0) { + return null; + } + + return ( + ({ + key: formatGenericText(type), + value: ( + + {type === 'ROLE' ? formatGenericText(from) : from} + + {type === 'ROLE' ? formatGenericText(to) : to} + + ), + }))} + /> + ); + }) + .with( + { type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_CREATED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_DELETED }, + { type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_UPDATED }, + ({ data }) => ( + + ), + ) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_META_UPDATED }, ({ data }) => { + if (data.changes.length === 0) { + return null; + } + + return ( + ({ + key: formatGenericText(change.type), + value: change.type === 'PASSWORD' ? '*********' : change.to, + }))} + /> + ); + }) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_TITLE_UPDATED }, ({ data }) => ( + + )) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED }, ({ data }) => ( + + )) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_UNINSERTED }, ({ data }) => ( + + )) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT }, ({ data }) => ( + + )) + .exhaustive()} + + {isUserDetailsVisible && ( + <> +
    + + IP: {auditLog.ipAddress ?? 'Unknown'} + + + + Browser: {extractBrowser(auditLog.userAgent)} + +
    + + )} +
  • + ))} + + {hasNextPage && ( +
    + +
    + )} +
+ )} +
+
+ ); +}; diff --git a/apps/web/src/components/formatter/locale-date.tsx b/apps/web/src/components/formatter/locale-date.tsx index 7262a9a57..98a115f60 100644 --- a/apps/web/src/components/formatter/locale-date.tsx +++ b/apps/web/src/components/formatter/locale-date.tsx @@ -1,7 +1,7 @@ 'use client'; import type { HTMLAttributes } from 'react'; -import { useEffect, useState } from 'react'; +import { useCallback, useEffect, useState } from 'react'; import type { DateTimeFormatOptions } from 'luxon'; import { DateTime } from 'luxon'; @@ -10,7 +10,7 @@ import { useLocale } from '@documenso/lib/client-only/providers/locale'; export type LocaleDateProps = HTMLAttributes & { date: string | number | Date; - format?: DateTimeFormatOptions; + format?: DateTimeFormatOptions | string; }; /** @@ -22,13 +22,24 @@ export type LocaleDateProps = HTMLAttributes & { export const LocaleDate = ({ className, date, format, ...props }: LocaleDateProps) => { const { locale } = useLocale(); + const formatDateTime = useCallback( + (date: DateTime) => { + if (typeof format === 'string') { + return date.toFormat(format); + } + + return date.toLocaleString(format); + }, + [format], + ); + const [localeDate, setLocaleDate] = useState(() => - DateTime.fromJSDate(new Date(date)).setLocale(locale).toLocaleString(format), + formatDateTime(DateTime.fromJSDate(new Date(date)).setLocale(locale)), ); useEffect(() => { - setLocaleDate(DateTime.fromJSDate(new Date(date)).toLocaleString(format)); - }, [date, format]); + setLocaleDate(formatDateTime(DateTime.fromJSDate(new Date(date)))); + }, [date, format, formatDateTime]); return ( diff --git a/packages/lib/constants/document-audit-logs.ts b/packages/lib/constants/document-audit-logs.ts new file mode 100644 index 000000000..8ae654977 --- /dev/null +++ b/packages/lib/constants/document-audit-logs.ts @@ -0,0 +1,19 @@ +import { DOCUMENT_EMAIL_TYPE } from '../types/document-audit-logs'; + +export const DOCUMENT_AUDIT_LOG_EMAIL_FORMAT = { + [DOCUMENT_EMAIL_TYPE.SIGNING_REQUEST]: { + description: 'Signing request', + }, + [DOCUMENT_EMAIL_TYPE.VIEW_REQUEST]: { + description: 'Viewing request', + }, + [DOCUMENT_EMAIL_TYPE.APPROVE_REQUEST]: { + description: 'Approval request', + }, + [DOCUMENT_EMAIL_TYPE.CC]: { + description: 'CC', + }, + [DOCUMENT_EMAIL_TYPE.DOCUMENT_COMPLETED]: { + description: 'Document completed', + }, +} satisfies Record; diff --git a/packages/lib/constants/recipient-roles.ts b/packages/lib/constants/recipient-roles.ts index d86026782..44e4c34da 100644 --- a/packages/lib/constants/recipient-roles.ts +++ b/packages/lib/constants/recipient-roles.ts @@ -1,29 +1,31 @@ import { RecipientRole } from '@documenso/prisma/client'; -export const RECIPIENT_ROLES_DESCRIPTION: { - [key in RecipientRole]: { actionVerb: string; progressiveVerb: string; roleName: string }; -} = { +export const RECIPIENT_ROLES_DESCRIPTION = { [RecipientRole.APPROVER]: { actionVerb: 'Approve', + actioned: 'Approved', progressiveVerb: 'Approving', roleName: 'Approver', }, [RecipientRole.CC]: { actionVerb: 'CC', + actioned: 'CCed', progressiveVerb: 'CC', roleName: 'Cc', }, [RecipientRole.SIGNER]: { actionVerb: 'Sign', + actioned: 'Signed', progressiveVerb: 'Signing', roleName: 'Signer', }, [RecipientRole.VIEWER]: { actionVerb: 'View', + actioned: 'Viewed', progressiveVerb: 'Viewing', roleName: 'Viewer', }, -}; +} satisfies Record; export const RECIPIENT_ROLE_TO_EMAIL_TYPE = { [RecipientRole.SIGNER]: 'SIGNING_REQUEST', diff --git a/packages/lib/server-only/document-meta/upsert-document-meta.ts b/packages/lib/server-only/document-meta/upsert-document-meta.ts index 5a1c1594e..d4781f280 100644 --- a/packages/lib/server-only/document-meta/upsert-document-meta.ts +++ b/packages/lib/server-only/document-meta/upsert-document-meta.ts @@ -89,17 +89,21 @@ export const upsertDocumentMeta = async ({ }, }); - await tx.documentAuditLog.create({ - data: createDocumentAuditLogData({ - type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_META_UPDATED, - documentId, - user, - requestMetadata, - data: { - changes: diffDocumentMetaChanges(originalDocumentMeta ?? {}, upsertedDocumentMeta), - }, - }), - }); + const changes = diffDocumentMetaChanges(originalDocumentMeta ?? {}, upsertedDocumentMeta); + + if (changes.length > 0) { + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_META_UPDATED, + documentId, + user, + requestMetadata, + data: { + changes: diffDocumentMetaChanges(originalDocumentMeta ?? {}, upsertedDocumentMeta), + }, + }), + }); + } return upsertedDocumentMeta; }); diff --git a/packages/lib/server-only/document/delete-document.ts b/packages/lib/server-only/document/delete-document.ts index 22365a727..473177b9b 100644 --- a/packages/lib/server-only/document/delete-document.ts +++ b/packages/lib/server-only/document/delete-document.ts @@ -9,27 +9,72 @@ import { prisma } from '@documenso/prisma'; import { DocumentStatus } from '@documenso/prisma/client'; import { FROM_ADDRESS, FROM_NAME } from '../../constants/email'; +import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs'; +import type { RequestMetadata } from '../../universal/extract-request-metadata'; +import { createDocumentAuditLogData } from '../../utils/document-audit-logs'; export type DeleteDocumentOptions = { id: number; userId: number; status: DocumentStatus; + requestMetadata?: RequestMetadata; }; -export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptions) => { +export const deleteDocument = async ({ + id, + userId, + status, + requestMetadata, +}: DeleteDocumentOptions) => { + await prisma.document.findFirstOrThrow({ + where: { + id, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], + }, + }); + + const user = await prisma.user.findFirstOrThrow({ + where: { + id: userId, + }, + }); + // if the document is a draft, hard-delete if (status === DocumentStatus.DRAFT) { - return await prisma.document.delete({ where: { id, userId, status: DocumentStatus.DRAFT } }); + return await prisma.$transaction(async (tx) => { + // Currently redundant since deleting a document will delete the audit logs. + // However may be useful if we disassociate audit lgos and documents if required. + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + documentId: id, + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED, + user, + requestMetadata, + data: { + type: 'HARD', + }, + }), + }); + + return await tx.document.delete({ where: { id, status: DocumentStatus.DRAFT } }); + }); } // if the document is pending, send cancellation emails to all recipients if (status === DocumentStatus.PENDING) { - const user = await prisma.user.findFirstOrThrow({ - where: { - id: userId, - }, - }); - const document = await prisma.document.findUnique({ where: { id, @@ -77,12 +122,26 @@ export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptio } // If the document is not a draft, only soft-delete. - return await prisma.document.update({ - where: { - id, - }, - data: { - deletedAt: new Date().toISOString(), - }, + return await prisma.$transaction(async (tx) => { + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + documentId: id, + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED, + user, + requestMetadata, + data: { + type: 'SOFT', + }, + }), + }); + + return await tx.document.update({ + where: { + id, + }, + data: { + deletedAt: new Date().toISOString(), + }, + }); }); }; diff --git a/packages/lib/server-only/document/find-document-audit-logs.ts b/packages/lib/server-only/document/find-document-audit-logs.ts new file mode 100644 index 000000000..4f423ce8c --- /dev/null +++ b/packages/lib/server-only/document/find-document-audit-logs.ts @@ -0,0 +1,115 @@ +import type { FindResultSet } from '@documenso/lib/types/find-result-set'; +import { prisma } from '@documenso/prisma'; +import type { DocumentAuditLog } from '@documenso/prisma/client'; +import type { Prisma } from '@documenso/prisma/client'; + +import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs'; +import { parseDocumentAuditLogData } from '../../utils/document-audit-logs'; + +export interface FindDocumentAuditLogsOptions { + userId: number; + documentId: number; + page?: number; + perPage?: number; + orderBy?: { + column: keyof DocumentAuditLog; + direction: 'asc' | 'desc'; + }; + cursor?: string; + filterForRecentActivity?: boolean; +} + +export const findDocumentAuditLogs = async ({ + userId, + documentId, + page = 1, + perPage = 30, + orderBy, + cursor, + filterForRecentActivity, +}: FindDocumentAuditLogsOptions) => { + const orderByColumn = orderBy?.column ?? 'createdAt'; + const orderByDirection = orderBy?.direction ?? 'desc'; + + await prisma.document.findFirstOrThrow({ + where: { + id: documentId, + OR: [ + { + userId, + }, + { + team: { + members: { + some: { + userId, + }, + }, + }, + }, + ], + }, + }); + + const whereClause: Prisma.DocumentAuditLogWhereInput = { + documentId, + }; + + // Filter events down to what we consider recent activity. + if (filterForRecentActivity) { + whereClause.OR = [ + { + type: { + in: [ + DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED, + DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED, + DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED, + DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED, + DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED, + DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT, + ], + }, + }, + { + type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT, + data: { + path: ['isResending'], + equals: true, + }, + }, + ]; + } + + const [data, count] = await Promise.all([ + prisma.documentAuditLog.findMany({ + where: whereClause, + skip: Math.max(page - 1, 0) * perPage, + take: perPage + 1, + orderBy: { + [orderByColumn]: orderByDirection, + }, + cursor: cursor ? { id: cursor } : undefined, + }), + prisma.documentAuditLog.count({ + where: whereClause, + }), + ]); + + let nextCursor: string | undefined = undefined; + + const parsedData = data.map((auditLog) => parseDocumentAuditLogData(auditLog)); + + if (parsedData.length > perPage) { + const nextItem = parsedData.pop(); + nextCursor = nextItem!.id; + } + + return { + data: parsedData, + count, + currentPage: Math.max(page, 1), + perPage, + totalPages: Math.ceil(count / perPage), + nextCursor, + } satisfies FindResultSet & { nextCursor?: string }; +}; diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx index fc174c084..aa44ccedf 100644 --- a/packages/lib/server-only/document/send-document.tsx +++ b/packages/lib/server-only/document/send-document.tsx @@ -152,13 +152,27 @@ export const sendDocument = async ({ }), ); - const updatedDocument = await prisma.document.update({ - where: { - id: documentId, - }, - data: { - status: DocumentStatus.PENDING, - }, + const updatedDocument = await prisma.$transaction(async (tx) => { + if (document.status === DocumentStatus.DRAFT) { + await tx.documentAuditLog.create({ + data: createDocumentAuditLogData({ + type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT, + documentId: document.id, + requestMetadata, + user, + data: {}, + }), + }); + } + + return await tx.document.update({ + where: { + id: documentId, + }, + data: { + status: DocumentStatus.PENDING, + }, + }); }); return updatedDocument; diff --git a/packages/lib/types/document-audit-logs.ts b/packages/lib/types/document-audit-logs.ts index e6a954603..14d594786 100644 --- a/packages/lib/types/document-audit-logs.ts +++ b/packages/lib/types/document-audit-logs.ts @@ -21,15 +21,24 @@ export const ZDocumentAuditLogTypeSchema = z.enum([ 'RECIPIENT_UPDATED', // Document events. + 'DOCUMENT_COMPLETED', // When the document is sealed and fully completed. + 'DOCUMENT_CREATED', // When the document is created. + 'DOCUMENT_DELETED', // When the document is soft deleted. + 'DOCUMENT_FIELD_INSERTED', // When a field is inserted (signed/approved/etc) by a recipient. + 'DOCUMENT_FIELD_UNINSERTED', // When a field is uninserted by a recipient. + 'DOCUMENT_META_UPDATED', // When the document meta data is updated. + 'DOCUMENT_OPENED', // When the document is opened by a recipient. + 'DOCUMENT_RECIPIENT_COMPLETED', // When a recipient completes all their required tasks for the document. + 'DOCUMENT_SENT', // When the document transitions from DRAFT to PENDING. + 'DOCUMENT_TITLE_UPDATED', // When the document title is updated. +]); + +export const ZDocumentAuditLogEmailTypeSchema = z.enum([ + 'SIGNING_REQUEST', + 'VIEW_REQUEST', + 'APPROVE_REQUEST', + 'CC', 'DOCUMENT_COMPLETED', - 'DOCUMENT_CREATED', - 'DOCUMENT_DELETED', - 'DOCUMENT_FIELD_INSERTED', - 'DOCUMENT_FIELD_UNINSERTED', - 'DOCUMENT_META_UPDATED', - 'DOCUMENT_OPENED', - 'DOCUMENT_TITLE_UPDATED', - 'DOCUMENT_RECIPIENT_COMPLETED', ]); export const ZDocumentMetaDiffTypeSchema = z.enum([ @@ -40,10 +49,12 @@ export const ZDocumentMetaDiffTypeSchema = z.enum([ 'SUBJECT', 'TIMEZONE', ]); + export const ZFieldDiffTypeSchema = z.enum(['DIMENSION', 'POSITION']); export const ZRecipientDiffTypeSchema = z.enum(['NAME', 'ROLE', 'EMAIL']); export const DOCUMENT_AUDIT_LOG_TYPE = ZDocumentAuditLogTypeSchema.Enum; +export const DOCUMENT_EMAIL_TYPE = ZDocumentAuditLogEmailTypeSchema.Enum; export const DOCUMENT_META_DIFF_TYPE = ZDocumentMetaDiffTypeSchema.Enum; export const FIELD_DIFF_TYPE = ZFieldDiffTypeSchema.Enum; export const RECIPIENT_DIFF_TYPE = ZRecipientDiffTypeSchema.Enum; @@ -140,13 +151,7 @@ const ZBaseRecipientDataSchema = z.object({ export const ZDocumentAuditLogEventEmailSentSchema = z.object({ type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT), data: ZBaseRecipientDataSchema.extend({ - emailType: z.enum([ - 'SIGNING_REQUEST', - 'VIEW_REQUEST', - 'APPROVE_REQUEST', - 'CC', - 'DOCUMENT_COMPLETED', - ]), + emailType: ZDocumentAuditLogEmailTypeSchema, isResending: z.boolean(), }), }); @@ -171,6 +176,16 @@ export const ZDocumentAuditLogEventDocumentCreatedSchema = z.object({ }), }); +/** + * Event: Document deleted. + */ +export const ZDocumentAuditLogEventDocumentDeletedSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED), + data: z.object({ + type: z.enum(['SOFT', 'HARD']), + }), +}); + /** * Event: Document field inserted. */ @@ -247,6 +262,14 @@ export const ZDocumentAuditLogEventDocumentRecipientCompleteSchema = z.object({ data: ZBaseRecipientDataSchema, }); +/** + * Event: Document sent. + */ +export const ZDocumentAuditLogEventDocumentSentSchema = z.object({ + type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT), + data: z.object({}), +}); + /** * Event: Document title updated. */ @@ -314,6 +337,11 @@ export const ZDocumentAuditLogBaseSchema = z.object({ id: z.string(), createdAt: z.date(), documentId: z.number(), + name: z.string().optional().nullable(), + email: z.string().optional().nullable(), + userId: z.number().optional().nullable(), + userAgent: z.string().optional().nullable(), + ipAddress: z.string().optional().nullable(), }); export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and( @@ -321,11 +349,13 @@ export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and( ZDocumentAuditLogEventEmailSentSchema, ZDocumentAuditLogEventDocumentCompletedSchema, ZDocumentAuditLogEventDocumentCreatedSchema, + ZDocumentAuditLogEventDocumentDeletedSchema, ZDocumentAuditLogEventDocumentFieldInsertedSchema, ZDocumentAuditLogEventDocumentFieldUninsertedSchema, ZDocumentAuditLogEventDocumentMetaUpdatedSchema, ZDocumentAuditLogEventDocumentOpenedSchema, ZDocumentAuditLogEventDocumentRecipientCompleteSchema, + ZDocumentAuditLogEventDocumentSentSchema, ZDocumentAuditLogEventDocumentTitleUpdatedSchema, ZDocumentAuditLogEventFieldCreatedSchema, ZDocumentAuditLogEventFieldRemovedSchema, @@ -348,3 +378,8 @@ export type TDocumentAuditLogDocumentMetaDiffSchema = z.infer< export type TDocumentAuditLogRecipientDiffSchema = z.infer< typeof ZDocumentAuditLogRecipientDiffSchema >; + +export type DocumentAuditLogByType = Extract< + TDocumentAuditLog, + { type: T } +>; diff --git a/packages/lib/utils/document-audit-logs.ts b/packages/lib/utils/document-audit-logs.ts index dcc3932e9..65ffb2817 100644 --- a/packages/lib/utils/document-audit-logs.ts +++ b/packages/lib/utils/document-audit-logs.ts @@ -1,5 +1,14 @@ -import type { DocumentAuditLog, DocumentMeta, Field, Recipient } from '@documenso/prisma/client'; +import { match } from 'ts-pattern'; +import type { + DocumentAuditLog, + DocumentMeta, + Field, + Recipient, + RecipientRole, +} from '@documenso/prisma/client'; + +import { RECIPIENT_ROLES_DESCRIPTION } from '../constants/recipient-roles'; import type { TDocumentAuditLog, TDocumentAuditLogDocumentMetaDiffSchema, @@ -7,6 +16,7 @@ import type { TDocumentAuditLogRecipientDiffSchema, } from '../types/document-audit-logs'; import { + DOCUMENT_AUDIT_LOG_TYPE, DOCUMENT_META_DIFF_TYPE, FIELD_DIFF_TYPE, RECIPIENT_DIFF_TYPE, @@ -58,6 +68,7 @@ export const parseDocumentAuditLogData = (auditLog: DocumentAuditLog): TDocument // Handle any required migrations here. if (!data.success) { + console.error(data.error); throw new Error('Migration required'); } @@ -203,3 +214,114 @@ export const diffDocumentMetaChanges = ( return diffs; }; + +/** + * Formats the audit log into a description of the action. + * + * Provide a userId to prefix the action with the user, example 'X did Y'. + */ +export const formatDocumentAuditLogActionString = ( + auditLog: TDocumentAuditLog, + userId?: number, +) => { + const { prefix, description } = formatDocumentAuditLogAction(auditLog, userId); + + return prefix ? `${prefix} ${description}` : description; +}; + +/** + * Formats the audit log into a description of the action. + * + * Provide a userId to prefix the action with the user, example 'X did Y'. + */ +export const formatDocumentAuditLogAction = (auditLog: TDocumentAuditLog, userId?: number) => { + let prefix = userId === auditLog.userId ? 'You' : auditLog.name || auditLog.email || ''; + + const description = match(auditLog) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_CREATED }, () => ({ + anonymous: 'A field was added', + identified: 'added a field', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_DELETED }, () => ({ + anonymous: 'A field was removed', + identified: 'removed a field', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_UPDATED }, () => ({ + anonymous: 'A field was updated', + identified: 'updated a field', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_CREATED }, () => ({ + anonymous: 'A recipient was added', + identified: 'added a recipient', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_DELETED }, () => ({ + anonymous: 'A recipient was removed', + identified: 'removed a recipient', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED }, () => ({ + anonymous: 'A recipient was updated', + identified: 'updated a recipient', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED }, () => ({ + anonymous: 'Document created', + identified: 'created the document', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED }, () => ({ + anonymous: 'Document deleted', + identified: 'deleted the document', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED }, () => ({ + anonymous: 'Field signed', + identified: 'signed a field', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_UNINSERTED }, () => ({ + anonymous: 'Field unsigned', + identified: 'unsigned a field', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_META_UPDATED }, () => ({ + anonymous: 'Document updated', + identified: 'updated the document', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED }, () => ({ + anonymous: 'Document opened', + identified: 'opened the document', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_TITLE_UPDATED }, () => ({ + anonymous: 'Document title updated', + identified: 'updated the document title', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT }, () => ({ + anonymous: 'Document sent', + identified: 'sent the document', + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED }, ({ data }) => { + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + const action = RECIPIENT_ROLES_DESCRIPTION[data.recipientRole as RecipientRole]?.actioned; + + const value = action ? `${action.toLowerCase()} the document` : 'completed their task'; + + return { + anonymous: `Recipient ${value}`, + identified: value, + }; + }) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT }, ({ data }) => ({ + anonymous: `Email ${data.isResending ? 'resent' : 'sent'}`, + identified: `${data.isResending ? 'resent' : 'sent'} an email`, + })) + .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED }, () => { + // Clear the prefix since this should be considered an 'anonymous' event. + prefix = ''; + + return { + anonymous: 'Document completed', + identified: 'Document completed', + }; + }) + .exhaustive(); + + return { + prefix, + description: prefix ? description.identified : description.anonymous, + }; +}; diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts index aebc6e505..cd9491fd6 100644 --- a/packages/trpc/server/document-router/router.ts +++ b/packages/trpc/server/document-router/router.ts @@ -6,6 +6,7 @@ import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/ups import { createDocument } from '@documenso/lib/server-only/document/create-document'; import { deleteDocument } from '@documenso/lib/server-only/document/delete-document'; import { duplicateDocumentById } from '@documenso/lib/server-only/document/duplicate-document-by-id'; +import { findDocumentAuditLogs } from '@documenso/lib/server-only/document/find-document-audit-logs'; import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id'; import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token'; import { resendDocument } from '@documenso/lib/server-only/document/resend-document'; @@ -21,6 +22,7 @@ import { authenticatedProcedure, procedure, router } from '../trpc'; import { ZCreateDocumentMutationSchema, ZDeleteDraftDocumentMutationSchema, + ZFindDocumentAuditLogsQuerySchema, ZGetDocumentByIdQuerySchema, ZGetDocumentByTokenQuerySchema, ZResendDocumentMutationSchema, @@ -111,7 +113,12 @@ export const documentRouter = router({ const userId = ctx.user.id; - return await deleteDocument({ id, userId, status }); + return await deleteDocument({ + id, + userId, + status, + requestMetadata: extractNextApiRequestMetadata(ctx.req), + }); } catch (err) { console.error(err); @@ -122,6 +129,30 @@ export const documentRouter = router({ } }), + findDocumentAuditLogs: authenticatedProcedure + .input(ZFindDocumentAuditLogsQuerySchema) + .query(async ({ input, ctx }) => { + try { + const { perPage, documentId, cursor, filterForRecentActivity, orderBy } = input; + + return await findDocumentAuditLogs({ + perPage, + documentId, + cursor, + filterForRecentActivity, + orderBy, + userId: ctx.user.id, + }); + } catch (err) { + console.error(err); + + throw new TRPCError({ + code: 'BAD_REQUEST', + message: 'We were unable to find audit logs for this document. Please try again later.', + }); + } + }), + setTitleForDocument: authenticatedProcedure .input(ZSetTitleForDocumentMutationSchema) .mutation(async ({ input, ctx }) => { diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts index 899baa41f..83c05b3b3 100644 --- a/packages/trpc/server/document-router/schema.ts +++ b/packages/trpc/server/document-router/schema.ts @@ -1,8 +1,21 @@ import { z } from 'zod'; import { URL_REGEX } from '@documenso/lib/constants/url-regex'; +import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params'; import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/client'; +export const ZFindDocumentAuditLogsQuerySchema = ZBaseTableSearchParamsSchema.extend({ + documentId: z.number().min(1), + cursor: z.string().optional(), + filterForRecentActivity: z.boolean().optional(), + orderBy: z + .object({ + column: z.enum(['createdAt', 'type']), + direction: z.enum(['asc', 'desc']), + }) + .optional(), +}); + export const ZGetDocumentByIdQuerySchema = z.object({ id: z.number().min(1), teamId: z.number().min(1).optional(), diff --git a/packages/trpc/server/team-router/schema.ts b/packages/trpc/server/team-router/schema.ts index 953b12490..75c307e35 100644 --- a/packages/trpc/server/team-router/schema.ts +++ b/packages/trpc/server/team-router/schema.ts @@ -3,10 +3,11 @@ import { z } from 'zod'; import { PROTECTED_TEAM_URLS } from '@documenso/lib/constants/teams'; import { TeamMemberRole } from '@documenso/prisma/client'; +// Consider refactoring to use ZBaseTableSearchParamsSchema. const GenericFindQuerySchema = z.object({ term: z.string().optional(), - page: z.number().optional(), - perPage: z.number().optional(), + page: z.number().min(1).optional(), + perPage: z.number().min(1).optional(), }); /** diff --git a/packages/ui/primitives/sheet.tsx b/packages/ui/primitives/sheet.tsx index a6326de0f..ef5348e59 100644 --- a/packages/ui/primitives/sheet.tsx +++ b/packages/ui/primitives/sheet.tsx @@ -143,14 +143,17 @@ const sheetVariants = cva( export interface DialogContentProps extends React.ComponentPropsWithoutRef, - VariantProps {} + VariantProps { + showOverlay?: boolean; + sheetClass?: string; +} const SheetContent = React.forwardRef< React.ElementRef, DialogContentProps ->(({ position, size, className, children, ...props }, ref) => ( +>(({ position, size, className, sheetClass, showOverlay = true, children, ...props }, ref) => ( - + {showOverlay && } Date: Thu, 15 Feb 2024 20:42:17 +1100 Subject: [PATCH 157/311] fix: styling --- .../documents/[id]/document-page-view-recent-activity.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recent-activity.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recent-activity.tsx index ef7d2e498..5890f8aa2 100644 --- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recent-activity.tsx +++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recent-activity.tsx @@ -37,6 +37,7 @@ export const DocumentPageViewRecentActivity = ({ column: 'createdAt', direction: 'asc', }, + perPage: 10, }, { getNextPageParam: (lastPage) => lastPage.nextCursor, @@ -77,7 +78,7 @@ export const DocumentPageViewRecentActivity = ({ {hasNextPage && (
  • -
    +
    From fddd860d15a69a804493babc70120f9ccc2d6499 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Thu, 15 Feb 2024 11:33:43 +0000 Subject: [PATCH 158/311] chore: code refactor to avoid repetitions --- apps/web/src/components/forms/profile.tsx | 32 +++++++++----------- packages/lib/server-only/user/delete-user.ts | 3 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index a44e70940..23861c9fc 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -113,18 +113,22 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { } }; + const deleteAccoutAndSignOut = async () => { + await deleteAccount(); + + toast({ + title: 'Account deleted', + description: 'Your account has been deleted successfully.', + duration: 5000, + }); + + return await signOut({ callbackUrl: '/' }); + }; + const onDeleteAccount = async (hasTwoFactorAuthentication: boolean) => { try { if (!hasTwoFactorAuthentication) { - await deleteAccount(); - - toast({ - title: 'Account deleted', - description: 'Your account has been deleted successfully.', - duration: 5000, - }); - - return await signOut({ callbackUrl: '/' }); + return await deleteAccoutAndSignOut(); } const { token } = deleteAccountTwoFactorTokenForm.getValues(); @@ -140,15 +144,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { throw new Error('We were unable to validate your Two Factor Authentication token.'); }); - await deleteAccount(); - - toast({ - title: 'Account deleted', - description: 'Your account has been deleted successfully.', - duration: 5000, - }); - - await signOut({ callbackUrl: '/' }); + await deleteAccoutAndSignOut(); } catch (err) { if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') { toast({ diff --git a/packages/lib/server-only/user/delete-user.ts b/packages/lib/server-only/user/delete-user.ts index 02d811b12..65a74ac42 100644 --- a/packages/lib/server-only/user/delete-user.ts +++ b/packages/lib/server-only/user/delete-user.ts @@ -1,4 +1,5 @@ import { prisma } from '@documenso/prisma'; +import { DocumentStatus } from '@documenso/prisma/client'; export type DeleteUserOptions = { email: string; @@ -31,7 +32,7 @@ export const deletedServiceAccount = async ({ email }: DeleteUserOptions) => { where: { userId: user.id, status: { - in: ['PENDING', 'COMPLETED'], + in: [DocumentStatus.PENDING, DocumentStatus.COMPLETED], }, }, data: { From 25291b64ebc61ce69387ee1e43511f58daccbf93 Mon Sep 17 00:00:00 2001 From: Sumit Bisht Date: Thu, 15 Feb 2024 22:25:23 +0530 Subject: [PATCH 159/311] fix: highlighting issue in recipient selection --- packages/ui/primitives/command.tsx | 2 +- packages/ui/primitives/document-flow/add-fields.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui/primitives/command.tsx b/packages/ui/primitives/command.tsx index fee5321cd..89777d417 100644 --- a/packages/ui/primitives/command.tsx +++ b/packages/ui/primitives/command.tsx @@ -121,7 +121,7 @@ const CommandItem = React.forwardRef< - + From 019db27b1d4b040cdbacf2df791f37efbd362478 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:04:11 +0200 Subject: [PATCH 160/311] feat: trigger webhook functionality --- .../document/complete-document-with-token.ts | 27 +++++++++---- .../server-only/document/create-document.ts | 12 +++++- .../server-only/webhooks/get-all-webhooks.ts | 17 ++++++++ .../lib/universal/post-webhook-payload.ts | 39 +++++++++++++++++++ packages/lib/universal/trigger-webhook.ts | 30 ++++++++++++++ 5 files changed, 117 insertions(+), 8 deletions(-) create mode 100644 packages/lib/server-only/webhooks/get-all-webhooks.ts create mode 100644 packages/lib/universal/post-webhook-payload.ts create mode 100644 packages/lib/universal/trigger-webhook.ts diff --git a/packages/lib/server-only/document/complete-document-with-token.ts b/packages/lib/server-only/document/complete-document-with-token.ts index 62db516fa..b1438f0ce 100644 --- a/packages/lib/server-only/document/complete-document-with-token.ts +++ b/packages/lib/server-only/document/complete-document-with-token.ts @@ -2,7 +2,9 @@ import { prisma } from '@documenso/prisma'; import { DocumentStatus, SigningStatus } from '@documenso/prisma/client'; +import { WebhookTriggerEvents } from '@documenso/prisma/client'; +import { triggerWebhook } from '../../universal/trigger-webhook'; import { sealDocument } from './seal-document'; import { sendPendingEmail } from './send-pending-email'; @@ -11,13 +13,8 @@ export type CompleteDocumentWithTokenOptions = { documentId: number; }; -export const completeDocumentWithToken = async ({ - token, - documentId, -}: CompleteDocumentWithTokenOptions) => { - 'use server'; - - const document = await prisma.document.findFirstOrThrow({ +const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptions) => { + return await prisma.document.findFirstOrThrow({ where: { id: documentId, Recipient: { @@ -34,6 +31,15 @@ export const completeDocumentWithToken = async ({ }, }, }); +}; + +export const completeDocumentWithToken = async ({ + token, + documentId, +}: CompleteDocumentWithTokenOptions) => { + 'use server'; + + const document = await getDocument({ token, documentId }); if (document.status === DocumentStatus.COMPLETED) { throw new Error(`Document ${document.id} has already been completed`); @@ -101,4 +107,11 @@ export const completeDocumentWithToken = async ({ if (documents.count > 0) { await sealDocument({ documentId: document.id }); } + + const updatedDocument = await getDocument({ token, documentId }); + + await triggerWebhook({ + eventTrigger: WebhookTriggerEvents.DOCUMENT_SIGNED, + documentData: updatedDocument, + }); }; diff --git a/packages/lib/server-only/document/create-document.ts b/packages/lib/server-only/document/create-document.ts index 93307a7b4..82dacfba7 100644 --- a/packages/lib/server-only/document/create-document.ts +++ b/packages/lib/server-only/document/create-document.ts @@ -1,6 +1,9 @@ 'use server'; import { prisma } from '@documenso/prisma'; +import { WebhookTriggerEvents } from '@documenso/prisma/client'; + +import { triggerWebhook } from '../../universal/trigger-webhook'; export type CreateDocumentOptions = { title: string; @@ -29,7 +32,7 @@ export const createDocument = async ({ }); } - return await tx.document.create({ + const createdDocument = await tx.document.create({ data: { title, documentDataId, @@ -37,5 +40,12 @@ export const createDocument = async ({ teamId, }, }); + + await triggerWebhook({ + eventTrigger: WebhookTriggerEvents.DOCUMENT_CREATED, + documentData: createdDocument, + }); + + return createdDocument; }); }; diff --git a/packages/lib/server-only/webhooks/get-all-webhooks.ts b/packages/lib/server-only/webhooks/get-all-webhooks.ts new file mode 100644 index 000000000..a6c88a086 --- /dev/null +++ b/packages/lib/server-only/webhooks/get-all-webhooks.ts @@ -0,0 +1,17 @@ +import { prisma } from '@documenso/prisma'; +import type { WebhookTriggerEvents } from '@documenso/prisma/client'; + +export type GetAllWebhooksOptions = { + eventTrigger: WebhookTriggerEvents; +}; + +export const getAllWebhooks = async ({ eventTrigger }: GetAllWebhooksOptions) => { + return prisma.webhook.findMany({ + where: { + eventTriggers: { + has: eventTrigger, + }, + enabled: true, + }, + }); +}; diff --git a/packages/lib/universal/post-webhook-payload.ts b/packages/lib/universal/post-webhook-payload.ts new file mode 100644 index 000000000..80ddea80d --- /dev/null +++ b/packages/lib/universal/post-webhook-payload.ts @@ -0,0 +1,39 @@ +import type { Document, Webhook } from '@documenso/prisma/client'; + +export type PostWebhookPayloadOptions = { + webhookData: Pick; + documentData: Document; +}; + +export const postWebhookPayload = async ({ + webhookData, + documentData, +}: PostWebhookPayloadOptions) => { + const { webhookUrl, secret } = webhookData; + + const payload = { + event: webhookData.eventTriggers.toString(), + createdAt: new Date().toISOString(), + webhookEndpoint: webhookUrl, + payload: documentData, + }; + + const response = await fetch(webhookUrl, { + method: 'POST', + body: JSON.stringify(payload), + headers: { + 'Content-Type': 'application/json', + 'X-Documenso-Secret': secret ?? '', + }, + }); + + if (!response.ok) { + throw new Error(`Webhook failed with the status code ${response.status}`); + } + + return { + status: response.status, + statusText: response.statusText, + message: 'Webhook sent successfully', + }; +}; diff --git a/packages/lib/universal/trigger-webhook.ts b/packages/lib/universal/trigger-webhook.ts new file mode 100644 index 000000000..025a154bc --- /dev/null +++ b/packages/lib/universal/trigger-webhook.ts @@ -0,0 +1,30 @@ +import type { Document, WebhookTriggerEvents } from '@documenso/prisma/client'; + +import { getAllWebhooks } from '../server-only/webhooks/get-all-webhooks'; +import { postWebhookPayload } from './post-webhook-payload'; + +export type TriggerWebhookOptions = { + eventTrigger: WebhookTriggerEvents; + documentData: Document; +}; + +export const triggerWebhook = async ({ eventTrigger, documentData }: TriggerWebhookOptions) => { + try { + const allWebhooks = await getAllWebhooks({ eventTrigger }); + + const webhookPromises = allWebhooks.map((webhook) => { + const { webhookUrl, secret } = webhook; + + postWebhookPayload({ + webhookData: { webhookUrl, secret, eventTriggers: [eventTrigger] }, + documentData, + }).catch((_err) => { + throw new Error(`Failed to send webhook to ${webhookUrl}`); + }); + }); + + return Promise.all(webhookPromises); + } catch (err) { + throw new Error(`Failed to trigger webhook`); + } +}; From 7f3f6f531232619ee574734cca4b8a44c990f733 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:44:03 +0200 Subject: [PATCH 161/311] feat: hide secret field --- .../src/app/(dashboard)/settings/webhooks/[id]/page.tsx | 3 ++- .../settings/webhooks/create-webhook-dialog.tsx | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx index 56a1e90a9..785536c2a 100644 --- a/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx @@ -18,6 +18,7 @@ import { FormMessage, } from '@documenso/ui/primitives/form/form'; import { Input } from '@documenso/ui/primitives/input'; +import { PasswordInput } from '@documenso/ui/primitives/password-input'; import { Switch } from '@documenso/ui/primitives/switch'; import { useToast } from '@documenso/ui/primitives/use-toast'; @@ -125,7 +126,7 @@ export default function WebhookPage({ params }: WebhookPageOptions) { Secret - + diff --git a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx index 0e24b04a7..2d4dc733e 100644 --- a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx @@ -30,6 +30,7 @@ import { FormMessage, } from '@documenso/ui/primitives/form/form'; import { Input } from '@documenso/ui/primitives/input'; +import { PasswordInput } from '@documenso/ui/primitives/password-input'; import { Switch } from '@documenso/ui/primitives/switch'; import { useToast } from '@documenso/ui/primitives/use-toast'; @@ -143,7 +144,11 @@ export const CreateWebhookDialog = ({ trigger, ...props }: CreateWebhookDialogPr Secret - + From a30b73ce86374ea0bfa9015c1633bc680f978f80 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Fri, 16 Feb 2024 11:02:04 +0000 Subject: [PATCH 162/311] fix: update css --- apps/web/src/app/(dashboard)/documents/upload-document.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/web/src/app/(dashboard)/documents/upload-document.tsx b/apps/web/src/app/(dashboard)/documents/upload-document.tsx index 71926dafc..f958d5a3f 100644 --- a/apps/web/src/app/(dashboard)/documents/upload-document.tsx +++ b/apps/web/src/app/(dashboard)/documents/upload-document.tsx @@ -96,12 +96,10 @@ export const UploadDocument = ({ className }: UploadDocumentProps) => { } }; - const isSmallVerticalScreen = typeof window !== 'undefined' && window.innerHeight < 800; - return (
    Date: Fri, 16 Feb 2024 13:44:28 +0200 Subject: [PATCH 163/311] chore: loading spinner --- .../src/app/(dashboard)/settings/webhooks/[id]/page.tsx | 8 +++++++- apps/web/src/app/(dashboard)/settings/webhooks/page.tsx | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx index 785536c2a..b9f04790c 100644 --- a/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/webhooks/[id]/page.tsx @@ -3,6 +3,7 @@ import { useRouter } from 'next/navigation'; import { zodResolver } from '@hookform/resolvers/zod'; +import { Loader } from 'lucide-react'; import { useForm } from 'react-hook-form'; import type { z } from 'zod'; @@ -39,7 +40,7 @@ export default function WebhookPage({ params }: WebhookPageOptions) { const { toast } = useToast(); const router = useRouter(); - const { data: webhook } = trpc.webhook.getWebhookById.useQuery( + const { data: webhook, isLoading } = trpc.webhook.getWebhookById.useQuery( { id: Number(params.id), }, @@ -87,6 +88,11 @@ export default function WebhookPage({ params }: WebhookPageOptions) { title="Edit webhook" subtitle="On this page, you can edit the webhook and its settings." /> + {isLoading && ( +
    + +
    + )}
    diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx index 638443bf9..d0532c065 100644 --- a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx @@ -4,6 +4,7 @@ import Link from 'next/link'; import { Zap } from 'lucide-react'; import { ToggleLeft, ToggleRight } from 'lucide-react'; +import { Loader } from 'lucide-react'; import { trpc } from '@documenso/trpc/react'; import { Button } from '@documenso/ui/primitives/button'; @@ -13,7 +14,7 @@ import { CreateWebhookDialog } from '~/components/(dashboard)/settings/webhooks/ import { DeleteWebhookDialog } from '~/components/(dashboard)/settings/webhooks/delete-webhook-dialog'; export default function WebhookPage() { - const { data: webhooks } = trpc.webhook.getWebhooks.useQuery(); + const { data: webhooks, isLoading } = trpc.webhook.getWebhooks.useQuery(); return (
    @@ -24,6 +25,12 @@ export default function WebhookPage() { + {isLoading && ( +
    + +
    + )} + {webhooks && webhooks.length === 0 && ( // TODO: Perhaps add some illustrations here to make the page more engaging
    From d83769b4104c9fbe4e74625486328712e16c4ca2 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Fri, 16 Feb 2024 11:56:02 +0000 Subject: [PATCH 164/311] chore: use unsafe effect --- .../lib/client-only/hooks/use-effect-once.ts | 13 ++++++++++ .../signature-pad/signature-pad.tsx | 25 ++++++++++++------- 2 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 packages/lib/client-only/hooks/use-effect-once.ts diff --git a/packages/lib/client-only/hooks/use-effect-once.ts b/packages/lib/client-only/hooks/use-effect-once.ts new file mode 100644 index 000000000..dc6d062dd --- /dev/null +++ b/packages/lib/client-only/hooks/use-effect-once.ts @@ -0,0 +1,13 @@ +import type { EffectCallback } from 'react'; +import { useEffect } from 'react'; + +/** + * Dangerously runs an effect "once" by ignoring the depedencies of a given effect. + * + * DANGER: The effect will run twice in concurrent react and development environments. + */ +export const unsafe_useEffectOnce = (callback: EffectCallback) => { + // Intentionally avoiding exhaustive deps and rule of hooks here + // eslint-disable-next-line react-hooks/exhaustive-deps, react-hooks/rules-of-hooks + return useEffect(callback, []); +}; diff --git a/packages/ui/primitives/signature-pad/signature-pad.tsx b/packages/ui/primitives/signature-pad/signature-pad.tsx index ad6f92e91..8524450fc 100644 --- a/packages/ui/primitives/signature-pad/signature-pad.tsx +++ b/packages/ui/primitives/signature-pad/signature-pad.tsx @@ -7,6 +7,8 @@ import { Undo2 } from 'lucide-react'; import type { StrokeOptions } from 'perfect-freehand'; import { getStroke } from 'perfect-freehand'; +import { unsafe_useEffectOnce } from '@documenso/lib/client-only/hooks/use-effect-once'; + import { cn } from '../../lib/utils'; import { getSvgPathFromStroke } from './helper'; import { Point } from './point'; @@ -28,7 +30,8 @@ export const SignaturePad = ({ ...props }: SignaturePadProps) => { const $el = useRef(null); - const defaultImageRef = useRef(null); + const $imageData = useRef(null); + const [isPressed, setIsPressed] = useState(false); const [lines, setLines] = useState([]); const [currentLine, setCurrentLine] = useState([]); @@ -162,7 +165,7 @@ export const SignaturePad = ({ const ctx = $el.current.getContext('2d'); ctx?.clearRect(0, 0, $el.current.width, $el.current.height); - defaultImageRef.current = null; + $imageData.current = null; } onChange?.(null); @@ -176,8 +179,7 @@ export const SignaturePad = ({ return; } - const newLines = [...lines]; - newLines.pop(); // Remove the last line + const newLines = lines.slice(0, -1); setLines(newLines); // Clear the canvas @@ -185,13 +187,16 @@ export const SignaturePad = ({ const ctx = $el.current.getContext('2d'); const { width, height } = $el.current; ctx?.clearRect(0, 0, width, height); - if (typeof defaultValue === 'string' && defaultImageRef.current) { - ctx?.putImageData(defaultImageRef.current, 0, 0); + + if (typeof defaultValue === 'string' && $imageData.current) { + ctx?.putImageData($imageData.current, 0, 0); } + newLines.forEach((line) => { const pathData = new Path2D(getSvgPathFromStroke(getStroke(line, perfectFreehandOptions))); ctx?.fill(pathData); }); + onChange?.($el.current.toDataURL()); } }; @@ -203,7 +208,7 @@ export const SignaturePad = ({ } }, []); - useEffect(() => { + unsafe_useEffectOnce(() => { if ($el.current && typeof defaultValue === 'string') { const ctx = $el.current.getContext('2d'); @@ -213,13 +218,15 @@ export const SignaturePad = ({ img.onload = () => { ctx?.drawImage(img, 0, 0, Math.min(width, img.width), Math.min(height, img.height)); + const defaultImageData = ctx?.getImageData(0, 0, width, height) || null; - defaultImageRef.current = defaultImageData; + + $imageData.current = defaultImageData; }; img.src = defaultValue; } - }, []); + }); return (
    Date: Fri, 16 Feb 2024 13:58:03 +0200 Subject: [PATCH 165/311] chore: ui updates --- apps/web/src/app/(dashboard)/settings/webhooks/page.tsx | 2 +- .../(dashboard)/settings/webhooks/create-webhook-dialog.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx index d0532c065..d36de6726 100644 --- a/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/webhooks/page.tsx @@ -65,7 +65,7 @@ export default function WebhookPage() { )}
    -
    +
    diff --git a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx index 2d4dc733e..c32493c4f 100644 --- a/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx +++ b/apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx @@ -92,7 +92,7 @@ export const CreateWebhookDialog = ({ trigger, ...props }: CreateWebhookDialogPr {trigger ?? } - + Create webhook On this page, you can create a new webhook. From 5d6cdbef891b558900a0017aabe4c5090ee9b264 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu Date: Fri, 16 Feb 2024 20:46:27 +0000 Subject: [PATCH 166/311] feat: ability to download all the 2FA recovery codes --- .../forms/2fa/view-recovery-codes-dialog.tsx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx b/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx index 18714332a..323bc7198 100644 --- a/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx +++ b/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx @@ -1,4 +1,4 @@ -import { useMemo } from 'react'; +import { useEffect, useMemo, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; @@ -41,6 +41,7 @@ export type ViewRecoveryCodesDialogProps = { export const ViewRecoveryCodesDialog = ({ open, onOpenChange }: ViewRecoveryCodesDialogProps) => { const { toast } = useToast(); + const [recoveryCodesUrl, setRecoveryCodesUrl] = useState(''); const { mutateAsync: viewRecoveryCodes, data: viewRecoveryCodesData } = trpc.twoFactorAuthentication.viewRecoveryCodes.useMutation(); @@ -62,6 +63,16 @@ export const ViewRecoveryCodesDialog = ({ open, onOpenChange }: ViewRecoveryCode return 'view'; }, [viewRecoveryCodesData, isViewRecoveryCodesSubmitting]); + useEffect(() => { + if (viewRecoveryCodesData && viewRecoveryCodesData.recoveryCodes) { + const textBlob = new Blob([viewRecoveryCodesData.recoveryCodes.join('\n')], { + type: 'text/plain', + }); + if (recoveryCodesUrl) URL.revokeObjectURL(recoveryCodesUrl); + setRecoveryCodesUrl(URL.createObjectURL(textBlob)); + } + }, [viewRecoveryCodesData]); + const onViewRecoveryCodesFormSubmit = async ({ password }: TViewRecoveryCodesForm) => { try { await viewRecoveryCodes({ password }); @@ -139,8 +150,11 @@ export const ViewRecoveryCodesDialog = ({ open, onOpenChange }: ViewRecoveryCode )} -
    +
    + + +
    )) From 2815b1a8091f6b3dd1caecaac41c8da2a0828f1a Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Sat, 17 Feb 2024 12:42:00 +1100 Subject: [PATCH 167/311] feat: add enterprise billing (#939) ## Description Add support for enterprise billing plans. Enterprise billing plans by default get access to everything early adopters do: - Unlimited teams - Unlimited documents They will also get additional features in the future. ## Notes Pending webhook updates to support enterprise onboarding. Rolled back env changes `NEXT_PUBLIC_PROJECT` since it doesn't seem to work. --- .../app/(dashboard)/settings/billing/page.tsx | 16 ++++++++-------- .../tables/teams-member-page-data-table.tsx | 2 +- packages/ee/server-only/limits/server.ts | 8 ++++---- .../stripe/get-document-related-prices.ts.ts | 10 ++++++++++ .../stripe/get-enterprise-plan-prices.ts | 13 +++++++++++++ .../ee/server-only/stripe/get-prices-by-plan.ts | 14 +++++++++----- .../stripe/get-primary-account-plan-prices.ts | 10 ++++++++++ .../stripe/get-team-related-prices.ts | 17 +++++++++++++++++ .../stripe/transfer-team-subscription.ts | 12 ++++++------ packages/lib/constants/app.ts | 9 ++++----- packages/lib/constants/billing.ts | 3 +-- packages/lib/server-only/team/create-team.ts | 13 ++++++------- packages/lib/utils/billing.ts | 9 ++++----- 13 files changed, 93 insertions(+), 43 deletions(-) create mode 100644 packages/ee/server-only/stripe/get-document-related-prices.ts.ts create mode 100644 packages/ee/server-only/stripe/get-enterprise-plan-prices.ts create mode 100644 packages/ee/server-only/stripe/get-primary-account-plan-prices.ts create mode 100644 packages/ee/server-only/stripe/get-team-related-prices.ts diff --git a/apps/web/src/app/(dashboard)/settings/billing/page.tsx b/apps/web/src/app/(dashboard)/settings/billing/page.tsx index cee2aa2f1..7865e2b5c 100644 --- a/apps/web/src/app/(dashboard)/settings/billing/page.tsx +++ b/apps/web/src/app/(dashboard)/settings/billing/page.tsx @@ -5,7 +5,7 @@ import { match } from 'ts-pattern'; import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer'; import { getPricesByInterval } from '@documenso/ee/server-only/stripe/get-prices-by-interval'; -import { getPricesByPlan } from '@documenso/ee/server-only/stripe/get-prices-by-plan'; +import { getPrimaryAccountPlanPrices } from '@documenso/ee/server-only/stripe/get-primary-account-plan-prices'; import { getProductByPriceId } from '@documenso/ee/server-only/stripe/get-product-by-price-id'; import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; @@ -37,23 +37,23 @@ export default async function BillingSettingsPage() { user = await getStripeCustomerByUser(user).then((result) => result.user); } - const [subscriptions, prices, communityPlanPrices] = await Promise.all([ + const [subscriptions, prices, primaryAccountPlanPrices] = await Promise.all([ getSubscriptionsByUserId({ userId: user.id }), getPricesByInterval({ plan: STRIPE_PLAN_TYPE.COMMUNITY }), - getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY), + getPrimaryAccountPlanPrices(), ]); - const communityPlanPriceIds = communityPlanPrices.map(({ id }) => id); + const primaryAccountPlanPriceIds = primaryAccountPlanPrices.map(({ id }) => id); let subscriptionProduct: Stripe.Product | null = null; - const communityPlanUserSubscriptions = subscriptions.filter(({ priceId }) => - communityPlanPriceIds.includes(priceId), + const primaryAccountPlanSubscriptions = subscriptions.filter(({ priceId }) => + primaryAccountPlanPriceIds.includes(priceId), ); const subscription = - communityPlanUserSubscriptions.find(({ status }) => status === SubscriptionStatus.ACTIVE) ?? - communityPlanUserSubscriptions[0]; + primaryAccountPlanSubscriptions.find(({ status }) => status === SubscriptionStatus.ACTIVE) ?? + primaryAccountPlanSubscriptions[0]; if (subscription?.priceId) { subscriptionProduct = await getProductByPriceId({ priceId: subscription.priceId }).catch( diff --git a/apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx b/apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx index 316c4373f..24d4089b2 100644 --- a/apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx +++ b/apps/web/src/components/(teams)/tables/teams-member-page-data-table.tsx @@ -67,7 +67,7 @@ export const TeamsMemberPageDataTable = ({ - All + Active diff --git a/packages/ee/server-only/limits/server.ts b/packages/ee/server-only/limits/server.ts index 4904f0271..abed86da7 100644 --- a/packages/ee/server-only/limits/server.ts +++ b/packages/ee/server-only/limits/server.ts @@ -1,11 +1,10 @@ import { DateTime } from 'luxon'; import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; -import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; import { prisma } from '@documenso/prisma'; import { SubscriptionStatus } from '@documenso/prisma/client'; -import { getPricesByPlan } from '../stripe/get-prices-by-plan'; +import { getDocumentRelatedPrices } from '../stripe/get-document-related-prices.ts'; import { FREE_PLAN_LIMITS, SELFHOSTED_PLAN_LIMITS, TEAM_PLAN_LIMITS } from './constants'; import { ERROR_CODES } from './errors'; import { ZLimitsSchema } from './schema'; @@ -56,10 +55,11 @@ const handleUserLimits = async ({ email }: HandleUserLimitsOptions) => { ); if (activeSubscriptions.length > 0) { - const communityPlanPrices = await getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY); + const documentPlanPrices = await getDocumentRelatedPrices(); for (const subscription of activeSubscriptions) { - const price = communityPlanPrices.find((price) => price.id === subscription.priceId); + const price = documentPlanPrices.find((price) => price.id === subscription.priceId); + if (!price || typeof price.product === 'string' || price.product.deleted) { continue; } diff --git a/packages/ee/server-only/stripe/get-document-related-prices.ts.ts b/packages/ee/server-only/stripe/get-document-related-prices.ts.ts new file mode 100644 index 000000000..81b32a7b9 --- /dev/null +++ b/packages/ee/server-only/stripe/get-document-related-prices.ts.ts @@ -0,0 +1,10 @@ +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; + +import { getPricesByPlan } from './get-prices-by-plan'; + +/** + * Returns the Stripe prices of items that affect the amount of documents a user can create. + */ +export const getDocumentRelatedPrices = async () => { + return await getPricesByPlan([STRIPE_PLAN_TYPE.COMMUNITY, STRIPE_PLAN_TYPE.ENTERPRISE]); +}; diff --git a/packages/ee/server-only/stripe/get-enterprise-plan-prices.ts b/packages/ee/server-only/stripe/get-enterprise-plan-prices.ts new file mode 100644 index 000000000..ec67fe163 --- /dev/null +++ b/packages/ee/server-only/stripe/get-enterprise-plan-prices.ts @@ -0,0 +1,13 @@ +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; + +import { getPricesByPlan } from './get-prices-by-plan'; + +export const getEnterprisePlanPrices = async () => { + return await getPricesByPlan(STRIPE_PLAN_TYPE.ENTERPRISE); +}; + +export const getEnterprisePlanPriceIds = async () => { + const prices = await getEnterprisePlanPrices(); + + return prices.map((price) => price.id); +}; diff --git a/packages/ee/server-only/stripe/get-prices-by-plan.ts b/packages/ee/server-only/stripe/get-prices-by-plan.ts index 5c390b35a..45906d54a 100644 --- a/packages/ee/server-only/stripe/get-prices-by-plan.ts +++ b/packages/ee/server-only/stripe/get-prices-by-plan.ts @@ -1,14 +1,18 @@ import type { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; import { stripe } from '@documenso/lib/server-only/stripe'; -export const getPricesByPlan = async ( - plan: (typeof STRIPE_PLAN_TYPE)[keyof typeof STRIPE_PLAN_TYPE], -) => { +type PlanType = (typeof STRIPE_PLAN_TYPE)[keyof typeof STRIPE_PLAN_TYPE]; + +export const getPricesByPlan = async (plan: PlanType | PlanType[]) => { + const planTypes = typeof plan === 'string' ? [plan] : plan; + + const query = planTypes.map((planType) => `metadata['plan']:'${planType}'`).join(' OR '); + const { data: prices } = await stripe.prices.search({ - query: `metadata['plan']:'${plan}' type:'recurring'`, + query, expand: ['data.product'], limit: 100, }); - return prices; + return prices.filter((price) => price.type === 'recurring'); }; diff --git a/packages/ee/server-only/stripe/get-primary-account-plan-prices.ts b/packages/ee/server-only/stripe/get-primary-account-plan-prices.ts new file mode 100644 index 000000000..0eb368ce7 --- /dev/null +++ b/packages/ee/server-only/stripe/get-primary-account-plan-prices.ts @@ -0,0 +1,10 @@ +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; + +import { getPricesByPlan } from './get-prices-by-plan'; + +/** + * Returns the prices of items that count as the account's primary plan. + */ +export const getPrimaryAccountPlanPrices = async () => { + return await getPricesByPlan([STRIPE_PLAN_TYPE.COMMUNITY, STRIPE_PLAN_TYPE.ENTERPRISE]); +}; diff --git a/packages/ee/server-only/stripe/get-team-related-prices.ts b/packages/ee/server-only/stripe/get-team-related-prices.ts new file mode 100644 index 000000000..b10ab06f4 --- /dev/null +++ b/packages/ee/server-only/stripe/get-team-related-prices.ts @@ -0,0 +1,17 @@ +import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing'; + +import { getPricesByPlan } from './get-prices-by-plan'; + +/** + * Returns the Stripe prices of items that affect the amount of teams a user can create. + */ +export const getTeamRelatedPrices = async () => { + return await getPricesByPlan([STRIPE_PLAN_TYPE.COMMUNITY, STRIPE_PLAN_TYPE.ENTERPRISE]); +}; + +/** + * Returns the Stripe price IDs of items that affect the amount of teams a user can create. + */ +export const getTeamRelatedPriceIds = async () => { + return await getTeamRelatedPrices().then((prices) => prices.map((price) => price.id)); +}; diff --git a/packages/ee/server-only/stripe/transfer-team-subscription.ts b/packages/ee/server-only/stripe/transfer-team-subscription.ts index b4e0bd59a..953efcaf4 100644 --- a/packages/ee/server-only/stripe/transfer-team-subscription.ts +++ b/packages/ee/server-only/stripe/transfer-team-subscription.ts @@ -2,13 +2,13 @@ import type Stripe from 'stripe'; import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; import { stripe } from '@documenso/lib/server-only/stripe'; -import { subscriptionsContainsActiveCommunityPlan } from '@documenso/lib/utils/billing'; +import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing'; import { prisma } from '@documenso/prisma'; import { type Subscription, type Team, type User } from '@documenso/prisma/client'; import { deleteCustomerPaymentMethods } from './delete-customer-payment-methods'; -import { getCommunityPlanPriceIds } from './get-community-plan-prices'; import { getTeamPrices } from './get-team-prices'; +import { getTeamRelatedPriceIds } from './get-team-related-prices'; type TransferStripeSubscriptionOptions = { /** @@ -46,14 +46,14 @@ export const transferTeamSubscription = async ({ throw new AppError(AppErrorCode.NOT_FOUND, 'Missing customer ID.'); } - const [communityPlanIds, teamSeatPrices] = await Promise.all([ - getCommunityPlanPriceIds(), + const [teamRelatedPlanPriceIds, teamSeatPrices] = await Promise.all([ + getTeamRelatedPriceIds(), getTeamPrices(), ]); - const teamSubscriptionRequired = !subscriptionsContainsActiveCommunityPlan( + const teamSubscriptionRequired = !subscriptionsContainsActivePlan( user.Subscription, - communityPlanIds, + teamRelatedPlanPriceIds, ); let teamSubscription: Stripe.Subscription | null = null; diff --git a/packages/lib/constants/app.ts b/packages/lib/constants/app.ts index 1adb4effb..c17193677 100644 --- a/packages/lib/constants/app.ts +++ b/packages/lib/constants/app.ts @@ -3,18 +3,17 @@ import { env } from 'next-runtime-env'; export const APP_DOCUMENT_UPLOAD_SIZE_LIMIT = Number(process.env.NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT) || 50; -export const NEXT_PUBLIC_PROJECT = () => env('NEXT_PUBLIC_PROJECT'); export const NEXT_PUBLIC_WEBAPP_URL = () => env('NEXT_PUBLIC_WEBAPP_URL'); export const NEXT_PUBLIC_MARKETING_URL = () => env('NEXT_PUBLIC_MARKETING_URL'); -export const IS_APP_MARKETING = () => NEXT_PUBLIC_PROJECT() === 'marketing'; -export const IS_APP_WEB = () => NEXT_PUBLIC_PROJECT() === 'web'; +export const IS_APP_MARKETING = process.env.NEXT_PUBLIC_PROJECT === 'marketing'; +export const IS_APP_WEB = process.env.NEXT_PUBLIC_PROJECT === 'web'; export const IS_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED') === 'true'; -export const APP_FOLDER = () => (IS_APP_MARKETING() ? 'marketing' : 'web'); +export const APP_FOLDER = () => (IS_APP_MARKETING ? 'marketing' : 'web'); export const APP_BASE_URL = () => - IS_APP_WEB() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PUBLIC_MARKETING_URL(); + IS_APP_WEB ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PUBLIC_MARKETING_URL(); export const WEBAPP_BASE_URL = NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000'; export const MARKETING_BASE_URL = NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001'; diff --git a/packages/lib/constants/billing.ts b/packages/lib/constants/billing.ts index e6d897af8..0d8dee6e2 100644 --- a/packages/lib/constants/billing.ts +++ b/packages/lib/constants/billing.ts @@ -6,6 +6,5 @@ export enum STRIPE_CUSTOMER_TYPE { export enum STRIPE_PLAN_TYPE { TEAM = 'team', COMMUNITY = 'community', + ENTERPRISE = 'enterprise', } - -export const TEAM_BILLING_DOMAIN = 'billing.team.documenso.com'; diff --git a/packages/lib/server-only/team/create-team.ts b/packages/lib/server-only/team/create-team.ts index 4d26a161a..3461d49bf 100644 --- a/packages/lib/server-only/team/create-team.ts +++ b/packages/lib/server-only/team/create-team.ts @@ -2,11 +2,11 @@ import type Stripe from 'stripe'; import { z } from 'zod'; import { createTeamCustomer } from '@documenso/ee/server-only/stripe/create-team-customer'; -import { getCommunityPlanPriceIds } from '@documenso/ee/server-only/stripe/get-community-plan-prices'; +import { getTeamRelatedPrices } from '@documenso/ee/server-only/stripe/get-team-related-prices'; import { mapStripeSubscriptionToPrismaUpsertAction } from '@documenso/ee/server-only/stripe/webhook/on-subscription-updated'; import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app'; import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; -import { subscriptionsContainsActiveCommunityPlan } from '@documenso/lib/utils/billing'; +import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing'; import { prisma } from '@documenso/prisma'; import { Prisma, TeamMemberRole } from '@documenso/prisma/client'; @@ -61,13 +61,12 @@ export const createTeam = async ({ let customerId: string | null = null; if (IS_BILLING_ENABLED()) { - const communityPlanPriceIds = await getCommunityPlanPriceIds(); - - isPaymentRequired = !subscriptionsContainsActiveCommunityPlan( - user.Subscription, - communityPlanPriceIds, + const teamRelatedPriceIds = await getTeamRelatedPrices().then((prices) => + prices.map((price) => price.id), ); + isPaymentRequired = !subscriptionsContainsActivePlan(user.Subscription, teamRelatedPriceIds); + customerId = await createTeamCustomer({ name: user.name ?? teamName, email: user.email, diff --git a/packages/lib/utils/billing.ts b/packages/lib/utils/billing.ts index ca85addbb..048fa6ee0 100644 --- a/packages/lib/utils/billing.ts +++ b/packages/lib/utils/billing.ts @@ -2,15 +2,14 @@ import type { Subscription } from '.prisma/client'; import { SubscriptionStatus } from '.prisma/client'; /** - * Returns true if there is a subscription that is active and is a community plan. + * Returns true if there is a subscription that is active and is one of the provided price IDs. */ -export const subscriptionsContainsActiveCommunityPlan = ( +export const subscriptionsContainsActivePlan = ( subscriptions: Subscription[], - communityPlanPriceIds: string[], + priceIds: string[], ) => { return subscriptions.some( (subscription) => - subscription.status === SubscriptionStatus.ACTIVE && - communityPlanPriceIds.includes(subscription.priceId), + subscription.status === SubscriptionStatus.ACTIVE && priceIds.includes(subscription.priceId), ); }; From f98567ea87852a77040488982f2d10ecf0dfc243 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sat, 17 Feb 2024 07:34:21 +0000 Subject: [PATCH 168/311] feat: request usee to disable 2fa before deleting account --- apps/web/src/components/forms/profile.tsx | 138 ++++++------------ .../lib/server-only/2fa/verify-2fa-token.ts | 1 - 2 files changed, 45 insertions(+), 94 deletions(-) diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx index 23861c9fc..8a7e2ff3f 100644 --- a/apps/web/src/components/forms/profile.tsx +++ b/apps/web/src/components/forms/profile.tsx @@ -7,7 +7,6 @@ import { signOut } from 'next-auth/react'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; -import { validateTwoFactorAuthentication } from '@documenso/lib/server-only/2fa/validate-2fa'; import type { User } from '@documenso/prisma/client'; import { TRPCClientError } from '@documenso/trpc/client'; import { trpc } from '@documenso/trpc/react'; @@ -67,13 +66,6 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { resolver: zodResolver(ZProfileFormSchema), }); - const deleteAccountTwoFactorTokenForm = useForm({ - defaultValues: { - token: '', - }, - resolver: zodResolver(ZTwoFactorAuthTokenSchema), - }); - const isSubmitting = form.formState.isSubmitting; const hasTwoFactorAuthentication = user.twoFactorEnabled; @@ -113,38 +105,17 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { } }; - const deleteAccoutAndSignOut = async () => { - await deleteAccount(); - - toast({ - title: 'Account deleted', - description: 'Your account has been deleted successfully.', - duration: 5000, - }); - - return await signOut({ callbackUrl: '/' }); - }; - - const onDeleteAccount = async (hasTwoFactorAuthentication: boolean) => { + const onDeleteAccount = async () => { try { - if (!hasTwoFactorAuthentication) { - return await deleteAccoutAndSignOut(); - } + await deleteAccount(); - const { token } = deleteAccountTwoFactorTokenForm.getValues(); - - if (!token) { - throw new Error('Please enter your Two Factor Authentication token.'); - } - - await validateTwoFactorAuthentication({ - totpCode: token, - user, - }).catch(() => { - throw new Error('We were unable to validate your Two Factor Authentication token.'); + toast({ + title: 'Account deleted', + description: 'Your account has been deleted successfully.', + duration: 5000, }); - await deleteAccoutAndSignOut(); + return await signOut({ callbackUrl: '/' }); } catch (err) { if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') { toast({ @@ -225,66 +196,47 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => { irreversible and will cancel your subscription, so proceed with caution. - - { - console.log('delete account'); - })} - > - - - - - - - Delete Account - - Documenso will delete{' '} - all of your documents, along with all - of your completed documents, signatures, and all other resources belonging - to your Account. - - + + + + + + + Delete Account + + Documenso will delete{' '} + all of your documents, along with all of + your completed documents, signatures, and all other resources belonging to your + Account. + + - - - This action is not reversible. Please be certain. - - + + + This action is not reversible. Please be certain. + + - {hasTwoFactorAuthentication && ( -
    - ( - - - Two Factor Authentication Token - - - - - - - )} - /> -
    - )} + {hasTwoFactorAuthentication && ( + + + Disable Two Factor Authentication before deleting your account. + + + )} - - - -
    -
    - - + + + +
    +
    diff --git a/packages/lib/server-only/2fa/verify-2fa-token.ts b/packages/lib/server-only/2fa/verify-2fa-token.ts index 3c410bd58..0e8ec6afc 100644 --- a/packages/lib/server-only/2fa/verify-2fa-token.ts +++ b/packages/lib/server-only/2fa/verify-2fa-token.ts @@ -17,7 +17,6 @@ export const verifyTwoFactorAuthenticationToken = async ({ user, totpCode, }: VerifyTwoFactorAuthenticationTokenOptions) => { - // TODO: This is undefined and I can't figure out why. const key = DOCUMENSO_ENCRYPTION_KEY; if (!user.twoFactorSecret) { From 0186f2dfeda8240be2bbf9e46e158f81d70e3321 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Sat, 17 Feb 2024 13:19:03 +0530 Subject: [PATCH 169/311] feat: ability to download 2FA recovery codes --- .../web/src/components/forms/2fa/view-recovery-codes-dialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx b/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx index 323bc7198..cfdae7015 100644 --- a/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx +++ b/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx @@ -153,7 +153,7 @@ export const ViewRecoveryCodesDialog = ({ open, onOpenChange }: ViewRecoveryCode
    - +
    From 5687503dfc8a63b7492489af13b8fb1b813edfa8 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sat, 17 Feb 2024 08:26:30 +0000 Subject: [PATCH 170/311] feat: sign document with a custom text --- .../src/app/(signing)/sign/[token]/page.tsx | 4 + .../app/(signing)/sign/[token]/provider.tsx | 7 + .../app/(signing)/sign/[token]/text-field.tsx | 178 ++++++++++++++++++ .../primitives/document-flow/add-fields.tsx | 22 +++ 4 files changed, 211 insertions(+) create mode 100644 apps/web/src/app/(signing)/sign/[token]/text-field.tsx diff --git a/apps/web/src/app/(signing)/sign/[token]/page.tsx b/apps/web/src/app/(signing)/sign/[token]/page.tsx index 99b9d1dd7..83cdb93e2 100644 --- a/apps/web/src/app/(signing)/sign/[token]/page.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/page.tsx @@ -29,6 +29,7 @@ import { NameField } from './name-field'; import { NoLongerAvailable } from './no-longer-available'; import { SigningProvider } from './provider'; import { SignatureField } from './signature-field'; +import { TextField } from './text-field'; export type SigningPageProps = { params: { @@ -168,6 +169,9 @@ export default async function SigningPage({ params: { token } }: SigningPageProp .with(FieldType.EMAIL, () => ( )) + .with(FieldType.TEXT, () => ( + + )) .otherwise(() => null), )} diff --git a/apps/web/src/app/(signing)/sign/[token]/provider.tsx b/apps/web/src/app/(signing)/sign/[token]/provider.tsx index 454007cb0..6531e8a40 100644 --- a/apps/web/src/app/(signing)/sign/[token]/provider.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/provider.tsx @@ -9,6 +9,8 @@ export type SigningContextValue = { setEmail: (_value: string) => void; signature: string | null; setSignature: (_value: string | null) => void; + customText: string; + setCustomText: (_value: string) => void; }; const SigningContext = createContext(null); @@ -31,6 +33,7 @@ export interface SigningProviderProps { fullName?: string | null; email?: string | null; signature?: string | null; + customText?: string | null; children: React.ReactNode; } @@ -38,11 +41,13 @@ export const SigningProvider = ({ fullName: initialFullName, email: initialEmail, signature: initialSignature, + customText: initialCustomText, children, }: SigningProviderProps) => { const [fullName, setFullName] = useState(initialFullName || ''); const [email, setEmail] = useState(initialEmail || ''); const [signature, setSignature] = useState(initialSignature || null); + const [customText, setCustomText] = useState(initialCustomText || ''); return ( {children} diff --git a/apps/web/src/app/(signing)/sign/[token]/text-field.tsx b/apps/web/src/app/(signing)/sign/[token]/text-field.tsx new file mode 100644 index 000000000..d324a50ba --- /dev/null +++ b/apps/web/src/app/(signing)/sign/[token]/text-field.tsx @@ -0,0 +1,178 @@ +'use client'; + +import { useEffect, useState, useTransition } from 'react'; + +import { useRouter } from 'next/navigation'; + +import { Loader } from 'lucide-react'; + +import type { Recipient } from '@documenso/prisma/client'; +import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature'; +import { trpc } from '@documenso/trpc/react'; +import { Button } from '@documenso/ui/primitives/button'; +import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog'; +import { Label } from '@documenso/ui/primitives/label'; +import { Textarea } from '@documenso/ui/primitives/textarea'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +import { useRequiredSigningContext } from './provider'; +import { SigningFieldContainer } from './signing-field-container'; + +export type TextFieldProps = { + field: FieldWithSignature; + recipient: Recipient; +}; + +export const TextField = ({ field, recipient }: TextFieldProps) => { + const router = useRouter(); + + const { toast } = useToast(); + const { customText: providedCustomText, setCustomText: setProvidedCustomText } = + useRequiredSigningContext(); + + const [isPending, startTransition] = useTransition(); + + const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } = + trpc.field.signFieldWithToken.useMutation(); + + const { + mutateAsync: removeSignedFieldWithToken, + isLoading: isRemoveSignedFieldWithTokenLoading, + } = trpc.field.removeSignedFieldWithToken.useMutation(); + + const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending; + + const [showCustomTextModal, setShowCustomTextModal] = useState(false); + const [localText, setLocalCustomText] = useState(''); + const [isLocalSignatureSet, setIsLocalSignatureSet] = useState(false); + + useEffect(() => { + if (!showCustomTextModal && !isLocalSignatureSet) { + setLocalCustomText(''); + } + }, [showCustomTextModal, isLocalSignatureSet]); + + const onSign = async (source: 'local' | 'provider' = 'provider') => { + try { + if (!providedCustomText && !localText) { + setIsLocalSignatureSet(false); + setShowCustomTextModal(true); + return; + } + + const value = source === 'local' && localText ? localText : providedCustomText ?? ''; + + if (!value) { + return; + } + + await signFieldWithToken({ + token: recipient.token, + fieldId: field.id, + value, + isBase64: true, + }); + + if (source === 'local' && !providedCustomText) { + setProvidedCustomText(localText); + } + + setLocalCustomText(''); + + startTransition(() => router.refresh()); + } catch (err) { + console.error(err); + + toast({ + title: 'Error', + description: 'An error occurred while signing the document.', + variant: 'destructive', + }); + } + }; + + const onRemove = async () => { + try { + // Necessary to reset the custom text if the user removes the signature + setProvidedCustomText(''); + + await removeSignedFieldWithToken({ + token: recipient.token, + fieldId: field.id, + }); + + startTransition(() => router.refresh()); + } catch (err) { + console.error(err); + + toast({ + title: 'Error', + description: 'An error occurred while removing the signature.', + variant: 'destructive', + }); + } + }; + + return ( + + {isLoading && ( +
    + +
    + )} + + {!field.inserted && ( +

    Text

    + )} + + {field.inserted &&

    {field.customText}

    } + + + + + Enter a Text ({recipient.email}) + + +
    + + +