The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: create full sentences for document-signing-auth files (#2451)
McMek590cf8e21bf3500
diff --git a/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx b/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsxindex e0b5ca2b1..be2b8f895 100644--- a/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx@@ -4,6 +4,7 @@ import { zodResolver } from '@hookform/resolvers/zod';import { Trans } from '@lingui/react/macro';import { RecipientRole } from '@prisma/client';import { useForm } from 'react-hook-form';+import { match } from 'ts-pattern';import { z } from 'zod';import { AppError } from '@documenso/lib/errors/app-error';@@ -27,7 +28,6 @@ import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-pexport type DocumentSigningAuth2FAProps = {actionTarget?: 'FIELD' | 'DOCUMENT';- actionVerb?: string;open: boolean;onOpenChange: (value: boolean) => void;onReauthFormSubmit: (values?: TRecipientActionAuth) => Promise<void> | void;@@ -44,7 +44,6 @@ type T2FAAuthFormSchema = z.infer<typeof Z2FAAuthFormSchema>;export const DocumentSigningAuth2FA = ({actionTarget = 'FIELD',- actionVerb = 'sign',onReauthFormSubmit,open,onOpenChange,@@ -101,14 +100,39 @@ export const DocumentSigningAuth2FA = ({<Alert variant="warning"><AlertDescription><p>- {recipient.role === RecipientRole.VIEWER && actionTarget === 'DOCUMENT' ? (- <Trans>You need to setup 2FA to mark this document as viewed.</Trans>- ) : (- // Todo: Translate- `You need to setup 2FA to ${actionVerb.toLowerCase()} this ${actionTarget.toLowerCase()}.`- )}+ {match({ role: recipient.role, actionTarget })+ .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup 2FA to sign this field.</Trans>+ ))+ .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup 2FA to sign this document.</Trans>+ ))+ .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup 2FA to approve this field.</Trans>+ ))+ .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup 2FA to approve this document.</Trans>+ ))+ .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup 2FA to view this field.</Trans>+ ))+ .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup 2FA to mark this document as viewed.</Trans>+ ))+ .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup 2FA to view this field.</Trans>+ ))+ .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup 2FA to view this document.</Trans>+ ))+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup 2FA to assist with this field.</Trans>+ ))+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup 2FA to assist with this document.</Trans>+ ))+ .exhaustive()}</p>-<p className="mt-2"><Trans>By enabling 2FA, you will be required to enter a code from your authenticator app@@ -138,7 +162,9 @@ export const DocumentSigningAuth2FA = ({name="token"render={({ field }) => (<FormItem>- <FormLabel required>2FA token</FormLabel>+ <FormLabel required>+ <Trans>2FA token</Trans>+ </FormLabel><FormControl><PinInput {...field} value={field.value ?? ''} maxLength={6}>diff --git a/apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx b/apps/remix/app/components/general/document-signing/document-signing-auth-account.tsxindex 3d991d5ee..cd3fc057c 100644--- a/apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx@@ -2,6 +2,7 @@ import { useState } from 'react';import { Trans, useLingui } from '@lingui/react/macro';import { RecipientRole } from '@prisma/client';+import { match } from 'ts-pattern';import { authClient } from '@documenso/auth/client';import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';@@ -13,13 +14,11 @@ import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-pexport type DocumentSigningAuthAccountProps = {actionTarget?: 'FIELD' | 'DOCUMENT';- actionVerb?: string;onOpenChange: (value: boolean) => void;};export const DocumentSigningAuthAccount = ({actionTarget = 'FIELD',- actionVerb = 'sign',onOpenChange,}: DocumentSigningAuthAccountProps) => {const { recipient, isDirectTemplate } = useRequiredDocumentSigningAuthContext();@@ -55,32 +54,110 @@ export const DocumentSigningAuthAccount = ({<fieldset disabled={isSigningOut} className="space-y-4"><Alert variant="warning"><AlertDescription>- {actionTarget === 'DOCUMENT' && recipient.role === RecipientRole.VIEWER ? (- <span>- {isDirectTemplate ? (- <Trans>To mark this document as viewed, you need to be logged in.</Trans>- ) : (- <Trans>- To mark this document as viewed, you need to be logged in as{' '}- <strong>{recipient.email}</strong>- </Trans>- )}- </span>- ) : (- <span>- {isDirectTemplate ? (- <Trans>- To {actionVerb.toLowerCase()} this {actionTarget.toLowerCase()}, you need to be- logged in.- </Trans>- ) : (- <Trans>- To {actionVerb.toLowerCase()} this {actionTarget.toLowerCase()}, you need to be- logged in as <strong>{recipient.email}</strong>- </Trans>- )}- </span>- )}+ <span>+ {match({ role: recipient.role, actionTarget })+ .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () =>+ isDirectTemplate ? (+ <Trans>To sign this field, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To sign this field, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () =>+ isDirectTemplate ? (+ <Trans>To sign this document, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To sign this document, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () =>+ isDirectTemplate ? (+ <Trans>To approve this field, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To approve this field, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () =>+ isDirectTemplate ? (+ <Trans>To approve this document, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To approve this document, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () =>+ isDirectTemplate ? (+ <Trans>To view this field, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To view this field, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () =>+ isDirectTemplate ? (+ <Trans>To mark this document as viewed, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To mark this document as viewed, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () =>+ isDirectTemplate ? (+ <Trans>To view this field, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To view this field, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () =>+ isDirectTemplate ? (+ <Trans>To view this document, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To view this document, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () =>+ isDirectTemplate ? (+ <Trans>To assist with this field, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To assist with this field, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () =>+ isDirectTemplate ? (+ <Trans>To assist with this document, you need to be logged in.</Trans>+ ) : (+ <Trans>+ To assist with this document, you need to be logged in as{' '}+ <strong>{recipient.email}</strong>+ </Trans>+ ),+ )+ .exhaustive()}+ </span></AlertDescription></Alert>diff --git a/apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx b/apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsxindex 9cdb2e28a..0c3fa1201 100644--- a/apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx@@ -8,6 +8,7 @@ import { RecipientRole } from '@prisma/client';import { browserSupportsWebAuthn, startAuthentication } from '@simplewebauthn/browser';import { Loader } from 'lucide-react';import { useForm } from 'react-hook-form';+import { match } from 'ts-pattern';import { z } from 'zod';import { AppError } from '@documenso/lib/errors/app-error';@@ -38,7 +39,6 @@ import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-pexport type DocumentSigningAuthPasskeyProps = {actionTarget?: 'FIELD' | 'DOCUMENT';- actionVerb?: string;open: boolean;onOpenChange: (value: boolean) => void;onReauthFormSubmit: (values?: TRecipientActionAuth) => Promise<void> | void;@@ -52,7 +52,6 @@ type TPasskeyAuthFormSchema = z.infer<typeof ZPasskeyAuthFormSchema>;export const DocumentSigningAuthPasskey = ({actionTarget = 'FIELD',- actionVerb = 'sign',onReauthFormSubmit,open,onOpenChange,@@ -128,9 +127,62 @@ export const DocumentSigningAuthPasskey = ({<div className="space-y-4"><Alert variant="warning"><AlertDescription>- {/* Todo: Translate */}- Your browser does not support passkeys, which is required to {actionVerb.toLowerCase()}{' '}- this {actionTarget.toLowerCase()}.+ {match({ role: recipient.role, actionTarget })+ .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to sign this field.+ </Trans>+ ))+ .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to sign this document.+ </Trans>+ ))+ .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to approve this field.+ </Trans>+ ))+ .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to approve this+ document.+ </Trans>+ ))+ .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to view this field.+ </Trans>+ ))+ .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to mark this document as+ viewed.+ </Trans>+ ))+ .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to view this field.+ </Trans>+ ))+ .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to view this document.+ </Trans>+ ))+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to assist with this+ field.+ </Trans>+ ))+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () => (+ <Trans>+ Your browser does not support passkeys, which is required to assist with this+ document.+ </Trans>+ ))+ .exhaustive()}</AlertDescription></Alert>@@ -178,10 +230,38 @@ export const DocumentSigningAuthPasskey = ({<div className="space-y-4"><Alert variant="warning"><AlertDescription>- {/* Todo: Translate */}- {recipient.role === RecipientRole.VIEWER && actionTarget === 'DOCUMENT'- ? 'You need to setup a passkey to mark this document as viewed.'- : `You need to setup a passkey to ${actionVerb.toLowerCase()} this ${actionTarget.toLowerCase()}.`}+ {match({ role: recipient.role, actionTarget })+ .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup a passkey to sign this field.</Trans>+ ))+ .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup a passkey to sign this document.</Trans>+ ))+ .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup a passkey to approve this field.</Trans>+ ))+ .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup a passkey to approve this document.</Trans>+ ))+ .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup a passkey to view this field.</Trans>+ ))+ .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup a passkey to mark this document as viewed.</Trans>+ ))+ .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup a passkey to view this field.</Trans>+ ))+ .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup a passkey to view this document.</Trans>+ ))+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () => (+ <Trans>You need to setup a passkey to assist with this field.</Trans>+ ))+ .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () => (+ <Trans>You need to setup a passkey to assist with this document.</Trans>+ ))+ .exhaustive()}</AlertDescription></Alert>@@ -213,7 +293,9 @@ export const DocumentSigningAuthPasskey = ({name="passkeyId"render={({ field }) => (<FormItem>- <FormLabel required>Passkey</FormLabel>+ <FormLabel required>+ <Trans>Passkey</Trans>+ </FormLabel><FormControl><Select {...field} onValueChange={field.onChange}>@@ -241,20 +323,24 @@ export const DocumentSigningAuthPasskey = ({{formErrorCode && (<Alert variant="destructive">- <AlertTitle>Unauthorized</AlertTitle>+ <AlertTitle>+ <Trans>Unauthorized</Trans>+ </AlertTitle><AlertDescription>- We were unable to verify your details. Please try again or contact support+ <Trans>+ We were unable to verify your details. Please try again or contact support+ </Trans></AlertDescription></Alert>)}<DialogFooter><Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>- Cancel+ <Trans>Cancel</Trans></Button><Button type="submit" loading={isCurrentlyAuthenticating}>- Sign+ <Trans>Sign</Trans></Button></DialogFooter></div>diff --git a/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx b/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsxindex 5f365d452..684ae6bf0 100644--- a/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx@@ -23,8 +23,6 @@ import { Input } from '@documenso/ui/primitives/input';import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-provider';export type DocumentSigningAuthPasswordProps = {- actionTarget?: 'FIELD' | 'DOCUMENT';- actionVerb?: string;open: boolean;onOpenChange: (value: boolean) => void;onReauthFormSubmit: (values?: TRecipientActionAuth) => Promise<void> | void;@@ -40,8 +38,6 @@ const ZPasswordAuthFormSchema = z.object({type TPasswordAuthFormSchema = z.infer<typeof ZPasswordAuthFormSchema>;export const DocumentSigningAuthPassword = ({- actionTarget = 'FIELD',- actionVerb = 'sign',onReauthFormSubmit,open,onOpenChange,