fix: wip

packages/lib/constants/auth.ts

@@ -47,9 +47,11 @@ export const PASSKEY_TIMEOUT = 60000;
  */
 export const MAXIMUM_PASSKEYS = 50;
 
+// Todo: nextuauth_url ??
 export const useSecureCookies =
   env('NODE_ENV') === 'production' && String(env('NEXTAUTH_URL')).startsWith('https://');
 
+// Todo: Test secure cookies prefix in remix.
 const secureCookiePrefix = useSecureCookies ? '__Secure-' : '';
 
 export const formatSecureCookieName = (name: string) => `${secureCookiePrefix}${name}`;

packages/lib/constants/email.ts

@@ -4,3 +4,10 @@ export const FROM_ADDRESS = env('NEXT_PRIVATE_SMTP_FROM_ADDRESS') || 'noreply@do
 export const FROM_NAME = env('NEXT_PRIVATE_SMTP_FROM_NAME') || 'Documenso';
 
 export const SERVICE_USER_EMAIL = 'serviceaccount@documenso.com';
+
+export const EMAIL_VERIFICATION_STATE = {
+  NOT_FOUND: 'NOT_FOUND',
+  VERIFIED: 'VERIFIED',
+  EXPIRED: 'EXPIRED',
+  ALREADY_VERIFIED: 'ALREADY_VERIFIED',
+} as const;

packages/lib/jobs/client/local.ts

@@ -68,13 +68,12 @@ export class LocalJobProvider extends BaseJobProvider {
     );
   }
 
-  public getApiHandler(): (context: HonoContext) => Promise<Response | void> {
-    return async (context: HonoContext) => {
-      const req = context.req;
+  public getApiHandler(): (c: HonoContext) => Promise<Response | void> {
+    return async (c: HonoContext) => {
+      const req = c.req;
 
       if (req.method !== 'POST') {
-        context.text('Method not allowed', 405);
-        return;
+        return c.text('Method not allowed', 405);
       }
 
       const jobId = req.header('x-job-id');
@@ -89,8 +88,7 @@ export class LocalJobProvider extends BaseJobProvider {
         .catch(() => null);
 
       if (!options) {
-        context.text('Bad request', 400);
-        return;
+        return c.text('Bad request', 400);
       }
 
       const definition = this._jobDefinitions[options.name];
@@ -100,33 +98,28 @@ export class LocalJobProvider extends BaseJobProvider {
         typeof signature !== 'string' ||
         typeof options !== 'object'
       ) {
-        context.text('Bad request', 400);
-        return;
+        return c.text('Bad request', 400);
       }
 
       if (!definition) {
-        context.text('Job not found', 404);
-        return;
+        return c.text('Job not found', 404);
       }
 
       if (definition && !definition.enabled) {
         console.log('Attempted to trigger a disabled job', options.name);
 
-        context.text('Job not found', 404);
-        return;
+        return c.text('Job not found', 404);
       }
 
       if (!signature || !verify(options, signature)) {
-        context.text('Unauthorized', 401);
-        return;
+        return c.text('Unauthorized', 401);
       }
 
       if (definition.trigger.schema) {
         const result = definition.trigger.schema.safeParse(options.payload);
 
         if (!result.success) {
-          context.text('Bad request', 400);
-          return;
+          return c.text('Bad request', 400);
         }
       }
 
@@ -149,8 +142,7 @@ export class LocalJobProvider extends BaseJobProvider {
         .catch(() => null);
 
       if (!backgroundJob) {
-        context.text('Job not found', 404);
-        return;
+        return c.text('Job not found', 404);
       }
 
       try {
@@ -189,8 +181,7 @@ export class LocalJobProvider extends BaseJobProvider {
             },
           });
 
-          context.text('Task exceeded retries', 500);
-          return;
+          return c.text('Task exceeded retries', 500);
         }
 
         backgroundJob = await prisma.backgroundJob.update({
@@ -210,7 +201,7 @@ export class LocalJobProvider extends BaseJobProvider {
         });
       }
 
-      context.text('OK', 200);
+      return c.text('OK', 200);
     };
   }
 

packages/lib/server-only/document/resend-document.tsx

@@ -134,7 +134,7 @@ export const resendDocument = async ({
         emailMessage =
           customEmail?.message ||
           i18n._(
-            msg`${user.name} on behalf of "${document.team.name}" has invited you to ${recipientActionVerb} the document "${document.title}".`,
+            msg`${user.name || user.email} on behalf of "${document.team.name}" has invited you to ${recipientActionVerb} the document "${document.title}".`,
           );
       }
 
@@ -164,20 +164,20 @@ export const resendDocument = async ({
         ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
         : undefined;
 
+      const [html, text] = await Promise.all([
+        renderEmailWithI18N(template, {
+          lang: document.documentMeta?.language,
+          branding,
+        }),
+        renderEmailWithI18N(template, {
+          lang: document.documentMeta?.language,
+          branding,
+          plainText: true,
+        }),
+      ]);
+
       await prisma.$transaction(
         async (tx) => {
-          const [html, text] = await Promise.all([
-            renderEmailWithI18N(template, {
-              lang: document.documentMeta?.language,
-              branding,
-            }),
-            renderEmailWithI18N(template, {
-              lang: document.documentMeta?.language,
-              branding,
-              plainText: true,
-            }),
-          ]);
-
           await mailer.sendMail({
             to: {
               address: email,

packages/lib/server-only/user/verify-email.ts

@@ -2,15 +2,9 @@ import { DateTime } from 'luxon';
 
 import { prisma } from '@documenso/prisma';
 
+import { EMAIL_VERIFICATION_STATE } from '../../constants/email';
 import { jobsClient } from '../../jobs/client';
 
-export const EMAIL_VERIFICATION_STATE = {
-  NOT_FOUND: 'NOT_FOUND',
-  VERIFIED: 'VERIFIED',
-  EXPIRED: 'EXPIRED',
-  ALREADY_VERIFIED: 'ALREADY_VERIFIED',
-} as const;
-
 export type VerifyEmailProps = {
   token: string;
 };