The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: add sender disabled view to signing link (#3423)
Lucas Smithcd0cc5febcbb
diff --git a/apps/remix/app/components/embed/embed-sender-disabled.tsx b/apps/remix/app/components/embed/embed-sender-disabled.tsxnew file mode 100644index 000000000..2fc0a495e--- /dev/null+++ b/apps/remix/app/components/embed/embed-sender-disabled.tsx@@ -0,0 +1,45 @@+import { Trans } from '@lingui/react/macro';+import { useEffect, useState } from 'react';++export const EmbedSenderDisabled = () => {+ const [hasPostedMessage, setHasPostedMessage] = useState(false);++ useEffect(() => {+ if (window.parent && !hasPostedMessage) {+ window.parent.postMessage(+ {+ action: 'sender-disabled',+ data: null,+ },+ '*',+ );+ }++ setHasPostedMessage(true);+ }, [hasPostedMessage]);++ if (!hasPostedMessage) {+ return null;+ }++ return (+ <div className="embed--SenderDisabled relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">+ <h3 className="text-center font-bold text-2xl text-foreground">+ <Trans>Sender Account Disabled</Trans>+ </h3>++ <div className="mt-8 max-w-[50ch] text-center">+ <p className="text-muted-foreground text-sm">+ <Trans>+ This document is no longer available to sign because the account that sent it has been disabled, likely due+ to spam or abuse.+ </Trans>+ </p>++ <p className="mt-4 text-muted-foreground text-sm">+ <Trans>Please check with the parent application for more information.</Trans>+ </p>+ </div>+ </div>+ );+};diff --git a/apps/remix/app/components/general/document-signing/document-signing-sender-disabled-page.tsx b/apps/remix/app/components/general/document-signing/document-signing-sender-disabled-page.tsxnew file mode 100644index 000000000..7d7f82dd4--- /dev/null+++ b/apps/remix/app/components/general/document-signing/document-signing-sender-disabled-page.tsx@@ -0,0 +1,46 @@+import { useOptionalSession } from '@documenso/lib/client-only/providers/session';+import { Button } from '@documenso/ui/primitives/button';+import { Trans } from '@lingui/react/macro';+import { ShieldBanIcon } from 'lucide-react';+import { Link } from 'react-router';++/**+ * Intentionally shows no title, sender or branding since the content itself may be the abuse.+ */+export const DocumentSigningSenderDisabledPage = () => {+ const { sessionData } = useOptionalSession();+ const user = sessionData?.user;++ return (+ <div className="flex flex-col items-center pt-24 lg:pt-36 xl:pt-44">+ <div className="flex flex-col items-center">+ <div className="flex items-center gap-x-4">+ <ShieldBanIcon className="h-10 w-10 text-destructive" />++ <h2 className="max-w-[35ch] text-center font-semibold text-2xl leading-normal md:text-3xl lg:text-4xl">+ <Trans>Sender Account Disabled</Trans>+ </h2>+ </div>++ <p className="mt-6 max-w-[60ch] text-center text-muted-foreground text-sm">+ <Trans>+ This document is no longer available to sign because the account that sent it has been disabled, likely due+ to spam or abuse.+ </Trans>+ </p>++ <p className="mt-2 max-w-[60ch] text-center text-muted-foreground text-sm">+ <Trans>If you believe this is a mistake, please contact the sender directly.</Trans>+ </p>++ {user && (+ <Button className="mt-6" asChild>+ <Link to="/">+ <Trans>Return Home</Trans>+ </Link>+ </Button>+ )}+ </div>+ </div>+ );+};diff --git a/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx b/apps/remix/app/routes/_recipient+/d.$token+/_index.tsxindex dff005fe1..569e72f28 100644--- a/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx+++ b/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx@@ -5,6 +5,7 @@ import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';import { loadRecipientBrandingByTeamId } from '@documenso/lib/server-only/branding/load-recipient-branding';import { getEnvelopeForDirectTemplateSigning } from '@documenso/lib/server-only/envelope/get-envelope-for-direct-template-signing';import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';+import { assertSenderNotDisabled } from '@documenso/lib/server-only/user/assert-user-not-disabled';import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';import { getRecipientsWithMissingFields } from '@documenso/lib/utils/recipients';@@ -22,6 +23,7 @@ import { DocumentSigningAuthPageView } from '~/components/general/document-signiimport { DocumentSigningAuthProvider } from '~/components/general/document-signing/document-signing-auth-provider';import { DocumentSigningPageViewV2 } from '~/components/general/document-signing/document-signing-page-view-v2';import { DocumentSigningProvider } from '~/components/general/document-signing/document-signing-provider';+import { DocumentSigningSenderDisabledPage } from '~/components/general/document-signing/document-signing-sender-disabled-page';import { EnvelopeSigningProvider } from '~/components/general/document-signing/envelope-signing-provider';import { RecipientBranding } from '~/components/general/recipient-branding';import { useCspNonce } from '~/utils/nonce';@@ -149,6 +151,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {select: {internalVersion: true,teamId: true,+ userId: true,},});@@ -156,6 +159,19 @@ export async function loader(loaderArgs: Route.LoaderArgs) {throw new Response('Not Found', { status: 404 });}+ // Resolved here rather than via the token fetchers so branding is never loaded for a disabled sender.+ try {+ await assertSenderNotDisabled({ userId: directEnvelope.userId });+ } catch (e) {+ if (AppError.parseError(e).code === AppErrorCode.SENDER_DISABLED) {+ return superLoaderJson({+ isSenderDisabled: true,+ } as const);+ }++ throw e;+ }+const branding = await loadRecipientBrandingByTeamId({teamId: directEnvelope.teamId,});@@ -164,6 +180,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {const payloadV2 = await handleV2Loader(loaderArgs);return superLoaderJson({+ isSenderDisabled: false,version: 2,payload: payloadV2,branding,@@ -173,6 +190,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {const payloadV1 = await handleV1Loader(loaderArgs);return superLoaderJson({+ isSenderDisabled: false,version: 1,payload: payloadV1,branding,@@ -183,6 +201,10 @@ export default function DirectTemplatePage() {const data = useSuperLoaderData<typeof loader>();const cspNonce = useCspNonce();+ if (data.isSenderDisabled) {+ return <DocumentSigningSenderDisabledPage />;+ }+return (<><RecipientBranding branding={data.branding} cspNonce={cspNonce} />diff --git a/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx b/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsxindex 49f847532..e10f6f71c 100644--- a/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx+++ b/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx@@ -23,6 +23,7 @@ import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-reimport { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';import { getRecipientsForAssistant } from '@documenso/lib/server-only/recipient/get-recipients-for-assistant';import { getTeamSettings } from '@documenso/lib/server-only/team/get-team-settings';+import { assertSenderNotDisabled } from '@documenso/lib/server-only/user/assert-user-not-disabled';import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';import { isTspEnvelope } from '@documenso/lib/types/signature-level';@@ -45,6 +46,7 @@ import { DocumentSigningAuthProvider } from '~/components/general/document-signiimport { DocumentSigningPageViewV1 } from '~/components/general/document-signing/document-signing-page-view-v1';import { DocumentSigningPageViewV2 } from '~/components/general/document-signing/document-signing-page-view-v2';import { DocumentSigningProvider } from '~/components/general/document-signing/document-signing-provider';+import { DocumentSigningSenderDisabledPage } from '~/components/general/document-signing/document-signing-sender-disabled-page';import { EnvelopeSigningProvider } from '~/components/general/document-signing/envelope-signing-provider';import { RecipientBranding } from '~/components/general/recipient-branding';import { useCspNonce } from '~/utils/nonce';@@ -344,6 +346,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {select: {internalVersion: true,teamId: true,+ userId: true,},},},@@ -353,6 +356,19 @@ export async function loader(loaderArgs: Route.LoaderArgs) {throw new Response('Not Found', { status: 404 });}+ // Resolved here rather than via the token fetchers so branding is never loaded for a disabled sender.+ try {+ await assertSenderNotDisabled({ userId: foundRecipient.envelope.userId });+ } catch (e) {+ if (AppError.parseError(e).code === AppErrorCode.SENDER_DISABLED) {+ return superLoaderJson({+ isSenderDisabled: true,+ } as const);+ }++ throw e;+ }+const branding = await loadRecipientBrandingByTeamId({teamId: foundRecipient.envelope.teamId,});@@ -370,6 +386,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {return superLoaderJson({+ isSenderDisabled: false,version: 2,payload: payloadV2,branding,@@ -381,6 +398,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {const payloadV1 = await handleV1Loader(loaderArgs);return superLoaderJson({+ isSenderDisabled: false,version: 1,payload: payloadV1,branding,@@ -391,6 +409,10 @@ export default function SigningPage() {const data = useSuperLoaderData<typeof loader>();const cspNonce = useCspNonce();+ if (data.isSenderDisabled) {+ return <DocumentSigningSenderDisabledPage />;+ }+return (<><RecipientBranding branding={data.branding} cspNonce={cspNonce} />diff --git a/apps/remix/app/routes/embed+/_v0+/_layout.tsx b/apps/remix/app/routes/embed+/_v0+/_layout.tsxindex 03a8aef40..76e178da6 100644--- a/apps/remix/app/routes/embed+/_v0+/_layout.tsx+++ b/apps/remix/app/routes/embed+/_v0+/_layout.tsx@@ -15,6 +15,7 @@ import { EmbedDocumentRejected } from '~/components/embed/embed-document-rejecteimport { EmbedDocumentWaitingForTurn } from '~/components/embed/embed-document-waiting-for-turn';import { EmbedPaywall } from '~/components/embed/embed-paywall';import { EmbedRecipientExpired } from '~/components/embed/embed-recipient-expired';+import { EmbedSenderDisabled } from '~/components/embed/embed-sender-disabled';import type { Route } from './+types/_layout';@@ -62,6 +63,7 @@ export function ErrorBoundary({ loaderData }: Route.ErrorBoundaryProps) {'embed-paywall','embed-waiting-for-turn','embed-recipient-expired',+ 'embed-sender-disabled','embed-document-rejected','embed-document-completed',].includes(error.data?.type);@@ -99,6 +101,10 @@ export function ErrorBoundary({ loaderData }: Route.ErrorBoundaryProps) {return <EmbedRecipientExpired />;}+ if (error.status === 403 && error.data.type === 'embed-sender-disabled') {+ return <EmbedSenderDisabled />;+ }+// !: Not used at the moment, may be removed in the future.if (error.status === 403 && error.data.type === 'embed-document-rejected') {return <EmbedDocumentRejected />;diff --git a/apps/remix/app/routes/embed+/_v0+/direct.$token.tsx b/apps/remix/app/routes/embed+/_v0+/direct.$token.tsxindex f8e6d0630..31e932c16 100644--- a/apps/remix/app/routes/embed+/_v0+/direct.$token.tsx+++ b/apps/remix/app/routes/embed+/_v0+/direct.$token.tsx@@ -7,6 +7,7 @@ import { getEnvelopeForDirectTemplateSigning } from '@documenso/lib/server-only/import { getEnvelopeRequiredAccessData } from '@documenso/lib/server-only/envelope/get-envelope-required-access-data';import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisation/get-organisation-claims';import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';+import { assertSenderNotDisabled } from '@documenso/lib/server-only/user/assert-user-not-disabled';import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';import { fireAndForget } from '@documenso/lib/universal/fire-and-forget';import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';@@ -269,6 +270,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {envelope: {select: {internalVersion: true,+ userId: true,},},},@@ -278,6 +280,23 @@ export async function loader(loaderArgs: Route.LoaderArgs) {throw new Response('Not Found', { status: 404 });}+ try {+ await assertSenderNotDisabled({ userId: foundDirectLink.envelope.userId });+ } catch (e) {+ if (AppError.parseError(e).code === AppErrorCode.SENDER_DISABLED) {+ throw data(+ {+ type: 'embed-sender-disabled',+ },+ {+ status: 403,+ },+ );+ }++ throw e;+ }+if (foundDirectLink.envelope.internalVersion === 2) {const payloadV2 = await handleV2Loader(loaderArgs);diff --git a/apps/remix/app/routes/embed+/_v0+/sign.$token.tsx b/apps/remix/app/routes/embed+/_v0+/sign.$token.tsxindex 922801c02..3458a2b53 100644--- a/apps/remix/app/routes/embed+/_v0+/sign.$token.tsx+++ b/apps/remix/app/routes/embed+/_v0+/sign.$token.tsx@@ -13,6 +13,7 @@ import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisimport { getIsRecipientsTurnToSign } from '@documenso/lib/server-only/recipient/get-is-recipient-turn';import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';import { getRecipientsForAssistant } from '@documenso/lib/server-only/recipient/get-recipients-for-assistant';+import { assertSenderNotDisabled } from '@documenso/lib/server-only/user/assert-user-not-disabled';import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';import { fireAndForget } from '@documenso/lib/universal/fire-and-forget';import { isDocumentCompleted } from '@documenso/lib/utils/document';@@ -353,6 +354,7 @@ export async function loader(loaderArgs: Route.LoaderArgs) {envelope: {select: {internalVersion: true,+ userId: true,},},},@@ -362,6 +364,23 @@ export async function loader(loaderArgs: Route.LoaderArgs) {throw new Response('Not Found', { status: 404 });}+ try {+ await assertSenderNotDisabled({ userId: foundRecipient.envelope.userId });+ } catch (e) {+ if (AppError.parseError(e).code === AppErrorCode.SENDER_DISABLED) {+ throw data(+ {+ type: 'embed-sender-disabled',+ },+ {+ status: 403,+ },+ );+ }++ throw e;+ }+if (foundRecipient.envelope.internalVersion === 2) {const payloadV2 = await handleV2Loader(loaderArgs);diff --git a/packages/lib/errors/app-error.ts b/packages/lib/errors/app-error.tsindex 108998eb2..3ce77378f 100644--- a/packages/lib/errors/app-error.ts+++ b/packages/lib/errors/app-error.ts@@ -43,6 +43,13 @@ export enum AppErrorCode {*/ENVELOPE_TSP_LOCKED = 'ENVELOPE_TSP_LOCKED',+ /**+ * Recipient action on an envelope whose sender's account is disabled.+ * Distinct from `ACCOUNT_DISABLED` so the UI can show a "sender disabled"+ * page rather than treating the recipient's own account as disabled.+ */+ SENDER_DISABLED = 'SENDER_DISABLED',+/*** A completion request was made for a recipient that has already signed.* Thrown for retried, stale or concurrent duplicate submissions so callers@@ -119,6 +126,7 @@ export const genericErrorCodeToTrpcErrorCodeMap: Record<string, { code: string;[AppErrorCode.ENVELOPE_CANCELLED]: { code: 'BAD_REQUEST', status: 400 },[AppErrorCode.ENVELOPE_LEGACY]: { code: 'BAD_REQUEST', status: 400 },[AppErrorCode.ENVELOPE_TSP_LOCKED]: { code: 'BAD_REQUEST', status: 400 },+ [AppErrorCode.SENDER_DISABLED]: { code: 'FORBIDDEN', status: 403 },[AppErrorCode.MISSING_SIGNATURE_FIELD]: { code: 'BAD_REQUEST', status: 400 },[AppErrorCode.RECIPIENT_HAS_UNSIGNED_FIELDS]: { code: 'BAD_REQUEST', status: 400 },[AppErrorCode.RECIPIENT_OUT_OF_TURN]: { code: 'BAD_REQUEST', status: 400 },@@ -341,7 +349,7 @@ export class AppError extends Error {() => 400 as const,).with(AppErrorCode.UNAUTHORIZED, () => 401 as const)- .with(AppErrorCode.FORBIDDEN, AppErrorCode.CSC_UNLICENSED, () => 403 as const)+ .with(AppErrorCode.FORBIDDEN, AppErrorCode.SENDER_DISABLED, AppErrorCode.CSC_UNLICENSED, () => 403 as const).with(AppErrorCode.NOT_FOUND, () => 404 as const).with(AppErrorCode.NOT_IMPLEMENTED, () => 501 as const).otherwise(() => 500 as const);diff --git a/packages/lib/server-only/document/complete-document-with-token.ts b/packages/lib/server-only/document/complete-document-with-token.tsindex 0b75210fb..bd2e55a47 100644--- a/packages/lib/server-only/document/complete-document-with-token.ts+++ b/packages/lib/server-only/document/complete-document-with-token.ts@@ -29,6 +29,7 @@ import { mapSecondaryIdToDocumentId, unsafeBuildEnvelopeIdQuery } from '../../utimport { getRecipientsInActiveSigningStep, isRecipientTurnBySigningOrder } from '../../utils/recipient-groups';import { assertRecipientNotExpired, isRecipientBefore } from '../../utils/recipients';import { getIsRecipientsTurnToSign } from '../recipient/get-is-recipient-turn';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';import { isRecipientAuthorized } from './is-recipient-authorized';@@ -90,6 +91,8 @@ export const completeDocumentWithToken = async ({});}+ await assertSenderNotDisabled({ userId: envelope.userId });+const legacyDocumentId = mapSecondaryIdToDocumentId(envelope.secondaryId);if (envelope.recipients.length === 0) {diff --git a/packages/lib/server-only/document/get-document-by-token.ts b/packages/lib/server-only/document/get-document-by-token.tsindex e28aabaef..4e1e5140a 100644--- a/packages/lib/server-only/document/get-document-by-token.ts+++ b/packages/lib/server-only/document/get-document-by-token.ts@@ -4,6 +4,7 @@ import { EnvelopeType } from '@prisma/client';import { AppError, AppErrorCode } from '../../errors/app-error';import type { TDocumentAuthMethods } from '../../types/document-auth';import { mapSecondaryIdToDocumentId } from '../../utils/envelope';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';import { isRecipientAuthorized } from './is-recipient-authorized';export interface GetDocumentAndSenderByTokenOptions {@@ -128,6 +129,8 @@ export const getDocumentAndSenderByToken = async ({throw new Error('Missing recipient');}+ await assertSenderNotDisabled({ userId: result.userId });+let documentAccessValid = true;if (requireAccessAuth) {diff --git a/packages/lib/server-only/document/reject-document-with-token.ts b/packages/lib/server-only/document/reject-document-with-token.tsindex 24e6c2d9b..673a4341e 100644--- a/packages/lib/server-only/document/reject-document-with-token.ts+++ b/packages/lib/server-only/document/reject-document-with-token.ts@@ -17,6 +17,7 @@ import { createDocumentAuditLogData } from '../../utils/document-audit-logs';import type { EnvelopeIdOptions } from '../../utils/envelope';import { mapSecondaryIdToDocumentId, unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';import { assertRecipientNotExpired } from '../../utils/recipients';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';export type RejectDocumentWithTokenOptions = {token: string;@@ -45,6 +46,8 @@ export async function rejectDocumentWithToken({ token, id, reason, requestMetada});}+ await assertSenderNotDisabled({ userId: envelope.userId });+if (envelope.status !== DocumentStatus.PENDING) {throw new AppError(AppErrorCode.INVALID_REQUEST, {message: `Document ${envelope.id} must be pending to reject`,diff --git a/packages/lib/server-only/envelope/get-envelope-for-direct-template-signing.ts b/packages/lib/server-only/envelope/get-envelope-for-direct-template-signing.tsindex 6383bc7f7..b9ef75694 100644--- a/packages/lib/server-only/envelope/get-envelope-for-direct-template-signing.ts+++ b/packages/lib/server-only/envelope/get-envelope-for-direct-template-signing.ts@@ -8,6 +8,7 @@ import { extractDocumentAuthMethods } from '../../utils/document-auth';import { getRecipientsWithMissingFields } from '../../utils/recipients';import { extractFieldAutoInsertValues } from '../document/send-document';import { getTeamSettings } from '../team/get-team-settings';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';import type { EnvelopeForSigningResponse } from './get-envelope-for-recipient-signing';import { ZEnvelopeForSigningResponse } from './get-envelope-for-recipient-signing';@@ -98,6 +99,8 @@ export const getEnvelopeForDirectTemplateSigning = async ({});}+ await assertSenderNotDisabled({ userId: envelope.userId });+// Currently not using this since for direct templates "User" access means they just need to be// logged in.// const documentAccessValid = await isRecipientAuthorized({diff --git a/packages/lib/server-only/envelope/get-envelope-for-recipient-signing.ts b/packages/lib/server-only/envelope/get-envelope-for-recipient-signing.tsindex f5caab1a1..687965302 100644--- a/packages/lib/server-only/envelope/get-envelope-for-recipient-signing.ts+++ b/packages/lib/server-only/envelope/get-envelope-for-recipient-signing.ts@@ -17,6 +17,7 @@ import { isRecipientTurnBySigningOrder } from '../../utils/recipient-groups';import { isRecipientExpired } from '../../utils/recipients';import { isRecipientAuthorized } from '../document/is-recipient-authorized';import { getTeamSettings } from '../team/get-team-settings';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';export type GetRecipientEnvelopeByTokenOptions = {token: string;@@ -230,6 +231,8 @@ export const getEnvelopeForRecipientSigning = async ({});}+ await assertSenderNotDisabled({ userId: envelope.userId });+const documentAccessValid = await isRecipientAuthorized({type: 'ACCESS',documentAuthOptions: envelope.authOptions,diff --git a/packages/lib/server-only/field/remove-signed-field-with-token.ts b/packages/lib/server-only/field/remove-signed-field-with-token.tsindex 77a5d34f7..c6e68ab88 100644--- a/packages/lib/server-only/field/remove-signed-field-with-token.ts+++ b/packages/lib/server-only/field/remove-signed-field-with-token.ts@@ -1,3 +1,4 @@+import { assertSenderNotDisabled } from '@documenso/lib/server-only/user/assert-user-not-disabled';import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';@@ -43,6 +44,8 @@ export const removeSignedFieldWithToken = async ({throw new Error(`Document not found for field ${field.id}`);}+ await assertSenderNotDisabled({ userId: envelope.userId });+if (envelope.status !== DocumentStatus.PENDING) {throw new Error(`Document ${envelope.id} must be pending`);}diff --git a/packages/lib/server-only/field/sign-field-with-token.ts b/packages/lib/server-only/field/sign-field-with-token.tsindex 8931cd198..ea90318a0 100644--- a/packages/lib/server-only/field/sign-field-with-token.ts+++ b/packages/lib/server-only/field/sign-field-with-token.ts@@ -28,6 +28,7 @@ import { createDocumentAuditLogData } from '../../utils/document-audit-logs';import { getRecipientFieldsWhereInput } from '../../utils/recipient-queries';import { assertRecipientNotExpired } from '../../utils/recipients';import { validateFieldAuth } from '../document/validate-field-auth';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';export type SignFieldWithTokenOptions = {token: string;@@ -92,6 +93,8 @@ export const signFieldWithToken = async ({throw new Error(`Recipient not found for field ${field.id}`);}+ await assertSenderNotDisabled({ userId: envelope.userId });+if (envelope.deletedAt) {throw new Error(`Document ${envelope.id} has been deleted`);}diff --git a/packages/lib/server-only/template/create-document-from-direct-template.ts b/packages/lib/server-only/template/create-document-from-direct-template.tsindex b61683fab..4fc4ad5b1 100644--- a/packages/lib/server-only/template/create-document-from-direct-template.ts+++ b/packages/lib/server-only/template/create-document-from-direct-template.ts@@ -53,6 +53,7 @@ import { assertOrganisationRatesAndLimits } from '../rate-limit/assert-organisatimport { assignOmittedRecipientSigningOrders } from '../recipient/assign-omitted-recipient-signing-orders';import { resolveSignatureLevel } from '../signature-level/resolve-signature-level';import { getTeamSettings } from '../team/get-team-settings';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';export type CreateDocumentFromDirectTemplateOptions = {@@ -146,6 +147,8 @@ export const createDocumentFromDirectTemplate = async ({throw new AppError(AppErrorCode.INVALID_REQUEST, { message: 'Invalid or missing template' });}+ await assertSenderNotDisabled({ userId: directTemplateEnvelope.userId });+if (nextSigner &&(!directTemplateEnvelope.documentMeta?.allowDictateNextSigner ||diff --git a/packages/lib/server-only/template/get-template-by-direct-link-token.ts b/packages/lib/server-only/template/get-template-by-direct-link-token.tsindex 782c90726..bbdcc9e1c 100644--- a/packages/lib/server-only/template/get-template-by-direct-link-token.ts+++ b/packages/lib/server-only/template/get-template-by-direct-link-token.ts@@ -3,6 +3,7 @@ import { EnvelopeType } from '@prisma/client';import { AppError, AppErrorCode } from '../../errors/app-error';import { mapSecondaryIdToTemplateId } from '../../utils/envelope';+import { assertSenderNotDisabled } from '../user/assert-user-not-disabled';export interface GetTemplateByDirectLinkTokenOptions {token: string;@@ -42,6 +43,8 @@ export const getTemplateByDirectLinkToken = async ({ token }: GetTemplateByDirecthrow new AppError(AppErrorCode.NOT_FOUND);}+ await assertSenderNotDisabled({ userId: envelope.userId });+const recipientsWithMappedFields = envelope.recipients.map((recipient) => ({...recipient,templateId: mapSecondaryIdToTemplateId(envelope.secondaryId),diff --git a/packages/lib/server-only/user/assert-user-not-disabled.ts b/packages/lib/server-only/user/assert-user-not-disabled.tsindex d4e789da8..4ea219865 100644--- a/packages/lib/server-only/user/assert-user-not-disabled.ts+++ b/packages/lib/server-only/user/assert-user-not-disabled.ts@@ -32,6 +32,30 @@ export type AssertUserNotDisabledByIdOptions = {* cannot continue to act through a stale session or token.*/export const assertUserNotDisabledById = async ({ userId }: AssertUserNotDisabledByIdOptions): Promise<void> => {+ const user = await getUserDisabledStatus({ userId });++ assertUserNotDisabled(user);+};++export type AssertSenderNotDisabledOptions = {+ userId: number;+};++/**+ * Recipient-side counterpart to `assertUserNotDisabledById`, keyed on `envelope.userId`.+ */+export const assertSenderNotDisabled = async ({ userId }: AssertSenderNotDisabledOptions): Promise<void> => {+ const user = await getUserDisabledStatus({ userId });++ if (user.disabled) {+ throw new AppError(AppErrorCode.SENDER_DISABLED, {+ message: 'Sender account disabled',+ statusCode: 403,+ });+ }+};++const getUserDisabledStatus = async ({ userId }: { userId: number }) => {const user = await prisma.user.findFirst({where: { id: userId },select: { disabled: true },@@ -44,5 +68,5 @@ export const assertUserNotDisabledById = async ({ userId }: AssertUserNotDisable});}- assertUserNotDisabled(user);+ return user;};diff --git a/packages/trpc/server/envelope-router/sign-envelope-field.ts b/packages/trpc/server/envelope-router/sign-envelope-field.tsindex 797c3b5bb..333355a11 100644--- a/packages/trpc/server/envelope-router/sign-envelope-field.ts+++ b/packages/trpc/server/envelope-router/sign-envelope-field.ts@@ -1,6 +1,7 @@import { isBase64Image } from '@documenso/lib/constants/signatures';import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';import { validateFieldAuth } from '@documenso/lib/server-only/document/validate-field-auth';+import { assertSenderNotDisabled } from '@documenso/lib/server-only/user/assert-user-not-disabled';import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';import { extractFieldInsertionValues } from '@documenso/lib/utils/envelope-signing';@@ -65,6 +66,8 @@ export const signEnvelopeFieldRoute = procedureconst { envelope } = field;const { documentMeta } = envelope;+ await assertSenderNotDisabled({ userId: envelope.userId });+if (envelope.internalVersion !== 2) {throw new AppError(AppErrorCode.NOT_FOUND, {message: `Envelope ${envelope.id} is not a version 2 envelope`,diff --git a/packages/trpc/server/recipient-router/router.ts b/packages/trpc/server/recipient-router/router.tsindex 29fff7d9c..76d6fd195 100644--- a/packages/trpc/server/recipient-router/router.ts+++ b/packages/trpc/server/recipient-router/router.ts@@ -8,6 +8,7 @@ import { getRecipientById } from '@documenso/lib/server-only/recipient/get-recipimport { setDocumentRecipients } from '@documenso/lib/server-only/recipient/set-document-recipients';import { setTemplateRecipients } from '@documenso/lib/server-only/recipient/set-template-recipients';import { updateEnvelopeRecipients } from '@documenso/lib/server-only/recipient/update-envelope-recipients';+import { assertSenderNotDisabled } from '@documenso/lib/server-only/user/assert-user-not-disabled';import { isTspEnvelope } from '@documenso/lib/types/signature-level';import { unsafeBuildEnvelopeIdQuery } from '@documenso/lib/utils/envelope';import { prisma } from '@documenso/prisma';@@ -608,7 +609,7 @@ export const recipientRouter = router({...unsafeBuildEnvelopeIdQuery({ type: 'documentId', id: documentId }, EnvelopeType.DOCUMENT),recipients: { some: { token } },},- select: { signatureLevel: true, internalVersion: true },+ select: { signatureLevel: true, internalVersion: true, userId: true },});// The most common cause is a stale signing page: the document was@@ -621,6 +622,10 @@ export const recipientRouter = router({});}+ // Checked here as well as inside `completeDocumentWithToken` so the+ // TSP branch below is covered.+ await assertSenderNotDisabled({ userId: envelope.userId });+if (isTspEnvelope(envelope)) {return await prepareCscRecipientSigning({recipientToken: token,