Merge branch "main"

packages/lib/server-only/template/create-document-from-direct-template.ts

@@ -40,6 +40,7 @@ import {
   extractDocumentAuthMethods,
 } from '../../utils/document-auth';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 import { formatDocumentsPath } from '../../utils/teams';
 import { sendDocument } from '../document/send-document';
 import { validateFieldAuth } from '../document/validate-field-auth';
@@ -91,6 +92,11 @@ export const createDocumentFromDirectTemplate = async ({
       templateDocumentData: true,
       templateMeta: true,
       User: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -145,7 +151,8 @@ export const createDocumentFromDirectTemplate = async ({
   const metaDateFormat = template.templateMeta?.dateFormat || DEFAULT_DOCUMENT_DATE_FORMAT;
   const metaEmailMessage = template.templateMeta?.message || '';
   const metaEmailSubject = template.templateMeta?.subject || '';
-  const metaLanguage = template.templateMeta?.language;
+  const metaLanguage =
+    template.templateMeta?.language ?? template.team?.teamGlobalSettings?.documentLanguage;
   const metaSigningOrder = template.templateMeta?.signingOrder || DocumentSigningOrder.PARALLEL;
 
   // Associate, validate and map to a query every direct template recipient field with the provided fields.
@@ -237,6 +244,7 @@ export const createDocumentFromDirectTemplate = async ({
         createdAt: initialRequestTime,
         status: DocumentStatus.PENDING,
         externalId: directTemplateExternalId,
+        visibility: template.team?.teamGlobalSettings?.documentVisibility,
         documentDataId: documentData.id,
         authOptions: createDocumentAuthOptions({
           globalAccessAuth: templateAuthOptions.globalAccessAuth,
@@ -275,6 +283,7 @@ export const createDocumentFromDirectTemplate = async ({
             subject: metaEmailSubject,
             language: metaLanguage,
             signingOrder: metaSigningOrder,
+            distributionMethod: template.templateMeta?.distributionMethod,
           },
         },
       },
@@ -533,9 +542,13 @@ export const createDocumentFromDirectTemplate = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000',
     });
 
+    const branding = template.team?.teamGlobalSettings
+      ? teamGlobalSettingsToBranding(template.team.teamGlobalSettings)
+      : undefined;
+
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(emailTemplate, { lang: metaLanguage }),
-      renderEmailWithI18N(emailTemplate, { lang: metaLanguage, plainText: true }),
+      renderEmailWithI18N(emailTemplate, { lang: metaLanguage, branding }),
+      renderEmailWithI18N(emailTemplate, { lang: metaLanguage, branding, plainText: true }),
     ]);
 
     const i18n = await getI18nInstance(metaLanguage);

packages/lib/server-only/template/create-document-from-template-legacy.ts

@@ -47,6 +47,11 @@ export const createDocumentFromTemplateLegacy = async ({
       Field: true,
       templateDocumentData: true,
       templateMeta: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -69,6 +74,7 @@ export const createDocumentFromTemplateLegacy = async ({
       userId,
       teamId: template.teamId,
       title: template.title,
+      visibility: template.team?.teamGlobalSettings?.documentVisibility,
       documentDataId: documentData.id,
       Recipient: {
         create: template.Recipient.map((recipient) => ({
@@ -87,7 +93,8 @@ export const createDocumentFromTemplateLegacy = async ({
           dateFormat: template.templateMeta?.dateFormat,
           redirectUrl: template.templateMeta?.redirectUrl,
           signingOrder: template.templateMeta?.signingOrder ?? undefined,
-          language: template.templateMeta?.language,
+          language:
+            template.templateMeta?.language || template.team?.teamGlobalSettings?.documentLanguage,
         },
       },
     },

packages/lib/server-only/template/create-document-from-template.ts

@@ -1,5 +1,6 @@
 import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
+import type { DocumentDistributionMethod } from '@documenso/prisma/client';
 import {
   DocumentSigningOrder,
   DocumentSource,
@@ -62,6 +63,7 @@ export type CreateDocumentFromTemplateOptions = {
     redirectUrl?: string;
     signingOrder?: DocumentSigningOrder;
     language?: SupportedLanguageCodes;
+    distributionMethod?: DocumentDistributionMethod;
   };
   requestMetadata?: RequestMetadata;
 };
@@ -108,6 +110,11 @@ export const createDocumentFromTemplate = async ({
       },
       templateDocumentData: true,
       templateMeta: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -169,6 +176,7 @@ export const createDocumentFromTemplate = async ({
           globalAccessAuth: templateAuthOptions.globalAccessAuth,
           globalActionAuth: templateAuthOptions.globalActionAuth,
         }),
+        visibility: template.team?.teamGlobalSettings?.documentVisibility,
         documentMeta: {
           create: {
             subject: override?.subject || template.templateMeta?.subject,
@@ -177,11 +185,17 @@ export const createDocumentFromTemplate = async ({
             password: override?.password || template.templateMeta?.password,
             dateFormat: override?.dateFormat || template.templateMeta?.dateFormat,
             redirectUrl: override?.redirectUrl || template.templateMeta?.redirectUrl,
+            distributionMethod:
+              override?.distributionMethod || template.templateMeta?.distributionMethod,
+            emailSettings: template.templateMeta?.emailSettings || undefined,
             signingOrder:
               override?.signingOrder ||
               template.templateMeta?.signingOrder ||
               DocumentSigningOrder.PARALLEL,
-            language: override?.language || template.templateMeta?.language,
+            language:
+              override?.language ||
+              template.templateMeta?.language ||
+              template.team?.teamGlobalSettings?.documentLanguage,
           },
         },
         Recipient: {

packages/lib/server-only/template/duplicate-template.ts

@@ -60,7 +60,10 @@ export const duplicateTemplate = async ({
 
   if (template.templateMeta) {
     templateMeta = {
-      create: omit(template.templateMeta, ['id', 'templateId']),
+      create: {
+        ...omit(template.templateMeta, ['id', 'templateId']),
+        emailSettings: template.templateMeta.emailSettings || undefined,
+      },
     };
   }
 

packages/lib/server-only/template/find-templates.ts

@@ -54,6 +54,7 @@ export const findTemplates = async ({
         templateMeta: {
           select: {
             signingOrder: true,
+            distributionMethod: true,
           },
         },
         directLink: {

packages/lib/server-only/template/update-template-settings.ts

@@ -112,9 +112,11 @@ export const updateTemplateSettings = async ({
           },
           create: {
             ...meta,
+            emailSettings: meta?.emailSettings || undefined,
           },
           update: {
             ...meta,
+            emailSettings: meta?.emailSettings || undefined,
           },
         },
       },