Merge branch 'main' into feature/pdf-placeholder-selection-fields

packages/trpc/server/envelope-router/find-envelopes.ts

@@ -10,7 +10,19 @@ export const findEnvelopesRoute = authenticatedProcedure
   .query(async ({ input, ctx }) => {
     const { user, teamId } = ctx;
 
-    const { query, type, templateId, page, perPage, orderByDirection, orderByColumn, source, status, folderId } = input;
+    const {
+      query,
+      type,
+      templateId,
+      page,
+      perPage,
+      orderByDirection,
+      orderByColumn,
+      source,
+      status,
+      hasExpiredRecipients,
+      folderId,
+    } = input;
 
     ctx.logger.info({
       input: {
@@ -19,6 +31,7 @@ export const findEnvelopesRoute = authenticatedProcedure
         templateId,
         source,
         status,
+        hasExpiredRecipients,
         folderId,
         page,
         perPage,
@@ -33,6 +46,7 @@ export const findEnvelopesRoute = authenticatedProcedure
       query,
       source,
       status,
+      hasExpiredRecipients,
       page,
       perPage,
       folderId,

packages/trpc/server/envelope-router/find-envelopes.types.ts

@@ -20,6 +20,11 @@ export const ZFindEnvelopesRequestSchema = ZFindSearchParamsSchema.extend({
   templateId: z.number().describe('Filter envelopes by the template ID used to create it.').optional(),
   source: z.nativeEnum(DocumentSource).describe('Filter envelopes by how it was created.').optional(),
   status: z.nativeEnum(DocumentStatus).describe('Filter envelopes by the current status.').optional(),
+  hasExpiredRecipients: z
+    .enum(['true', 'false'])
+    .describe('Filter for envelopes that have at least one recipient whose signing link has expired.')
+    .transform((value) => value === 'true')
+    .optional(),
   folderId: z.string().describe('Filter envelopes by folder ID.').optional(),
   orderByColumn: z.enum(['createdAt']).optional(),
   orderByDirection: z.enum(['asc', 'desc']).describe('Sort direction.').default('desc'),

packages/trpc/server/envelope-router/redistribute-envelope.types.ts

@@ -10,7 +10,7 @@ export const redistributeEnvelopeMeta: TrpcRouteMeta = {
     path: '/envelope/redistribute',
     summary: 'Redistribute envelope',
     description:
-      'Redistribute the envelope to the provided recipients who have not actioned the envelope. Will use the distribution method set in the envelope',
+      'Redistribute the envelope to the provided recipients who have not actioned the envelope. Will use the distribution method set in the envelope. This also refreshes the signing-link expiration for the targeted unsigned recipients, renewing any expired links.',
     tags: ['Envelope'],
   },
 };

packages/trpc/server/envelope-router/sign-envelope-field.ts

@@ -4,6 +4,7 @@ import { validateFieldAuth } from '@documenso/lib/server-only/document/validate-
 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';
+import { assertRecipientNotExpired } from '@documenso/lib/utils/recipients';
 import { prisma } from '@documenso/prisma';
 import { DocumentStatus, FieldType, RecipientRole, SigningStatus } from '@prisma/client';
 import { match } from 'ts-pattern';
@@ -108,6 +109,12 @@ export const signEnvelopeFieldRoute = procedure
       });
     }
 
+    // Both are checked because an assistant may insert values into a field belonging to
+    // another recipient, and neither signing window may have closed. For every other
+    // role these reference the same recipient.
+    assertRecipientNotExpired(recipient);
+    assertRecipientNotExpired(field.recipient);
+
     if (recipient.signingStatus === SigningStatus.SIGNED || field.recipient.signingStatus === SigningStatus.SIGNED) {
       throw new AppError(AppErrorCode.INVALID_REQUEST, {
         message: `Recipient ${recipient.id} has already signed`,