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.

use queue instead

Steven Tey11911052b482
diff --git a/apps/web/app/(ee)/api/admin/ban/route.ts b/apps/web/app/(ee)/api/admin/ban/route.ts
index 6eea124623..9d27bcff47 100644
--- a/apps/web/app/(ee)/api/admin/ban/route.ts
+++ b/apps/web/app/(ee)/api/admin/ban/route.ts
@@ -4,6 +4,7 @@ import { updateConfig } from "@/lib/edge-config";
import { prisma } from "@/lib/prisma";
import { isStored, storage } from "@/lib/storage";
import { R2_URL } from "@dub/utils";
+import { waitUntil } from "@vercel/functions";
import { NextResponse } from "next/server";
// POST /api/admin/ban
@@ -41,26 +42,28 @@ export const POST = withAdmin(
`Found user ${user.email} with ${user.projects.length} workspaces`,
);
- await 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,
- }),
- ]);
+ waitUntil(
+ 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,
+ }),
+ ]);
- // delete user
- await prisma.user.delete({
- where: {
- id: user.id,
- },
- });
- });
+ // delete user
+ await prisma.user.delete({
+ where: {
+ id: user.id,
+ },
+ });
+ }),
+ );
return NextResponse.json({ success: true });
},
diff --git a/apps/web/lib/api/workspaces/delete-workspace.ts b/apps/web/lib/api/workspaces/delete-workspace.ts
index 49bd7ecf89..23e4b2da92 100644
--- a/apps/web/lib/api/workspaces/delete-workspace.ts
+++ b/apps/web/lib/api/workspaces/delete-workspace.ts
@@ -12,7 +12,6 @@ import {
import { waitUntil } from "@vercel/functions";
import { qstash } from "../../cron";
import { cancelSubscription } from "../../stripe/cancel-subscription";
-import { markDomainAsDeleted } from "../domains/mark-domain-deleted";
import { linkCache } from "../links/cache";
export async function deleteWorkspace(
@@ -114,62 +113,20 @@ export async function deleteWorkspaceAdmin(
);
}
- const customDomains = await prisma.domain.findMany({
- where: {
- projectId: workspace.id,
- },
- select: {
- slug: true,
- },
- });
-
- // delete all domains, links, and uploaded images associated with the workspace
- const deleteDomainsLinksResponse = await Promise.allSettled(
- customDomains.map(({ slug }) =>
- markDomainAsDeleted({
- domain: slug,
- }),
- ),
- );
-
- console.log(
- `Deleted ${customDomains.length} custom domains for ${workspace.slug}`,
- deleteDomainsLinksResponse,
- );
-
- // Delete folders
- const deleteFoldersResponse = await prisma.folder.deleteMany({
- where: {
- projectId: workspace.id,
- },
- });
-
- console.log(
- `Deleted ${deleteFoldersResponse.count} folders for ${workspace.slug}`,
- );
-
- // Delete customers
- const deleteCustomersResponse = await prisma.customer.deleteMany({
- where: {
- projectId: workspace.id,
- },
- });
-
- console.log(
- `Deleted ${deleteCustomersResponse.count} customers for ${workspace.slug}`,
- );
-
const deleteWorkspaceResponse = await Promise.allSettled([
// delete workspace logo if it's a custom logo stored in R2
workspace.logo &&
workspace.logo.startsWith(`${R2_URL}/logos/${workspace.id}`) &&
storage.delete({ key: workspace.logo.replace(`${R2_URL}/`, "") }),
+
// if they have a Stripe subscription, cancel it
workspace.stripeId && cancelSubscription(workspace.stripeId),
- // delete the workspace
- prisma.project.delete({
- where: {
- slug: workspace.slug,
+
+ // Queue the workspace for deletion
+ qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/delete`,
+ body: {
+ workspaceId: workspace.id,
},
}),
]);
@@ -177,7 +134,6 @@ export async function deleteWorkspaceAdmin(
console.log(`Deleted workspace ${workspace.slug}`, deleteWorkspaceResponse);
return {
- deleteDomainsLinksResponse,
deleteWorkspaceResponse,
};
}