Merge pull request dubinc#2428 from dubinc/server-actions-default-program

Refactor partner actions to utilize `getDefaultProgramIdOrThrow`

Author: steven-tey

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/programs/[programId]/commissions/create-commission-sheet.tsx

@@ -87,7 +87,6 @@ function CreateCommissionSheetContent({
     await executeAsync({
       ...data,
       workspaceId,
-      programId: program.id,
       saleAmount: data.saleAmount ? data.saleAmount * 100 : null,
       saleEventDate,
       leadEventDate,

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/programs/[programId]/partners/invite-partner-sheet.tsx

@@ -113,7 +113,6 @@ function InvitePartnerSheetContent({ setIsOpen }: InvitePartnerSheetProps) {
     await executeAsync({
       ...data,
       workspaceId,
-      programId: program.id,
     });
   };
 

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/programs/[programId]/partners/partner-table.tsx

@@ -410,7 +410,6 @@ function RowMenuButton({
 
                       await resendInvite({
                         workspaceId,
-                        programId: row.original.programId!,
                         partnerId: row.original.id,
                       });
                     }}
@@ -434,7 +433,6 @@ function RowMenuButton({
 
                       await deleteInvite({
                         workspaceId,
-                        programId: row.original.programId!,
                         partnerId: row.original.id,
                       });
                     }}

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/programs/[programId]/settings/branding/branding-settings.tsx

@@ -60,8 +60,7 @@ function BrandingSettingsForm({ program }: { program: ProgramProps }) {
       className="rounded-lg border border-neutral-200 bg-white"
       onSubmit={handleSubmit(async (data) => {
         await executeAsync({
-          workspaceId: workspaceId || "",
-          programId: program.id,
+          workspaceId: workspaceId!,
           ...data,
         });
 

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/programs/[programId]/settings/communication/page-client.tsx

@@ -44,14 +44,13 @@ export function ProgramCommunication() {
   });
 
   const onSubmit = async (data: FormData) => {
-    if (!workspaceId || !program?.id) {
+    if (!workspaceId) {
       return;
     }
 
     await executeAsync({
       ...data,
       workspaceId,
-      programId: program.id,
       helpUrl: data.helpUrl || null,
       termsUrl: data.termsUrl || null,
     });

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/programs/[programId]/settings/links/links-settings.tsx

@@ -78,7 +78,6 @@ function LinksSettingsForm({ program }: { program: ProgramProps }) {
         await executeAsync({
           ...data,
           workspaceId: workspaceId!,
-          programId: program.id,
         });
 
         // Reset isDirty state

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/programs/[programId]/settings/rewards/settings.tsx

@@ -46,13 +46,12 @@ export function RewardSettings() {
   });
 
   const onSubmit = async (data: FormData) => {
-    if (!workspaceId || !program?.id) {
+    if (!workspaceId) {
       return;
     }
 
     await executeAsync({
       workspaceId,
-      programId: program.id,
       ...data,
     });
   };

apps/web/lib/actions/partners/approve-partner.ts

@@ -1,6 +1,7 @@
 "use server";
 
 import { createPartnerLink } from "@/lib/api/partners/create-partner-link";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { determinePartnerReward } from "@/lib/partners/determine-partner-reward";
 import { ProgramPartnerLinkProps } from "@/lib/types";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
@@ -23,7 +24,9 @@ export const approvePartnerAction = authActionClient
   .schema(approvePartnerSchema)
   .action(async ({ parsedInput, ctx }) => {
     const { workspace, user } = ctx;
-    const { programId, partnerId, linkId } = parsedInput;
+    const { partnerId, linkId } = parsedInput;
+
+    const programId = getDefaultProgramIdOrThrow(workspace);
 
     const [program, link] = await Promise.all([
       getProgramOrThrow({

apps/web/lib/actions/partners/ban-partner.ts

@@ -1,6 +1,7 @@
 "use server";
 
 import { linkCache } from "@/lib/api/links/cache";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import {
   BAN_PARTNER_REASONS,
@@ -17,19 +18,15 @@ export const banPartnerAction = authActionClient
   .schema(banPartnerSchema)
   .action(async ({ parsedInput, ctx }) => {
     const { workspace } = ctx;
-    const { programId, partnerId } = parsedInput;
+    const { partnerId } = parsedInput;
+
+    const programId = getDefaultProgramIdOrThrow(workspace);
 
     const programEnrollment = await getProgramEnrollmentOrThrow({
       partnerId,
       programId,
     });
 
-    const { program } = programEnrollment;
-
-    if (program.workspaceId !== workspace.id) {
-      throw new Error("You are not authorized to ban this partner.");
-    }
-
     if (programEnrollment.status === "banned") {
       throw new Error("This partner is already banned.");
     }
@@ -91,6 +88,8 @@ export const banPartnerAction = authActionClient
           return;
         }
 
+        const { program } = programEnrollment;
+
         const supportEmail = program.supportEmail || "support@dub.co";
 
         await sendEmail({

apps/web/lib/actions/partners/confirm-payouts.ts

@@ -1,6 +1,7 @@
 "use server";
 
 import { createId } from "@/lib/api/create-id";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
 import { PAYOUT_FEES } from "@/lib/partners/constants";
 import { stripe } from "@/lib/stripe";
@@ -13,7 +14,6 @@ import { authActionClient } from "../safe-action";
 
 const confirmPayoutsSchema = z.object({
   workspaceId: z.string(),
-  programId: z.string(),
   paymentMethodId: z.string(),
 });
 
@@ -24,7 +24,9 @@ export const confirmPayoutsAction = authActionClient
   .schema(confirmPayoutsSchema)
   .action(async ({ parsedInput, ctx }) => {
     const { workspace, user } = ctx;
-    const { programId, paymentMethodId } = parsedInput;
+    const { paymentMethodId } = parsedInput;
+
+    const programId = getDefaultProgramIdOrThrow(workspace);
 
     const { minPayoutAmount } = await getProgramOrThrow({
       workspaceId: workspace.id,