Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

finalize changes

Steven Teyb890ccd759d1
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
index 54319a3b27..287478a769 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
@@ -1,5 +1,6 @@
"use client";
+import { parseActionError } from "@/lib/actions/parse-action-errors";
import { PartnerData } from "@/lib/actions/partners/create-program-application";
import { onboardPartnerAction } from "@/lib/actions/partners/onboard-partner";
import { onboardPartnerSchema } from "@/lib/zod/schemas/partners";
@@ -95,7 +96,7 @@ export function OnboardingForm({
router.push("/onboarding/platforms");
},
onError: ({ error, input }) => {
- toast.error(error.serverError);
+ toast.error(parseActionError(error, "An unknown error occurred."));
reset(input);
},
});
@@ -129,7 +130,6 @@ export function OnboardingForm({
<label>
<span className="text-sm font-medium text-neutral-800">
Profile image
- <span className="font-normal text-neutral-500"> (optional)</span>
</span>
<div className="flex items-center gap-5">
<Controller
@@ -156,7 +156,7 @@ export function OnboardingForm({
Square image recommended, up to 2 MB.
</p>
<p className="mt-0.5 text-xs font-medium text-neutral-500">
- Adding can improve your program approvals.
+ Adding an image can improve your approval rates.
</p>
</div>
</div>
diff --git a/apps/web/lib/actions/partners/onboard-partner.ts b/apps/web/lib/actions/partners/onboard-partner.ts
index 2a5e95aed3..f9b0bc103d 100644
--- a/apps/web/lib/actions/partners/onboard-partner.ts
+++ b/apps/web/lib/actions/partners/onboard-partner.ts
@@ -6,7 +6,7 @@ import { storage } from "@/lib/storage";
import { onboardPartnerSchema } from "@/lib/zod/schemas/partners";
import { prisma } from "@dub/prisma";
import { Prisma } from "@dub/prisma/client";
-import { nanoid, OG_AVATAR_URL, R2_URL } from "@dub/utils";
+import { nanoid } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
import { authUserActionClient } from "../safe-action";
@@ -19,34 +19,16 @@ export const onboardPartnerAction = authUserActionClient
const { user } = ctx;
const { name, image, country, description, profileType } = parsedInput;
- const [existingPartner, userHasProjects] = await Promise.all([
- prisma.partner.findUnique({
- where: {
- email: user.email,
- },
- }),
- // Check if user has any workspaces (dub account)
- prisma.projectUsers.findFirst({
- where: {
- userId: user.id,
- },
- select: { id: true },
- }),
- ]);
+ const existingPartner = await prisma.partner.findUnique({
+ where: {
+ email: user.email,
+ },
+ });
const partnerId = existingPartner
? existingPartner.id
: createId({ prefix: "pn_" });
- // Determine if we should sync the partner image to the user account
- // Only sync on partner creation (not update) and only if user has no dub account (no projects)
- // Also don't overwrite if user already has a custom image (stored in R2, not a default avatar)
- const isNewPartner = !existingPartner;
- const userHasCustomImage = user.image?.startsWith(R2_URL);
- const shouldSyncImageToUser =
- isNewPartner && !userHasProjects && !userHasCustomImage;
-
- // Use uploaded image or generate default avatar URL
const imageUrl = image
? await storage
.upload({
@@ -54,7 +36,7 @@ export const onboardPartnerAction = authUserActionClient
body: image,
})
.then(({ url }) => url)
- : `${OG_AVATAR_URL}${name || user.email}`;
+ : undefined;
// country, profileType, and companyName cannot be changed once set
const payload: Prisma.PartnerCreateInput = {
@@ -99,16 +81,16 @@ export const onboardPartnerAction = authUserActionClient
},
}),
- // only set the default partner ID if the user doesn't already have one
- // also sync the partner image to user account if creating a new partner and user has no dub account
- (!user.defaultPartnerId || shouldSyncImageToUser) &&
+ (!user.defaultPartnerId || !user.image) &&
prisma.user.update({
where: {
id: user.id,
},
data: {
+ // if the user doesn't have a default partner id, set the new partner id
...(!user.defaultPartnerId && { defaultPartnerId: partnerId }),
- ...(shouldSyncImageToUser && { image: imageUrl }),
+ // if the user doesn't have an image, set the partner image
+ ...(!user.image && { image: imageUrl }),
},
}),
]);
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index f90f7b13db..3f6eb1dc5e 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -600,15 +600,14 @@ export const createPartnerSchema = z.object({
});
// This is a temporary fix to allow arbitrary image URL
-const partnerImageSchema = z
- .union([
- base64ImageSchema,
- storedR2ImageUrlSchema,
- publicHostedImageSchema,
- googleFaviconUrlSchema,
- ])
- .optional()
- .transform((v) => v || undefined);
+// TODO: Fix this by using file-type
+const partnerImageSchema = z.union([
+ base64ImageSchema,
+ storedR2ImageUrlSchema,
+ publicHostedImageSchema,
+ googleFaviconUrlSchema,
+ z.string().nullish(), // make image optional
+]);
export const onboardPartnerSchema = createPartnerSchema
.omit({