fix(actions): leaking trigger.dev keys due to imports

jhdcruz · Nov 14, 2024 · 73bfab1 · 73bfab1
1 parent a3a5f88
commit 73bfab1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/src/app/eval/actions.ts b/src/app/eval/actions.ts
@@ -11,6 +11,7 @@ import type { ImplementerFeedbackProps } from './_components/Forms/ImplementersF
 import type { PartnersFeedbackProps } from './_components/Forms/PartnersForm';
 import type { BeneficiariesFeedbackProps } from './_components/Forms/BeneficiariesForm';
 import type ApiResponse from '@/utils/response';
+import { tasks } from '@trigger.dev/sdk/v3';
 
 /**
  * Submit feedback for an activity.
@@ -51,7 +52,8 @@ export async function submitFeedback(
   switch (type) {
     case 'beneficiaries':
       // analyze beneficiary feedback
-      await analyzeBeneficiary.trigger(
+      await tasks.trigger<typeof analyzeBeneficiary>(
+        'analyze-beneficiary',
         { id: data.id, form: feedback as BeneficiariesFeedbackProps },
         {
           idempotencyKey: idempotencyKey,
@@ -63,7 +65,8 @@ export async function submitFeedback(
 
     case 'partners':
       // analyze partner feedback
-      await analyzePartner.trigger(
+      await tasks.trigger<typeof analyzePartner>(
+        'analyze-partner',
         { id: data.id, form: feedback as PartnersFeedbackProps },
         {
           idempotencyKey: idempotencyKey,
@@ -75,7 +78,8 @@ export async function submitFeedback(
 
     case 'implementers':
       // analyze implementers feedback
-      await analyzeImplementer.trigger(
+      await tasks.trigger<typeof analyzeImplementer>(
+        'analyze-implementer',
         { id: data.id, form: feedback as ImplementerFeedbackProps },
         {
           idempotencyKey: idempotencyKey,

diff --git a/src/app/portal/activities/actions.ts b/src/app/portal/activities/actions.ts
@@ -13,15 +13,16 @@ import {
 } from '@/libs/supabase/api/faculty-assignments';
 import type { ActivityResponse } from '@/libs/supabase/api/_response';
 import type { ActivityFormProps } from './_components/Forms/ActivityFormModal';
-import type ApiResponse from '@/utils/response';
-import { emailAssigned } from '@/trigger/email-assigned';
+import type { emailAssigned } from '@/trigger/email-assigned';
+import type { emailUnassigned } from '@/trigger/email-unassigned';
+import type { emailDepts } from '@/trigger/email-depts';
 import {
   rescheduleReminders,
   scheduleReminders,
 } from '@/libs/triggerdev/reminders';
-import { emailUnassigned } from '@/trigger/email-unassigned';
 import { revalidate } from '@/app/actions';
-import { emailDepts } from '@/trigger/email-depts';
+import type ApiResponse from '@/utils/response';
+import { tasks } from '@trigger.dev/sdk/v3';
 
 /**
  * Create and process new activity.
@@ -159,7 +160,7 @@ export async function submitActivity(
 
   // email notification to selected departments
   if (activity.notify?.length) {
-    emailDepts.trigger({
+    await tasks.trigger<typeof emailDepts>('email-depts', {
       activityId: activityId,
       depts: activity.notify,
     });
@@ -210,7 +211,7 @@ export async function assignFaculty(
     if (assignResponse.status !== 0) return assignResponse!;
 
     // send email notice to newly assigned faculties
-    emailAssigned.trigger({
+    await tasks.trigger<typeof emailAssigned>('email-assigned', {
       activityId: activityId,
       ids: faculty.filter((id) => !original?.includes(id)),
     });
@@ -227,7 +228,7 @@ export async function assignFaculty(
     if (delResponse.status !== 0) return delResponse;
 
     // send email notice to unassigned faculties
-    emailUnassigned.trigger({
+    await tasks.trigger<typeof emailUnassigned>('email-unassigned', {
       activityId: activityId,
       ids: faculty.filter((id) => !original?.includes(id)),
     });

diff --git a/src/libs/triggerdev/reminders.ts b/src/libs/triggerdev/reminders.ts
@@ -1,5 +1,5 @@
-import { runs } from '@trigger.dev/sdk/v3';
-import { emailReminders } from '@/trigger/email-reminders';
+import { tasks, runs } from '@trigger.dev/sdk/v3';
+import type { emailReminders } from '@/trigger/email-reminders';
 
 /**
  * Schedule email reminders for an activity.
@@ -21,7 +21,8 @@ export async function scheduleReminders({
   // no need to await
   if (activityStartingDate.getTime() - 1 * 24 * 60 * 60 * 1000 > Date.now()) {
     // schedule new reminder task, 1 day before the activity
-    await emailReminders.trigger(
+    await tasks.trigger<typeof emailReminders>(
+      'email-reminders',
       { activityId: activityId },
       {
         idempotencyKey: activityId + '_1d',
@@ -37,7 +38,8 @@ export async function scheduleReminders({
   // check if the activity starting date is not within 3 days from now
   if (activityStartingDate.getTime() - 3 * 24 * 60 * 60 * 1000 > Date.now()) {
     // schedule new reminder task, 3 and 7 days before the activity
-    await emailReminders.trigger(
+    await tasks.trigger<typeof emailReminders>(
+      'email-reminders',
       { activityId: activityId },
       {
         idempotencyKey: activityId + '_3d',
@@ -53,7 +55,8 @@ export async function scheduleReminders({
   // check if the activity starting date is not within 7 days from now
   if (activityStartingDate.getTime() - 7 * 24 * 60 * 60 * 1000 > Date.now()) {
     // schedule new reminder task, 7 days before the activity
-    await emailReminders.trigger(
+    await tasks.trigger<typeof emailReminders>(
+      'email-reminders',
       { activityId: activityId },
       {
         idempotencyKey: activityId + '_7d',

diff --git a/src/trigger/analyze-feedback.ts b/src/trigger/analyze-feedback.ts
@@ -72,8 +72,10 @@ export const analyzePartner = task({
     const sentimentScore = await analyzeSentiments(textsForSentiment);
 
     // save results
-    await envvars.retrieve('SUPABASE_URL');
-    await envvars.retrieve('SUPABASE_SERVICE_KEY');
+    await Promise.all([
+      envvars.retrieve('SUPABASE_URL'),
+      envvars.retrieve('SUPABASE_SERVICE_KEY'),
+    ]);
     const supabase = createAdminClient();
 
     const data = {
@@ -166,8 +168,10 @@ export const analyzeImplementer = task({
     const sentimentScore = await analyzeSentiments(textsForSentiment);
 
     // save results
-    await envvars.retrieve('SUPABASE_URL');
-    await envvars.retrieve('SUPABASE_SERVICE_KEY');
+    await Promise.all([
+      envvars.retrieve('SUPABASE_URL'),
+      envvars.retrieve('SUPABASE_SERVICE_KEY'),
+    ]);
     const supabase = createAdminClient();
 
     const data = {
@@ -249,8 +253,10 @@ export const analyzeBeneficiary = task({
     const sentimentScore = await analyzeSentiments(textsForSentiment);
 
     // save results
-    await envvars.retrieve('SUPABASE_URL');
-    await envvars.retrieve('SUPABASE_SERVICE_KEY');
+    await Promise.all([
+      envvars.retrieve('SUPABASE_URL'),
+      envvars.retrieve('SUPABASE_SERVICE_KEY'),
+    ]);
     const supabase = createAdminClient();
 
     const data = {