The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
chore: merged main
Catalin Pit936e75fd30cc
diff --cc apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsxindex 89bcabf60,f4b2aae5e..214c5af99--- 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 +5,7 @@@ import type { HTMLAttributes } from 'reimport Link from 'next/link';import { usePathname } from 'next/navigation';- import { Braces, CreditCard, Key, User } from 'lucide-react';-import { CreditCard, Lock, User } from 'lucide-react';++import { Braces, CreditCard, Lock, User } from 'lucide-react';import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';import { cn } from '@documenso/ui/lib/utils';diff --cc apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsxindex d508c19d3,28ffc960f..ce61ba97d--- a/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx+++ b/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx@@@ -5,7 -5,7 +5,7 @@@ import type { HTMLAttributes } from 'reimport Link from 'next/link';import { usePathname } from 'next/navigation';- import { Braces, CreditCard, Key, User } from 'lucide-react';-import { CreditCard, Lock, User } from 'lucide-react';++import { Braces, CreditCard, Lock, User } from 'lucide-react';import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';import { cn } from '@documenso/ui/lib/utils';diff --cc package-lock.jsonindex f1078e528,61c4749e6..72bca2771--- a/package-lock.json+++ b/package-lock.json@@@ -5981,26 -5966,16 +5966,29 @@@}},"node_modules/@trpc/server": {- "version": "10.40.0",- "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.40.0.tgz",- "integrity": "sha512-49SUOMWzSZtu5+OdrADmJD+u+sjSE0qj1cWgYk2FY4jLkPJunLuNRuhzM7aOeBhiUjyfhg2YTfur8FN1WBmvEw==",+ "version": "10.44.1",+ "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.44.1.tgz",+ "integrity": "sha512-mF7B+K6LjuboX8I1RZgKE5GA/fJhsJ8tKGK2UBt3Bwik7hepEPb4NJgNr7vO6BK5IYwPdBLRLTctRw6XZx0sRg==","funding": ["https://trpc.io/sponsor"- ]+ ],+ "engines": {+ "node": ">=18.0.0"+ }},+ "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",@@@ -19838,223 -19475,13 +19488,226 @@@"@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",+ "luxon": "^3.4.0","superjson": "^1.13.1",+ "ts-pattern": "^5.0.5","zod": "^3.22.4"- }+ },+ "devDependencies": {}},+ "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 --cc packages/prisma/schema.prismaindex 8e073829b,75c175adc..3f8e82b37--- a/packages/prisma/schema.prisma+++ b/packages/prisma/schema.prisma@@@ -19,25 -19,27 +19,28 @@@ enum Role}model User {- id Int @id @default(autoincrement())- name String?- email String @unique- emailVerified DateTime?- password String?- source String?- signature String?- createdAt DateTime @default(now())- updatedAt DateTime @default(now()) @updatedAt- lastSignedIn DateTime @default(now())- roles Role[] @default([USER])- identityProvider IdentityProvider @default(DOCUMENSO)- accounts Account[]- sessions Session[]- Document Document[]- Subscription Subscription?- PasswordResetToken PasswordResetToken[]- VerificationToken VerificationToken[]- ApiToken ApiToken[]+ id Int @id @default(autoincrement())+ name String?+ email String @unique+ emailVerified DateTime?+ password String?+ source String?+ signature String?+ createdAt DateTime @default(now())+ updatedAt DateTime @default(now()) @updatedAt+ lastSignedIn DateTime @default(now())+ roles Role[] @default([USER])+ identityProvider IdentityProvider @default(DOCUMENSO)+ accounts Account[]+ sessions Session[]+ Document Document[]+ Subscription Subscription?+ PasswordResetToken PasswordResetToken[]+ twoFactorSecret String?+ twoFactorEnabled Boolean @default(false)+ twoFactorBackupCodes String?+ VerificationToken VerificationToken[]++ ApiToken ApiToken[]@@index([email])}@@@ -58,24 -60,9 +61,24 @@@ model VerificationTokenexpires DateTimecreatedAt DateTime @default(now())userId Int- user User @relation(fields: [userId], references: [id])+ user User @relation(fields: [userId], references: [id], onDelete: Cascade)}+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 {ACTIVEPAST_DUEdiff --cc packages/trpc/package.jsonindex f92b04e4c,54c1d5917..fb32bcdf3--- a/packages/trpc/package.json+++ b/packages/trpc/package.json@@@ -17,9 -17,10 +17,12 @@@"@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",+ "luxon": "^3.4.0","superjson": "^1.13.1",+ "ts-pattern": "^5.0.5","zod": "^3.22.4"- }+ },+ "devDependencies": {}}diff --cc packages/trpc/server/router.tsindex b7ccf4d3c,bf8a03ce1..1bd340cb0--- a/packages/trpc/server/router.ts+++ b/packages/trpc/server/router.ts@@@ -12,9 -14,11 +15,12 @@@ export const appRouter = router(profile: profileRouter,document: documentRouter,field: fieldRouter,+ recipient: recipientRouter,admin: adminRouter,shareLink: shareLinkRouter,+ apiToken: apiTokenRouter,+ singleplayer: singleplayerRouter,+ twoFactorAuthentication: twoFactorAuthenticationRouter,});export type AppRouter = typeof appRouter;