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.

clear defaultPartnerId when a partner member is removed

Pedro Ladeirad95095ba034e
diff --git a/apps/web/app/(ee)/api/partner-profile/users/route.ts b/apps/web/app/(ee)/api/partner-profile/users/route.ts
index 9108e088b7..7c5ad92814 100644
--- a/apps/web/app/(ee)/api/partner-profile/users/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/users/route.ts
@@ -151,6 +151,13 @@ export const DELETE = withPartnerProfile(
partnerId: partner.id,
},
},
+ include: {
+ user: {
+ select: {
+ defaultPartnerId: true,
+ },
+ },
+ },
}),
tx.partnerUser.count({
@@ -186,11 +193,24 @@ export const DELETE = withPartnerProfile(
});
}
- return tx.partnerUser.delete({
+ const deletedPartnerUser = await tx.partnerUser.delete({
where: {
id: userToRemove.id,
},
});
+
+ if (userToRemove.user.defaultPartnerId === partner.id) {
+ await tx.user.update({
+ where: {
+ id: userId,
+ },
+ data: {
+ defaultPartnerId: null,
+ },
+ });
+ }
+
+ return deletedPartnerUser;
});
return NextResponse.json(response);
diff --git a/apps/web/playwright/api/partner-profile/users.spec.ts b/apps/web/playwright/api/partner-profile/users.spec.ts
new file mode 100644
index 0000000000..2342f5f8a1
--- /dev/null
+++ b/apps/web/playwright/api/partner-profile/users.spec.ts
@@ -0,0 +1,113 @@
+import { createId } from "@/lib/api/create-id";
+import { hashToken } from "@/lib/auth/hash-token";
+import { conn } from "@/lib/planetscale";
+import { prisma } from "@/lib/prisma";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { randomName, randomPartnerEmail } from "../../utils";
+import { createBearerApiClient, test } from "../fixtures";
+
+async function createPartnerProfileAuth(
+ partner: {
+ id: string;
+ email?: string | null;
+ },
+ { role = "owner" as const }: { role?: "owner" | "member" } = {},
+) {
+ const token = `dub_pw_${nanoid(24)}`;
+ const user = await prisma.user.create({
+ data: {
+ id: createId({ prefix: "user_" }),
+ email: role === "owner" ? partner.email : randomPartnerEmail(),
+ emailVerified: new Date(),
+ defaultPartnerId: partner.id,
+ partners: {
+ create: {
+ partnerId: partner.id,
+ role,
+ },
+ },
+ tokens: {
+ create: {
+ name: "Playwright partner profile",
+ hashedKey: await hashToken(token),
+ partialKey: `${token.slice(0, 3)}...${token.slice(-4)}`,
+ },
+ },
+ },
+ });
+
+ return { token, userId: user.id };
+}
+
+test("DELETE /partner-profile/users - clears defaultPartnerId", async ({
+ playwright,
+}) => {
+ let partnerId: string | undefined;
+ let ownerId: string | undefined;
+ let memberId: string | undefined;
+
+ try {
+ const partner = await prisma.partner.create({
+ data: {
+ id: createId({ prefix: "pn_" }),
+ name: randomName("partner"),
+ email: randomPartnerEmail(),
+ },
+ });
+ partnerId = partner.id;
+
+ const owner = await createPartnerProfileAuth(partner);
+ ownerId = owner.userId;
+
+ const member = await createPartnerProfileAuth(partner, { role: "member" });
+ memberId = member.userId;
+
+ const { api: partnerApi, dispose } = await createBearerApiClient({
+ playwright,
+ token: owner.token,
+ });
+
+ try {
+ const { status, data } = await partnerApi.delete<{
+ id: string;
+ userId: string;
+ partnerId: string;
+ role: string;
+ }>(`/api/partner-profile/users?userId=${member.userId}`);
+
+ expect(status).toEqual(200);
+ expect(data).toMatchObject({
+ userId: member.userId,
+ partnerId: partner.id,
+ role: "member",
+ });
+
+ const [updatedMember, membership] = await Promise.all([
+ prisma.user.findUnique({
+ where: { id: member.userId },
+ select: { defaultPartnerId: true },
+ }),
+ prisma.partnerUser.findUnique({
+ where: {
+ userId_partnerId: {
+ userId: member.userId,
+ partnerId: partner.id,
+ },
+ },
+ }),
+ ]);
+
+ expect(updatedMember?.defaultPartnerId).toBeNull();
+ expect(membership).toBeNull();
+ } finally {
+ await dispose();
+ }
+ } finally {
+ if (ownerId) await prisma.user.delete({ where: { id: ownerId } });
+ if (memberId) await prisma.user.delete({ where: { id: memberId } });
+ if (partnerId) {
+ await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partnerId]);
+ }
+ }
+});