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 workspace logo R2 deletion prefix and tidy imports/webhook guard

Kiran Ke43fbe397934
diff --git a/apps/web/app/(ee)/api/cron/import/csv/route.ts b/apps/web/app/(ee)/api/cron/import/csv/route.ts
index 196b2f6650..e13b43ddc5 100644
--- a/apps/web/app/(ee)/api/cron/import/csv/route.ts
+++ b/apps/web/app/(ee)/api/cron/import/csv/route.ts
@@ -14,12 +14,12 @@ import {
APP_DOMAIN_WITH_NGROK,
DEFAULT_LINK_PROPS,
DUB_DOMAINS_ARRAY,
+ getUrlObjFromString,
linkConstructorSimple,
log,
normalizeString,
parseDateTime,
} from "@dub/utils";
-import { getUrlObjFromString } from "@dub/utils/src";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
import { sendCsvImportEmails } from "./utils";
diff --git a/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts b/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts
index f255b0e58c..253f483f56 100644
--- a/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts
+++ b/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts
@@ -1,7 +1,7 @@
+import { getWorkspaceLogoStorageKey } from "@/lib/api/workspaces/workspace-logo";
import { prisma } from "@/lib/prisma";
import { storage } from "@/lib/storage";
import { cancelSubscription } from "@/lib/stripe/cancel-subscription";
-import { R2_URL } from "@dub/utils";
import { logAndRespond } from "../../utils";
import { DeleteWorkspacePayload } from "./utils";
@@ -43,11 +43,13 @@ export async function deleteWorkspace(payload: DeleteWorkspacePayload) {
// Delete workspace logo if it's a custom logo stored in R2
try {
- if (
- workspace.logo &&
- workspace.logo.startsWith(`${R2_URL}/logos/${workspace.id}`)
- ) {
- await storage.delete({ key: workspace.logo.replace(`${R2_URL}/`, "") });
+ const logoKey = getWorkspaceLogoStorageKey({
+ workspaceId: workspace.id,
+ logoUrl: workspace.logo,
+ });
+
+ if (logoKey) {
+ await storage.delete({ key: logoKey });
}
} catch (error) {
console.error(
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts
index 9b8b6a1586..cf7b50cef2 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/route.ts
@@ -91,7 +91,7 @@ export const POST = withAxiom(async (req: Request) => {
}
const workspace = await resolveWebhookWorkspace({
- stripeAccountId: event.account!,
+ stripeAccountId: event.account,
mode,
});
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.ts
index 3c4c62f84e..07327a97cb 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.ts
@@ -5,9 +5,13 @@ export async function resolveWebhookWorkspace({
stripeAccountId,
mode,
}: {
- stripeAccountId: string;
+ stripeAccountId?: string | null;
mode: StripeMode;
}) {
+ if (!stripeAccountId) {
+ return null;
+ }
+
const workspace = await prisma.project.findUnique({
where: {
stripeConnectId: stripeAccountId,
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/rewind/2025/rewind.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/rewind/2025/rewind.tsx
index f40e1cdb9c..e8a76a901b 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/rewind/2025/rewind.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/rewind/2025/rewind.tsx
@@ -5,7 +5,7 @@ import {
ChevronRight,
ReferredVia,
} from "@dub/ui";
-import { cn } from "@dub/utils/src";
+import { cn } from "@dub/utils";
import NumberFlow from "@number-flow/react";
import { AnimatePresence, motion } from "motion/react";
import { CSSProperties, useEffect, useMemo, useState } from "react";
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
index 83b8a2f842..533e66ab32 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
@@ -3,6 +3,7 @@ import { DubApiError } from "@/lib/api/errors";
import { parseRequestBody } from "@/lib/api/utils";
import { validateAllowedHostnames } from "@/lib/api/validate-allowed-hostnames";
import { deleteWorkspace } from "@/lib/api/workspaces/delete-workspace";
+import { getWorkspaceLogoKeyPrefix } from "@/lib/api/workspaces/workspace-logo";
import { prefixWorkspaceId } from "@/lib/api/workspaces/workspace-id";
import { withWorkspace } from "@/lib/auth";
import { getFeatureFlags } from "@/lib/edge-config";
@@ -115,7 +116,7 @@ export const PATCH = withWorkspace(
const logoUploaded = logo
? await storage.upload({
- key: `workspaces/${prefixWorkspaceId(workspace.id)}/logo_${nanoid(7)}`,
+ key: `${getWorkspaceLogoKeyPrefix(workspace.id)}${nanoid(7)}`,
body: logo,
})
: null;
diff --git a/apps/web/lib/api/workspaces/delete-workspace.ts b/apps/web/lib/api/workspaces/delete-workspace.ts
index 9ed9f79ed5..1f623ac391 100644
--- a/apps/web/lib/api/workspaces/delete-workspace.ts
+++ b/apps/web/lib/api/workspaces/delete-workspace.ts
@@ -1,3 +1,4 @@
+import { getWorkspaceLogoStorageKey } from "@/lib/api/workspaces/workspace-logo";
import { prisma } from "@/lib/prisma";
import { storage } from "@/lib/storage";
import { WorkspaceProps } from "@/lib/types";
@@ -6,7 +7,6 @@ import {
DUB_DOMAINS_ARRAY,
LEGAL_USER_ID,
LEGAL_WORKSPACE_ID,
- R2_URL,
} from "@dub/utils";
import { waitUntil } from "@vercel/functions";
import { qstash } from "../../cron";
@@ -173,11 +173,14 @@ export async function deleteWorkspaceAdmin(
`Deleted ${deleteCustomersResponse.count} customers for ${workspace.slug}`,
);
+ const logoKey = getWorkspaceLogoStorageKey({
+ workspaceId: workspace.id,
+ logoUrl: workspace.logo,
+ });
+
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}/`, "") }),
+ logoKey && storage.delete({ key: logoKey }),
// if they have a Stripe subscription, cancel it
workspace.stripeId && cancelSubscription(workspace.stripeId),
// delete the workspace
diff --git a/apps/web/lib/api/workspaces/workspace-logo.ts b/apps/web/lib/api/workspaces/workspace-logo.ts
new file mode 100644
index 0000000000..56459907b9
--- /dev/null
+++ b/apps/web/lib/api/workspaces/workspace-logo.ts
@@ -0,0 +1,26 @@
+import { R2_URL } from "@dub/utils";
+import { prefixWorkspaceId } from "./workspace-id";
+
+export function getWorkspaceLogoKeyPrefix(workspaceId: string) {
+ return `workspaces/${prefixWorkspaceId(workspaceId)}/logo_`;
+}
+
+export function getWorkspaceLogoStorageKey({
+ workspaceId,
+ logoUrl,
+}: {
+ workspaceId: string;
+ logoUrl: string | null | undefined;
+}) {
+ if (!logoUrl) {
+ return null;
+ }
+
+ const keyPrefix = getWorkspaceLogoKeyPrefix(workspaceId);
+
+ if (!logoUrl.startsWith(`${R2_URL}/${keyPrefix}`)) {
+ return null;
+ }
+
+ return logoUrl.replace(`${R2_URL}/`, "");
+}