Merging 350d949 into trunk-temp/pr-2312/ebd3955b-feff-419a-9a7e-d2a2f…

…36c0838
arcjet · Nov 25, 2024 · 3b2bd35 · 3b2bd35
2 parents 2bfaa79 + 350d949
commit 3b2bd35
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 116 deletions.
diff --git a/examples/nextjs-clerk-rate-limit/app/api/arcjet/route.ts b/examples/nextjs-clerk-rate-limit/app/api/arcjet/route.ts
@@ -50,7 +50,7 @@ export async function GET(req: NextRequest) {
       })
     );
 
-    const fingerprint = ip(req);
+    const fingerprint = ip(req) || "127.0.0.1"; // Fall back to local IP if none
 
     // Deduct 5 tokens from the token bucket
     decision = await rl.protect(req, { fingerprint, requested: 5 });
@@ -67,19 +67,15 @@ export async function GET(req: NextRequest) {
           status: 429,
         }
       );
-    } else {
-      // Detected a bot
-      return NextResponse.json(
-        {
-          error: "Forbidden",
-          reason: decision.reason,
-        },
-        {
-          status: 403,
-        }
-      );
     }
   }
+
+  let reset: Date | undefined;
+  let remaining: number | undefined;
+
+  if (decision.reason.isRateLimit()) {
+    reset = decision.reason.resetTime;
+    remaining = decision.reason.remaining;
+  }
 
-  return NextResponse.json({ message: "Hello World" });
-}
+  return NextResponse.json({ message: "Hello World", reset, remaining });}
diff --git a/examples/nextjs-clerk-rate-limit/app/api/token/route.ts b/examples/nextjs-clerk-rate-limit/app/api/token/route.ts
@@ -5,11 +5,9 @@
 import { auth } from "@clerk/nextjs/server";
 
 export async function GET(req: Request) {
-  const { userId, getToken } = await auth();
+  const { userId, getToken, redirectToSignIn } = await auth();
 
-  if (!userId) {
-    return new Response("Unauthorized", { status: 401 });
-  }
+  if (!userId) return redirectToSignIn()
 
   try {
     const token = await getToken();

diff --git a/examples/nextjs-clerk-rate-limit/middleware.ts b/examples/nextjs-clerk-rate-limit/middleware.ts
@@ -3,7 +3,7 @@ import { NextResponse } from "next/server";
 
 const isProtectedRoute = createRouteMatcher(["/api/private", "/api/token"]);
 
-export default clerkMiddleware((auth, request) => {
+export default clerkMiddleware(async (auth, request) => {
   if (isProtectedRoute(request)) {
     auth.protect();
   }

diff --git a/examples/nextjs-clerk-rate-limit/package-lock.json b/examples/nextjs-clerk-rate-limit/package-lock.json
diff --git a/examples/nextjs-clerk-rate-limit/package.json b/examples/nextjs-clerk-rate-limit/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@arcjet/next": "file:../../arcjet-next",
-    "@clerk/nextjs": "^6.4.1",
+    "@clerk/nextjs": "^6.5.0",
     "next": "15.0.3",
     "react": "^18",
     "react-dom": "^18"
@@ -26,4 +26,4 @@
     "tailwindcss": "^3.4.15",
     "typescript": "^5"
   }
-}
+}