fix: merge conflicts

packages/lib/utils/document-audit-logs.ts

@@ -1,14 +1,10 @@
+import type { I18n } from '@lingui/core';
+import { msg } from '@lingui/macro';
 import { match } from 'ts-pattern';
 
-import type {
-  DocumentAuditLog,
-  DocumentMeta,
-  Field,
-  Recipient,
-  RecipientRole,
-} from '@documenso/prisma/client';
+import type { DocumentAuditLog, DocumentMeta, Field, Recipient } from '@documenso/prisma/client';
+import { RecipientRole } from '@documenso/prisma/client';
 
-import { RECIPIENT_ROLES_DESCRIPTION_ENG } from '../constants/recipient-roles';
 import type {
   TDocumentAuditLog,
   TDocumentAuditLogDocumentMetaDiffSchema,
@@ -254,133 +250,133 @@ export const diffDocumentMetaChanges = (
  *
  * Provide a userId to prefix the action with the user, example 'X did Y'.
  */
-export const formatDocumentAuditLogActionString = (
+export const formatDocumentAuditLogAction = (
+  _: I18n['_'],
   auditLog: TDocumentAuditLog,
   userId?: number,
 ) => {
-  const { prefix, description } = formatDocumentAuditLogAction(auditLog, userId);
-
-  return prefix ? `${prefix} ${description}` : description;
-};
-
-/**
- * Formats the audit log into a description of the action.
- *
- * Provide a userId to prefix the action with the user, example 'X did Y'.
- */
-// Todo: Translations.
-export const formatDocumentAuditLogAction = (auditLog: TDocumentAuditLog, userId?: number) => {
-  let prefix = userId === auditLog.userId ? 'You' : auditLog.name || auditLog.email || '';
+  const prefix = userId === auditLog.userId ? _(msg`You`) : auditLog.name || auditLog.email || '';
 
   const description = match(auditLog)
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_CREATED }, () => ({
-      anonymous: 'A field was added',
-      identified: 'added a field',
+      anonymous: msg`A field was added`,
+      identified: msg`${prefix} added a field`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_DELETED }, () => ({
-      anonymous: 'A field was removed',
-      identified: 'removed a field',
+      anonymous: msg`A field was removed`,
+      identified: msg`${prefix} removed a field`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_UPDATED }, () => ({
-      anonymous: 'A field was updated',
-      identified: 'updated a field',
+      anonymous: msg`A field was updated`,
+      identified: msg`${prefix} updated a field`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_CREATED }, () => ({
-      anonymous: 'A recipient was added',
-      identified: 'added a recipient',
+      anonymous: msg`A recipient was added`,
+      identified: msg`${prefix} added a recipient`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_DELETED }, () => ({
-      anonymous: 'A recipient was removed',
-      identified: 'removed a recipient',
+      anonymous: msg`A recipient was removed`,
+      identified: msg`${prefix} removed a recipient`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED }, () => ({
-      anonymous: 'A recipient was updated',
-      identified: 'updated a recipient',
+      anonymous: msg`A recipient was updated`,
+      identified: msg`${prefix} updated a recipient`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED }, () => ({
-      anonymous: 'Document created',
-      identified: 'created the document',
+      anonymous: msg`Document created`,
+      identified: msg`${prefix} created the document`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED }, () => ({
-      anonymous: 'Document deleted',
-      identified: 'deleted the document',
+      anonymous: msg`Document deleted`,
+      identified: msg`${prefix} deleted the document`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RESTORED }, () => ({
       anonymous: 'Document restored',
       identified: 'restored the document',
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED }, () => ({
-      anonymous: 'Field signed',
-      identified: 'signed a field',
+      anonymous: msg`Field signed`,
+      identified: msg`${prefix} signed a field`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_UNINSERTED }, () => ({
-      anonymous: 'Field unsigned',
-      identified: 'unsigned a field',
+      anonymous: msg`Field unsigned`,
+      identified: msg`${prefix} unsigned a field`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_VISIBILITY_UPDATED }, () => ({
-      anonymous: 'Document visibility updated',
-      identified: 'updated the document visibility',
+      anonymous: msg`Document visibility updated`,
+      identified: msg`${prefix} updated the document visibility`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_GLOBAL_AUTH_ACCESS_UPDATED }, () => ({
-      anonymous: 'Document access auth updated',
-      identified: 'updated the document access auth requirements',
+      anonymous: msg`Document access auth updated`,
+      identified: msg`${prefix} updated the document access auth requirements`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_GLOBAL_AUTH_ACTION_UPDATED }, () => ({
-      anonymous: 'Document signing auth updated',
-      identified: 'updated the document signing auth requirements',
+      anonymous: msg`Document signing auth updated`,
+      identified: msg`${prefix} updated the document signing auth requirements`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_META_UPDATED }, () => ({
-      anonymous: 'Document updated',
-      identified: 'updated the document',
+      anonymous: msg`Document updated`,
+      identified: msg`${prefix} updated the document`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED }, () => ({
-      anonymous: 'Document opened',
-      identified: 'opened the document',
+      anonymous: msg`Document opened`,
+      identified: msg`${prefix} opened the document`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_TITLE_UPDATED }, () => ({
-      anonymous: 'Document title updated',
-      identified: 'updated the document title',
+      anonymous: msg`Document title updated`,
+      identified: msg`${prefix} updated the document title`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_EXTERNAL_ID_UPDATED }, () => ({
-      anonymous: 'Document external ID updated',
-      identified: 'updated the document external ID',
+      anonymous: msg`Document external ID updated`,
+      identified: msg`${prefix} updated the document external ID`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT }, () => ({
-      anonymous: 'Document sent',
-      identified: 'sent the document',
+      anonymous: msg`Document sent`,
+      identified: msg`${prefix} sent the document`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_MOVED_TO_TEAM }, () => ({
-      anonymous: 'Document moved to team',
-      identified: 'moved the document to team',
+      anonymous: msg`Document moved to team`,
+      identified: msg`${prefix} moved the document to team`,
     }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED }, ({ data }) => {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const action = RECIPIENT_ROLES_DESCRIPTION_ENG[data.recipientRole as RecipientRole]?.actioned;
+      const userName = prefix || _(msg`Recipient`);
 
-      const value = action ? `${action.toLowerCase()} the document` : 'completed their task';
+      const result = match(data.recipientRole)
+        .with(RecipientRole.SIGNER, () => msg`${userName} signed the document`)
+        .with(RecipientRole.VIEWER, () => msg`${userName} viewed the document`)
+        .with(RecipientRole.APPROVER, () => msg`${userName} approved the document`)
+        .with(RecipientRole.CC, () => msg`${userName} CC'd the document`)
+        .otherwise(() => msg`${userName} completed their task`);
 
       return {
-        anonymous: `Recipient ${value}`,
-        identified: value,
+        anonymous: result,
+        identified: result,
+      };
+    })
+    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_REJECTED }, ({ data }) => {
+      const userName = prefix || _(msg`Recipient`);
+
+      const result = msg`${userName} rejected the document`;
+
+      return {
+        anonymous: result,
+        identified: result,
       };
     })
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT }, ({ data }) => ({
-      anonymous: `Email ${data.isResending ? 'resent' : 'sent'}`,
-      identified: `${data.isResending ? 'resent' : 'sent'} an email to ${data.recipientEmail}`,
+      anonymous: data.isResending ? msg`Email resent` : msg`Email sent`,
+      identified: data.isResending
+        ? msg`${prefix} resent an email to ${data.recipientEmail}`
+        : msg`${prefix} sent an email to ${data.recipientEmail}`,
+    }))
+    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED }, () => ({
+      anonymous: msg`Document completed`,
+      identified: msg`Document completed`,
     }))
-    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED }, () => {
-      // Clear the prefix since this should be considered an 'anonymous' event.
-      prefix = '';
-
-      return {
-        anonymous: 'Document completed',
-        identified: 'Document completed',
-      };
-    })
     .exhaustive();
 
   return {
     prefix,
-    description: prefix ? description.identified : description.anonymous,
+    description: _(prefix ? description.identified : description.anonymous),
   };
 };

packages/lib/utils/i18n.ts

@@ -1,6 +1,6 @@
 import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies';
 
-import type { I18n } from '@lingui/core';
+import type { I18n, MessageDescriptor } from '@lingui/core';
 
 import { IS_APP_WEB, IS_APP_WEB_I18N_ENABLED } from '../constants/app';
 import type { I18nLocaleData, SupportedLanguageCodes } from '../constants/i18n';
@@ -10,7 +10,17 @@ export async function dynamicActivate(i18nInstance: I18n, locale: string) {
   const extension = process.env.NODE_ENV === 'development' ? 'po' : 'js';
   const context = IS_APP_WEB ? 'web' : 'marketing';
 
-  const { messages } = await import(`../translations/${locale}/${context}.${extension}`);
+  let { messages } = await import(`../translations/${locale}/${context}.${extension}`);
+
+  // Dirty way to load common messages for development since it's not compiled.
+  if (process.env.NODE_ENV === 'development') {
+    const commonMessages = await import(`../translations/${locale}/common.${extension}`);
+
+    messages = {
+      ...messages,
+      ...commonMessages.messages,
+    };
+  }
 
   i18nInstance.loadAndActivate({ locale, messages });
 }
@@ -106,3 +116,7 @@ export const extractLocaleData = ({
     locales,
   };
 };
+
+export const parseMessageDescriptor = (_: I18n['_'], value: string | MessageDescriptor) => {
+  return typeof value === 'string' ? value : _(value);
+};

packages/lib/utils/is-valid-redirect-url.ts

@@ -4,7 +4,6 @@ export const isValidRedirectUrl = (value: string) => {
   try {
     const url = new URL(value);
 
-    console.log({ protocol: url.protocol });
     if (!ALLOWED_PROTOCOLS.includes(url.protocol.slice(0, -1).toLowerCase())) {
       return false;
     }

packages/lib/utils/recipients.ts

@@ -1,5 +1,9 @@
 import { type Field, type Recipient, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 
+import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';
+
+export const formatSigningLink = (token: string) => `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${token}`;
+
 /**
  * Whether a recipient can be modified by the document owner.
  */

packages/lib/utils/remember.ts

@@ -0,0 +1,18 @@
+declare global {
+  // eslint-disable-next-line no-var, @typescript-eslint/no-explicit-any
+  var __documenso_util_remember: Map<string, any>;
+}
+
+export function remember<T>(name: string, getValue: () => T): T {
+  const thusly = globalThis;
+
+  if (!thusly.__documenso_util_remember) {
+    thusly.__documenso_util_remember = new Map();
+  }
+
+  if (!thusly.__documenso_util_remember.has(name)) {
+    thusly.__documenso_util_remember.set(name, getValue());
+  }
+
+  return thusly.__documenso_util_remember.get(name);
+}

packages/lib/utils/render-email-with-i18n.tsx

@@ -0,0 +1,34 @@
+import { I18nProvider } from '@lingui/react';
+
+import type { RenderOptions } from '@documenso/email/render';
+import { render } from '@documenso/email/render';
+
+import { getI18nInstance } from '../client-only/providers/i18n.server';
+import {
+  APP_I18N_OPTIONS,
+  type SupportedLanguageCodes,
+  isValidLanguageCode,
+} from '../constants/i18n';
+
+export const renderEmailWithI18N = async (
+  component: React.ReactElement,
+  options?: RenderOptions & {
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    lang?: SupportedLanguageCodes | (string & {});
+  },
+) => {
+  try {
+    const { lang: providedLang, ...otherOptions } = options ?? {};
+
+    const lang = isValidLanguageCode(providedLang) ? providedLang : APP_I18N_OPTIONS.sourceLang;
+
+    const i18n = await getI18nInstance(lang);
+
+    i18n.activate(lang);
+
+    return render(<I18nProvider i18n={i18n}>{component}</I18nProvider>, otherOptions);
+  } catch (err) {
+    console.error(err);
+    throw new Error('Failed to render email');
+  }
+};

packages/lib/utils/team-global-settings-to-branding.ts

@@ -0,0 +1,13 @@
+import type { TeamGlobalSettings } from '@documenso/prisma/client';
+
+import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';
+
+export const teamGlobalSettingsToBranding = (teamGlobalSettings: TeamGlobalSettings) => {
+  return {
+    ...teamGlobalSettings,
+    brandingLogo:
+      teamGlobalSettings.brandingEnabled && teamGlobalSettings.brandingLogo
+        ? `${NEXT_PUBLIC_WEBAPP_URL()}/api/branding/logo/team/${teamGlobalSettings.teamId}`
+        : '',
+  };
+};