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.

Expand creator filter across folders (#4468)

Pedro Ladeira87ff0bf8ff6a
diff --git a/apps/web/app/(ee)/api/cron/export/links/route.ts b/apps/web/app/(ee)/api/cron/export/links/route.ts
index 808a871e4a..6cd61b0fa3 100644
--- a/apps/web/app/(ee)/api/cron/export/links/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/links/route.ts
@@ -82,7 +82,7 @@ export async function POST(req: Request) {
const { folderIds } = await validateLinksQueryFilters({
...filters,
- userId,
+ sessionUserId: userId,
workspace: {
...workspace,
plan: workspace.plan as PlanProps,
diff --git a/apps/web/app/api/links/count/route.ts b/apps/web/app/api/links/count/route.ts
index fdc2309e37..712f169e76 100644
--- a/apps/web/app/api/links/count/route.ts
+++ b/apps/web/app/api/links/count/route.ts
@@ -13,7 +13,7 @@ export const GET = withWorkspace(
let { folderIds } = await validateLinksQueryFilters({
...filters,
workspace,
- userId: session.user.id,
+ sessionUserId: session.user.id,
});
if (
diff --git a/apps/web/app/api/links/export/route.ts b/apps/web/app/api/links/export/route.ts
index d755447e81..df3dbd332c 100644
--- a/apps/web/app/api/links/export/route.ts
+++ b/apps/web/app/api/links/export/route.ts
@@ -28,7 +28,7 @@ export const GET = withWorkspace(
const { folderIds } = await validateLinksQueryFilters({
...filters,
workspace,
- userId: session.user.id,
+ sessionUserId: session.user.id,
});
const { interval, start, end } = filters;
diff --git a/apps/web/app/api/links/route.ts b/apps/web/app/api/links/route.ts
index 779d3c305b..3d0393d812 100644
--- a/apps/web/app/api/links/route.ts
+++ b/apps/web/app/api/links/route.ts
@@ -27,7 +27,7 @@ export const GET = withWorkspace(
const { folderIds } = await validateLinksQueryFilters({
...filters,
workspace,
- userId: session.user.id,
+ sessionUserId: session.user.id,
});
const response = await getLinksForWorkspace({
diff --git a/apps/web/lib/api/links/validate-links-query-filters.ts b/apps/web/lib/api/links/validate-links-query-filters.ts
index 3c101d87ff..638c553294 100644
--- a/apps/web/lib/api/links/validate-links-query-filters.ts
+++ b/apps/web/lib/api/links/validate-links-query-filters.ts
@@ -7,7 +7,7 @@ import { getDomainOrThrow } from "../domains/get-domain-or-throw";
interface LinksQueryFilters
extends Partial<z.infer<typeof getLinksQuerySchemaExtended>> {
- userId: string;
+ sessionUserId: string;
workspace: Pick<WorkspaceProps, "id" | "plan" | "foldersUsage" | "users">;
}
@@ -21,6 +21,7 @@ export async function validateLinksQueryFilters({
tenantId,
folderId,
userId,
+ sessionUserId,
workspace,
}: LinksQueryFilters) {
let folderIds: string[] | undefined = undefined;
@@ -35,7 +36,7 @@ export async function validateLinksQueryFilters({
if (folderId) {
await verifyFolderAccess({
workspace,
- userId,
+ userId: sessionUserId,
folderId,
requiredPermission: "folders.read",
});
@@ -43,15 +44,22 @@ export async function validateLinksQueryFilters({
/* we only need to get the folder ids if we are:
- not filtering by folder
- - filtering by search, domain, tags, tenantId, or linkIds
+ - filtering by search, domain, tags, creator, tenantId, or linkIds
*/
if (
!folderId &&
- (search || domain || tagId || tagIds || tagNames || tenantId || linkIds)
+ (search ||
+ domain ||
+ tagId ||
+ tagIds ||
+ tagNames ||
+ tenantId ||
+ linkIds ||
+ userId)
) {
folderIds = await getFolderIdsToFilter({
workspace,
- userId,
+ userId: sessionUserId,
});
}