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.

fix logic

Steven Teye7d49bdf5db9
diff --git a/apps/web/app/(ee)/api/admin/ban/route.ts b/apps/web/app/(ee)/api/admin/ban/route.ts
index a8c325233c..a011888aef 100644
--- a/apps/web/app/(ee)/api/admin/ban/route.ts
+++ b/apps/web/app/(ee)/api/admin/ban/route.ts
@@ -41,6 +41,20 @@ export const POST = withAdmin(
const emailDomain = extractEmailDomain(email);
+ // block email in edge config first so that no feedback emails are sent
+ await Promise.all([
+ updateConfig({
+ key: "emails",
+ value: email,
+ }),
+ blockEmailDomain &&
+ emailDomain &&
+ updateConfig({
+ key: "emailDomainTerms",
+ value: emailDomain,
+ }),
+ ]);
+
console.log(
`Found user ${user.email} with ${user.projects.length} workspaces`,
);
@@ -49,28 +63,18 @@ export const POST = withAdmin(
Promise.allSettled(
user.projects.map(({ project }) => deleteWorkspaceAdmin(project)),
).then(async () => {
- await Promise.all([
- user.image &&
- isStored(user.image) &&
- storage.delete({ key: user.image.replace(`${R2_URL}/`, "") }),
- updateConfig({
- key: "emails",
- value: email,
- }),
- blockEmailDomain &&
- emailDomain &&
- updateConfig({
- key: "emailDomainTerms",
- value: emailDomain,
- }),
- ]);
-
- // delete user
+ // delete user after all workspaces are deleted
await prisma.user.delete({
where: {
id: user.id,
},
});
+ console.log(`Deleted user ${user.email}`);
+
+ if (user.image && isStored(user.image)) {
+ await storage.delete({ key: user.image.replace(`${R2_URL}/`, "") });
+ console.log(`Deleted user image ${user.image}`);
+ }
}),
);