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 index 7c75a0729..047861fac 100644 --- 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 @@ -10,7 +10,7 @@ import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted'; import type { Document, Recipient, User } from '@documenso/prisma/client'; export type DocumentPageViewInformationProps = { - userId: number; + userId: string; document: Document & { User: Pick; Recipient: Recipient[]; 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 c6e0787bb..40fbd4d77 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 @@ -16,7 +16,7 @@ import { cn } from '@documenso/ui/lib/utils'; export type DocumentPageViewRecentActivityProps = { documentId: number; - userId: number; + userId: string; }; export const DocumentPageViewRecentActivity = ({ diff --git a/apps/web/src/app/(dashboard)/templates/[id]/template-page-view-information.tsx b/apps/web/src/app/(dashboard)/templates/[id]/template-page-view-information.tsx index 2b25dd819..7e9db1530 100644 --- a/apps/web/src/app/(dashboard)/templates/[id]/template-page-view-information.tsx +++ b/apps/web/src/app/(dashboard)/templates/[id]/template-page-view-information.tsx @@ -10,7 +10,7 @@ import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted'; import type { Template, User } from '@documenso/prisma/client'; export type TemplatePageViewInformationProps = { - userId: number; + userId: string; template: Template & { User: Pick; }; 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 fa991099b..b978745f8 100644 --- a/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx +++ b/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx @@ -45,7 +45,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast'; export type TransferTeamDialogProps = { teamId: number; teamName: string; - ownerUserId: number; + ownerUserId: string; trigger?: React.ReactNode; }; @@ -98,7 +98,7 @@ export const TransferTeamDialog = ({ try { await requestTeamOwnershipTransfer({ teamId, - newOwnerUserId: Number.parseInt(newOwnerUserId), + newOwnerUserId, clearPaymentMethods, }); 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 index 91997d7fa..f92490330 100644 --- a/apps/web/src/components/(teams)/tables/team-members-data-table.tsx +++ b/apps/web/src/components/(teams)/tables/team-members-data-table.tsx @@ -34,7 +34,7 @@ import { UpdateTeamMemberDialog } from '../dialogs/update-team-member-dialog'; export type TeamMembersDataTableProps = { currentUserTeamRole: TeamMemberRole; - teamOwnerUserId: number; + teamOwneruserId: string; teamId: number; teamName: string; }; 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 496427f39..328904475 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 @@ -20,7 +20,7 @@ export type TeamsMemberPageDataTableProps = { currentUserTeamRole: TeamMemberRole; teamId: number; teamName: string; - teamOwnerUserId: number; + teamOwneruserId: string; }; export const TeamsMemberPageDataTable = ({ diff --git a/apps/web/src/components/document/document-history-sheet.tsx b/apps/web/src/components/document/document-history-sheet.tsx index 8ee2098b6..980f142bd 100644 --- a/apps/web/src/components/document/document-history-sheet.tsx +++ b/apps/web/src/components/document/document-history-sheet.tsx @@ -24,7 +24,7 @@ import { DocumentHistorySheetChanges } from './document-history-sheet-changes'; export type DocumentHistorySheetProps = { documentId: number; - userId: number; + userId: string; isMenuOpen?: boolean; onMenuOpenChange?: (_value: boolean) => void; children?: React.ReactNode; diff --git a/package-lock.json b/package-lock.json index d38e95fdf..88dc1b0f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,10 +15,12 @@ "@documenso/pdf-sign": "^0.1.0", "@documenso/prisma": "^0.0.0", "@lingui/core": "^4.11.3", + "@prisma/client": "^6.1.0", "inngest-cli": "^0.29.1", "luxon": "^3.5.0", "mupdf": "^1.0.0", "next-runtime-env": "^3.2.0", + "prisma": "^6.1.0", "react": "^18", "zod": "3.24.1" }, @@ -5636,15 +5638,13 @@ } }, "node_modules/@prisma/client": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.4.2.tgz", - "integrity": "sha512-2xsPaz4EaMKj1WS9iW6MlPhmbqtBsXAOeVttSePp8vTFTtvzh2hZbDgswwBdSCgPzmmwF+tLB259QzggvCmJqA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-6.1.0.tgz", + "integrity": "sha512-AbQYc5+EJKm1Ydfq3KxwcGiy7wIbm4/QbjCKWWoNROtvy7d6a3gmAGkKjK0iUCzh+rHV8xDhD5Cge8ke/kiy5Q==", "hasInstallScript": true, - "dependencies": { - "@prisma/engines-version": "5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574" - }, + "license": "Apache-2.0", "engines": { - "node": ">=16.13" + "node": ">=18.18" }, "peerDependencies": { "prisma": "*" @@ -5676,15 +5676,49 @@ } }, "node_modules/@prisma/engines": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.4.2.tgz", - "integrity": "sha512-fqeucJ3LH0e1eyFdT0zRx+oETLancu5+n4lhiYECyEz6H2RDskPJHJYHkVc0LhkU4Uv7fuEnppKU3nVKNzMh8g==", - "hasInstallScript": true + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.1.0.tgz", + "integrity": "sha512-GnYJbCiep3Vyr1P/415ReYrgJUjP79fBNc1wCo7NP6Eia0CzL2Ot9vK7Infczv3oK7JLrCcawOSAxFxNFsAERQ==", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "@prisma/debug": "6.1.0", + "@prisma/engines-version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959", + "@prisma/fetch-engine": "6.1.0", + "@prisma/get-platform": "6.1.0" + } }, "node_modules/@prisma/engines-version": { - "version": "5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574.tgz", - "integrity": "sha512-wvupDL4AA1vf4TQNANg7kR7y98ITqPsk6aacfBxZKtrJKRIsWjURHkZCGcQliHdqCiW/hGreO6d6ZuSv9MhdAA==" + "version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959.tgz", + "integrity": "sha512-PdJqmYM2Fd8K0weOOtQThWylwjsDlTig+8Pcg47/jszMuLL9iLIaygC3cjWJLda69siRW4STlCTMSgOjZzvKPQ==", + "license": "Apache-2.0" + }, + "node_modules/@prisma/engines/node_modules/@prisma/debug": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.1.0.tgz", + "integrity": "sha512-0himsvcM4DGBTtvXkd2Tggv6sl2JyUYLzEGXXleFY+7Kp6rZeSS3hiTW9mwtUlXrwYbJP6pwlVNB7jYElrjWUg==", + "license": "Apache-2.0" + }, + "node_modules/@prisma/engines/node_modules/@prisma/fetch-engine": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.1.0.tgz", + "integrity": "sha512-asdFi7TvPlEZ8CzSZ/+Du5wZ27q6OJbRSXh+S8ISZguu+S9KtS/gP7NeXceZyb1Jv1SM1S5YfiCv+STDsG6rrg==", + "license": "Apache-2.0", + "dependencies": { + "@prisma/debug": "6.1.0", + "@prisma/engines-version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959", + "@prisma/get-platform": "6.1.0" + } + }, + "node_modules/@prisma/engines/node_modules/@prisma/get-platform": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.1.0.tgz", + "integrity": "sha512-ia8bNjboBoHkmKGGaWtqtlgQOhCi7+f85aOkPJKgNwWvYrT6l78KgojLekE8zMhVk0R9lWcifV0Pf8l3/15V0Q==", + "license": "Apache-2.0", + "dependencies": { + "@prisma/debug": "6.1.0" + } }, "node_modules/@prisma/fetch-engine": { "version": "5.3.1", @@ -20088,14 +20122,6 @@ "node": ">=6" } }, - "node_modules/kysely": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.27.3.tgz", - "integrity": "sha512-lG03Ru+XyOJFsjH3OMY6R/9U38IjDPfnOfDgO3ynhbDr+Dz8fak+X6L62vqu3iybQnj+lG84OttBuU9KY3L9kA==", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -26162,26 +26188,22 @@ "integrity": "sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==" }, "node_modules/prisma": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.4.2.tgz", - "integrity": "sha512-GDMZwZy7mysB2oXU+angQqJ90iaPFdD0rHaZNkn+dio5NRkGLmMqmXs31//tg/qXT3iB0cTQwnGGQNuirhSTZg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.1.0.tgz", + "integrity": "sha512-aFI3Yi+ApUxkwCJJwyQSwpyzUX7YX3ihzuHNHOyv4GJg3X5tQsmRaJEnZ+ZyfHpMtnyahhmXVfbTZ+lS8ZtfKw==", "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { - "@prisma/engines": "5.4.2" + "@prisma/engines": "6.1.0" }, "bin": { "prisma": "build/index.js" }, "engines": { - "node": ">=16.13" - } - }, - "node_modules/prisma-extension-kysely": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/prisma-extension-kysely/-/prisma-extension-kysely-2.1.0.tgz", - "integrity": "sha512-s1hujYjrNzfQc9Z79s93464mkTkkt9ZPqPELDRFe9jEmiIlM/JRXZtqIyyN3FM0GDkN/BDPVtpPtdC52XnjAcQ==", - "peerDependencies": { - "@prisma/client": "latest" + "node": ">=18.18" + }, + "optionalDependencies": { + "fsevents": "2.3.3" } }, "node_modules/prisma-kysely": { @@ -34070,36 +34092,6 @@ "zod": "^3.20.2" } }, - "node_modules/zod-prisma-types": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/zod-prisma-types/-/zod-prisma-types-3.1.8.tgz", - "integrity": "sha512-5oe0ays3ur4u2GtuUqlhgCraKBcsuMaMI8o7VMV4YAnFeOuVid7K2zGvjI19V0ue9PeNF2ICyVREQVohaQm5dw==", - "dev": true, - "dependencies": { - "@prisma/generator-helper": "^5.14.0", - "code-block-writer": "^12.0.0", - "lodash": "^4.17.21", - "zod": "^3.23.8" - }, - "bin": { - "zod-prisma-types": "dist/bin.js" - } - }, - "node_modules/zod-prisma-types/node_modules/@prisma/debug": { - "version": "5.22.0", - "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz", - "integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==", - "dev": true - }, - "node_modules/zod-prisma-types/node_modules/@prisma/generator-helper": { - "version": "5.22.0", - "resolved": "https://registry.npmjs.org/@prisma/generator-helper/-/generator-helper-5.22.0.tgz", - "integrity": "sha512-LwqcBQ5/QsuAaLNQZAIVIAJDJBMjHwMwn16e06IYx/3Okj/xEEfw9IvrqB2cJCl3b2mCBlh3eVH0w9WGmi4aHg==", - "dev": true, - "dependencies": { - "@prisma/debug": "5.22.0" - } - }, "node_modules/zod-to-json-schema": { "version": "3.24.1", "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.1.tgz", @@ -35466,10 +35458,10 @@ "version": "0.0.0", "license": "MIT", "dependencies": { - "@prisma/client": "5.4.2", - "kysely": "^0.27.3", - "prisma": "5.4.2", - "prisma-extension-kysely": "^2.1.0", + "@prisma/client": "^6.1.0", + "kysely": "^0.27.5", + "prisma": "^6.1.0", + "prisma-extension-kysely": "^3.0.0", "ts-pattern": "^5.0.6" }, "devDependencies": { @@ -35478,7 +35470,42 @@ "prisma-kysely": "^1.8.0", "tsx": "^4.11.0", "typescript": "5.2.2", - "zod-prisma-types": "^3.1.8" + "zod-prisma-types": "^3.2.1" + } + }, + "packages/prisma/node_modules/@prisma/debug": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.1.0.tgz", + "integrity": "sha512-0himsvcM4DGBTtvXkd2Tggv6sl2JyUYLzEGXXleFY+7Kp6rZeSS3hiTW9mwtUlXrwYbJP6pwlVNB7jYElrjWUg==", + "dev": true, + "license": "Apache-2.0" + }, + "packages/prisma/node_modules/@prisma/generator-helper": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@prisma/generator-helper/-/generator-helper-6.1.0.tgz", + "integrity": "sha512-drHaTKRmRsz6esHk2dpn7aPoxfttoqkYWSaI7zXsL5YQz73jww1YgJpGbPgOUiblriJAtdT4o7mibMqnf8TOsA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@prisma/debug": "6.1.0" + } + }, + "packages/prisma/node_modules/kysely": { + "version": "0.27.5", + "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.27.5.tgz", + "integrity": "sha512-s7hZHcQeSNKpzCkHRm8yA+0JPLjncSWnjb+2TIElwS2JAqYr+Kv3Ess+9KFfJS0C1xcQ1i9NkNHpWwCYpHMWsA==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "packages/prisma/node_modules/prisma-extension-kysely": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/prisma-extension-kysely/-/prisma-extension-kysely-3.0.0.tgz", + "integrity": "sha512-J8gtIINuqsmbucei7PehAiuKvlPEe6SpRNXM6SdG7wXvY2aNxm5RnjnTwWITLTvzM3smarsKfMMfpMcNua82mA==", + "license": "MIT", + "peerDependencies": { + "@prisma/client": "latest" } }, "packages/prisma/node_modules/ts-pattern": { @@ -35499,6 +35526,26 @@ "node": ">=14.17" } }, + "packages/prisma/node_modules/zod-prisma-types": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/zod-prisma-types/-/zod-prisma-types-3.2.1.tgz", + "integrity": "sha512-qsOD8aMVx3Yg9gHctvhTRpavaJizt8xUda6qjwOcH7suvrirXax38tjs0ilKcY7GKbyY57q2rZ+uoSDnzVXpag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@prisma/generator-helper": "^6.0.1", + "code-block-writer": "^12.0.0", + "lodash": "^4.17.21", + "zod": "^3.23.8" + }, + "bin": { + "zod-prisma-types": "dist/bin.js" + }, + "peerDependencies": { + "@prisma/client": "^4.x.x || ^5.x.x || ^6.x.x", + "prisma": "^4.x.x || ^5.x.x || ^6.x.x" + } + }, "packages/signing": { "name": "@documenso/signing", "version": "0.0.0", diff --git a/package.json b/package.json index 2d1ae3aa2..3bbfa7906 100644 --- a/package.json +++ b/package.json @@ -70,14 +70,18 @@ "luxon": "^3.5.0", "mupdf": "^1.0.0", "next-runtime-env": "^3.2.0", + "@prisma/client": "^6.1.0", + "prisma": "^6.1.0", "react": "^18", "zod": "3.24.1" }, "overrides": { "next": "14.2.6", + "@prisma/client": "^6.1.0", + "prisma": "^6.1.0", "zod": "3.24.1" }, "trigger.dev": { "endpointId": "documenso-app" } -} +} \ No newline at end of file diff --git a/packages/ee/server-only/stripe/get-customer.ts b/packages/ee/server-only/stripe/get-customer.ts index 6e2d4f088..19fd16cbb 100644 --- a/packages/ee/server-only/stripe/get-customer.ts +++ b/packages/ee/server-only/stripe/get-customer.ts @@ -91,7 +91,7 @@ export const getStripeCustomerIdByUser = async (user: User) => { return await getStripeCustomerByUser(user).then((session) => session.stripeCustomer.id); }; -const syncStripeCustomerSubscriptions = async (userId: number, stripeCustomerId: string) => { +const syncStripeCustomerSubscriptions = async (userId: string, stripeCustomerId: string) => { const stripeSubscriptions = await stripe.subscriptions.list({ customer: stripeCustomerId, }); diff --git a/packages/ee/server-only/util/is-document-enterprise.ts b/packages/ee/server-only/util/is-document-enterprise.ts index c49d98edb..e1d7f6661 100644 --- a/packages/ee/server-only/util/is-document-enterprise.ts +++ b/packages/ee/server-only/util/is-document-enterprise.ts @@ -6,7 +6,7 @@ import type { Subscription } from '@documenso/prisma/client'; import { getEnterprisePlanPriceIds } from '../stripe/get-enterprise-plan-prices'; export type IsUserEnterpriseOptions = { - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.ts index 3559467ef..5eadec473 100644 --- a/packages/lib/next-auth/auth-options.ts +++ b/packages/lib/next-auth/auth-options.ts @@ -126,7 +126,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } return { - id: Number(user.id), + id: user.id, email: user.email, name: user.name, emailVerified: user.emailVerified?.toISOString() ?? null, @@ -140,7 +140,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { profile(profile) { return { - id: Number(profile.sub), + id: profile.sub, name: profile.name || `${profile.given_name} ${profile.family_name}`.trim(), email: profile.email, emailVerified: profile.email_verified ? new Date().toISOString() : null, @@ -274,7 +274,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { }); return { - id: Number(user.id), + id: user.id, email: user.email, name: user.name, emailVerified: user.emailVerified?.toISOString() ?? null, @@ -308,7 +308,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { const { userId, email } = parsedCredential; - if (typeof userId !== 'number' || typeof email !== 'string') { + if (typeof userId !== 'string' || typeof email !== 'string') { throw new AppError(AppErrorCode.INVALID_REQUEST); } @@ -323,7 +323,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } return { - id: Number(user.id), + id: user.id, email: user.email, name: user.name, emailVerified: user.emailVerified?.toISOString() ?? null, @@ -340,7 +340,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { } satisfies JWT; if (!merged.email || typeof merged.emailVerified !== 'string') { - const userId = Number(merged.id ?? token.sub); + const userId = merged.id ?? token.sub; const retrieved = await prisma.user.findFirst({ where: { @@ -367,7 +367,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { const user = await prisma.user.update({ where: { - id: Number(merged.id), + id: merged.id, }, data: { lastSignedIn: merged.lastSignedIn, @@ -384,7 +384,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { await prisma.user.update({ where: { - id: Number(merged.id), + id: merged.id, }, data: { emailVerified: merged.emailVerified, @@ -407,7 +407,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = { return { ...session, user: { - id: Number(token.id), + id: token.id, name: token.name, email: token.email, emailVerified: token.emailVerified ?? null, diff --git a/packages/lib/server-only/auth/create-passkey-authentication-options.ts b/packages/lib/server-only/auth/create-passkey-authentication-options.ts index afa3072bc..3b44de89a 100644 --- a/packages/lib/server-only/auth/create-passkey-authentication-options.ts +++ b/packages/lib/server-only/auth/create-passkey-authentication-options.ts @@ -9,7 +9,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; import { getAuthenticatorOptions } from '../../utils/authenticator'; type CreatePasskeyAuthenticationOptions = { - userId: number; + userId: string; /** * The ID of the passkey to request authentication for. diff --git a/packages/lib/server-only/auth/create-passkey-registration-options.ts b/packages/lib/server-only/auth/create-passkey-registration-options.ts index 8f2b3d53a..04d57164f 100644 --- a/packages/lib/server-only/auth/create-passkey-registration-options.ts +++ b/packages/lib/server-only/auth/create-passkey-registration-options.ts @@ -8,7 +8,7 @@ import { PASSKEY_TIMEOUT } from '../../constants/auth'; import { getAuthenticatorOptions } from '../../utils/authenticator'; type CreatePasskeyRegistrationOptions = { - userId: number; + userId: string; }; export const createPasskeyRegistrationOptions = async ({ diff --git a/packages/lib/server-only/auth/create-passkey.ts b/packages/lib/server-only/auth/create-passkey.ts index f71c9c58e..9a8bf5183 100644 --- a/packages/lib/server-only/auth/create-passkey.ts +++ b/packages/lib/server-only/auth/create-passkey.ts @@ -10,7 +10,7 @@ import type { RequestMetadata } from '../../universal/extract-request-metadata'; import { getAuthenticatorOptions } from '../../utils/authenticator'; type CreatePasskeyOptions = { - userId: number; + userId: string; passkeyName: string; verificationResponse: RegistrationResponseJSON; requestMetadata?: RequestMetadata; diff --git a/packages/lib/server-only/auth/delete-passkey.ts b/packages/lib/server-only/auth/delete-passkey.ts index cb7edc4cf..4f2df5b3f 100644 --- a/packages/lib/server-only/auth/delete-passkey.ts +++ b/packages/lib/server-only/auth/delete-passkey.ts @@ -4,7 +4,7 @@ import { UserSecurityAuditLogType } from '@documenso/prisma/client'; import type { RequestMetadata } from '../../universal/extract-request-metadata'; export interface DeletePasskeyOptions { - userId: number; + userId: string; passkeyId: string; requestMetadata?: RequestMetadata; } diff --git a/packages/lib/server-only/auth/find-passkeys.ts b/packages/lib/server-only/auth/find-passkeys.ts index d92042185..80952d48c 100644 --- a/packages/lib/server-only/auth/find-passkeys.ts +++ b/packages/lib/server-only/auth/find-passkeys.ts @@ -5,7 +5,7 @@ import { Prisma } from '@documenso/prisma/client'; import type { FindResultResponse } from '../../types/search-params'; export interface FindPasskeysOptions { - userId: number; + userId: string; query?: string; page?: number; perPage?: number; diff --git a/packages/lib/server-only/auth/send-confirmation-email.ts b/packages/lib/server-only/auth/send-confirmation-email.ts index 5673d9603..bcfd31487 100644 --- a/packages/lib/server-only/auth/send-confirmation-email.ts +++ b/packages/lib/server-only/auth/send-confirmation-email.ts @@ -11,7 +11,7 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; export interface SendConfirmationEmailProps { - userId: number; + userId: string; } export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailProps) => { diff --git a/packages/lib/server-only/auth/send-forgot-password.ts b/packages/lib/server-only/auth/send-forgot-password.ts index fef1543c3..196f16a89 100644 --- a/packages/lib/server-only/auth/send-forgot-password.ts +++ b/packages/lib/server-only/auth/send-forgot-password.ts @@ -11,7 +11,7 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; export interface SendForgotPasswordOptions { - userId: number; + userId: string; } export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions) => { diff --git a/packages/lib/server-only/auth/send-reset-password.ts b/packages/lib/server-only/auth/send-reset-password.ts index 03165fcfc..3c3a24f4b 100644 --- a/packages/lib/server-only/auth/send-reset-password.ts +++ b/packages/lib/server-only/auth/send-reset-password.ts @@ -8,7 +8,7 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app'; import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; export interface SendResetPasswordOptions { - userId: number; + userId: string; } export const sendResetPassword = async ({ userId }: SendResetPasswordOptions) => { diff --git a/packages/lib/server-only/auth/update-passkey.ts b/packages/lib/server-only/auth/update-passkey.ts index b08eca233..9b3d4de49 100644 --- a/packages/lib/server-only/auth/update-passkey.ts +++ b/packages/lib/server-only/auth/update-passkey.ts @@ -4,7 +4,7 @@ import { UserSecurityAuditLogType } from '@documenso/prisma/client'; import type { RequestMetadata } from '../../universal/extract-request-metadata'; export interface UpdateAuthenticatorsOptions { - userId: number; + userId: string; passkeyId: string; name: string; requestMetadata?: RequestMetadata; 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 c6f4fd7a3..b0351b2b5 100644 --- a/packages/lib/server-only/document-meta/upsert-document-meta.ts +++ b/packages/lib/server-only/document-meta/upsert-document-meta.ts @@ -25,7 +25,7 @@ export type CreateDocumentMetaOptions = { distributionMethod?: DocumentDistributionMethod; typedSignatureEnabled?: boolean; language?: SupportedLanguageCodes; - userId: number; + userId: string; requestMetadata: RequestMetadata; }; diff --git a/packages/lib/server-only/document/create-document.ts b/packages/lib/server-only/document/create-document.ts index a0b857fbf..7e954c261 100644 --- a/packages/lib/server-only/document/create-document.ts +++ b/packages/lib/server-only/document/create-document.ts @@ -21,7 +21,7 @@ import { triggerWebhook } from '../webhooks/trigger/trigger-webhook'; export type CreateDocumentOptions = { title: string; externalId?: string | null; - userId: number; + userId: string; teamId?: number; documentDataId: string; formValues?: Record; diff --git a/packages/lib/server-only/document/delete-document.ts b/packages/lib/server-only/document/delete-document.ts index f4d1beecc..fdf2397f1 100644 --- a/packages/lib/server-only/document/delete-document.ts +++ b/packages/lib/server-only/document/delete-document.ts @@ -29,7 +29,7 @@ import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-t export type DeleteDocumentOptions = { id: number; - userId: number; + userId: string; teamId?: number; requestMetadata?: RequestMetadata; }; 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 1c7d0a38d..de304ae9d 100644 --- a/packages/lib/server-only/document/duplicate-document-by-id.ts +++ b/packages/lib/server-only/document/duplicate-document-by-id.ts @@ -7,7 +7,7 @@ import { getDocumentWhereInput } from './get-document-by-id'; export interface DuplicateDocumentOptions { documentId: number; - userId: number; + userId: string; teamId?: number; } diff --git a/packages/lib/server-only/document/find-document-audit-logs.ts b/packages/lib/server-only/document/find-document-audit-logs.ts index d9eb4d7fd..52c9cff31 100644 --- a/packages/lib/server-only/document/find-document-audit-logs.ts +++ b/packages/lib/server-only/document/find-document-audit-logs.ts @@ -7,7 +7,7 @@ import type { FindResultResponse } from '../../types/search-params'; import { parseDocumentAuditLogData } from '../../utils/document-audit-logs'; export interface FindDocumentAuditLogsOptions { - userId: number; + userId: string; documentId: number; page?: number; perPage?: number; diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts index ad53af829..51e7ac679 100644 --- a/packages/lib/server-only/document/find-documents.ts +++ b/packages/lib/server-only/document/find-documents.ts @@ -27,7 +27,7 @@ import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-token export type PeriodSelectorValue = '' | '7d' | '14d' | '30d'; export type FindDocumentsOptions = { - userId: number; + userId: string; teamId?: number; templateId?: number; source?: DocumentSource; 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 93bd79259..16fcc787a 100644 --- a/packages/lib/server-only/document/get-document-by-id.ts +++ b/packages/lib/server-only/document/get-document-by-id.ts @@ -10,7 +10,7 @@ import { getTeamById } from '../team/get-team'; export type GetDocumentByIdOptions = { documentId: number; - userId: number; + userId: string; teamId?: number; }; @@ -58,7 +58,7 @@ export const getDocumentById = async ({ documentId, userId, teamId }: GetDocumen export type GetDocumentWhereInputOptions = { documentId: number; - userId: number; + userId: string; teamId?: number; /** diff --git a/packages/lib/server-only/document/get-document-with-details-by-id.ts b/packages/lib/server-only/document/get-document-with-details-by-id.ts index bde03c337..0b25866d4 100644 --- a/packages/lib/server-only/document/get-document-with-details-by-id.ts +++ b/packages/lib/server-only/document/get-document-with-details-by-id.ts @@ -14,7 +14,7 @@ import { getDocumentWhereInput } from './get-document-by-id'; export type GetDocumentWithDetailsByIdOptions = { documentId: number; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/document/get-stats.ts b/packages/lib/server-only/document/get-stats.ts index e95e7d53b..0aaa7fc1b 100644 --- a/packages/lib/server-only/document/get-stats.ts +++ b/packages/lib/server-only/document/get-stats.ts @@ -170,7 +170,7 @@ type GetTeamCountsOption = { teamEmail?: string; senderIds?: number[]; currentUserEmail: string; - userId: number; + userId: string; createdAt: Prisma.DocumentWhereInput['createdAt']; currentTeamMemberRole?: TeamMemberRole; search?: string; diff --git a/packages/lib/server-only/document/is-recipient-authorized.ts b/packages/lib/server-only/document/is-recipient-authorized.ts index 85fea6078..5903b3629 100644 --- a/packages/lib/server-only/document/is-recipient-authorized.ts +++ b/packages/lib/server-only/document/is-recipient-authorized.ts @@ -124,7 +124,7 @@ type VerifyPasskeyOptions = { /** * The ID of the user who initiated the request. */ - userId: number; + userId: string; /** * The secondary ID of the verification token. diff --git a/packages/lib/server-only/document/move-document-to-team.ts b/packages/lib/server-only/document/move-document-to-team.ts index 8aad63429..1d953e2cb 100644 --- a/packages/lib/server-only/document/move-document-to-team.ts +++ b/packages/lib/server-only/document/move-document-to-team.ts @@ -11,7 +11,7 @@ import { createDocumentAuditLogData } from '../../utils/document-audit-logs'; export type MoveDocumentToTeamOptions = { documentId: number; teamId: number; - userId: number; + userId: string; requestMetadata?: RequestMetadata; }; diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx index 1ed899fe1..84ed2a3d9 100644 --- a/packages/lib/server-only/document/resend-document.tsx +++ b/packages/lib/server-only/document/resend-document.tsx @@ -26,7 +26,7 @@ import { getDocumentWhereInput } from './get-document-by-id'; export type ResendDocumentOptions = { documentId: number; - userId: number; + userId: string; recipients: number[]; teamId?: number; requestMetadata: RequestMetadata; diff --git a/packages/lib/server-only/document/search-documents-with-keyword.ts b/packages/lib/server-only/document/search-documents-with-keyword.ts index 98def25a4..999858438 100644 --- a/packages/lib/server-only/document/search-documents-with-keyword.ts +++ b/packages/lib/server-only/document/search-documents-with-keyword.ts @@ -8,7 +8,7 @@ import { DocumentVisibility, TeamMemberRole } from '@documenso/prisma/client'; export type SearchDocumentsWithKeywordOptions = { query: string; - userId: number; + userId: string; limit?: number; }; diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx index 8fc2674fc..b1b76b62e 100644 --- a/packages/lib/server-only/document/send-document.tsx +++ b/packages/lib/server-only/document/send-document.tsx @@ -28,7 +28,7 @@ import { triggerWebhook } from '../webhooks/trigger/trigger-webhook'; export type SendDocumentOptions = { documentId: number; - userId: number; + userId: string; teamId?: number; sendEmail?: boolean; requestMetadata?: RequestMetadata; diff --git a/packages/lib/server-only/document/update-document-settings.ts b/packages/lib/server-only/document/update-document-settings.ts index 87a18d4e7..d307c9ddf 100644 --- a/packages/lib/server-only/document/update-document-settings.ts +++ b/packages/lib/server-only/document/update-document-settings.ts @@ -18,7 +18,7 @@ import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../t import { createDocumentAuthOptions, extractDocumentAuthMethods } from '../../utils/document-auth'; export type UpdateDocumentSettingsOptions = { - userId: number; + userId: string; teamId?: number; documentId: number; data: { diff --git a/packages/lib/server-only/document/update-document.ts b/packages/lib/server-only/document/update-document.ts index 3e35f52e4..000dd603a 100644 --- a/packages/lib/server-only/document/update-document.ts +++ b/packages/lib/server-only/document/update-document.ts @@ -7,7 +7,7 @@ import { prisma } from '@documenso/prisma'; export type UpdateDocumentOptions = { documentId: number; data: Prisma.DocumentUpdateInput; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/document/update-title.ts b/packages/lib/server-only/document/update-title.ts index 43e7c2d91..6a5fe5401 100644 --- a/packages/lib/server-only/document/update-title.ts +++ b/packages/lib/server-only/document/update-title.ts @@ -6,7 +6,7 @@ import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit- import { prisma } from '@documenso/prisma'; export type UpdateTitleOptions = { - userId: number; + userId: string; teamId?: number; documentId: number; title: string; diff --git a/packages/lib/server-only/field/create-field.ts b/packages/lib/server-only/field/create-field.ts index da1a26276..3a319c735 100644 --- a/packages/lib/server-only/field/create-field.ts +++ b/packages/lib/server-only/field/create-field.ts @@ -16,7 +16,7 @@ import { createDocumentAuditLogData } from '../../utils/document-audit-logs'; export type CreateFieldOptions = { documentId: number; - userId: number; + userId: string; teamId?: number; recipientId: number; type: FieldType; diff --git a/packages/lib/server-only/field/delete-field.ts b/packages/lib/server-only/field/delete-field.ts index 67145de10..d29c3c9ba 100644 --- a/packages/lib/server-only/field/delete-field.ts +++ b/packages/lib/server-only/field/delete-field.ts @@ -7,7 +7,7 @@ import { createDocumentAuditLogData } from '../../utils/document-audit-logs'; export type DeleteFieldOptions = { fieldId: number; documentId: number; - userId: number; + userId: string; teamId?: number; requestMetadata?: RequestMetadata; }; diff --git a/packages/lib/server-only/field/get-field-by-id.ts b/packages/lib/server-only/field/get-field-by-id.ts index 13aa75d54..d59c47fa1 100644 --- a/packages/lib/server-only/field/get-field-by-id.ts +++ b/packages/lib/server-only/field/get-field-by-id.ts @@ -6,7 +6,7 @@ import { FieldSchema } from '@documenso/prisma/generated/zod'; import { AppError, AppErrorCode } from '../../errors/app-error'; export type GetFieldByIdOptions = { - userId: number; + userId: string; teamId?: number; fieldId: number; documentId?: number; 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 2cd8aa07c..3f0f806df 100644 --- a/packages/lib/server-only/field/get-fields-for-document.ts +++ b/packages/lib/server-only/field/get-fields-for-document.ts @@ -2,7 +2,7 @@ import { prisma } from '@documenso/prisma'; export interface GetFieldsForDocumentOptions { documentId: number; - userId: number; + userId: string; } export type DocumentField = Awaited>[number]; 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 724ec75fb..23708ae9d 100644 --- a/packages/lib/server-only/field/get-fields-for-template.ts +++ b/packages/lib/server-only/field/get-fields-for-template.ts @@ -2,7 +2,7 @@ import { prisma } from '@documenso/prisma'; export interface GetFieldsForTemplateOptions { templateId: number; - userId: number; + userId: string; } export const getFieldsForTemplate = async ({ templateId, userId }: GetFieldsForTemplateOptions) => { 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 6b3a79bf2..a9ae799ca 100644 --- a/packages/lib/server-only/field/set-fields-for-document.ts +++ b/packages/lib/server-only/field/set-fields-for-document.ts @@ -30,7 +30,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; import { canRecipientFieldsBeModified } from '../../utils/recipients'; export interface SetFieldsForDocumentOptions { - userId: number; + userId: string; documentId: number; fields: FieldData[]; requestMetadata?: RequestMetadata; 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 e89fa6250..033f17c2a 100644 --- a/packages/lib/server-only/field/set-fields-for-template.ts +++ b/packages/lib/server-only/field/set-fields-for-template.ts @@ -19,7 +19,7 @@ import { FieldType } from '@documenso/prisma/client'; import { FieldSchema } from '@documenso/prisma/generated/zod'; export type SetFieldsForTemplateOptions = { - userId: number; + userId: string; templateId: number; fields: { id?: number | null; diff --git a/packages/lib/server-only/field/update-field.ts b/packages/lib/server-only/field/update-field.ts index 434d0f651..45015b330 100644 --- a/packages/lib/server-only/field/update-field.ts +++ b/packages/lib/server-only/field/update-field.ts @@ -9,7 +9,7 @@ import { createDocumentAuditLogData, diffFieldChanges } from '../../utils/docume export type UpdateFieldOptions = { fieldId: number; documentId: number; - userId: number; + userId: string; teamId?: number; recipientId?: number; type?: FieldType; diff --git a/packages/lib/server-only/profile/set-avatar-image.ts b/packages/lib/server-only/profile/set-avatar-image.ts index 92683dcc4..987a685d5 100644 --- a/packages/lib/server-only/profile/set-avatar-image.ts +++ b/packages/lib/server-only/profile/set-avatar-image.ts @@ -6,7 +6,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; import type { RequestMetadata } from '../../universal/extract-request-metadata'; export type SetAvatarImageOptions = { - userId: number; + userId: string; teamId?: number | null; bytes?: string | null; requestMetadata?: RequestMetadata; 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 3d54eb26d..e8faf1713 100644 --- a/packages/lib/server-only/public-api/create-api-token.ts +++ b/packages/lib/server-only/public-api/create-api-token.ts @@ -14,7 +14,7 @@ type TimeConstants = typeof timeConstants & { }; type CreateApiTokenInput = { - userId: number; + userId: string; teamId?: number; tokenName: string; expiresIn: string | null; 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 9a5033d4f..b42352d22 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 @@ -3,7 +3,7 @@ import { TeamMemberRole } from '@documenso/prisma/client'; export type DeleteTokenByIdOptions = { id: number; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/public-api/get-all-team-tokens.ts b/packages/lib/server-only/public-api/get-all-team-tokens.ts index a1adbe9a6..193489f69 100644 --- a/packages/lib/server-only/public-api/get-all-team-tokens.ts +++ b/packages/lib/server-only/public-api/get-all-team-tokens.ts @@ -3,7 +3,7 @@ import { prisma } from '@documenso/prisma'; import { TeamMemberRole } from '@documenso/prisma/client'; export type GetUserTokensOptions = { - userId: number; + userId: string; teamId: number; }; 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 5561a308f..1929c1dc7 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 @@ -1,7 +1,7 @@ import { prisma } from '@documenso/prisma'; export type GetUserTokensOptions = { - userId: number; + userId: string; }; export const getUserTokens = async ({ userId }: GetUserTokensOptions) => { 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 8b25717f9..74fd88521 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 @@ -2,7 +2,7 @@ import { prisma } from '@documenso/prisma'; export type GetApiTokenByIdOptions = { id: number; - userId: number; + userId: string; }; export const getApiTokenById = async ({ id, userId }: GetApiTokenByIdOptions) => { diff --git a/packages/lib/server-only/recipient/delete-recipient.ts b/packages/lib/server-only/recipient/delete-recipient.ts index 74fb4a8d2..724a72ba3 100644 --- a/packages/lib/server-only/recipient/delete-recipient.ts +++ b/packages/lib/server-only/recipient/delete-recipient.ts @@ -8,7 +8,7 @@ import { createDocumentAuditLogData } from '../../utils/document-audit-logs'; export type DeleteRecipientOptions = { documentId: number; recipientId: number; - userId: number; + userId: string; teamId?: number; requestMetadata?: RequestMetadata; }; diff --git a/packages/lib/server-only/recipient/get-recipient-by-id.ts b/packages/lib/server-only/recipient/get-recipient-by-id.ts index 52b98019f..d82c94c38 100644 --- a/packages/lib/server-only/recipient/get-recipient-by-id.ts +++ b/packages/lib/server-only/recipient/get-recipient-by-id.ts @@ -7,7 +7,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; export type GetRecipientByIdOptions = { recipientId: number; - userId: number; + userId: string; teamId?: number; }; 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 03bc0e6c8..335c31b55 100644 --- a/packages/lib/server-only/recipient/get-recipients-for-document.ts +++ b/packages/lib/server-only/recipient/get-recipients-for-document.ts @@ -2,7 +2,7 @@ import { prisma } from '@documenso/prisma'; export interface GetRecipientsForDocumentOptions { documentId: number; - userId: number; + userId: string; teamId?: number; } 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 4b393353d..f4314e6b7 100644 --- a/packages/lib/server-only/recipient/get-recipients-for-template.ts +++ b/packages/lib/server-only/recipient/get-recipients-for-template.ts @@ -2,7 +2,7 @@ import { prisma } from '@documenso/prisma'; export interface GetRecipientsForTemplateOptions { templateId: number; - userId: number; + userId: string; } export const getRecipientsForTemplate = async ({ 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 fb1a50997..9b8ff3839 100644 --- a/packages/lib/server-only/recipient/set-recipients-for-document.ts +++ b/packages/lib/server-only/recipient/set-recipients-for-document.ts @@ -34,7 +34,7 @@ import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding'; export interface SetRecipientsForDocumentOptions { - userId: number; + userId: string; teamId?: number; documentId: number; recipients: RecipientData[]; 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 82859ca73..8b2bbe857 100644 --- a/packages/lib/server-only/recipient/set-recipients-for-template.ts +++ b/packages/lib/server-only/recipient/set-recipients-for-template.ts @@ -19,7 +19,7 @@ import { nanoid } from '../../universal/id'; import { createRecipientAuthOptions } from '../../utils/document-auth'; export type SetRecipientsForTemplateOptions = { - userId: number; + userId: string; teamId?: number; templateId: number; recipients: { diff --git a/packages/lib/server-only/recipient/update-recipient.ts b/packages/lib/server-only/recipient/update-recipient.ts index 5d2c64259..bafc60d2d 100644 --- a/packages/lib/server-only/recipient/update-recipient.ts +++ b/packages/lib/server-only/recipient/update-recipient.ts @@ -20,7 +20,7 @@ export type UpdateRecipientOptions = { role?: RecipientRole; signingOrder?: number | null; actionAuth?: TRecipientActionAuthTypes | null; - userId: number; + userId: string; teamId?: number; requestMetadata?: RequestMetadata; }; diff --git a/packages/lib/server-only/share/create-or-get-share-link.ts b/packages/lib/server-only/share/create-or-get-share-link.ts index 1569b98af..f162ff224 100644 --- a/packages/lib/server-only/share/create-or-get-share-link.ts +++ b/packages/lib/server-only/share/create-or-get-share-link.ts @@ -11,7 +11,7 @@ export type CreateSharingIdOptions = } | { documentId: number; - userId: number; + userId: string; }; export const createOrGetShareLink = async ({ documentId, ...options }: CreateSharingIdOptions) => { diff --git a/packages/lib/server-only/site-settings/upsert-site-setting.ts b/packages/lib/server-only/site-settings/upsert-site-setting.ts index 6fc59b1d1..6a72c4202 100644 --- a/packages/lib/server-only/site-settings/upsert-site-setting.ts +++ b/packages/lib/server-only/site-settings/upsert-site-setting.ts @@ -3,7 +3,7 @@ import { prisma } from '@documenso/prisma'; import type { TSiteSettingSchema } from './schema'; export type UpsertSiteSettingOptions = TSiteSettingSchema & { - userId: number; + userId: string; }; export const upsertSiteSetting = async ({ diff --git a/packages/lib/server-only/subscription/get-active-subscriptions-by-user-id.ts b/packages/lib/server-only/subscription/get-active-subscriptions-by-user-id.ts index f881cdb84..37c6bca03 100644 --- a/packages/lib/server-only/subscription/get-active-subscriptions-by-user-id.ts +++ b/packages/lib/server-only/subscription/get-active-subscriptions-by-user-id.ts @@ -4,7 +4,7 @@ import { prisma } from '@documenso/prisma'; import { SubscriptionStatus } from '@documenso/prisma/client'; export type GetActiveSubscriptionsByUserIdOptions = { - userId: number; + userId: string; }; export const getActiveSubscriptionsByUserId = async ({ diff --git a/packages/lib/server-only/subscription/get-subscriptions-by-user-id.ts b/packages/lib/server-only/subscription/get-subscriptions-by-user-id.ts index 33f6255bd..3b8dc3055 100644 --- a/packages/lib/server-only/subscription/get-subscriptions-by-user-id.ts +++ b/packages/lib/server-only/subscription/get-subscriptions-by-user-id.ts @@ -3,7 +3,7 @@ import { prisma } from '@documenso/prisma'; export type GetSubscriptionsByUserIdOptions = { - userId: number; + userId: string; }; export const getSubscriptionsByUserId = async ({ userId }: GetSubscriptionsByUserIdOptions) => { diff --git a/packages/lib/server-only/team/accept-team-invitation.ts b/packages/lib/server-only/team/accept-team-invitation.ts index 5004809fa..bbb4a71e8 100644 --- a/packages/lib/server-only/team/accept-team-invitation.ts +++ b/packages/lib/server-only/team/accept-team-invitation.ts @@ -6,7 +6,7 @@ import { TeamMemberInviteStatus } from '@documenso/prisma/client'; import { jobs } from '../../jobs/client'; export type AcceptTeamInvitationOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/create-team-billing-portal.ts b/packages/lib/server-only/team/create-team-billing-portal.ts index 3c96b4e8c..7e63cb79f 100644 --- a/packages/lib/server-only/team/create-team-billing-portal.ts +++ b/packages/lib/server-only/team/create-team-billing-portal.ts @@ -4,7 +4,7 @@ import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams import { prisma } from '@documenso/prisma'; export type CreateTeamBillingPortalOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/create-team-checkout-session.ts b/packages/lib/server-only/team/create-team-checkout-session.ts index 9a476ea70..8e920ac6d 100644 --- a/packages/lib/server-only/team/create-team-checkout-session.ts +++ b/packages/lib/server-only/team/create-team-checkout-session.ts @@ -5,7 +5,7 @@ import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; import { prisma } from '@documenso/prisma'; export type CreateTeamPendingCheckoutSession = { - userId: number; + userId: string; pendingTeamId: number; interval: 'monthly' | 'yearly'; }; diff --git a/packages/lib/server-only/team/create-team-email-verification.ts b/packages/lib/server-only/team/create-team-email-verification.ts index 166f76de4..525a126ed 100644 --- a/packages/lib/server-only/team/create-team-email-verification.ts +++ b/packages/lib/server-only/team/create-team-email-verification.ts @@ -19,7 +19,7 @@ import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding'; export type CreateTeamEmailVerificationOptions = { - userId: number; + userId: string; teamId: number; data: { email: string; diff --git a/packages/lib/server-only/team/create-team-member-invites.ts b/packages/lib/server-only/team/create-team-member-invites.ts index 0e8484f2a..70fc021a9 100644 --- a/packages/lib/server-only/team/create-team-member-invites.ts +++ b/packages/lib/server-only/team/create-team-member-invites.ts @@ -20,7 +20,7 @@ import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding'; export type CreateTeamMemberInvitesOptions = { - userId: number; + userId: string; userName: string; teamId: number; invitations: TCreateTeamMemberInvitesMutationSchema['invitations']; diff --git a/packages/lib/server-only/team/create-team.ts b/packages/lib/server-only/team/create-team.ts index 1b60ef99f..560afb8c5 100644 --- a/packages/lib/server-only/team/create-team.ts +++ b/packages/lib/server-only/team/create-team.ts @@ -16,7 +16,7 @@ export type CreateTeamOptions = { /** * ID of the user creating the Team. */ - userId: number; + userId: string; /** * Name of the team to display. diff --git a/packages/lib/server-only/team/decline-team-invitation.ts b/packages/lib/server-only/team/decline-team-invitation.ts index e3d87dc4e..414c32108 100644 --- a/packages/lib/server-only/team/decline-team-invitation.ts +++ b/packages/lib/server-only/team/decline-team-invitation.ts @@ -1,7 +1,7 @@ import { prisma } from '@documenso/prisma'; export type DeclineTeamInvitationOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/delete-team-email-verification.ts b/packages/lib/server-only/team/delete-team-email-verification.ts index fee39553f..5ebcc8ed7 100644 --- a/packages/lib/server-only/team/delete-team-email-verification.ts +++ b/packages/lib/server-only/team/delete-team-email-verification.ts @@ -2,7 +2,7 @@ import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams import { prisma } from '@documenso/prisma'; export type DeleteTeamEmailVerificationOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/delete-team-email.ts b/packages/lib/server-only/team/delete-team-email.ts index a15375b7c..03b1c00bc 100644 --- a/packages/lib/server-only/team/delete-team-email.ts +++ b/packages/lib/server-only/team/delete-team-email.ts @@ -14,7 +14,7 @@ import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding'; export type DeleteTeamEmailOptions = { - userId: number; + userId: string; userEmail: string; teamId: number; }; diff --git a/packages/lib/server-only/team/delete-team-invitations.ts b/packages/lib/server-only/team/delete-team-invitations.ts index a2baf8352..e5caaf442 100644 --- a/packages/lib/server-only/team/delete-team-invitations.ts +++ b/packages/lib/server-only/team/delete-team-invitations.ts @@ -6,7 +6,7 @@ export type DeleteTeamMemberInvitationsOptions = { /** * The ID of the user who is initiating this action. */ - userId: number; + userId: string; /** * The ID of the team to remove members from. diff --git a/packages/lib/server-only/team/delete-team-members.ts b/packages/lib/server-only/team/delete-team-members.ts index 001817c5e..3c57a054a 100644 --- a/packages/lib/server-only/team/delete-team-members.ts +++ b/packages/lib/server-only/team/delete-team-members.ts @@ -9,7 +9,7 @@ export type DeleteTeamMembersOptions = { /** * The ID of the user who is initiating this action. */ - userId: number; + userId: string; /** * The ID of the team to remove members from. diff --git a/packages/lib/server-only/team/delete-team-pending.ts b/packages/lib/server-only/team/delete-team-pending.ts index b339fd862..470851fc7 100644 --- a/packages/lib/server-only/team/delete-team-pending.ts +++ b/packages/lib/server-only/team/delete-team-pending.ts @@ -1,7 +1,7 @@ import { prisma } from '@documenso/prisma'; export type DeleteTeamPendingOptions = { - userId: number; + userId: string; pendingTeamId: number; }; diff --git a/packages/lib/server-only/team/delete-team-transfer-request.ts b/packages/lib/server-only/team/delete-team-transfer-request.ts index 245a72b5a..936279f62 100644 --- a/packages/lib/server-only/team/delete-team-transfer-request.ts +++ b/packages/lib/server-only/team/delete-team-transfer-request.ts @@ -6,7 +6,7 @@ export type DeleteTeamTransferRequestOptions = { /** * The ID of the user deleting the transfer. */ - userId: number; + userId: string; /** * The ID of the team whose team transfer request should be deleted. diff --git a/packages/lib/server-only/team/delete-team.ts b/packages/lib/server-only/team/delete-team.ts index 6403c0550..d19654fd1 100644 --- a/packages/lib/server-only/team/delete-team.ts +++ b/packages/lib/server-only/team/delete-team.ts @@ -17,7 +17,7 @@ import { renderEmailWithI18N } from '../../utils/render-email-with-i18n'; import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding'; export type DeleteTeamOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/find-team-invoices.ts b/packages/lib/server-only/team/find-team-invoices.ts index 2f522237e..01a02589c 100644 --- a/packages/lib/server-only/team/find-team-invoices.ts +++ b/packages/lib/server-only/team/find-team-invoices.ts @@ -4,7 +4,7 @@ import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; import { prisma } from '@documenso/prisma'; export interface FindTeamInvoicesOptions { - userId: number; + userId: string; teamId: number; } diff --git a/packages/lib/server-only/team/find-team-member-invites.ts b/packages/lib/server-only/team/find-team-member-invites.ts index b4d7b9461..7ea339343 100644 --- a/packages/lib/server-only/team/find-team-member-invites.ts +++ b/packages/lib/server-only/team/find-team-member-invites.ts @@ -10,7 +10,7 @@ import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams'; import { type FindResultResponse, ZFindResultResponse } from '../../types/search-params'; export interface FindTeamMemberInvitesOptions { - userId: number; + userId: string; teamId: number; query?: string; page?: number; diff --git a/packages/lib/server-only/team/find-team-members.ts b/packages/lib/server-only/team/find-team-members.ts index 9189044e8..0aa2de59e 100644 --- a/packages/lib/server-only/team/find-team-members.ts +++ b/packages/lib/server-only/team/find-team-members.ts @@ -10,7 +10,7 @@ import type { FindResultResponse } from '../../types/search-params'; import { ZFindResultResponse } from '../../types/search-params'; export interface FindTeamMembersOptions { - userId: number; + userId: string; teamId: number; query?: string; page?: number; diff --git a/packages/lib/server-only/team/find-teams-pending.ts b/packages/lib/server-only/team/find-teams-pending.ts index 4543b4e1b..08eedad2b 100644 --- a/packages/lib/server-only/team/find-teams-pending.ts +++ b/packages/lib/server-only/team/find-teams-pending.ts @@ -8,7 +8,7 @@ import { TeamPendingSchema } from '@documenso/prisma/generated/zod'; import { type FindResultResponse, ZFindResultResponse } from '../../types/search-params'; export interface FindTeamsPendingOptions { - userId: number; + userId: string; query?: string; page?: number; perPage?: number; diff --git a/packages/lib/server-only/team/find-teams.ts b/packages/lib/server-only/team/find-teams.ts index d0a542e61..72dc64b26 100644 --- a/packages/lib/server-only/team/find-teams.ts +++ b/packages/lib/server-only/team/find-teams.ts @@ -5,7 +5,7 @@ import { Prisma } from '@documenso/prisma/client'; import type { FindResultResponse } from '../../types/search-params'; export interface FindTeamsOptions { - userId: number; + userId: string; query?: string; page?: number; perPage?: number; diff --git a/packages/lib/server-only/team/get-team-members.ts b/packages/lib/server-only/team/get-team-members.ts index 9d61afaed..350118a10 100644 --- a/packages/lib/server-only/team/get-team-members.ts +++ b/packages/lib/server-only/team/get-team-members.ts @@ -4,7 +4,7 @@ import { prisma } from '@documenso/prisma'; import { TeamMemberSchema, UserSchema } from '@documenso/prisma/generated/zod'; export type GetTeamMembersOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/get-team-public-profile.ts b/packages/lib/server-only/team/get-team-public-profile.ts index 563974267..6e54ed37b 100644 --- a/packages/lib/server-only/team/get-team-public-profile.ts +++ b/packages/lib/server-only/team/get-team-public-profile.ts @@ -5,7 +5,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; import { updateTeamPublicProfile } from './update-team-public-profile'; export type GetTeamPublicProfileOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/get-team.ts b/packages/lib/server-only/team/get-team.ts index 1e8dc6c8c..84f8a48a8 100644 --- a/packages/lib/server-only/team/get-team.ts +++ b/packages/lib/server-only/team/get-team.ts @@ -70,7 +70,7 @@ export const getTeamById = async ({ }; export type GetTeamByUrlOptions = { - userId: number; + userId: string; teamUrl: string; }; diff --git a/packages/lib/server-only/team/get-teams.ts b/packages/lib/server-only/team/get-teams.ts index e3fb1f842..c465f54bb 100644 --- a/packages/lib/server-only/team/get-teams.ts +++ b/packages/lib/server-only/team/get-teams.ts @@ -4,7 +4,7 @@ import { prisma } from '@documenso/prisma'; import { TeamMemberSchema, TeamSchema } from '@documenso/prisma/generated/zod'; export type GetTeamsOptions = { - userId: number; + userId: string; }; export const ZGetTeamsResponseSchema = TeamSchema.extend({ diff --git a/packages/lib/server-only/team/leave-team.ts b/packages/lib/server-only/team/leave-team.ts index 36305eea3..e5511bd21 100644 --- a/packages/lib/server-only/team/leave-team.ts +++ b/packages/lib/server-only/team/leave-team.ts @@ -8,7 +8,7 @@ export type LeaveTeamOptions = { /** * The ID of the user who is leaving the team. */ - userId: number; + userId: string; /** * The ID of the team the user is leaving. diff --git a/packages/lib/server-only/team/request-team-ownership-transfer.ts b/packages/lib/server-only/team/request-team-ownership-transfer.ts index 585c602fd..064198b37 100644 --- a/packages/lib/server-only/team/request-team-ownership-transfer.ts +++ b/packages/lib/server-only/team/request-team-ownership-transfer.ts @@ -16,7 +16,7 @@ export type RequestTeamOwnershipTransferOptions = { /** * The ID of the user initiating the transfer. */ - userId: number; + userId: string; /** * The name of the user initiating the transfer. @@ -31,7 +31,7 @@ export type RequestTeamOwnershipTransferOptions = { /** * The user ID of the new owner. */ - newOwnerUserId: number; + newOwneruserId: string; /** * Whether to clear any current payment methods attached to the team. diff --git a/packages/lib/server-only/team/resend-team-email-verification.ts b/packages/lib/server-only/team/resend-team-email-verification.ts index b7b5d8cff..884a3e48e 100644 --- a/packages/lib/server-only/team/resend-team-email-verification.ts +++ b/packages/lib/server-only/team/resend-team-email-verification.ts @@ -6,7 +6,7 @@ import { prisma } from '@documenso/prisma'; import { sendTeamEmailVerificationEmail } from './create-team-email-verification'; export type ResendTeamMemberInvitationOptions = { - userId: number; + userId: string; teamId: number; }; diff --git a/packages/lib/server-only/team/resend-team-member-invitation.ts b/packages/lib/server-only/team/resend-team-member-invitation.ts index e4aa47e97..cc8a84d61 100644 --- a/packages/lib/server-only/team/resend-team-member-invitation.ts +++ b/packages/lib/server-only/team/resend-team-member-invitation.ts @@ -8,7 +8,7 @@ export type ResendTeamMemberInvitationOptions = { /** * The ID of the user who is initiating this action. */ - userId: number; + userId: string; /** * The name of the user who is initiating this action. diff --git a/packages/lib/server-only/team/update-team-branding-settings.ts b/packages/lib/server-only/team/update-team-branding-settings.ts index f0f085b50..2e0827edc 100644 --- a/packages/lib/server-only/team/update-team-branding-settings.ts +++ b/packages/lib/server-only/team/update-team-branding-settings.ts @@ -5,7 +5,7 @@ import { TeamMemberRole } from '@documenso/prisma/client'; import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod'; export type UpdateTeamBrandingSettingsOptions = { - userId: number; + userId: string; teamId: number; settings: { diff --git a/packages/lib/server-only/team/update-team-document-settings.ts b/packages/lib/server-only/team/update-team-document-settings.ts index 28d5a3ddf..b1d09ee3c 100644 --- a/packages/lib/server-only/team/update-team-document-settings.ts +++ b/packages/lib/server-only/team/update-team-document-settings.ts @@ -8,7 +8,7 @@ import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod'; import type { SupportedLanguageCodes } from '../../constants/i18n'; export type UpdateTeamDocumentSettingsOptions = { - userId: number; + userId: string; teamId: number; settings: { diff --git a/packages/lib/server-only/team/update-team-email.ts b/packages/lib/server-only/team/update-team-email.ts index 1cc36d7e8..cb6f4c077 100644 --- a/packages/lib/server-only/team/update-team-email.ts +++ b/packages/lib/server-only/team/update-team-email.ts @@ -3,7 +3,7 @@ import { prisma } from '@documenso/prisma'; import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams'; export type UpdateTeamEmailOptions = { - userId: number; + userId: string; teamId: number; data: { name: string; diff --git a/packages/lib/server-only/team/update-team-member.ts b/packages/lib/server-only/team/update-team-member.ts index df9587073..76db08088 100644 --- a/packages/lib/server-only/team/update-team-member.ts +++ b/packages/lib/server-only/team/update-team-member.ts @@ -5,7 +5,7 @@ import { prisma } from '@documenso/prisma'; import type { TeamMemberRole } from '@documenso/prisma/client'; export type UpdateTeamMemberOptions = { - userId: number; + userId: string; teamId: number; teamMemberId: number; data: { diff --git a/packages/lib/server-only/team/update-team-public-profile.ts b/packages/lib/server-only/team/update-team-public-profile.ts index cb3477a6b..43d5158da 100644 --- a/packages/lib/server-only/team/update-team-public-profile.ts +++ b/packages/lib/server-only/team/update-team-public-profile.ts @@ -1,7 +1,7 @@ import { prisma } from '@documenso/prisma'; export type UpdatePublicProfileOptions = { - userId: number; + userId: string; teamId: number; data: { bio?: string; diff --git a/packages/lib/server-only/team/update-team.ts b/packages/lib/server-only/team/update-team.ts index 70a5b4f8d..b909f0f88 100644 --- a/packages/lib/server-only/team/update-team.ts +++ b/packages/lib/server-only/team/update-team.ts @@ -6,7 +6,7 @@ import { prisma } from '@documenso/prisma'; import { Prisma } from '@documenso/prisma/client'; export type UpdateTeamOptions = { - userId: number; + userId: string; teamId: number; data: { name?: string; diff --git a/packages/lib/server-only/template/create-document-from-template-legacy.ts b/packages/lib/server-only/template/create-document-from-template-legacy.ts index c9ffaffc1..0ef711041 100644 --- a/packages/lib/server-only/template/create-document-from-template-legacy.ts +++ b/packages/lib/server-only/template/create-document-from-template-legacy.ts @@ -4,7 +4,7 @@ import { DocumentSource, type RecipientRole } from '@documenso/prisma/client'; export type CreateDocumentFromTemplateLegacyOptions = { templateId: number; - userId: number; + userId: string; teamId?: number; recipients?: { name?: string; 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 949de80e5..33dc53343 100644 --- a/packages/lib/server-only/template/create-document-from-template.ts +++ b/packages/lib/server-only/template/create-document-from-template.ts @@ -46,7 +46,7 @@ type FinalRecipient = Pick< export type CreateDocumentFromTemplateOptions = { templateId: number; externalId?: string | null; - userId: number; + userId: string; teamId?: number; recipients: { id: number; diff --git a/packages/lib/server-only/template/create-template-direct-link.ts b/packages/lib/server-only/template/create-template-direct-link.ts index 388739498..ebaac7ec7 100644 --- a/packages/lib/server-only/template/create-template-direct-link.ts +++ b/packages/lib/server-only/template/create-template-direct-link.ts @@ -15,7 +15,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; export type CreateTemplateDirectLinkOptions = { templateId: number; - userId: number; + userId: string; directRecipientId?: number; }; diff --git a/packages/lib/server-only/template/create-template.ts b/packages/lib/server-only/template/create-template.ts index e5dd10ecc..e6149c9a8 100644 --- a/packages/lib/server-only/template/create-template.ts +++ b/packages/lib/server-only/template/create-template.ts @@ -5,7 +5,7 @@ import { TemplateSchema } from '@documenso/prisma/generated/zod'; import type { TCreateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema'; export type CreateTemplateOptions = TCreateTemplateMutationSchema & { - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/template/delete-template-direct-link.ts b/packages/lib/server-only/template/delete-template-direct-link.ts index 7f3d00606..770cf04d1 100644 --- a/packages/lib/server-only/template/delete-template-direct-link.ts +++ b/packages/lib/server-only/template/delete-template-direct-link.ts @@ -7,7 +7,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; export type DeleteTemplateDirectLinkOptions = { templateId: number; - userId: number; + userId: string; }; export const deleteTemplateDirectLink = async ({ diff --git a/packages/lib/server-only/template/delete-template.ts b/packages/lib/server-only/template/delete-template.ts index 0962b6b9a..27230755f 100644 --- a/packages/lib/server-only/template/delete-template.ts +++ b/packages/lib/server-only/template/delete-template.ts @@ -4,7 +4,7 @@ import { prisma } from '@documenso/prisma'; export type DeleteTemplateOptions = { id: number; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/template/duplicate-template.ts b/packages/lib/server-only/template/duplicate-template.ts index 8d5722a82..fb1b79ecf 100644 --- a/packages/lib/server-only/template/duplicate-template.ts +++ b/packages/lib/server-only/template/duplicate-template.ts @@ -8,7 +8,7 @@ import { TemplateSchema } from '@documenso/prisma/generated/zod'; import type { TDuplicateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema'; export type DuplicateTemplateOptions = TDuplicateTemplateMutationSchema & { - userId: number; + userId: string; }; export const ZDuplicateTemplateResponseSchema = TemplateSchema; diff --git a/packages/lib/server-only/template/find-templates.ts b/packages/lib/server-only/template/find-templates.ts index a9b7d9075..5c5c96d70 100644 --- a/packages/lib/server-only/template/find-templates.ts +++ b/packages/lib/server-only/template/find-templates.ts @@ -15,7 +15,7 @@ import { import { type FindResultResponse, ZFindResultResponse } from '../../types/search-params'; export type FindTemplatesOptions = { - userId: number; + userId: string; teamId?: number; type?: Template['type']; page?: number; 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 1e4b36d0f..ec5be6840 100644 --- a/packages/lib/server-only/template/get-template-by-id.ts +++ b/packages/lib/server-only/template/get-template-by-id.ts @@ -16,7 +16,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; export type GetTemplateByIdOptions = { id: number; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/template/move-template-to-team.ts b/packages/lib/server-only/template/move-template-to-team.ts index 9dae002a1..03f49fa9f 100644 --- a/packages/lib/server-only/template/move-template-to-team.ts +++ b/packages/lib/server-only/template/move-template-to-team.ts @@ -8,7 +8,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; export type MoveTemplateToTeamOptions = { templateId: number; teamId: number; - userId: number; + userId: string; }; export const ZMoveTemplateToTeamResponseSchema = TemplateSchema; diff --git a/packages/lib/server-only/template/toggle-template-direct-link.ts b/packages/lib/server-only/template/toggle-template-direct-link.ts index 7c1573ef9..61acd7ac3 100644 --- a/packages/lib/server-only/template/toggle-template-direct-link.ts +++ b/packages/lib/server-only/template/toggle-template-direct-link.ts @@ -9,7 +9,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; export type ToggleTemplateDirectLinkOptions = { templateId: number; - userId: number; + userId: string; enabled: boolean; }; diff --git a/packages/lib/server-only/template/update-template-settings.ts b/packages/lib/server-only/template/update-template-settings.ts index 97d3bdbbe..5b87df992 100644 --- a/packages/lib/server-only/template/update-template-settings.ts +++ b/packages/lib/server-only/template/update-template-settings.ts @@ -13,7 +13,7 @@ import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../t import { createDocumentAuthOptions, extractDocumentAuthMethods } from '../../utils/document-auth'; export type UpdateTemplateSettingsOptions = { - userId: number; + userId: string; teamId?: number; templateId: number; data: { 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 index b7f0d0ef9..6b6691df0 100644 --- a/packages/lib/server-only/user/find-user-security-audit-logs.ts +++ b/packages/lib/server-only/user/find-user-security-audit-logs.ts @@ -4,7 +4,7 @@ import type { UserSecurityAuditLog, UserSecurityAuditLogType } from '@documenso/ import type { FindResultResponse } from '../../types/search-params'; export type FindUserSecurityAuditLogsOptions = { - userId: number; + userId: string; type?: UserSecurityAuditLogType; page?: number; perPage?: number; 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 index d9adc4498..518422825 100644 --- 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 @@ -1,7 +1,7 @@ import { prisma } from '@documenso/prisma'; export type GetMostRecentVerificationTokenByUserIdOptions = { - userId: number; + userId: string; }; export const getMostRecentVerificationTokenByUserId = async ({ diff --git a/packages/lib/server-only/user/get-user-public-profile.ts b/packages/lib/server-only/user/get-user-public-profile.ts index 1701a87de..2f73e6fb8 100644 --- a/packages/lib/server-only/user/get-user-public-profile.ts +++ b/packages/lib/server-only/user/get-user-public-profile.ts @@ -5,7 +5,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error'; import { updatePublicProfile } from './update-public-profile'; export type GetUserPublicProfileOptions = { - userId: number; + userId: string; }; type GetUserPublicProfileResponse = { diff --git a/packages/lib/server-only/user/update-password.ts b/packages/lib/server-only/user/update-password.ts index c8f55574e..b4186f00e 100644 --- a/packages/lib/server-only/user/update-password.ts +++ b/packages/lib/server-only/user/update-password.ts @@ -8,7 +8,7 @@ import { UserSecurityAuditLogType } from '@documenso/prisma/client'; import { AppError } from '../../errors/app-error'; export type UpdatePasswordOptions = { - userId: number; + userId: string; password: string; currentPassword: string; requestMetadata?: RequestMetadata; diff --git a/packages/lib/server-only/user/update-profile.ts b/packages/lib/server-only/user/update-profile.ts index a99caff99..448b8c51c 100644 --- a/packages/lib/server-only/user/update-profile.ts +++ b/packages/lib/server-only/user/update-profile.ts @@ -4,7 +4,7 @@ import { UserSecurityAuditLogType } from '@documenso/prisma/client'; import type { RequestMetadata } from '../../universal/extract-request-metadata'; export type UpdateProfileOptions = { - userId: number; + userId: string; name: string; signature: string; requestMetadata?: RequestMetadata; diff --git a/packages/lib/server-only/user/update-public-profile.ts b/packages/lib/server-only/user/update-public-profile.ts index 8c9c6eab2..e8d2f4713 100644 --- a/packages/lib/server-only/user/update-public-profile.ts +++ b/packages/lib/server-only/user/update-public-profile.ts @@ -3,7 +3,7 @@ import { prisma } from '@documenso/prisma'; import { AppError, AppErrorCode } from '../../errors/app-error'; export type UpdatePublicProfileOptions = { - userId: number; + userId: string; data: { url?: string; bio?: string; diff --git a/packages/lib/server-only/webhooks/create-webhook.ts b/packages/lib/server-only/webhooks/create-webhook.ts index 0eff215af..fe0c235d2 100644 --- a/packages/lib/server-only/webhooks/create-webhook.ts +++ b/packages/lib/server-only/webhooks/create-webhook.ts @@ -6,7 +6,7 @@ export interface CreateWebhookOptions { eventTriggers: WebhookTriggerEvents[]; secret: string | null; enabled: boolean; - userId: number; + userId: string; teamId?: number; } diff --git a/packages/lib/server-only/webhooks/delete-webhook-by-id.ts b/packages/lib/server-only/webhooks/delete-webhook-by-id.ts index 9af93bc50..6268689ff 100644 --- a/packages/lib/server-only/webhooks/delete-webhook-by-id.ts +++ b/packages/lib/server-only/webhooks/delete-webhook-by-id.ts @@ -2,7 +2,7 @@ import { prisma } from '@documenso/prisma'; export type DeleteWebhookByIdOptions = { id: string; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/webhooks/edit-webhook.ts b/packages/lib/server-only/webhooks/edit-webhook.ts index e582ebebe..1a9dfcfc5 100644 --- a/packages/lib/server-only/webhooks/edit-webhook.ts +++ b/packages/lib/server-only/webhooks/edit-webhook.ts @@ -5,7 +5,7 @@ import { prisma } from '@documenso/prisma'; export type EditWebhookOptions = { id: string; data: Omit; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts b/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts index f2dac459b..e01cd9b15 100644 --- a/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts +++ b/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts @@ -3,7 +3,7 @@ import type { WebhookTriggerEvents } from '@documenso/prisma/client'; export type GetAllWebhooksByEventTriggerOptions = { event: WebhookTriggerEvents; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/webhooks/get-webhook-by-id.ts b/packages/lib/server-only/webhooks/get-webhook-by-id.ts index fe2ff62ff..156e39625 100644 --- a/packages/lib/server-only/webhooks/get-webhook-by-id.ts +++ b/packages/lib/server-only/webhooks/get-webhook-by-id.ts @@ -2,7 +2,7 @@ import { prisma } from '@documenso/prisma'; export type GetWebhookByIdOptions = { id: string; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts b/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts index 82737a46d..99d61ca9a 100644 --- a/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts +++ b/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts @@ -1,6 +1,6 @@ import { prisma } from '@documenso/prisma'; -export const getWebhooksByTeamId = async (teamId: number, userId: number) => { +export const getWebhooksByTeamId = async (teamId: number, userId: string) => { return await prisma.webhook.findMany({ where: { team: { 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 index 0877d878f..81e49ca06 100644 --- a/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts +++ b/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts @@ -1,6 +1,6 @@ import { prisma } from '@documenso/prisma'; -export const getWebhooksByUserId = async (userId: number) => { +export const getWebhooksByUserId = async (userId: string) => { return await prisma.webhook.findMany({ where: { userId, diff --git a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts index e226c808d..67a823ff6 100644 --- a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts +++ b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts @@ -7,7 +7,7 @@ import { getAllWebhooksByEventTrigger } from '../get-all-webhooks-by-event-trigg export type TriggerWebhookOptions = { event: WebhookTriggerEvents; data: Record; - userId: number; + userId: string; teamId?: number; }; diff --git a/packages/lib/types/next-auth.d.ts b/packages/lib/types/next-auth.d.ts index edc05ccc4..d24ed3829 100644 --- a/packages/lib/types/next-auth.d.ts +++ b/packages/lib/types/next-auth.d.ts @@ -16,7 +16,7 @@ declare module 'next-auth' { declare module 'next-auth/jwt' { interface JWT { - id: string | number; + id: string; name?: string | null; email: string | null; emailVerified?: string | null; diff --git a/packages/prisma/migrations/20250103043341_migrate_users_to_a_string_id_part_one/migration.sql b/packages/prisma/migrations/20250103043341_migrate_users_to_a_string_id_part_one/migration.sql new file mode 100644 index 000000000..6fb2e868b --- /dev/null +++ b/packages/prisma/migrations/20250103043341_migrate_users_to_a_string_id_part_one/migration.sql @@ -0,0 +1,94 @@ +-- !: This needs to run first + +-- AlterTable +ALTER TABLE "User" ADD COLUMN "secondaryId" TEXT; + +-- Set all null secondaryId users to a uuid +UPDATE "User" SET "secondaryId" = gen_random_uuid()::text WHERE "secondaryId" IS NULL; + +-- Restrict the secondaryId to required +ALTER TABLE "User" ALTER COLUMN "secondaryId" SET NOT NULL; + +-- Now lets update all the tables that reference the user table to use the secondaryId +-- AlterTable +ALTER TABLE "Account" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "Account" a SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = a."userId"); + +-- AlterTable +ALTER TABLE "ApiToken" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "ApiToken" a SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = a."userId"); + +-- AlterTable +ALTER TABLE "Document" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "Document" d SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = d."userId"); + +-- AlterTable +ALTER TABLE "Passkey" ADD COLUMN "secondaryUserId" TEXT NOT NULL; + +UPDATE "Passkey" p SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = p."userId"); + +-- AlterTable +ALTER TABLE "PasswordResetToken" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "PasswordResetToken" p SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = p."userId"); + +-- AlterTable +ALTER TABLE "Session" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "Session" s SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = s."userId"); + +-- AlterTable +ALTER TABLE "SiteSettings" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "SiteSettings" s SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = s."lastModifiedByUserId"); + +-- AlterTable +ALTER TABLE "Subscription" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "Subscription" s SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = s."userId"); + +-- AlterTable +ALTER TABLE "Team" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "Team" t SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = t."ownerUserId"); + +-- AlterTable +ALTER TABLE "TeamMember" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "TeamMember" tm SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = tm."userId"); + +-- AlterTable +ALTER TABLE "TeamPending" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "TeamPending" tp SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = tp."ownerUserId"); + +-- AlterTable +ALTER TABLE "Template" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "Template" t SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = t."userId"); + +-- AlterTable +ALTER TABLE "UserProfile" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "UserProfile" up SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = up."userId"); + +-- AlterTable +ALTER TABLE "UserSecurityAuditLog" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "UserSecurityAuditLog" usal SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = usal."userId"); + +-- AlterTable +ALTER TABLE "VerificationToken" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "VerificationToken" vt SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = vt."userId"); + +-- AlterTable +ALTER TABLE "Webhook" ADD COLUMN "secondaryUserId" TEXT; + +UPDATE "Webhook" w SET "secondaryUserId" = (SELECT "secondaryId" FROM "User" u WHERE u."id" = w."userId"); + +-- CreateIndex +CREATE UNIQUE INDEX "User_secondaryId_key" ON "User"("secondaryId"); diff --git a/packages/prisma/migrations/20250103045358_migrate_users_to_a_string_id_part_two/migration.sql b/packages/prisma/migrations/20250103045358_migrate_users_to_a_string_id_part_two/migration.sql new file mode 100644 index 000000000..ce354deed --- /dev/null +++ b/packages/prisma/migrations/20250103045358_migrate_users_to_a_string_id_part_two/migration.sql @@ -0,0 +1,199 @@ +/* + Warnings: + + - You are about to drop the column `secondaryUserId` on the `Account` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `ApiToken` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `Document` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `Passkey` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `PasswordResetToken` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `Session` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `SiteSettings` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `Subscription` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `Team` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `TeamMember` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `TeamPending` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `Template` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `UserProfile` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `UserSecurityAuditLog` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `VerificationToken` table. All the data in the column will be lost. + - You are about to drop the column `secondaryUserId` on the `Webhook` table. All the data in the column will be lost. + +*/ +-- DropForeignKey +ALTER TABLE "Account" DROP CONSTRAINT "Account_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "ApiToken" DROP CONSTRAINT "ApiToken_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Document" DROP CONSTRAINT "Document_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Passkey" DROP CONSTRAINT "Passkey_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "PasswordResetToken" DROP CONSTRAINT "PasswordResetToken_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Session" DROP CONSTRAINT "Session_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "SiteSettings" DROP CONSTRAINT "SiteSettings_lastModifiedByUserId_fkey"; + +-- DropForeignKey +ALTER TABLE "Subscription" DROP CONSTRAINT "Subscription_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Team" DROP CONSTRAINT "Team_ownerUserId_fkey"; + +-- DropForeignKey +ALTER TABLE "TeamMember" DROP CONSTRAINT "TeamMember_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "TeamPending" DROP CONSTRAINT "TeamPending_ownerUserId_fkey"; + +-- DropForeignKey +ALTER TABLE "Template" DROP CONSTRAINT "Template_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "UserProfile" DROP CONSTRAINT "UserProfile_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "UserSecurityAuditLog" DROP CONSTRAINT "UserSecurityAuditLog_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "VerificationToken" DROP CONSTRAINT "VerificationToken_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Webhook" DROP CONSTRAINT "Webhook_userId_fkey"; + +-- AlterTable +ALTER TABLE "Account" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "Account" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "Account" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "ApiToken" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "ApiToken" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "ApiToken" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "Document" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "Document" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "Document" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "Passkey" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "Passkey" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "Passkey" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "PasswordResetToken" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "PasswordResetToken" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "PasswordResetToken" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "Session" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "Session" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "Session" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "SiteSettings" RENAME COLUMN "lastModifiedByUserId" TO "lastModifiedByUserId_old"; +ALTER TABLE "SiteSettings" RENAME COLUMN "secondaryUserId" TO "lastModifiedByUserId"; +ALTER TABLE "SiteSettings" DROP COLUMN "lastModifiedByUserId_old"; + +-- AlterTable +ALTER TABLE "Subscription" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "Subscription" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "Subscription" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "Team" RENAME COLUMN "ownerUserId" TO "ownerUserId_old"; +ALTER TABLE "Team" RENAME COLUMN "secondaryUserId" TO "ownerUserId"; +ALTER TABLE "Team" DROP COLUMN "ownerUserId_old"; + +-- AlterTable +ALTER TABLE "TeamMember" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "TeamMember" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "TeamMember" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "TeamPending" RENAME COLUMN "ownerUserId" TO "ownerUserId_old"; +ALTER TABLE "TeamPending" RENAME COLUMN "secondaryUserId" TO "ownerUserId"; +ALTER TABLE "TeamPending" DROP COLUMN "ownerUserId_old"; + +-- AlterTable +ALTER TABLE "Template" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "Template" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "Template" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "UserProfile" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "UserProfile" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "UserProfile" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "UserSecurityAuditLog" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "UserSecurityAuditLog" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "UserSecurityAuditLog" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "VerificationToken" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "VerificationToken" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "VerificationToken" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "Webhook" RENAME COLUMN "userId" TO "userId_old"; +ALTER TABLE "Webhook" RENAME COLUMN "secondaryUserId" TO "userId"; +ALTER TABLE "Webhook" DROP COLUMN "userId_old"; + +-- AlterTable +ALTER TABLE "TeamTransferVerification" ALTER COLUMN "userId" SET DATA TYPE TEXT; + +-- AddForeignKey +ALTER TABLE "UserProfile" ADD CONSTRAINT "UserProfile_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "UserSecurityAuditLog" ADD CONSTRAINT "UserSecurityAuditLog_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "PasswordResetToken" ADD CONSTRAINT "PasswordResetToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Passkey" ADD CONSTRAINT "Passkey_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "VerificationToken" ADD CONSTRAINT "VerificationToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Webhook" ADD CONSTRAINT "Webhook_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "ApiToken" ADD CONSTRAINT "ApiToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Subscription" ADD CONSTRAINT "Subscription_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Account" ADD CONSTRAINT "Account_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Session" ADD CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Document" ADD CONSTRAINT "Document_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Team" ADD CONSTRAINT "Team_ownerUserId_fkey" FOREIGN KEY ("ownerUserId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamPending" ADD CONSTRAINT "TeamPending_ownerUserId_fkey" FOREIGN KEY ("ownerUserId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "TeamMember" ADD CONSTRAINT "TeamMember_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Template" ADD CONSTRAINT "Template_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("secondaryId") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "SiteSettings" ADD CONSTRAINT "SiteSettings_lastModifiedByUserId_fkey" FOREIGN KEY ("lastModifiedByUserId") REFERENCES "User"("secondaryId") ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/packages/prisma/migrations/20250103045900_wot_actually_changed/migration.sql b/packages/prisma/migrations/20250103045900_wot_actually_changed/migration.sql new file mode 100644 index 000000000..09cbb94e1 --- /dev/null +++ b/packages/prisma/migrations/20250103045900_wot_actually_changed/migration.sql @@ -0,0 +1,66 @@ +/* + Warnings: + + - A unique constraint covering the columns `[userId,teamId]` on the table `TeamMember` will be added. If there are existing duplicate values, this will fail. + - A unique constraint covering the columns `[userId]` on the table `UserProfile` will be added. If there are existing duplicate values, this will fail. + - Made the column `userId` on table `Account` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `Document` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `PasswordResetToken` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `Session` required. This step will fail if there are existing NULL values in that column. + - Made the column `ownerUserId` on table `Team` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `TeamMember` required. This step will fail if there are existing NULL values in that column. + - Made the column `ownerUserId` on table `TeamPending` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `Template` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `UserProfile` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `UserSecurityAuditLog` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `VerificationToken` required. This step will fail if there are existing NULL values in that column. + - Made the column `userId` on table `Webhook` required. This step will fail if there are existing NULL values in that column. + +*/ +-- AlterTable +ALTER TABLE "Account" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "Document" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "PasswordResetToken" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "Session" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "Team" ALTER COLUMN "ownerUserId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "TeamMember" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "TeamPending" ALTER COLUMN "ownerUserId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "Template" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "UserProfile" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "UserSecurityAuditLog" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "VerificationToken" ALTER COLUMN "userId" SET NOT NULL; + +-- AlterTable +ALTER TABLE "Webhook" ALTER COLUMN "userId" SET NOT NULL; + +-- CreateIndex +CREATE INDEX "Document_userId_idx" ON "Document"("userId"); + +-- CreateIndex +CREATE INDEX "Subscription_userId_idx" ON "Subscription"("userId"); + +-- CreateIndex +CREATE UNIQUE INDEX "TeamMember_userId_teamId_key" ON "TeamMember"("userId", "teamId"); + +-- CreateIndex +CREATE UNIQUE INDEX "UserProfile_userId_key" ON "UserProfile"("userId"); diff --git a/packages/prisma/migrations/20250103050111_migrate_user_ids_to_a_string_part_four/migration.sql b/packages/prisma/migrations/20250103050111_migrate_user_ids_to_a_string_part_four/migration.sql new file mode 100644 index 000000000..260c93944 --- /dev/null +++ b/packages/prisma/migrations/20250103050111_migrate_user_ids_to_a_string_part_four/migration.sql @@ -0,0 +1,123 @@ +/* + Warnings: + + - The primary key for the `User` table will be changed. If it partially fails, the table could be left without primary key constraint. + - You are about to drop the column `secondaryId` on the `User` table. All the data in the column will be lost. + - A unique constraint covering the columns `[id]` on the table `User` will be added. If there are existing duplicate values, this will fail. + +*/ +-- DropForeignKey +ALTER TABLE "Account" DROP CONSTRAINT "Account_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "ApiToken" DROP CONSTRAINT "ApiToken_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Document" DROP CONSTRAINT "Document_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Passkey" DROP CONSTRAINT "Passkey_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "PasswordResetToken" DROP CONSTRAINT "PasswordResetToken_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Session" DROP CONSTRAINT "Session_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "SiteSettings" DROP CONSTRAINT "SiteSettings_lastModifiedByUserId_fkey"; + +-- DropForeignKey +ALTER TABLE "Subscription" DROP CONSTRAINT "Subscription_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Team" DROP CONSTRAINT "Team_ownerUserId_fkey"; + +-- DropForeignKey +ALTER TABLE "TeamMember" DROP CONSTRAINT "TeamMember_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "TeamPending" DROP CONSTRAINT "TeamPending_ownerUserId_fkey"; + +-- DropForeignKey +ALTER TABLE "Template" DROP CONSTRAINT "Template_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "UserProfile" DROP CONSTRAINT "UserProfile_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "UserSecurityAuditLog" DROP CONSTRAINT "UserSecurityAuditLog_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "VerificationToken" DROP CONSTRAINT "VerificationToken_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "Webhook" DROP CONSTRAINT "Webhook_userId_fkey"; + +-- DropIndex +DROP INDEX "User_secondaryId_key"; + +-- AlterTable +ALTER TABLE "User" DROP CONSTRAINT "User_pkey"; + +-- Rename the id column to id_old +ALTER TABLE "User" ALTER COLUMN "id" SET DATA TYPE TEXT; +ALTER TABLE "User" ALTER COLUMN "id" DROP DEFAULT; +ALTER TABLE "User" RENAME COLUMN "id" TO "id_old"; + +-- Rename the secondaryId column to id +ALTER TABLE "User" RENAME COLUMN "secondaryId" TO "id"; + +-- Drop the id_old column +ALTER TABLE "User" DROP COLUMN "id_old"; + +-- CreateIndex +CREATE UNIQUE INDEX "User_id_key" ON "User"("id"); + +-- AddForeignKey +ALTER TABLE "UserProfile" ADD CONSTRAINT "UserProfile_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "UserSecurityAuditLog" ADD CONSTRAINT "UserSecurityAuditLog_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "PasswordResetToken" ADD CONSTRAINT "PasswordResetToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Passkey" ADD CONSTRAINT "Passkey_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "VerificationToken" ADD CONSTRAINT "VerificationToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Webhook" ADD CONSTRAINT "Webhook_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "ApiToken" ADD CONSTRAINT "ApiToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Subscription" ADD CONSTRAINT "Subscription_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Account" ADD CONSTRAINT "Account_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Session" ADD CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Document" ADD CONSTRAINT "Document_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Team" ADD CONSTRAINT "Team_ownerUserId_fkey" FOREIGN KEY ("ownerUserId") REFERENCES "User"("id") ON DELETE CASCADE 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 CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Template" ADD CONSTRAINT "Template_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "SiteSettings" ADD CONSTRAINT "SiteSettings_lastModifiedByUserId_fkey" FOREIGN KEY ("lastModifiedByUserId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/packages/prisma/migrations/migration_lock.toml b/packages/prisma/migrations/migration_lock.toml index fbffa92c2..648c57fd5 100644 --- a/packages/prisma/migrations/migration_lock.toml +++ b/packages/prisma/migrations/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually -# It should be added in your version-control system (i.e. Git) +# It should be added in your version-control system (e.g., Git) provider = "postgresql" \ No newline at end of file diff --git a/packages/prisma/package.json b/packages/prisma/package.json index 5a5ff6d1d..50974e7e3 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -21,10 +21,10 @@ "seed": "tsx ./seed-database.ts" }, "dependencies": { - "@prisma/client": "5.4.2", - "kysely": "^0.27.3", - "prisma": "5.4.2", - "prisma-extension-kysely": "^2.1.0", + "@prisma/client": "^6.1.0", + "kysely": "^0.27.5", + "prisma": "^6.1.0", + "prisma-extension-kysely": "^3.0.0", "ts-pattern": "^5.0.6" }, "devDependencies": { @@ -33,6 +33,6 @@ "prisma-kysely": "^1.8.0", "tsx": "^4.11.0", "typescript": "5.2.2", - "zod-prisma-types": "^3.1.8" + "zod-prisma-types": "^3.2.1" } -} +} \ No newline at end of file diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index efafbb3e6..becc0055e 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -28,7 +28,7 @@ enum Role { } model User { - id Int @id @default(autoincrement()) + id String @unique @default(cuid(2)) name String? customerId String? @unique email String @unique @@ -73,7 +73,7 @@ model User { model UserProfile { id String @id @default(cuid()) enabled Boolean @default(false) - userId Int @unique + userId String @unique bio String? User User? @relation(fields: [userId], references: [id], onDelete: Cascade) @@ -106,8 +106,9 @@ enum UserSecurityAuditLogType { } model UserSecurityAuditLog { - id Int @id @default(autoincrement()) - userId Int + id Int @id @default(autoincrement()) + userId String + createdAt DateTime @default(now()) type UserSecurityAuditLogType userAgent String? @@ -121,13 +122,13 @@ model PasswordResetToken { token String @unique createdAt DateTime @default(now()) expiry DateTime - userId Int + userId String User User @relation(fields: [userId], references: [id], onDelete: Cascade) } model Passkey { id String @id @default(cuid()) - userId Int + userId String name String createdAt DateTime @default(now()) updatedAt DateTime @default(now()) @@ -157,7 +158,7 @@ model VerificationToken { completed Boolean @default(false) expires DateTime createdAt DateTime @default(now()) - userId Int + userId String user User @relation(fields: [userId], references: [id], onDelete: Cascade) } @@ -178,7 +179,7 @@ model Webhook { enabled Boolean @default(true) createdAt DateTime @default(now()) updatedAt DateTime @default(now()) @updatedAt - userId Int + userId String User User @relation(fields: [userId], references: [id], onDelete: Cascade) teamId Int? team Team? @relation(fields: [teamId], references: [id], onDelete: Cascade) @@ -215,7 +216,7 @@ model ApiToken { algorithm ApiTokenAlgorithm @default(SHA512) expires DateTime? createdAt DateTime @default(now()) - userId Int? + userId String? user User? @relation(fields: [userId], references: [id], onDelete: Cascade) teamId Int? team Team? @relation(fields: [teamId], references: [id], onDelete: Cascade) @@ -233,7 +234,7 @@ model Subscription { planId String @unique priceId String periodEnd DateTime? - userId Int? + userId String? teamId Int? @unique createdAt DateTime @default(now()) updatedAt DateTime @updatedAt @@ -247,16 +248,14 @@ model Subscription { model Account { id String @id @default(cuid()) - userId Int + userId String type String provider String providerAccountId String refresh_token String? @db.Text access_token String? @db.Text expires_at Int? - // Some providers return created_at so we need to make it optional created_at Int? - // Stops next-auth from crashing when dealing with AzureAD ext_expires_in Int? token_type String? scope String? @@ -271,7 +270,7 @@ model Account { model Session { id String @id @default(cuid()) sessionToken String @unique - userId Int + userId String expires DateTime user User? @relation(fields: [userId], references: [id], onDelete: Cascade) } @@ -297,7 +296,7 @@ enum DocumentVisibility { model Document { id Int @id @default(autoincrement()) externalId String? - userId Int + userId String User User @relation(fields: [userId], references: [id], onDelete: Cascade) authOptions Json? formValues Json? @@ -534,14 +533,13 @@ model TeamGlobalSettings { } model Team { - id Int @id @default(autoincrement()) - name String - url String @unique - createdAt DateTime @default(now()) - avatarImageId String? - customerId String? @unique - ownerUserId Int - + id Int @id @default(autoincrement()) + name String + url String @unique + createdAt DateTime @default(now()) + avatarImageId String? + customerId String? @unique + ownerUserId String members TeamMember[] invites TeamMemberInvite[] teamEmail TeamEmail? @@ -566,7 +564,7 @@ model TeamPending { url String @unique createdAt DateTime @default(now()) customerId String @unique - ownerUserId Int + ownerUserId String owner User @relation(fields: [ownerUserId], references: [id], onDelete: Cascade) } @@ -576,7 +574,7 @@ model TeamMember { teamId Int createdAt DateTime @default(now()) role TeamMemberRole - userId Int + userId String user User @relation(fields: [userId], references: [id], onDelete: Cascade) team Team @relation(fields: [teamId], references: [id], onDelete: Cascade) @@ -605,7 +603,7 @@ model TeamEmailVerification { model TeamTransferVerification { teamId Int @id @unique - userId Int + userId String name String email String token String @unique @@ -658,11 +656,11 @@ model Template { externalId String? type TemplateType @default(PRIVATE) title String - userId Int + userId String teamId Int? authOptions Json? templateMeta TemplateMeta? - templateDocumentDataId String + templateDocumentDataId String @unique createdAt DateTime @default(now()) updatedAt DateTime @default(now()) @updatedAt publicTitle String @default("") @@ -675,8 +673,6 @@ model Template { Field Field[] directLink TemplateDirectLink? documents Document[] - - @@unique([templateDocumentDataId]) } model TemplateDirectLink { @@ -695,7 +691,7 @@ model SiteSettings { id String @id enabled Boolean @default(false) data Json - lastModifiedByUserId Int? + lastModifiedByUserId String? lastModifiedAt DateTime @default(now()) lastModifiedByUser User? @relation(fields: [lastModifiedByUserId], references: [id], onDelete: SetNull) } diff --git a/packages/prisma/seed/subscriptions.ts b/packages/prisma/seed/subscriptions.ts index 8e237299f..ed65b0744 100644 --- a/packages/prisma/seed/subscriptions.ts +++ b/packages/prisma/seed/subscriptions.ts @@ -3,7 +3,7 @@ import { prisma } from '..'; export const seedTestEmail = () => `user-${Date.now()}@test.documenso.com`; type SeedSubscriptionOptions = { - userId: number; + userId: string; priceId: string; }; diff --git a/packages/prisma/seed/teams.ts b/packages/prisma/seed/teams.ts index 503e5b3cf..7478eb371 100644 --- a/packages/prisma/seed/teams.ts +++ b/packages/prisma/seed/teams.ts @@ -133,7 +133,7 @@ export const seedTeamMember = async ({ type UnseedTeamMemberOptions = { teamId: number; - userId: number; + userId: string; }; export const unseedTeamMember = async ({ teamId, userId }: UnseedTeamMemberOptions) => { @@ -147,7 +147,7 @@ export const unseedTeamMember = async ({ teamId, userId }: UnseedTeamMemberOptio }); }; -export const seedTeamTransfer = async (options: { newOwnerUserId: number; teamId: number }) => { +export const seedTeamTransfer = async (options: { newOwneruserId: string; teamId: number }) => { return await prisma.teamTransferVerification.create({ data: { teamId: options.teamId, diff --git a/packages/prisma/seed/templates.ts b/packages/prisma/seed/templates.ts index c3c08e6f4..a4e5c12f7 100644 --- a/packages/prisma/seed/templates.ts +++ b/packages/prisma/seed/templates.ts @@ -16,7 +16,7 @@ const examplePdf = fs type SeedTemplateOptions = { title?: string; - userId: number; + userId: string; teamId?: number; createTemplateOptions?: Partial; }; diff --git a/packages/prisma/seed/users.ts b/packages/prisma/seed/users.ts index 73f1cb157..9ad1b1b73 100644 --- a/packages/prisma/seed/users.ts +++ b/packages/prisma/seed/users.ts @@ -45,7 +45,7 @@ export const seedUser = async ({ }); }; -export const unseedUser = async (userId: number) => { +export const unseedUser = async (userId: string) => { await prisma.user.delete({ where: { id: userId,