fix: update reauth constraints and tests

apps/web/src/app/(signing)/sign/[token]/document-action-auth-dialog.tsx

@@ -9,12 +9,12 @@ import { DateTime } from 'luxon';
 import { signOut } from 'next-auth/react';
 import { match } from 'ts-pattern';
 
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import {
   DocumentAuth,
   type TRecipientActionAuth,
   type TRecipientActionAuthTypes,
 } from '@documenso/lib/types/document-auth';
+import type { FieldType } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
@@ -33,7 +33,7 @@ export type DocumentActionAuthDialogProps = {
   title?: string;
   documentAuthType: TRecipientActionAuthTypes;
   description?: string;
-  actionTarget?: 'FIELD' | 'DOCUMENT';
+  actionTarget: FieldType | 'DOCUMENT';
   isSubmitting?: boolean;
   open: boolean;
   onOpenChange: (value: boolean) => void;
@@ -53,7 +53,6 @@ export const DocumentActionAuthDialog = ({
   title,
   description,
   documentAuthType,
-  actionTarget = 'FIELD',
   // onReauthFormSubmit,
   isSubmitting,
   open,
@@ -135,19 +134,14 @@ export const DocumentActionAuthDialog = ({
   //   setFormErrorCode(null);
   // }, [open, form]);
 
-  const defaultRecipientActionVerb = RECIPIENT_ROLES_DESCRIPTION[recipient.role].actionVerb;
-
   return (
     <Dialog open={open} onOpenChange={handleOnOpenChange}>
       <DialogContent>
         <DialogHeader>
-          <DialogTitle>
-            {title || `${defaultRecipientActionVerb} ${actionTarget.toLowerCase()}`}
-          </DialogTitle>
+          <DialogTitle>{title || 'Sign field'}</DialogTitle>
 
           <DialogDescription>
-            {description ||
-              `Reauthentication is required to ${defaultRecipientActionVerb.toLowerCase()} the ${actionTarget.toLowerCase()}`}
+            {description || `Reauthentication is required to sign the field`}
           </DialogDescription>
         </DialogHeader>
 
@@ -156,8 +150,7 @@ export const DocumentActionAuthDialog = ({
             <fieldset disabled={isSigningOut} className="space-y-4">
               <Alert>
                 <AlertDescription>
-                  To {defaultRecipientActionVerb.toLowerCase()} this {actionTarget.toLowerCase()},
-                  you need to be logged in as <strong>{recipient.email}</strong>
+                  To sign this field, you need to be logged in as <strong>{recipient.email}</strong>
                 </AlertDescription>
               </Alert>
 

apps/web/src/app/(signing)/sign/[token]/document-auth-provider.tsx

@@ -13,7 +13,7 @@ import type {
 } from '@documenso/lib/types/document-auth';
 import { DocumentAuth } from '@documenso/lib/types/document-auth';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import type { Document, Recipient, User } from '@documenso/prisma/client';
+import { type Document, FieldType, type Recipient, type User } from '@documenso/prisma/client';
 
 import type { DocumentActionAuthDialogProps } from './document-action-auth-dialog';
 import { DocumentActionAuthDialog } from './document-action-auth-dialog';
@@ -106,7 +106,7 @@ export const DocumentAuthProvider = ({
 
   const executeActionAuthProcedure = async (options: ExecuteActionAuthProcedureOptions) => {
     // Directly run callback if no auth required.
-    if (!derivedRecipientActionAuth) {
+    if (!derivedRecipientActionAuth || options.actionTarget !== FieldType.SIGNATURE) {
       await options.onReauthFormSubmit();
       return;
     }

apps/web/src/app/(signing)/sign/[token]/form.tsx

@@ -20,7 +20,6 @@ import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
 
-import { useRequiredDocumentAuthContext } from './document-auth-provider';
 import { useRequiredSigningContext } from './provider';
 import { SignDialog } from './sign-dialog';
 
@@ -37,7 +36,6 @@ export const SigningForm = ({ document, recipient, fields, redirectUrl }: Signin
   const { data: session } = useSession();
 
   const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();
-  const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
 
   const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
 
@@ -67,10 +65,13 @@ export const SigningForm = ({ document, recipient, fields, redirectUrl }: Signin
       return;
     }
 
-    await executeActionAuthProcedure({
-      onReauthFormSubmit: completeDocument,
-      actionTarget: 'DOCUMENT',
-    });
+    await completeDocument();
+
+    // Reauth is currently not required for completing the document.
+    // await executeActionAuthProcedure({
+    //   onReauthFormSubmit: completeDocument,
+    //   actionTarget: 'DOCUMENT',
+    // });
   };
 
   const completeDocument = async (authOptions?: TRecipientActionAuth) => {

apps/web/src/app/(signing)/sign/[token]/name-field.tsx

@@ -8,7 +8,7 @@ import { Loader } from 'lucide-react';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
-import type { Recipient } from '@documenso/prisma/client';
+import { type Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
@@ -69,6 +69,7 @@ export const NameField = ({ field, recipient }: NameFieldProps) => {
 
     void executeActionAuthProcedure({
       onReauthFormSubmit: async (authOptions) => await onSign(authOptions, localFullName),
+      actionTarget: field.type,
     });
   };
 

apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx

@@ -12,8 +12,6 @@ import {
 
 import { truncateTitle } from '~/helpers/truncate-title';
 
-import { useRequiredDocumentAuthContext } from './document-auth-provider';
-
 export type SignDialogProps = {
   isSubmitting: boolean;
   document: Document;
@@ -31,27 +29,26 @@ export const SignDialog = ({
   onSignatureComplete,
   role,
 }: SignDialogProps) => {
-  const { executeActionAuthProcedure, isAuthRedirectRequired } = useRequiredDocumentAuthContext();
-
   const [showDialog, setShowDialog] = useState(false);
   const truncatedTitle = truncateTitle(document.title);
   const isComplete = fields.every((field) => field.inserted);
 
-  const handleOpenChange = async (open: boolean) => {
+  const handleOpenChange = (open: boolean) => {
     if (isSubmitting || !isComplete) {
       return;
     }
 
-    if (isAuthRedirectRequired) {
-      await executeActionAuthProcedure({
-        actionTarget: 'DOCUMENT',
-        onReauthFormSubmit: () => {
-          // Do nothing since the user should be redirected.
-        },
-      });
+    // Reauth is currently not required for signing the document.
+    // if (isAuthRedirectRequired) {
+    //   await executeActionAuthProcedure({
+    //     actionTarget: 'DOCUMENT',
+    //     onReauthFormSubmit: () => {
+    //       // Do nothing since the user should be redirected.
+    //     },
+    //   });
 
-      return;
-    }
+    //   return;
+    // }
 
     setShowDialog(open);
   };

apps/web/src/app/(signing)/sign/[token]/signature-field.tsx

@@ -8,7 +8,7 @@ import { Loader } from 'lucide-react';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
-import type { Recipient } from '@documenso/prisma/client';
+import { type Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
@@ -89,6 +89,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
 
     void executeActionAuthProcedure({
       onReauthFormSubmit: async (authOptions) => await onSign(authOptions, localSignature),
+      actionTarget: field.type,
     });
   };
 

apps/web/src/app/(signing)/sign/[token]/signing-field-container.tsx

@@ -3,6 +3,7 @@
 import React from 'react';
 
 import { type TRecipientActionAuth } from '@documenso/lib/types/document-auth';
+import { FieldType } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { FieldRootContainer } from '@documenso/ui/components/field/field';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
@@ -55,11 +56,24 @@ export const SigningFieldContainer = ({
       return;
     }
 
+    // Bypass reauth for non signature fields.
+    if (field.type !== FieldType.SIGNATURE) {
+      const presignResult = await onPreSign?.();
+
+      if (presignResult === false) {
+        return;
+      }
+
+      await onSign();
+      return;
+    }
+
     if (isAuthRedirectRequired) {
       await executeActionAuthProcedure({
         onReauthFormSubmit: () => {
           // Do nothing since the user should be redirected.
         },
+        actionTarget: field.type,
       });
 
       return;
@@ -76,6 +90,7 @@ export const SigningFieldContainer = ({
 
     await executeActionAuthProcedure({
       onReauthFormSubmit: onSign,
+      actionTarget: field.type,
     });
   };
 

apps/web/src/app/(signing)/sign/[token]/text-field.tsx

@@ -8,7 +8,7 @@ import { Loader } from 'lucide-react';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
-import type { Recipient } from '@documenso/prisma/client';
+import { type Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
@@ -61,6 +61,7 @@ export const TextField = ({ field, recipient }: TextFieldProps) => {
 
     void executeActionAuthProcedure({
       onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
+      actionTarget: field.type,
     });
   };