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.

Make partner onboarding image optional and sync to user

Marcus Farrell126cfac57553
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 84e9f33a8e..4c2a5d08b8 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
@@ -7,7 +7,6 @@ import { CountryCombobox } from "@/ui/partners/country-combobox";
import { Partner } from "@dub/prisma/client";
import {
Button,
- buttonVariants,
FileUpload,
ToggleGroup,
TooltipContent,
@@ -15,7 +14,7 @@ import {
useLocalStorage,
useMediaQuery,
} from "@dub/ui";
-import { cn } from "@dub/utils/src/functions";
+import { cn } from "@dub/utils";
import { AnimatePresence, LayoutGroup, motion } from "motion/react";
import { useSession } from "next-auth/react";
import { useAction } from "next-safe-action/hooks";
@@ -111,7 +110,7 @@ export function OnboardingForm({
className="flex w-full flex-col gap-6 text-left"
>
<label>
- <span className="text-sm font-medium text-neutral-800">Full Name</span>
+ <span className="text-sm font-medium text-neutral-800">Name</span>
<input
type="text"
className={cn(
@@ -129,22 +128,19 @@ export function OnboardingForm({
<label>
<span className="text-sm font-medium text-neutral-800">
- Profile Image
+ Profile image
+ <span className="font-normal text-neutral-500"> (optional)</span>
</span>
<div className="flex items-center gap-5">
<Controller
control={control}
name="image"
- rules={{ required: true }}
render={({ field }) => (
<FileUpload
accept="images"
- className={cn(
- "mt-1.5 size-20 rounded-full border border-neutral-300",
- errors.image && "border-0 ring-2 ring-red-500",
- )}
+ className="mt-1.5 size-20 rounded-full border border-neutral-300"
iconClassName="size-5"
- previewClassName="size-10 rounded-full"
+ previewClassName="size-20 rounded-full"
variant="plain"
imageSrc={field.value}
readFile
@@ -156,16 +152,11 @@ export function OnboardingForm({
)}
/>
<div>
- <div
- className={cn(
- buttonVariants({ variant: "secondary" }),
- "flex h-7 w-fit cursor-pointer items-center rounded-md border px-2 text-xs",
- )}
- >
- Upload image
- </div>
- <p className="mt-1.5 text-xs text-neutral-500">
- Recommended size: 160x160px
+ <p className="text-xs text-neutral-500">
+ 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.
</p>
</div>
</div>
diff --git a/apps/web/lib/actions/partners/onboard-partner.ts b/apps/web/lib/actions/partners/onboard-partner.ts
index e5a737d243..344d12423b 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 } from "@dub/utils";
+import { nanoid, OG_AVATAR_URL, R2_URL } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
import { authUserActionClient } from "../safe-action";
@@ -19,22 +19,42 @@ export const onboardPartnerAction = authUserActionClient
const { user } = ctx;
const { name, image, country, description, profileType } = parsedInput;
- const existingPartner = await prisma.partner.findUnique({
- where: {
- email: user.email,
- },
- });
+ 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 partnerId = existingPartner
? existingPartner.id
: createId({ prefix: "pn_" });
- const imageUrl = await storage
- .upload({
- key: `partners/${partnerId}/image_${nanoid(7)}`,
- body: image,
- })
- .then(({ url }) => url);
+ // 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({
+ key: `partners/${partnerId}/image_${nanoid(7)}`,
+ body: image,
+ })
+ .then(({ url }) => url)
+ : `${OG_AVATAR_URL}${name || user.email}`;
// country, profileType, and companyName cannot be changed once set
const payload: Prisma.PartnerCreateInput = {
@@ -80,13 +100,15 @@ export const onboardPartnerAction = authUserActionClient
}),
// only set the default partner ID if the user doesn't already have one
- !user.defaultPartnerId &&
+ // also sync the partner image to user account if creating a new partner and user has no dub account
+ (!user.defaultPartnerId || shouldSyncImageToUser) &&
prisma.user.update({
where: {
id: user.id,
},
data: {
- defaultPartnerId: partnerId,
+ ...(!user.defaultPartnerId && { defaultPartnerId: partnerId }),
+ ...(shouldSyncImageToUser && { image: imageUrl }),
},
}),
]);
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 7bbdc50a06..18d8a619b3 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -586,6 +586,24 @@ const partnerImageSchema = z
message: "Image is required",
});
+// Optional image schema for onboarding (image is not required)
+const optionalPartnerImageSchema = z
+ .union([
+ base64ImageSchema,
+ storedR2ImageUrlSchema,
+ publicHostedImageSchema,
+ z
+ .string()
+ .url()
+ .trim()
+ .refine((url) => url.startsWith(GOOGLE_FAVICON_URL), {
+ message: `Image URL must start with ${GOOGLE_FAVICON_URL}`,
+ }),
+ z.literal(""),
+ ])
+ .optional()
+ .transform((v) => v || undefined);
+
export const onboardPartnerSchema = createPartnerSchema
.omit({
username: true,
@@ -595,7 +613,7 @@ export const onboardPartnerSchema = createPartnerSchema
.merge(
z.object({
name: z.string().min(1, "Name is required"),
- image: partnerImageSchema,
+ image: optionalPartnerImageSchema,
country: z.enum(COUNTRY_CODES),
profileType: z.nativeEnum(PartnerProfileType).default("individual"),
companyName: z.string().nullish(),