v1.9.1-rc.4

Resolve external link issue

README.md

@@ -1,4 +1,4 @@
-> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="documen.so/sign-everywhere">The Platform Plan</a>!
+> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="https://documen.so/sign-everywhere">The Platform Plan</a>!
 
 <a href="https://www.producthunt.com/posts/documenso-platform-plan?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso&#0045;platform&#0045;plan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=670576&theme=light" alt="Documenso&#0032;Platform&#0032;Plan - Whitelabeled&#0032;signing&#0032;flows&#0032;in&#0032;your&#0032;product | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 

apps/documentation/pages/developers/_meta.json

@@ -14,4 +14,4 @@
   "public-api": "Public API",
   "embedding": "Embedding",
   "webhooks": "Webhooks"
-}
+}

apps/documentation/pages/developers/public-api/index.mdx

@@ -21,14 +21,25 @@ Check out the [API V1 documentation](https://app.documenso.com/api/v1/openapi) f
 
 ## API V2 - Beta
 
-Our new API V2 is currently in Beta. The new API features typed SDKs for TypeScript, Python and Go and example code for many more.
+<Callout type="warning">API V2 is currently beta, and will be subject to breaking changes</Callout>
 
-<Callout type="warning">
-  NOW IN BETA: [API V2 Documentation](https://documen.so/api-v2-docs)
+Check out the [API V2 documentation](https://documen.so/api-v2-docs) for details about the API endpoints, request parameters, response formats, and authentication methods.
+
+Our new API V2 supports the following typed SDKs:
+
+- [TypeScript](https://github.com/documenso/sdk-typescript)
+- [Python](https://github.com/documenso/sdk-python)
+- [Go](https://github.com/documenso/sdk-go)
+
+<Callout type="info">
+  For the staging API, please use the following base URL:
+  `https://stg-app.documenso.dev/api/v2-beta/`
 </Callout>
 
 🚀 [V2 Announcement](https://documen.so/sdk-blog)
 
+📖 [Documentation](https://documen.so/api-v2-docs)
+
 💬 [Leave Feedback](https://documen.so/sdk-feedback)
 
 🔔 [Breaking Changes](https://documen.so/sdk-breaking)

apps/documentation/pages/users/signing-documents/index.mdx

@@ -85,12 +85,13 @@ You can also set the recipient's role, which determines their actions and permis
 
 Documenso has 4 roles for recipients with different permissions and actions.
 
-|   Role   |                                    Function                                     | Action required | Signature |
-| :------: | :-----------------------------------------------------------------------------: | :-------------: | :-------: |
-|  Signer  |                Needs to sign signatures fields assigned to them.                |       Yes       |    Yes    |
-| Approver |          Needs to approve the document as a whole. Signature optional.          |       Yes       | Optional  |
-|  Viewer  |                   Needs to confirm they viewed the document.                    |       Yes       |    No     |
-|   BCC    | Receives a copy of the signed document after completion. No action is required. |       No        |    No     |
+|   Role    |                                    Function                                     | Action required | Signature |
+| :-------: | :-----------------------------------------------------------------------------: | :-------------: | :-------: |
+|  Signer   |                Needs to sign signatures fields assigned to them.                |       Yes       |    Yes    |
+| Approver  |          Needs to approve the document as a whole. Signature optional.          |       Yes       | Optional  |
+|  Viewer   |                   Needs to confirm they viewed the document.                    |       Yes       |    No     |
+| Assistant | Can help prepare the document by filling in fields on behalf of other signers.  |       Yes       |    No     |
+|    CC     | Receives a copy of the signed document after completion. No action is required. |       No        |    No     |
 
 ### Fields
 

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.9.1-rc.1",
+  "version": "1.9.1-rc.4",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {

apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx

@@ -73,7 +73,7 @@ export const EditDocumentForm = ({
 
   const { recipients, fields } = document;
 
-  const { mutateAsync: updateDocument } = trpc.document.updateDocument.useMutation({
+  const { mutateAsync: updateDocument } = trpc.document.setSettingsForDocument.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
       utils.document.getDocumentWithDetailsById.setData(
@@ -85,6 +85,19 @@ export const EditDocumentForm = ({
     },
   });
 
+  const { mutateAsync: setSigningOrderForDocument } =
+    trpc.document.setSigningOrderForDocument.useMutation({
+      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
+      onSuccess: (newData) => {
+        utils.document.getDocumentWithDetailsById.setData(
+          {
+            documentId: initialDocument.id,
+          },
+          (oldData) => ({ ...(oldData || initialDocument), ...newData, id: Number(newData.id) }),
+        );
+      },
+    });
+
   const { mutateAsync: addFields } = trpc.field.addFields.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: ({ fields: newFields }) => {
@@ -203,12 +216,9 @@ export const EditDocumentForm = ({
   const onAddSignersFormSubmit = async (data: TAddSignersFormSchema) => {
     try {
       await Promise.all([
-        updateDocument({
+        setSigningOrderForDocument({
           documentId: document.id,
-          meta: {
-            signingOrder: data.signingOrder,
-            modifyNextSigner: data.modifyNextSigner,
-          },
+          signingOrder: data.signingOrder,
         }),
 
         setRecipients({
@@ -381,7 +391,6 @@ export const EditDocumentForm = ({
               documentFlow={documentFlow.signers}
               recipients={recipients}
               signingOrder={document.documentMeta?.signingOrder}
-              modifyNextSigner={document.documentMeta?.modifyNextSigner}
               fields={fields}
               isDocumentEnterprise={isDocumentEnterprise}
               onSubmit={onAddSignersFormSubmit}

apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx

@@ -76,7 +76,6 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
     ? {
         ...templateMeta,
         signingOrder: templateMeta.signingOrder || DocumentSigningOrder.SEQUENTIAL,
-        modifyNextSigner: templateMeta.modifyNextSigner ?? false,
         documentId: 0,
       }
     : undefined;

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

@@ -44,7 +44,12 @@ export const CheckboxField = ({ field, onSignField, onUnsignField }: CheckboxFie
   const [isPending, startTransition] = useTransition();
   const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
 
-  const parsedFieldMeta = ZCheckboxFieldMeta.parse(field.fieldMeta);
+  const parsedFieldMeta = ZCheckboxFieldMeta.parse(
+    field.fieldMeta ?? {
+      type: 'checkbox',
+      values: [{ id: 1, checked: false, value: '' }],
+    },
+  );
 
   const values = parsedFieldMeta.values?.map((item) => ({
     ...item,

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

@@ -15,12 +15,7 @@ import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
 import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { Recipient } from '@documenso/prisma/client';
-import {
-  DocumentSigningOrder,
-  type Field,
-  FieldType,
-  RecipientRole,
-} from '@documenso/prisma/client';
+import { type Field, FieldType, RecipientRole } from '@documenso/prisma/client';
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
@@ -45,12 +40,6 @@ export type SigningFormProps = {
   isRecipientsTurn: boolean;
   allRecipients?: RecipientWithFields[];
   setSelectedSignerId?: (id: number | null) => void;
-  isLastRecipient: boolean;
-};
-
-type SigningFormData = {
-  email?: string;
-  name?: string;
 };
 
 export const SigningForm = ({
@@ -61,7 +50,6 @@ export const SigningForm = ({
   isRecipientsTurn,
   allRecipients = [],
   setSelectedSignerId,
-  isLastRecipient,
 }: SigningFormProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
@@ -89,7 +77,7 @@ export const SigningForm = ({
     },
   });
 
-  const { handleSubmit, formState } = useForm<SigningFormData>();
+  const { handleSubmit, formState } = useForm();
 
   // Keep the loading state going if successful since the redirect may take some time.
   const isSubmitting = formState.isSubmitting || formState.isSubmitSuccessful;
@@ -114,58 +102,20 @@ export const SigningForm = ({
     validateFieldsInserted(fieldsRequiringValidation);
   };
 
-  const completeDocument = async (
-    authOptions?: TRecipientActionAuth,
-    nextSigner?: { email: string; name: string },
-  ) => {
-    const payload = {
-      token: recipient.token,
-      documentId: document.id,
-      authOptions,
-      ...(nextSigner?.email && nextSigner?.name ? { nextSigner } : {}),
-    };
+  const onFormSubmit = async () => {
+    setValidateUninsertedFields(true);
 
-    await completeDocumentWithToken(payload);
+    const isFieldsValid = validateFieldsInserted(fieldsRequiringValidation);
 
-    analytics.capture('App: Recipient has completed signing', {
-      signerId: recipient.id,
-      documentId: document.id,
-      timestamp: new Date().toISOString(),
-    });
-
-    redirectUrl ? router.push(redirectUrl) : router.push(`/sign/${recipient.token}/complete`);
-  };
-
-  const onFormSubmit = async (data: SigningFormData) => {
-    try {
-      setValidateUninsertedFields(true);
-
-      const isFieldsValid = validateFieldsInserted(fieldsRequiringValidation);
-
-      if (hasSignatureField && !signatureValid) {
-        throw new Error('Please provide a valid signature');
-      }
-
-      if (!isFieldsValid) {
-        throw new Error('Please complete all required fields');
-      }
-
-      const nextSigner =
-        data.email && data.name
-          ? {
-              email: data.email,
-              name: data.name,
-            }
-          : undefined;
-
-      await completeDocument(undefined, nextSigner);
-    } catch (error) {
-      toast({
-        title: 'Error',
-        description: 'An error occurred while completing the document. Please try again.',
-        variant: 'destructive',
-      });
+    if (hasSignatureField && !signatureValid) {
+      return;
     }
+
+    if (!isFieldsValid) {
+      return;
+    }
+
+    await completeDocument();
   };
 
   const onAssistantFormSubmit = () => {
@@ -193,6 +143,22 @@ export const SigningForm = ({
     }
   };
 
+  const completeDocument = async (authOptions?: TRecipientActionAuth) => {
+    await completeDocumentWithToken({
+      token: recipient.token,
+      documentId: document.id,
+      authOptions,
+    });
+
+    analytics.capture('App: Recipient has completed signing', {
+      signerId: recipient.id,
+      documentId: document.id,
+      timestamp: new Date().toISOString(),
+    });
+
+    redirectUrl ? router.push(redirectUrl) : router.push(`/sign/${recipient.token}/complete`);
+  };
+
   return (
     <div
       className={cn(
@@ -242,21 +208,12 @@ export const SigningForm = ({
 
                   <SignDialog
                     isSubmitting={isSubmitting}
-                    onSignatureComplete={async (nextSigner) => {
-                      await handleSubmit(async (formData) =>
-                        onFormSubmit({ ...formData, ...nextSigner }),
-                      )();
-                    }}
+                    onSignatureComplete={handleSubmit(onFormSubmit)}
                     documentTitle={document.title}
                     fields={fields}
                     fieldsValidated={fieldsValidated}
                     role={recipient.role}
                     disabled={!isRecipientsTurn}
-                    canModifyNextSigner={
-                      document.documentMeta?.modifyNextSigner &&
-                      document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL &&
-                      !isLastRecipient
-                    }
                   />
                 </div>
               </div>
@@ -426,21 +383,12 @@ export const SigningForm = ({
 
                     <SignDialog
                       isSubmitting={isSubmitting}
-                      onSignatureComplete={async (nextSigner) => {
-                        await handleSubmit(async (formData) =>
-                          onFormSubmit({ ...formData, ...nextSigner }),
-                        )();
-                      }}
+                      onSignatureComplete={handleSubmit(onFormSubmit)}
                       documentTitle={document.title}
                       fields={fields}
                       fieldsValidated={fieldsValidated}
                       role={recipient.role}
                       disabled={!isRecipientsTurn}
-                      canModifyNextSigner={
-                        document.documentMeta?.modifyNextSigner &&
-                        document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL &&
-                        !isLastRecipient
-                      }
                     />
                   </div>
                 </fieldset>

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

@@ -9,7 +9,6 @@ import { isRecipientAuthorized } from '@documenso/lib/server-only/document/is-re
 import { viewedDocument } from '@documenso/lib/server-only/document/viewed-document';
 import { getCompletedFieldsForToken } from '@documenso/lib/server-only/field/get-completed-fields-for-token';
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
-import { getIsLastRecipient } from '@documenso/lib/server-only/recipient/get-is-last-recipient';
 import { getIsRecipientsTurnToSign } from '@documenso/lib/server-only/recipient/get-is-recipient-turn';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
@@ -45,7 +44,7 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
 
   const requestMetadata = extractNextHeaderRequestMetadata(requestHeaders);
 
-  const [document, recipient, fields, completedFields, isLastRecipient] = await Promise.all([
+  const [document, recipient, fields, completedFields] = await Promise.all([
     getDocumentAndSenderByToken({
       token,
       userId: user?.id,
@@ -54,7 +53,6 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
     getRecipientByToken({ token }).catch(() => null),
     getFieldsForToken({ token }),
     getCompletedFieldsForToken({ token }),
-    getIsLastRecipient({ token }),
   ]);
 
   if (
@@ -171,7 +169,6 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
           completedFields={completedFields}
           isRecipientsTurn={isRecipientsTurn}
           allRecipients={allRecipients}
-          isLastRecipient={isLastRecipient}
         />
       </DocumentAuthProvider>
     </SigningProvider>

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

@@ -37,6 +37,11 @@ export const RecipientProvider = ({
   recipient,
   targetSigner = null,
 }: RecipientProviderProps) => {
+  // console.log({
+  //   recipient,
+  //   targetSigner,
+  //   isAssistantMode: !!targetSigner,
+  // });
   return (
     <RecipientContext.Provider
       value={{

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

@@ -43,9 +43,10 @@ type TRejectDocumentFormSchema = z.infer<typeof ZRejectDocumentFormSchema>;
 export interface RejectDocumentDialogProps {
   document: Pick<Document, 'id'>;
   token: string;
+  onRejected?: (reason: string) => void | Promise<void>;
 }
 
-export function RejectDocumentDialog({ document, token }: RejectDocumentDialogProps) {
+export function RejectDocumentDialog({ document, token, onRejected }: RejectDocumentDialogProps) {
   const { toast } = useToast();
   const router = useRouter();
   const searchParams = useSearchParams();
@@ -79,7 +80,11 @@ export function RejectDocumentDialog({ document, token }: RejectDocumentDialogPr
 
       setIsOpen(false);
 
-      router.push(`/sign/${token}/rejected`);
+      if (onRejected) {
+        await onRejected(reason);
+      } else {
+        router.push(`/sign/${token}/rejected`);
+      }
     } catch (err) {
       toast({
         title: 'Error',

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

@@ -1,36 +1,18 @@
-'use client';
-
 import { useMemo, useState } from 'react';
 
-import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans } from '@lingui/macro';
-import { ArrowRight } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
 import { fieldsContainUnsignedRequiredField } from '@documenso/lib/utils/advanced-fields-helpers';
 import type { Field } from '@documenso/prisma/client';
 import { RecipientRole } from '@documenso/prisma/client';
-import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
 import {
   Dialog,
-  DialogClose,
   DialogContent,
   DialogFooter,
   DialogTitle,
   DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
 
 import { SigningDisclosure } from '~/components/general/signing-disclosure';
 
@@ -39,26 +21,12 @@ export type SignDialogProps = {
   documentTitle: string;
   fields: Field[];
   fieldsValidated: () => void | Promise<void>;
-  onSignatureComplete: (nextSigner?: { email?: string; name?: string }) => void | Promise<void>;
+  onSignatureComplete: () => void | Promise<void>;
   role: RecipientRole;
   disabled?: boolean;
-  canModifyNextSigner?: boolean;
 };
 
-const formSchema = z.object({
-  modifyNextSigner: z.boolean().default(false),
-  nextSigner: z
-    .object({
-      email: z.string().email({ message: 'Please enter a valid email address' }).optional(),
-      name: z.string().optional(),
-    })
-    .optional()
-    .default({}),
-});
-
-type TFormSchema = z.infer<typeof formSchema>;
-
-export function SignDialog({
+export const SignDialog = ({
   isSubmitting,
   documentTitle,
   fields,
@@ -66,9 +34,7 @@ export function SignDialog({
   onSignatureComplete,
   role,
   disabled = false,
-  canModifyNextSigner = false,
-}: SignDialogProps) {
-  const [step, setStep] = useState(1);
+}: SignDialogProps) => {
   const [showDialog, setShowDialog] = useState(false);
 
   const isComplete = useMemo(() => !fieldsContainUnsignedRequiredField(fields), [fields]);
@@ -81,336 +47,104 @@ export function SignDialog({
     setShowDialog(open);
   };
 
-  const totalSteps = 2;
-
-  const handleContinue = () => {
-    if (step < totalSteps) {
-      setStep(step + 1);
-    }
-  };
-
-  const form = useForm<TFormSchema>({
-    resolver: zodResolver(formSchema),
-  });
-
-  const onFormSubmit = async (data: TFormSchema) => {
-    try {
-      await fieldsValidated();
-
-      await onSignatureComplete({
-        email: data.nextSigner.email?.trim().toLowerCase(),
-        name: data.nextSigner.name?.trim(),
-      });
-
-      setShowDialog(false);
-      form.reset();
-    } catch (err) {
-      console.error(err);
-    }
-  };
-
   return (
-    <>
-      {!canModifyNextSigner ? (
-        <Dialog open={showDialog} onOpenChange={handleOpenChange}>
-          <DialogTrigger asChild>
-            <Button
-              className="w-full"
-              type="button"
-              size="lg"
-              onClick={fieldsValidated}
-              loading={isSubmitting}
-              disabled={disabled}
-            >
-              {isComplete ? <Trans>Complete</Trans> : <Trans>Next field</Trans>}
-            </Button>
-          </DialogTrigger>
-
-          <DialogContent>
-            <DialogTitle>
-              <div className="text-foreground text-xl font-semibold">
-                {role === RecipientRole.VIEWER && <Trans>Complete Viewing</Trans>}
-                {role === RecipientRole.SIGNER && <Trans>Complete Signing</Trans>}
-                {role === RecipientRole.APPROVER && <Trans>Complete Approval</Trans>}
-              </div>
-            </DialogTitle>
-
-            <div className="text-muted-foreground max-w-[50ch]">
-              {role === RecipientRole.VIEWER && (
-                <span>
-                  <Trans>
-                    <span className="inline-flex flex-wrap">
-                      You are about to complete viewing "
-                      <span className="inline-block max-w-[11rem] truncate align-baseline">
-                        {documentTitle}
-                      </span>
-                      ".
-                    </span>
-                    <br /> Are you sure?
-                  </Trans>
-                </span>
-              )}
-              {role === RecipientRole.SIGNER && (
-                <span>
-                  <Trans>
-                    <span className="inline-flex flex-wrap">
-                      You are about to complete signing "
-                      <span className="inline-block max-w-[11rem] truncate align-baseline">
-                        {documentTitle}
-                      </span>
-                      ".
-                    </span>
-                    <br /> Are you sure?
-                  </Trans>
-                </span>
-              )}
-              {role === RecipientRole.APPROVER && (
-                <span>
-                  <Trans>
-                    <span className="inline-flex flex-wrap">
-                      You are about to complete approving{' '}
-                      <span className="inline-block max-w-[11rem] truncate align-baseline">
-                        "{documentTitle}"
-                      </span>
-                      .
-                    </span>
-                    <br /> Are you sure?
-                  </Trans>
-                </span>
-              )}
-            </div>
-
-            <SigningDisclosure className="mt-4" />
-
-            <DialogFooter>
-              <div className="flex w-full flex-1 flex-nowrap gap-4">
-                <Button
-                  type="button"
-                  className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"
-                  variant="secondary"
-                  onClick={() => {
-                    setShowDialog(false);
-                  }}
-                >
-                  <Trans>Cancel</Trans>
-                </Button>
-
-                <Button
-                  type="button"
-                  className="flex-1"
-                  disabled={!isComplete}
-                  loading={isSubmitting}
-                  onClick={async (e) => {
-                    e.preventDefault();
-                    await onSignatureComplete();
-                  }}
-                >
-                  {role === RecipientRole.VIEWER && <Trans>Mark as Viewed</Trans>}
-                  {role === RecipientRole.SIGNER && <Trans>Sign</Trans>}
-                  {role === RecipientRole.APPROVER && <Trans>Approve</Trans>}
-                </Button>
-              </div>
-            </DialogFooter>
-          </DialogContent>
-        </Dialog>
-      ) : (
-        <Dialog
-          onOpenChange={(open) => {
-            if (open) setStep(1);
-          }}
+    <Dialog open={showDialog} onOpenChange={handleOpenChange}>
+      <DialogTrigger asChild>
+        <Button
+          className="w-full"
+          type="button"
+          size="lg"
+          onClick={fieldsValidated}
+          loading={isSubmitting}
+          disabled={disabled}
         >
-          <DialogTrigger asChild>
+          {isComplete ? <Trans>Complete</Trans> : <Trans>Next field</Trans>}
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent>
+        <DialogTitle>
+          <div className="text-foreground text-xl font-semibold">
+            {role === RecipientRole.VIEWER && <Trans>Complete Viewing</Trans>}
+            {role === RecipientRole.SIGNER && <Trans>Complete Signing</Trans>}
+            {role === RecipientRole.APPROVER && <Trans>Complete Approval</Trans>}
+          </div>
+        </DialogTitle>
+
+        <div className="text-muted-foreground max-w-[50ch]">
+          {role === RecipientRole.VIEWER && (
+            <span>
+              <Trans>
+                <span className="inline-flex flex-wrap">
+                  You are about to complete viewing "
+                  <span className="inline-block max-w-[11rem] truncate align-baseline">
+                    {documentTitle}
+                  </span>
+                  ".
+                </span>
+                <br /> Are you sure?
+              </Trans>
+            </span>
+          )}
+          {role === RecipientRole.SIGNER && (
+            <span>
+              <Trans>
+                <span className="inline-flex flex-wrap">
+                  You are about to complete signing "
+                  <span className="inline-block max-w-[11rem] truncate align-baseline">
+                    {documentTitle}
+                  </span>
+                  ".
+                </span>
+                <br /> Are you sure?
+              </Trans>
+            </span>
+          )}
+          {role === RecipientRole.APPROVER && (
+            <span>
+              <Trans>
+                <span className="inline-flex flex-wrap">
+                  You are about to complete approving{' '}
+                  <span className="inline-block max-w-[11rem] truncate align-baseline">
+                    "{documentTitle}"
+                  </span>
+                  .
+                </span>
+                <br /> Are you sure?
+              </Trans>
+            </span>
+          )}
+        </div>
+
+        <SigningDisclosure className="mt-4" />
+
+        <DialogFooter>
+          <div className="flex w-full flex-1 flex-nowrap gap-4">
             <Button
-              className="w-full"
               type="button"
-              size="lg"
-              onClick={fieldsValidated}
-              loading={isSubmitting}
-              disabled={disabled}
+              className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"
+              variant="secondary"
+              onClick={() => {
+                setShowDialog(false);
+              }}
             >
-              {isComplete ? <Trans>Complete</Trans> : <Trans>Next field</Trans>}
+              <Trans>Cancel</Trans>
             </Button>
-          </DialogTrigger>
-          <DialogContent>
-            <DialogTitle>
-              {step === 1 && (
-                <div className="text-foreground text-base font-semibold">
-                  <Trans>
-                    Modify Next Signer <span className="text-muted-foreground">(Optional)</span>
-                  </Trans>
-                </div>
-              )}
 
-              {step === 2 && (
-                <div className="text-foreground text-xl font-semibold">
-                  {role === RecipientRole.VIEWER && <Trans>Complete Viewing</Trans>}
-                  {role === RecipientRole.SIGNER && <Trans>Complete Signing</Trans>}
-                  {role === RecipientRole.APPROVER && <Trans>Complete Approval</Trans>}
-                </div>
-              )}
-            </DialogTitle>
-
-            {step === 1 && (
-              <Form {...form}>
-                <form onSubmit={form.handleSubmit(onFormSubmit)} className="flex flex-col gap-y-4">
-                  <FormField
-                    control={form.control}
-                    name="modifyNextSigner"
-                    render={({ field }) => (
-                      <FormItem className="flex flex-row items-center space-x-2 space-y-0">
-                        <FormControl>
-                          <Checkbox checked={field.value} onCheckedChange={field.onChange} />
-                        </FormControl>
-                        <FormLabel className="font-normal">
-                          <Trans>Modify next signer details</Trans>
-                        </FormLabel>
-                      </FormItem>
-                    )}
-                  />
-
-                  {form.watch('modifyNextSigner') && (
-                    <>
-                      <FormField
-                        control={form.control}
-                        name="nextSigner.email"
-                        render={({ field }) => (
-                          <FormItem>
-                            <FormLabel>
-                              <Trans>Next Signer Email</Trans>
-                            </FormLabel>
-                            <FormControl>
-                              <Input type="email" {...field} />
-                            </FormControl>
-                            <FormMessage />
-                          </FormItem>
-                        )}
-                      />
-
-                      <FormField
-                        control={form.control}
-                        name="nextSigner.name"
-                        render={({ field }) => (
-                          <FormItem>
-                            <FormLabel>
-                              <Trans>Next Signer Name</Trans>
-                            </FormLabel>
-                            <FormControl>
-                              <Input {...field} />
-                            </FormControl>
-                            <FormMessage />
-                          </FormItem>
-                        )}
-                      />
-                    </>
-                  )}
-                </form>
-              </Form>
-            )}
-
-            {step === 2 && (
-              <>
-                <div className="text-muted-foreground max-w-[50ch]">
-                  {role === RecipientRole.VIEWER && (
-                    <span>
-                      <Trans>
-                        <span className="inline-flex flex-wrap">
-                          You are about to complete viewing "
-                          <span className="inline-block max-w-[11rem] truncate align-baseline">
-                            {documentTitle}
-                          </span>
-                          ".
-                        </span>
-                        <br /> Are you sure?
-                      </Trans>
-                    </span>
-                  )}
-                  {role === RecipientRole.SIGNER && (
-                    <span>
-                      <Trans>
-                        <span className="inline-flex flex-wrap">
-                          You are about to complete signing "
-                          <span className="inline-block max-w-[11rem] truncate align-baseline">
-                            {documentTitle}
-                          </span>
-                          ".
-                        </span>
-                        <br /> Are you sure?
-                      </Trans>
-                    </span>
-                  )}
-                  {role === RecipientRole.APPROVER && (
-                    <span>
-                      <Trans>
-                        <span className="inline-flex flex-wrap">
-                          You are about to complete approving{' '}
-                          <span className="inline-block max-w-[11rem] truncate align-baseline">
-                            "{documentTitle}"
-                          </span>
-                          .
-                        </span>
-                        <br /> Are you sure?
-                      </Trans>
-                    </span>
-                  )}
-                </div>
-
-                <SigningDisclosure className="mt-4" />
-              </>
-            )}
-
-            <div className="flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
-              <div className="flex justify-center space-x-1.5 max-sm:order-1">
-                {[...Array(totalSteps)].map((_, index) => (
-                  <button
-                    key={index}
-                    onClick={() => setStep(index + 1)}
-                    className={cn(
-                      'bg-primary h-1.5 w-1.5 rounded-full',
-                      index + 1 === step ? 'bg-primary' : 'opacity-20',
-                    )}
-                    type="button"
-                    aria-label={`Go to step ${index + 1}`}
-                  />
-                ))}
-              </div>
-
-              <DialogFooter>
-                <DialogClose asChild>
-                  <Button type="button" variant="ghost">
-                    Cancel
-                  </Button>
-                </DialogClose>
-
-                {step === 1 && (
-                  <Button className="group" type="button" onClick={handleContinue}>
-                    Next
-                    <ArrowRight
-                      className="-me-1 ms-2 opacity-60 transition-transform group-hover:translate-x-0.5"
-                      size={16}
-                      strokeWidth={2}
-                      aria-hidden="true"
-                    />
-                  </Button>
-                )}
-
-                {step === 2 && (
-                  <Button
-                    type="button"
-                    className="flex-1"
-                    disabled={!isComplete}
-                    loading={isSubmitting}
-                    onClick={form.handleSubmit(onFormSubmit)}
-                  >
-                    {role === RecipientRole.VIEWER && <Trans>Mark as Viewed</Trans>}
-                    {role === RecipientRole.SIGNER && <Trans>Sign</Trans>}
-                    {role === RecipientRole.APPROVER && <Trans>Approve</Trans>}
-                  </Button>
-                )}
-              </DialogFooter>
-            </div>
-          </DialogContent>
-        </Dialog>
-      )}
-    </>
+            <Button
+              type="button"
+              className="flex-1"
+              disabled={!isComplete}
+              loading={isSubmitting}
+              onClick={onSignatureComplete}
+            >
+              {role === RecipientRole.VIEWER && <Trans>Mark as Viewed</Trans>}
+              {role === RecipientRole.SIGNER && <Trans>Sign</Trans>}
+              {role === RecipientRole.APPROVER && <Trans>Approve</Trans>}
+            </Button>
+          </div>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
-}
+};

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

@@ -49,7 +49,6 @@ export type SigningPageViewProps = {
   completedFields: CompletedField[];
   isRecipientsTurn: boolean;
   allRecipients?: RecipientWithFields[];
-  isLastRecipient: boolean;
 };
 
 export const SigningPageView = ({
@@ -59,7 +58,6 @@ export const SigningPageView = ({
   completedFields,
   isRecipientsTurn,
   allRecipients = [],
-  isLastRecipient,
 }: SigningPageViewProps) => {
   const { documentData, documentMeta } = document;
 
@@ -161,7 +159,6 @@ export const SigningPageView = ({
               redirectUrl={documentMeta?.redirectUrl}
               isRecipientsTurn={isRecipientsTurn}
               allRecipients={allRecipients}
-              isLastRecipient={isLastRecipient}
               setSelectedSignerId={setSelectedSignerId}
             />
           </div>

apps/web/src/app/embed/completed.tsx

@@ -10,6 +10,7 @@ export type EmbedDocumentCompletedPageProps = {
 };
 
 export const EmbedDocumentCompleted = ({ name, signature }: EmbedDocumentCompletedPageProps) => {
+  console.log({ signature });
   return (
     <div className="embed--DocumentCompleted relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
       <h3 className="text-foreground text-2xl font-semibold">

apps/web/src/app/embed/direct/[[...url]]/client.tsx

@@ -49,7 +49,7 @@ export type EmbedDirectTemplateClientPageProps = {
   fields: Field[];
   metadata?: DocumentMeta | TemplateMeta | null;
   hidePoweredBy?: boolean;
-  isPlatformOrEnterprise?: boolean;
+  allowWhiteLabelling?: boolean;
 };
 
 export const EmbedDirectTemplateClientPage = ({
@@ -60,7 +60,7 @@ export const EmbedDirectTemplateClientPage = ({
   fields,
   metadata,
   hidePoweredBy = false,
-  isPlatformOrEnterprise = false,
+  allowWhiteLabelling = false,
 }: EmbedDirectTemplateClientPageProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
@@ -288,7 +288,7 @@ export const EmbedDirectTemplateClientPage = ({
         document.documentElement.classList.add('dark-mode-disabled');
       }
 
-      if (isPlatformOrEnterprise) {
+      if (allowWhiteLabelling) {
         injectCss({
           css: data.css,
           cssVars: data.cssVars,

apps/web/src/app/embed/direct/[[...url]]/page.tsx

@@ -2,6 +2,7 @@ import { notFound } from 'next/navigation';
 
 import { match } from 'ts-pattern';
 
+import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
@@ -55,12 +56,16 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
     documentAuth: template.authOptions,
   });
 
-  const [isPlatformDocument, isEnterpriseDocument] = await Promise.all([
+  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
     isDocumentPlatform(template),
     isUserEnterprise({
       userId: template.userId,
       teamId: template.teamId ?? undefined,
     }),
+    isUserCommunityPlan({
+      userId: template.userId,
+      teamId: template.teamId ?? undefined,
+    }),
   ]);
 
   const isAccessAuthValid = match(derivedRecipientAccessAuth)
@@ -106,7 +111,7 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
             fields={fields}
             metadata={template.templateMeta}
             hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
-            isPlatformOrEnterprise={isPlatformDocument || isEnterpriseDocument}
+            allowWhiteLabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
           />
         </RecipientProvider>
       </DocumentAuthProvider>

apps/web/src/app/embed/rejected.tsx

@@ -0,0 +1,40 @@
+import { Trans } from '@lingui/macro';
+import { XCircle } from 'lucide-react';
+
+import type { Signature } from '@documenso/prisma/client';
+
+export type EmbedDocumentRejectedPageProps = {
+  name?: string;
+  signature?: Signature;
+};
+
+export const EmbedDocumentRejected = ({ name }: EmbedDocumentRejectedPageProps) => {
+  return (
+    <div className="embed--DocumentRejected relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
+      <div className="flex flex-col items-center">
+        <div className="flex items-center gap-x-4">
+          <XCircle className="text-destructive h-10 w-10" />
+
+          <h2 className="max-w-[35ch] text-center text-2xl font-semibold leading-normal md:text-3xl lg:text-4xl">
+            <Trans>Document Rejected</Trans>
+          </h2>
+        </div>
+
+        <div className="text-destructive mt-4 flex items-center text-center text-sm">
+          <Trans>You have rejected this document</Trans>
+        </div>
+
+        <p className="text-muted-foreground mt-6 max-w-[60ch] text-center text-sm">
+          <Trans>
+            The document owner has been notified of your decision. They may contact you with further
+            instructions if necessary.
+          </Trans>
+        </p>
+
+        <p className="text-muted-foreground mt-2 max-w-[60ch] text-center text-sm">
+          <Trans>No further action is required from you at this time.</Trans>
+        </p>
+      </div>
+    </div>
+  );
+};

apps/web/src/app/embed/sign/[[...url]]/client.tsx

@@ -10,7 +10,13 @@ import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn'
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { DocumentMeta, TemplateMeta } from '@documenso/prisma/client';
-import { type DocumentData, type Field, FieldType, RecipientRole } from '@documenso/prisma/client';
+import {
+  type DocumentData,
+  type Field,
+  FieldType,
+  RecipientRole,
+  SigningStatus,
+} from '@documenso/prisma/client';
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
@@ -26,11 +32,13 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
 import { RecipientProvider } from '~/app/(signing)/sign/[token]/recipient-context';
+import { RejectDocumentDialog } from '~/app/(signing)/sign/[token]/reject-document-dialog';
 import { Logo } from '~/components/branding/logo';
 
 import { EmbedClientLoading } from '../../client-loading';
 import { EmbedDocumentCompleted } from '../../completed';
 import { EmbedDocumentFields } from '../../document-fields';
+import { EmbedDocumentRejected } from '../../rejected';
 import { injectCss } from '../../util';
 import { ZSignDocumentEmbedDataSchema } from './schema';
 
@@ -43,7 +51,7 @@ export type EmbedSignDocumentClientPageProps = {
   metadata?: DocumentMeta | TemplateMeta | null;
   isCompleted?: boolean;
   hidePoweredBy?: boolean;
-  isPlatformOrEnterprise?: boolean;
+  allowWhitelabelling?: boolean;
   allRecipients?: RecipientWithFields[];
 };
 
@@ -56,7 +64,7 @@ export const EmbedSignDocumentClientPage = ({
   metadata,
   isCompleted,
   hidePoweredBy = false,
-  isPlatformOrEnterprise = false,
+  allowWhitelabelling = false,
   allRecipients = [],
 }: EmbedSignDocumentClientPageProps) => {
   const { _ } = useLingui();
@@ -75,6 +83,9 @@ export const EmbedSignDocumentClientPage = ({
   const [hasFinishedInit, setHasFinishedInit] = useState(false);
   const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
   const [hasCompletedDocument, setHasCompletedDocument] = useState(isCompleted);
+  const [hasRejectedDocument, setHasRejectedDocument] = useState(
+    recipient.signingStatus === SigningStatus.REJECTED,
+  );
   const [selectedSignerId, setSelectedSignerId] = useState<number | null>(
     allRecipients.length > 0 ? allRecipients[0].id : null,
   );
@@ -83,6 +94,8 @@ export const EmbedSignDocumentClientPage = ({
   const [isNameLocked, setIsNameLocked] = useState(false);
   const [showPendingFieldTooltip, setShowPendingFieldTooltip] = useState(false);
 
+  const [allowDocumentRejection, setAllowDocumentRejection] = useState(false);
+
   const selectedSigner = allRecipients.find((r) => r.id === selectedSignerId);
   const isAssistantMode = recipient.role === RecipientRole.ASSISTANT;
 
@@ -161,6 +174,25 @@ export const EmbedSignDocumentClientPage = ({
     }
   };
 
+  const onDocumentRejected = (reason: string) => {
+    if (window.parent) {
+      window.parent.postMessage(
+        {
+          action: 'document-rejected',
+          data: {
+            token,
+            documentId,
+            recipientId: recipient.id,
+            reason,
+          },
+        },
+        '*',
+      );
+    }
+
+    setHasRejectedDocument(true);
+  };
+
   useLayoutEffect(() => {
     const hash = window.location.hash.slice(1);
 
@@ -174,12 +206,13 @@ export const EmbedSignDocumentClientPage = ({
       // Since a recipient can be provided a name we can lock it without requiring
       // a to be provided by the parent application, unlike direct templates.
       setIsNameLocked(!!data.lockName);
+      setAllowDocumentRejection(!!data.allowDocumentRejection);
 
       if (data.darkModeDisabled) {
         document.documentElement.classList.add('dark-mode-disabled');
       }
 
-      if (isPlatformOrEnterprise) {
+      if (allowWhitelabelling) {
         injectCss({
           css: data.css,
           cssVars: data.cssVars,
@@ -208,6 +241,10 @@ export const EmbedSignDocumentClientPage = ({
     }
   }, [hasFinishedInit, hasDocumentLoaded]);
 
+  if (hasRejectedDocument) {
+    return <EmbedDocumentRejected name={fullName} />;
+  }
+
   if (hasCompletedDocument) {
     return (
       <EmbedDocumentCompleted
@@ -229,6 +266,16 @@ export const EmbedSignDocumentClientPage = ({
       <div className="embed--Root relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
         {(!hasFinishedInit || !hasDocumentLoaded) && <EmbedClientLoading />}
 
+        {allowDocumentRejection && (
+          <div className="embed--Actions mb-4 flex w-full flex-row-reverse items-baseline justify-between">
+            <RejectDocumentDialog
+              document={{ id: documentId }}
+              token={token}
+              onRejected={onDocumentRejected}
+            />
+          </div>
+        )}
+
         <div className="embed--DocumentContainer relative flex w-full flex-col gap-x-6 gap-y-12 md:flex-row">
           {/* Viewer */}
           <div className="embed--DocumentViewer flex-1">
@@ -420,7 +467,7 @@ export const EmbedSignDocumentClientPage = ({
                   </Button>
                 ) : (
                   <Button
-                    className="col-start-2"
+                    className={allowDocumentRejection ? 'col-start-2' : 'col-span-2'}
                     disabled={
                       isThrottled || (!isAssistantMode && hasSignatureField && !signatureValid)
                     }

apps/web/src/app/embed/sign/[[...url]]/page.tsx

@@ -2,6 +2,7 @@ import { notFound } from 'next/navigation';
 
 import { match } from 'ts-pattern';
 
+import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
@@ -62,12 +63,16 @@ export default async function EmbedSignDocumentPage({ params }: EmbedSignDocumen
     return <EmbedPaywall />;
   }
 
-  const [isPlatformDocument, isEnterpriseDocument] = await Promise.all([
+  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
     isDocumentPlatform(document),
     isUserEnterprise({
       userId: document.userId,
       teamId: document.teamId ?? undefined,
     }),
+    isUserCommunityPlan({
+      userId: document.userId,
+      teamId: document.teamId ?? undefined,
+    }),
   ]);
 
   const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
@@ -127,7 +132,7 @@ export default async function EmbedSignDocumentPage({ params }: EmbedSignDocumen
           metadata={document.documentMeta}
           isCompleted={document.status === DocumentStatus.COMPLETED}
           hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
-          isPlatformOrEnterprise={isPlatformDocument || isEnterpriseDocument}
+          allowWhitelabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
           allRecipients={allRecipients}
         />
       </DocumentAuthProvider>

apps/web/src/app/embed/sign/[[...url]]/schema.ts

@@ -13,4 +13,5 @@ export const ZSignDocumentEmbedDataSchema = ZBaseEmbedDataSchema.extend({
     .optional()
     .transform((value) => value || undefined),
   lockName: z.boolean().optional().default(false),
+  allowDocumentRejection: z.boolean().optional(),
 });

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "1.9.1-rc.1",
+  "version": "1.9.1-rc.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "1.9.1-rc.1",
+      "version": "1.9.1-rc.4",
       "workspaces": [
         "apps/*",
         "packages/*"
@@ -106,7 +106,7 @@
     },
     "apps/web": {
       "name": "@documenso/web",
-      "version": "1.9.1-rc.1",
+      "version": "1.9.1-rc.4",
       "license": "AGPL-3.0",
       "dependencies": {
         "@documenso/api": "*",
@@ -35722,21 +35722,6 @@
       "engines": {
         "node": ">=6"
       }
-    },
-    "packages/trpc/node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.6.tgz",
-      "integrity": "sha512-hNukAxq7hu4o5/UjPp5jqoBEtrpCbOmnUqZSKNJG8GrUVzfq0ucdhQFVrHcLRMvQcwqqDh1a5AJN9ORnNDpgBQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.9.1-rc.1",
+  "version": "1.9.1-rc.4",
   "scripts": {
     "build": "turbo run build",
     "build:web": "turbo run build --filter=@documenso/web",

packages/ee/server-only/util/is-community-plan.ts

@@ -0,0 +1,56 @@
+import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
+import { prisma } from '@documenso/prisma';
+import type { Subscription } from '@documenso/prisma/client';
+
+import { getCommunityPlanPriceIds } from '../stripe/get-community-plan-prices';
+
+export type IsCommunityPlanOptions = {
+  userId: number;
+  teamId?: number;
+};
+
+/**
+ * Whether the user or team is on the community plan.
+ */
+export const isCommunityPlan = async ({
+  userId,
+  teamId,
+}: IsCommunityPlanOptions): Promise<boolean> => {
+  let subscriptions: Subscription[] = [];
+
+  if (teamId) {
+    subscriptions = await prisma.team
+      .findFirstOrThrow({
+        where: {
+          id: teamId,
+        },
+        select: {
+          owner: {
+            include: {
+              subscriptions: true,
+            },
+          },
+        },
+      })
+      .then((team) => team.owner.subscriptions);
+  } else {
+    subscriptions = await prisma.user
+      .findFirstOrThrow({
+        where: {
+          id: userId,
+        },
+        select: {
+          subscriptions: true,
+        },
+      })
+      .then((user) => user.subscriptions);
+  }
+
+  if (subscriptions.length === 0) {
+    return false;
+  }
+
+  const communityPlanPriceIds = await getCommunityPlanPriceIds();
+
+  return subscriptionsContainsActivePlan(subscriptions, communityPlanPriceIds);
+};

packages/lib/server-only/document-meta/upsert-document-meta.ts

@@ -28,7 +28,6 @@ export type CreateDocumentMetaOptions = {
   distributionMethod?: DocumentDistributionMethod;
   typedSignatureEnabled?: boolean;
   language?: SupportedLanguageCodes;
-  modifyNextSigner?: boolean;
   requestMetadata: ApiRequestMetadata;
 };
 
@@ -47,7 +46,6 @@ export const upsertDocumentMeta = async ({
   distributionMethod,
   typedSignatureEnabled,
   language,
-  modifyNextSigner,
   requestMetadata,
 }: CreateDocumentMetaOptions) => {
   const document = await prisma.document.findFirst({
@@ -100,7 +98,6 @@ export const upsertDocumentMeta = async ({
         distributionMethod,
         typedSignatureEnabled,
         language,
-        modifyNextSigner,
       },
       update: {
         subject,
@@ -114,7 +111,6 @@ export const upsertDocumentMeta = async ({
         distributionMethod,
         typedSignatureEnabled,
         language,
-        modifyNextSigner,
       },
     });
 

packages/lib/server-only/document/complete-document-with-token.ts

@@ -12,6 +12,7 @@ import {
   WebhookTriggerEvents,
 } from '@documenso/prisma/client';
 
+import { AppError, AppErrorCode } from '../../errors/app-error';
 import { jobs } from '../../jobs/client';
 import type { TRecipientActionAuth } from '../../types/document-auth';
 import {
@@ -28,10 +29,6 @@ export type CompleteDocumentWithTokenOptions = {
   userId?: number;
   authOptions?: TRecipientActionAuth;
   requestMetadata?: RequestMetadata;
-  nextSigner?: {
-    email: string;
-    name: string;
-  };
 };
 
 const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptions) => {
@@ -55,53 +52,10 @@ const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptio
   });
 };
 
-export const delegateNextSigner = async ({
-  documentId,
-  currentRecipientId,
-  nextSigner,
-}: {
-  documentId: number;
-  currentRecipientId: number;
-  nextSigner: { email: string; name: string };
-}) => {
-  const document = await prisma.document.findUnique({
-    where: { id: documentId },
-    include: {
-      recipients: {
-        orderBy: [{ signingOrder: 'asc' }, { id: 'asc' }],
-      },
-    },
-  });
-
-  if (!document) {
-    throw new Error('Document not found');
-  }
-
-  const currentRecipient = document.recipients.find((r) => r.id === currentRecipientId);
-  const nextRecipient = document.recipients.find(
-    (r) => r.signingOrder === (currentRecipient?.signingOrder ?? 0) + 1,
-  );
-
-  if (!nextRecipient) {
-    throw new Error('Next recipient not found');
-  }
-
-  await prisma.recipient.update({
-    where: { id: nextRecipient.id },
-    data: {
-      email: nextSigner.email,
-      name: nextSigner.name,
-    },
-  });
-
-  return nextRecipient;
-};
-
 export const completeDocumentWithToken = async ({
   token,
   documentId,
   requestMetadata,
-  nextSigner,
 }: CompleteDocumentWithTokenOptions) => {
   const document = await getDocument({ token, documentId });
 
@@ -119,6 +73,13 @@ export const completeDocumentWithToken = async ({
     throw new Error(`Recipient ${recipient.id} has already signed`);
   }
 
+  if (recipient.signingStatus === SigningStatus.REJECTED) {
+    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+      message: 'Recipient has already rejected the document',
+      statusCode: 400,
+    });
+  }
+
   if (document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL) {
     const isRecipientsTurn = await getIsRecipientsTurnToSign({ token: recipient.token });
 
@@ -159,18 +120,6 @@ export const completeDocumentWithToken = async ({
   //   throw new AppError(AppErrorCode.UNAUTHORIZED, 'Invalid authentication values');
   // }
 
-  if (
-    nextSigner &&
-    document.documentMeta?.modifyNextSigner &&
-    document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL
-  ) {
-    await delegateNextSigner({
-      documentId: document.id,
-      currentRecipientId: recipient.id,
-      nextSigner,
-    });
-  }
-
   await prisma.$transaction(async (tx) => {
     await tx.recipient.update({
       where: {

packages/lib/server-only/document/find-documents.ts

@@ -88,6 +88,7 @@ export const findDocuments = async ({
   const searchFilter: Prisma.DocumentWhereInput = {
     OR: [
       { title: { contains: query, mode: 'insensitive' } },
+      { externalId: { contains: query, mode: 'insensitive' } },
       { recipients: { some: { name: { contains: query, mode: 'insensitive' } } } },
       { recipients: { some: { email: { contains: query, mode: 'insensitive' } } } },
     ],

packages/lib/server-only/document/search-documents-with-keyword.ts

@@ -34,6 +34,14 @@ export const searchDocumentsWithKeyword = async ({
           userId: userId,
           deletedAt: null,
         },
+        {
+          externalId: {
+            contains: query,
+            mode: 'insensitive',
+          },
+          userId: userId,
+          deletedAt: null,
+        },
         {
           recipients: {
             some: {
@@ -88,6 +96,23 @@ export const searchDocumentsWithKeyword = async ({
           },
           deletedAt: null,
         },
+        {
+          externalId: {
+            contains: query,
+            mode: 'insensitive',
+          },
+          teamId: {
+            not: null,
+          },
+          team: {
+            members: {
+              some: {
+                userId: userId,
+              },
+            },
+          },
+          deletedAt: null,
+        },
       ],
     },
     include: {

packages/lib/server-only/recipient/get-is-last-recipient.ts

@@ -1,46 +0,0 @@
-import { prisma } from '@documenso/prisma';
-import { DocumentSigningOrder, RecipientRole, SigningStatus } from '@documenso/prisma/client';
-
-export type GetIsLastRecipientOptions = {
-  token: string;
-};
-
-export async function getIsLastRecipient({ token }: GetIsLastRecipientOptions) {
-  const document = await prisma.document.findFirstOrThrow({
-    where: {
-      recipients: {
-        some: {
-          token,
-        },
-      },
-    },
-    include: {
-      documentMeta: true,
-      recipients: {
-        where: {
-          role: {
-            not: RecipientRole.CC,
-          },
-        },
-        orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
-      },
-    },
-  });
-
-  if (document.documentMeta?.signingOrder !== DocumentSigningOrder.SEQUENTIAL) {
-    const unsignedRecipients = document.recipients.filter(
-      (recipient) => recipient.signingStatus !== SigningStatus.SIGNED,
-    );
-
-    return unsignedRecipients.length <= 1;
-  }
-
-  const { recipients } = document;
-  const currentRecipientIndex = recipients.findIndex((r) => r.token === token);
-
-  if (currentRecipientIndex === -1) {
-    return false;
-  }
-
-  return currentRecipientIndex === recipients.length - 1;
-}

packages/lib/types/document.ts

@@ -55,7 +55,6 @@ export const ZDocumentSchema = DocumentSchema.pick({
     typedSignatureEnabled: true,
     language: true,
     emailSettings: true,
-    modifyNextSigner: true,
   }).nullable(),
   recipients: ZRecipientLiteSchema.array(),
   fields: ZFieldSchema.array(),

packages/prisma/migrations/20250213164804_add_modify_next_signer_meta/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "DocumentMeta" ADD COLUMN     "modifyNextSigner" BOOLEAN NOT NULL DEFAULT false;

packages/prisma/migrations/20250214131444_add_modify_signer_to_template_meta/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "TemplateMeta" ADD COLUMN     "modifyNextSigner" BOOLEAN NOT NULL DEFAULT false;

packages/prisma/migrations/20250217120859_add_session_fields/migration.sql

@@ -0,0 +1,18 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `expires` on the `Session` table. All the data in the column will be lost.
+  - Added the required column `expiresAt` to the `Session` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `updatedAt` to the `Session` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Account" ADD COLUMN     "password" TEXT;
+
+-- AlterTable
+ALTER TABLE "Session" DROP COLUMN "expires",
+ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ADD COLUMN     "expiresAt" TIMESTAMP(3) NOT NULL,
+ADD COLUMN     "ipAddress" TEXT,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL,
+ADD COLUMN     "userAgent" TEXT;

packages/prisma/schema.prisma

@@ -270,18 +270,25 @@ model Account {
   scope             String?
   id_token          String? @db.Text
   session_state     String?
+  password          String?
 
-  user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
+  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([provider, providerAccountId])
 }
 
 model Session {
-  id           String   @id @default(cuid())
-  sessionToken String   @unique
+  id           String @id @default(cuid())
+  sessionToken String @unique
   userId       Int
-  expires      DateTime
-  user         User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  ipAddress String?
+  userAgent String?
+  expiresAt DateTime
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
 enum DocumentStatus {
@@ -390,7 +397,6 @@ model DocumentMeta {
   document              Document                   @relation(fields: [documentId], references: [id], onDelete: Cascade)
   redirectUrl           String?
   signingOrder          DocumentSigningOrder       @default(PARALLEL)
-  modifyNextSigner      Boolean                    @default(false)
   typedSignatureEnabled Boolean                    @default(true)
   language              String                     @default("en")
   distributionMethod    DocumentDistributionMethod @default(EMAIL)
@@ -660,7 +666,6 @@ model TemplateMeta {
   signingOrder          DocumentSigningOrder?      @default(PARALLEL)
   typedSignatureEnabled Boolean                    @default(true)
   distributionMethod    DocumentDistributionMethod @default(EMAIL)
-  modifyNextSigner      Boolean                    @default(false)
 
   templateId    Int      @unique
   template      Template @relation(fields: [templateId], references: [id], onDelete: Cascade)

packages/trpc/server/document-router/router.ts

@@ -266,14 +266,15 @@ export const documentRouter = router({
 
   /**
    * @public
+   *
+   * Todo: Refactor to updateDocument.
    */
-  updateDocument: authenticatedProcedure
+  setSettingsForDocument: authenticatedProcedure
     .meta({
       openapi: {
         method: 'POST',
         path: '/document/update',
         summary: 'Update document',
-        description: 'Update an existing document',
         tags: ['Document'],
       },
     })
@@ -285,9 +286,9 @@ export const documentRouter = router({
 
       const userId = ctx.user.id;
 
-      if (Object.keys(meta).length > 0) {
+      if (Object.values(meta).length > 0) {
         await upsertDocumentMeta({
-          userId,
+          userId: ctx.user.id,
           teamId,
           documentId,
           subject: meta.subject,
@@ -300,7 +301,6 @@ export const documentRouter = router({
           distributionMethod: meta.distributionMethod,
           signingOrder: meta.signingOrder,
           emailSettings: meta.emailSettings,
-          modifyNextSigner: meta.modifyNextSigner,
           requestMetadata: ctx.metadata,
         });
       }

packages/trpc/server/document-router/schema.ts

@@ -251,7 +251,6 @@ export const ZUpdateDocumentRequestSchema = z.object({
       language: ZDocumentMetaLanguageSchema.optional(),
       typedSignatureEnabled: ZDocumentMetaTypedSignatureEnabledSchema.optional(),
       emailSettings: ZDocumentEmailSettingsSchema.optional(),
-      modifyNextSigner: z.boolean().optional(),
     })
     .optional(),
 });

packages/trpc/server/recipient-router/router.ts

@@ -437,14 +437,13 @@ export const recipientRouter = router({
   completeDocumentWithToken: procedure
     .input(ZCompleteDocumentWithTokenMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      const { token, documentId, authOptions, nextSigner } = input;
+      const { token, documentId, authOptions } = input;
 
       return await completeDocumentWithToken({
         token,
         documentId,
         authOptions,
         userId: ctx.user?.id,
-        nextSigner,
         requestMetadata: extractNextApiRequestMetadata(ctx.req),
       });
     }),

packages/trpc/server/recipient-router/schema.ts

@@ -212,12 +212,6 @@ export const ZCompleteDocumentWithTokenMutationSchema = z.object({
   token: z.string(),
   documentId: z.number(),
   authOptions: ZRecipientActionAuthSchema.optional(),
-  nextSigner: z
-    .object({
-      email: z.string().email(),
-      name: z.string(),
-    })
-    .optional(),
 });
 
 export type TCompleteDocumentWithTokenMutationSchema = z.infer<

packages/ui/primitives/document-flow/add-signers.tsx

@@ -49,7 +49,6 @@ export type AddSignersFormProps = {
   recipients: Recipient[];
   fields: Field[];
   signingOrder?: DocumentSigningOrder | null;
-  modifyNextSigner?: boolean | null;
   isDocumentEnterprise: boolean;
   onSubmit: (_data: TAddSignersFormSchema) => void;
   isDocumentPdfLoaded: boolean;
@@ -60,7 +59,6 @@ export const AddSignersFormPartial = ({
   recipients,
   fields,
   signingOrder,
-  modifyNextSigner,
   isDocumentEnterprise,
   onSubmit,
   isDocumentPdfLoaded,
@@ -109,7 +107,6 @@ export const AddSignersFormPartial = ({
             )
           : defaultRecipients,
       signingOrder: signingOrder || DocumentSigningOrder.PARALLEL,
-      modifyNextSigner: modifyNextSigner ?? false,
     },
   });
 
@@ -407,35 +404,6 @@ export const AddSignersFormPartial = ({
                 </FormItem>
               )}
             />
-
-            {isSigningOrderSequential && (
-              <FormField
-                control={form.control}
-                name="modifyNextSigner"
-                render={({ field }) => (
-                  <FormItem className="mb-6 flex flex-row items-center space-x-2 space-y-0">
-                    <FormControl>
-                      <Checkbox
-                        id="modifyNextSigner"
-                        checked={field.value}
-                        onCheckedChange={(checked) => {
-                          field.onChange(checked);
-                        }}
-                        disabled={isSubmitting || hasDocumentBeenSent}
-                      />
-                    </FormControl>
-
-                    <FormLabel
-                      htmlFor="modifyNextSigner"
-                      className="text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                    >
-                      <Trans>Modify next signer</Trans>
-                    </FormLabel>
-                  </FormItem>
-                )}
-              />
-            )}
-
             <DragDropContext
               onDragEnd={onDragEnd}
               sensors={[

packages/ui/primitives/document-flow/add-signers.types.ts

@@ -25,7 +25,6 @@ export const ZAddSignersFormSchema = z
       }),
     ),
     signingOrder: z.nativeEnum(DocumentSigningOrder),
-    modifyNextSigner: z.boolean(),
   })
   .refine(
     (schema) => {

packages/ui/primitives/form/form.tsx

@@ -183,12 +183,12 @@ const FormMessage = React.forwardRef<
 FormMessage.displayName = 'FormMessage';
 
 export {
+  useFormField,
   Form,
-  FormControl,
-  FormDescription,
-  FormField,
   FormItem,
   FormLabel,
+  FormControl,
+  FormDescription,
   FormMessage,
-  useFormField,
+  FormField,
 };