Link folders

apps/web/app/api/analytics/export/route.ts

@@ -5,18 +5,20 @@ import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
 import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";
 import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { withWorkspace } from "@/lib/auth";
+import { getFolders } from "@/lib/folder/get-folders";
+import { checkFolderPermission } from "@/lib/folder/permissions";
 import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
 import { Link } from "@dub/prisma/client";
 import JSZip from "jszip";
 
 // GET /api/analytics/export – get export data for analytics
 export const GET = withWorkspace(
-  async ({ searchParams, workspace }) => {
+  async ({ searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);
 
     const parsedParams = analyticsQuerySchema.parse(searchParams);
 
-    const { interval, start, end, linkId, externalId, domain, key } =
+    const { interval, start, end, linkId, externalId, domain, key, folderId } =
       parsedParams;
 
     let link: Link | null = null;
@@ -35,6 +37,29 @@ export const GET = withWorkspace(
       });
     }
 
+    if (link && link.folderId) {
+      await checkFolderPermission({
+        folderId: link.folderId,
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    if (folderId) {
+      await checkFolderPermission({
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        folderId,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    const folders = await getFolders({
+      workspaceId: workspace.id,
+      userId: session.user.id,
+    });
+
     validDateRangeForPlan({
       plan: workspace.plan,
       conversionEnabled: workspace.conversionEnabled,
@@ -60,7 +85,9 @@ export const GET = withWorkspace(
           ...(link && { linkId: link.id }),
           event: "clicks",
           groupBy: endpoint,
+          allowedFolderIds: folders.map((folder) => folder.id),
         });
+
         if (!response || response.length === 0) return;
 
         const csvData = convertToCSV(response);

apps/web/app/api/analytics/route.ts

@@ -5,6 +5,8 @@ import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
 import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";
 import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { withWorkspace } from "@/lib/auth";
+import { getFolders } from "@/lib/folder/get-folders";
+import { checkFolderPermission } from "@/lib/folder/permissions";
 import {
   analyticsPathParamsSchema,
   analyticsQuerySchema,
@@ -14,7 +16,7 @@ import { NextResponse } from "next/server";
 
 // GET /api/analytics – get analytics
 export const GET = withWorkspace(
-  async ({ params, searchParams, workspace }) => {
+  async ({ params, searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);
 
     let { eventType: oldEvent, endpoint: oldType } =
@@ -38,9 +40,14 @@ export const GET = withWorkspace(
       externalId,
       domain,
       key,
+      folderId,
     } = parsedParams;
+
     let link: Link | null = null;
 
+    event = oldEvent || event;
+    groupBy = oldType || groupBy;
+
     if (domain) {
       await getDomainOrThrow({ workspace, domain });
     }
@@ -55,8 +62,28 @@ export const GET = withWorkspace(
       });
     }
 
-    event = oldEvent || event;
-    groupBy = oldType || groupBy;
+    if (link && link.folderId) {
+      await checkFolderPermission({
+        folderId: link.folderId,
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    if (folderId) {
+      await checkFolderPermission({
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        folderId,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    const folders = await getFolders({
+      workspaceId: workspace.id,
+      userId: session.user.id,
+    });
 
     validDateRangeForPlan({
       plan: workspace.plan,
@@ -82,6 +109,7 @@ export const GET = withWorkspace(
       ...(link && { linkId: link.id }),
       workspaceId: workspace.id,
       isDeprecatedClicksEndpoint,
+      allowedFolderIds: folders.map((folder) => folder.id),
     });
 
     return NextResponse.json(response);

apps/web/app/api/cron/domains/transfer/route.ts

@@ -74,6 +74,7 @@ export async function POST(req: Request) {
             key: link.key,
             url: link.url,
             tag_ids: [],
+            folder_id: null,
             program_id: link.programId ?? "",
             workspace_id: newWorkspaceId,
             created_at: link.createdAt,

apps/web/app/api/domains/[domain]/route.ts

@@ -158,6 +158,7 @@ export const PATCH = withWorkspace(
               key: link.key,
               url: link.url,
               tag_ids: link.tags.map((tag) => tag.tagId),
+              folder_id: link.folderId,
               program_id: link.programId ?? "",
               workspace_id: link.projectId,
               created_at: link.createdAt,

apps/web/app/api/events/export/route.ts

@@ -4,6 +4,8 @@ import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
 import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";
 import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { withWorkspace } from "@/lib/auth";
+import { getFolders } from "@/lib/folder/get-folders";
+import { checkFolderPermission } from "@/lib/folder/permissions";
 import { ClickEvent, LeadEvent, SaleEvent } from "@/lib/types";
 import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";
 import { COUNTRIES, capitalize } from "@dub/utils";
@@ -33,7 +35,7 @@ const columnAccessors = {
 
 // GET /api/events/export – get export data for analytics
 export const GET = withWorkspace(
-  async ({ searchParams, workspace }) => {
+  async ({ searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);
 
     const parsedParams = eventsQuerySchema
@@ -47,7 +49,8 @@ export const GET = withWorkspace(
       )
       .parse(searchParams);
 
-    const { event, domain, interval, start, end, columns, key } = parsedParams;
+    const { event, domain, interval, start, end, columns, key, folderId } =
+      parsedParams;
 
     if (domain) {
       await getDomainOrThrow({ workspace, domain });
@@ -58,6 +61,29 @@ export const GET = withWorkspace(
         ? await getLinkOrThrow({ workspaceId: workspace.id, domain, key })
         : null;
 
+    if (link && link.folderId) {
+      await checkFolderPermission({
+        folderId: link.folderId,
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    if (folderId) {
+      await checkFolderPermission({
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        folderId,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    const folders = await getFolders({
+      workspaceId: workspace.id,
+      userId: session.user.id,
+    });
+
     validDateRangeForPlan({
       plan: workspace.plan,
       conversionEnabled: workspace.conversionEnabled,
@@ -72,6 +98,7 @@ export const GET = withWorkspace(
       ...(link && { linkId: link.id }),
       workspaceId: workspace.id,
       limit: 100000,
+      allowedFolderIds: folders.map((folder) => folder.id),
     });
 
     const data = response.map((row) =>

apps/web/app/api/events/route.ts

@@ -4,18 +4,30 @@ import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
 import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";
 import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { withWorkspace } from "@/lib/auth";
+import { getFolders } from "@/lib/folder/get-folders";
+import { checkFolderPermission } from "@/lib/folder/permissions";
 import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";
 import { Link } from "@dub/prisma/client";
 import { NextResponse } from "next/server";
 
 export const GET = withWorkspace(
-  async ({ searchParams, workspace }) => {
+  async ({ searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);
 
     const parsedParams = eventsQuerySchema.parse(searchParams);
 
-    let { event, interval, start, end, linkId, externalId, domain, key } =
-      parsedParams;
+    let {
+      event,
+      interval,
+      start,
+      end,
+      linkId,
+      externalId,
+      domain,
+      key,
+      folderId,
+    } = parsedParams;
+
     let link: Link | null = null;
 
     if (domain) {
@@ -32,6 +44,29 @@ export const GET = withWorkspace(
       });
     }
 
+    if (link && link.folderId) {
+      await checkFolderPermission({
+        folderId: link.folderId,
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    if (folderId) {
+      await checkFolderPermission({
+        workspaceId: workspace.id,
+        userId: session.user.id,
+        folderId,
+        requiredPermission: "folders.read",
+      });
+    }
+
+    const folders = await getFolders({
+      workspaceId: workspace.id,
+      userId: session.user.id,
+    });
+
     validDateRangeForPlan({
       plan: workspace.plan,
       conversionEnabled: workspace.conversionEnabled,
@@ -46,6 +81,7 @@ export const GET = withWorkspace(
       event,
       ...(link && { linkId: link.id }),
       workspaceId: workspace.id,
+      allowedFolderIds: folders.map((folder) => folder.id),
     });
 
     return NextResponse.json(response);