some cleanup

dubinc · Mar 3, 2025 · 0e177e3 · 0e177e3
1 parent 4920d66
commit 0e177e3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 48 deletions.
diff --git a/apps/web/app/api/tokens/embed/route.ts b/apps/web/app/api/tokens/embed/route.ts
@@ -98,37 +98,7 @@ export const POST = withWorkspace(
         programEnrollment = {
           partnerId: enrolledPartner.id,
         };
-      }
-
-      // else if (partner.programs.length === 0) {
-      //   const partnerLink = await createPartnerLink({
-      //     workspace,
-      //     program,
-      //     partner: partnerProps,
-      //     userId: session.user.id,
-      //   });
-
-      //   const enrolledPartner = await createAndEnrollPartner({
-      //     program,
-      //     link: partnerLink,
-      //     workspace,
-      //     partner: {
-      //       name: partnerProps.name,
-      //       email: partnerProps.email,
-      //       image: partnerProps.image ?? null,
-      //       country: partnerProps.country ?? null,
-      //       description: partnerProps.description,
-      //     },
-      //     tenantId: partnerProps.tenantId,
-      //   });
-
-      //   programEnrollment = {
-      //     partnerId: enrolledPartner.id,
-      //   };
-      // }
-
-      // partner exists and is enrolled in the program, we can use the existing partnerId
-      else {
+      } else {
         console.log(
           "partner exists and is enrolled in the program, we can use the existing partnerId",
         );

diff --git a/apps/web/app/api/user/embed-tokens/route.ts b/apps/web/app/api/user/embed-tokens/route.ts
@@ -1,12 +1,24 @@
 import { withSession } from "@/lib/auth";
+import { createEmbedTokenSchema } from "@/lib/zod/schemas/token";
 import { NextResponse } from "next/server";
+import { z } from "zod";
 
 export const GET = withSession(async ({ session }) => {
   // const { publicToken } = await dub.embedTokens.create({
   //   programId: "prog_d8pl69xXCv4AoHNT281pHQdo",
   //   partnerId: dubPartnerId,
   // });
 
+  const partnerProps: z.infer<typeof createEmbedTokenSchema> = {
+    programId: "prog_d8pl69xXCv4AoHNT281pHQdo",
+    partner: {
+      name: session.user.name,
+      email: session.user.email,
+      image: session.user.image || null,
+      tenantId: session.user.id,
+    },
+  };
+
   const { publicToken } = await fetch(
     "http://localhost:8888/api/tokens/embed",
     {
@@ -15,15 +27,7 @@ export const GET = withSession(async ({ session }) => {
         "Content-Type": "application/json",
         Authorization: `Bearer ${process.env.DUB_API_KEY}`,
       },
-      body: JSON.stringify({
-        programId: "prog_d8pl69xXCv4AoHNT281pHQdo",
-        tenantId: session.user.id,
-        partner: {
-          name: session.user.name,
-          email: session.user.email,
-          image: session.user.image,
-        },
-      }),
+      body: JSON.stringify(partnerProps),
     },
   ).then((res) => {
     if (!res.ok) {
@@ -32,7 +36,5 @@ export const GET = withSession(async ({ session }) => {
     return res.json();
   });
 
-  console.log({ publicToken });
-
   return NextResponse.json({ publicToken });
 });
diff --git a/apps/web/lib/actions/partners/add-partner.ts b/apps/web/lib/actions/partners/add-partner.ts
@@ -62,10 +62,7 @@ export const addPartnerAction = authActionClient
         workspace,
         partner: {
           name,
-          email: email ?? null,
-          image: null,
-          country: null,
-          description: null,
+          email: email ?? "",
         },
       });
     }

diff --git a/apps/web/lib/api/partners/create-and-enroll-partner.ts b/apps/web/lib/api/partners/create-and-enroll-partner.ts
@@ -3,7 +3,7 @@
 import { createId } from "@/lib/api/utils";
 import { recordLink } from "@/lib/tinybird";
 import {
-  PartnerProps,
+  CreatePartnerProps,
   ProgramPartnerLinkProps,
   ProgramProps,
   WorkspaceProps,
@@ -28,7 +28,7 @@ export const createAndEnrollPartner = async ({
   workspace: Pick<WorkspaceProps, "id" | "webhookEnabled">;
   link: ProgramPartnerLinkProps;
   partner: Pick<
-    PartnerProps,
+    CreatePartnerProps,
     "email" | "name" | "image" | "country" | "description"
   >;
   tenantId?: string;