Merge branch 'main' into add-more-user-roles

Author: steven-tey

apps/web/app/(ee)/admin.dub.co/(dashboard)/components/reset-login-attempts.tsx

@@ -0,0 +1,59 @@
+"use client";
+
+import { LoadingSpinner } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { useFormStatus } from "react-dom";
+import { toast } from "sonner";
+
+export function ResetLoginAttempts() {
+  return (
+    <div className="flex flex-col space-y-5">
+      <form
+        action={async (data) =>
+          await fetch("/api/admin/reset-login-attempts", {
+            method: "POST",
+            body: JSON.stringify({
+              email: data.get("email"),
+            }),
+          })
+            .then((res) => res.json())
+            .then((res) => {
+              if (res.error) {
+                toast.error(res.error);
+              } else {
+                toast.success("Login attempts have been reset");
+              }
+            })
+        }
+      >
+        <Form />
+      </form>
+    </div>
+  );
+}
+
+const Form = () => {
+  const { pending } = useFormStatus();
+
+  return (
+    <div className="relative flex w-full rounded-md shadow-sm">
+      <input
+        name="email"
+        id="email"
+        type="email"
+        required
+        disabled={pending}
+        autoComplete="off"
+        className={cn(
+          "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+          pending && "bg-neutral-100",
+        )}
+        placeholder="user@example.com"
+        aria-invalid="true"
+      />
+      {pending && (
+        <LoadingSpinner className="absolute inset-y-0 right-2 my-auto h-full w-5 text-neutral-400" />
+      )}
+    </div>
+  );
+};

apps/web/app/(ee)/admin.dub.co/(dashboard)/page.tsx

@@ -4,6 +4,7 @@ import { DeletePartnerAccount } from "./components/delete-partner-account";
 import { ImpersonateUser } from "./components/impersonate-user";
 import { ImpersonateWorkspace } from "./components/impersonate-workspace";
 import { RefreshDomain } from "./components/refresh-domain";
+import { ResetLoginAttempts } from "./components/reset-login-attempts";
 
 export const metadata = constructMetadata({
   title: "Dub Admin",
@@ -51,6 +52,13 @@ export default function AdminPage() {
         </p>
         <RefreshDomain />
       </div>
+      <div className="flex flex-col space-y-4 px-5 py-10">
+        <h2 className="text-xl font-semibold">Reset Login Attempts</h2>
+        <p className="text-sm text-neutral-500">
+          Reset a user's invalidLoginAttempts and lockedAt fields
+        </p>
+        <ResetLoginAttempts />
+      </div>
     </div>
   );
 }

apps/web/app/(ee)/api/admin/reset-login-attempts/route.ts

@@ -0,0 +1,48 @@
+import { withAdmin } from "@/lib/auth";
+import { prisma } from "@dub/prisma";
+import { NextResponse } from "next/server";
+
+// POST /api/admin/reset-login-attempts
+export const POST = withAdmin(async ({ req }) => {
+  const { email } = await req.json();
+
+  if (!email) {
+    return NextResponse.json(
+      { error: "Email is required" },
+      { status: 400 },
+    );
+  }
+
+  const user = await prisma.user.findUnique({
+    where: { email },
+    select: {
+      id: true,
+      email: true,
+      invalidLoginAttempts: true,
+      lockedAt: true,
+    },
+  });
+
+  if (!user) {
+    return NextResponse.json({ error: "User not found" }, { status: 404 });
+  }
+
+  const updatedUser = await prisma.user.update({
+    where: { email },
+    data: {
+      invalidLoginAttempts: 0,
+      lockedAt: null,
+    },
+    select: {
+      id: true,
+      email: true,
+      invalidLoginAttempts: true,
+      lockedAt: true,
+    },
+  });
+
+  return NextResponse.json({
+    success: true,
+    user: updatedUser,
+  });
+});

apps/web/app/(ee)/api/bounties/[bountyId]/submissions/[submissionId]/approve/route.ts

@@ -0,0 +1,43 @@
+import { approveBountySubmission } from "@/lib/api/bounties/approve-bounty-submission";
+import { getBountyOrThrow } from "@/lib/api/bounties/get-bounty-or-throw";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { parseRequestBody } from "@/lib/api/utils";
+import { withWorkspace } from "@/lib/auth";
+import { approveBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
+import { NextResponse } from "next/server";
+
+// POST /api/bounties/[bountyId]/submissions/[submissionId]/approve - approve a submission
+export const POST = withWorkspace(
+  async ({ workspace, params, req, session }) => {
+    const { bountyId, submissionId } = params;
+    const programId = getDefaultProgramIdOrThrow(workspace);
+
+    let body;
+    try {
+      body = await parseRequestBody(req);
+    } catch (e) {
+      // If body is empty or invalid, use empty object since body is optional
+      body = {};
+    }
+
+    const { rewardAmount } = approveBountySubmissionBodySchema.parse(body);
+
+    await getBountyOrThrow({
+      bountyId,
+      programId,
+    });
+
+    const approvedSubmission = await approveBountySubmission({
+      programId,
+      bountyId,
+      submissionId,
+      rewardAmount,
+      user: session.user,
+    });
+
+    return NextResponse.json(approvedSubmission);
+  },
+  {
+    requiredPlan: ["advanced", "enterprise"],
+  },
+);

apps/web/app/(ee)/api/bounties/[bountyId]/submissions/[submissionId]/reject/route.ts

@@ -0,0 +1,45 @@
+import { getBountyOrThrow } from "@/lib/api/bounties/get-bounty-or-throw";
+import { rejectBountySubmission } from "@/lib/api/bounties/reject-bounty-submission";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { parseRequestBody } from "@/lib/api/utils";
+import { withWorkspace } from "@/lib/auth";
+import { rejectBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
+import { NextResponse } from "next/server";
+
+// POST /api/bounties/[bountyId]/submissions/[submissionId]/reject - reject a submission
+export const POST = withWorkspace(
+  async ({ workspace, params, req, session }) => {
+    const { bountyId, submissionId } = params;
+    const programId = getDefaultProgramIdOrThrow(workspace);
+
+    let body;
+    try {
+      body = await parseRequestBody(req);
+    } catch (e) {
+      // If body is empty or invalid, use empty object since body is optional
+      body = {};
+    }
+
+    const { rejectionReason, rejectionNote } =
+      rejectBountySubmissionBodySchema.parse(body);
+
+    await getBountyOrThrow({
+      bountyId,
+      programId,
+    });
+
+    const rejectedSubmission = await rejectBountySubmission({
+      programId,
+      bountyId,
+      submissionId,
+      rejectionReason,
+      rejectionNote,
+      user: session.user,
+    });
+
+    return NextResponse.json(rejectedSubmission);
+  },
+  {
+    requiredPlan: ["advanced", "enterprise"],
+  },
+);

apps/web/app/(ee)/api/bounties/[bountyId]/submissions/route.ts

@@ -1,5 +1,4 @@
-import { getBountySubmissions } from "@/lib/api/bounties/get-bounty-submissions";
-import { DubApiError } from "@/lib/api/errors";
+import { getBountyOrThrow } from "@/lib/api/bounties/get-bounty-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { withWorkspace } from "@/lib/auth";
 import {
@@ -8,40 +7,69 @@ import {
 } from "@/lib/zod/schemas/bounties";
 import { prisma } from "@dub/prisma";
 import { NextResponse } from "next/server";
-import * as z from "zod/v4";
 
 // GET /api/bounties/[bountyId]/submissions - get all submissions for a bounty
 export const GET = withWorkspace(
   async ({ workspace, params, searchParams }) => {
     const { bountyId } = params;
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const bounty = await prisma.bounty.findUniqueOrThrow({
-      where: {
-        id: bountyId,
-      },
+    const bounty = await getBountyOrThrow({
+      bountyId,
+      programId,
       include: {
         groups: true,
       },
     });
 
-    if (bounty.programId !== programId) {
-      throw new DubApiError({
-        code: "not_found",
-        message: `Bounty ${bountyId} not found.`,
-      });
-    }
-
-    const filters = getBountySubmissionsQuerySchema.parse(searchParams);
+    const { status, groupId, partnerId, sortOrder, sortBy, page, pageSize } =
+      getBountySubmissionsQuerySchema.parse(searchParams);
 
-    const bountySubmissions = await getBountySubmissions({
-      ...filters,
-      bountyId: bounty.id,
+    const submissions = await prisma.bountySubmission.findMany({
+      where: {
+        bountyId,
+        status: status ?? {
+          in: ["draft", "submitted", "approved"],
+        },
+        ...(groupId && {
+          programEnrollment: {
+            groupId,
+          },
+        }),
+        ...(partnerId && {
+          partnerId,
+        }),
+      },
+      include: {
+        user: true,
+        commission: true,
+        partner: true,
+        programEnrollment: true,
+      },
+      orderBy: {
+        [sortBy === "completedAt" ? "completedAt" : "performanceCount"]:
+          sortOrder,
+      },
+      skip: (page - 1) * pageSize,
+      take: pageSize,
     });
 
-    return NextResponse.json(
-      z.array(BountySubmissionExtendedSchema).parse(bountySubmissions),
+    const bountySubmissions = submissions.map(
+      ({ partner, programEnrollment, commission, user, ...submissionData }) =>
+        BountySubmissionExtendedSchema.parse({
+          ...submissionData,
+          partner: {
+            ...partner,
+            ...(programEnrollment || {}),
+            id: partner.id,
+            status: programEnrollment?.status ?? null,
+          },
+          commission,
+          user,
+        }),
     );
+
+    return NextResponse.json(bountySubmissions);
   },
   {
     requiredPlan: [

apps/web/app/(ee)/api/commissions/export/route.ts

@@ -11,7 +11,7 @@ import { NextResponse } from "next/server";
 
 const MAX_COMMISSIONS_TO_EXPORT = 1000;
 
-// GET /api/commissions/export – export commissions to CSV
+// GET /api/commissions/export – export commissions to CSV (with async support if >1000 commissions)
 export const GET = withWorkspace(
   async ({ searchParams, workspace, session }) => {
     const programId = getDefaultProgramIdOrThrow(workspace);
@@ -28,7 +28,7 @@ export const GET = withWorkspace(
     // Process the export in the background if the number of commissions is greater than MAX_COMMISSIONS_TO_EXPORT
     if (counts.all.count > MAX_COMMISSIONS_TO_EXPORT) {
       await qstash.publishJSON({
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/commissions/export`,
+        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/export/commissions`,
         body: {
           ...parsedParams,
           columns: columns.join(","),

…ssions/export/fetch-commissions-batch.ts …t/commissions/fetch-commissions-batch.tsapps/web/app/(ee)/api/cron/commissions/export/fetch-commissions-batch.ts renamed to apps/web/app/(ee)/api/cron/export/commissions/fetch-commissions-batch.ts apps/web/app/(ee)/api/cron/commissions/export/fetch-commissions-batch.ts renamed to apps/web/app/(ee)/api/cron/export/commissions/fetch-commissions-batch.ts

@@ -19,7 +19,7 @@ const payloadSchema = commissionsExportQuerySchema.extend({
   userId: z.string(),
 });
 
-// POST /api/cron/commissions/export - QStash worker for processing large commission exports
+// POST /api/cron/export/commissions - QStash worker for processing large commission exports
 export async function POST(req: Request) {
   try {
     const rawBody = await req.text();
@@ -89,7 +89,7 @@ export async function POST(req: Request) {
 
     await sendEmail({
       to: user.email,
-      subject: "Your commission export is ready",
+      subject: "Your commissions export is ready",
       react: ExportReady({
         email: user.email,
         exportType: "commissions",

…ee)/api/cron/commissions/export/route.ts …ee)/api/cron/export/commissions/route.tsapps/web/app/(ee)/api/cron/commissions/export/route.ts renamed to apps/web/app/(ee)/api/cron/export/commissions/route.ts apps/web/app/(ee)/api/cron/commissions/export/route.ts renamed to apps/web/app/(ee)/api/cron/export/commissions/route.ts

@@ -0,0 +1,26 @@
+import { getEvents } from "@/lib/analytics/get-events";
+import { EventsFilters } from "@/lib/analytics/types";
+
+export async function* fetchEventsBatch(
+  filters: Omit<EventsFilters, "page" | "limit">,
+  pageSize: number = 1000,
+) {
+  let page = 1;
+  let hasMore = true;
+
+  while (hasMore) {
+    const events = await getEvents({
+      ...filters,
+      page,
+      limit: pageSize,
+    });
+
+    if (events.length > 0) {
+      yield { events };
+      page++;
+      hasMore = events.length === pageSize;
+    } else {
+      hasMore = false;
+    }
+  }
+}