:| finally

src/middleware.ts

@@ -1,18 +1,33 @@
-import { authMiddleware } from "@clerk/nextjs";
+import { authMiddleware, redirectToSignIn } from "@clerk/nextjs";
 import { validateRequest } from "./server/unkey";
 import { NextResponse } from "next/server";
 
 export default authMiddleware({
-  publicRoutes: ["/", "/api/(.*)"],
-  beforeAuth: async (req) => {
-    if (req.nextUrl.pathname.startsWith("/api/external")) {
+  publicRoutes: ["/", "/api/public/(.*)"],
+  afterAuth: async (auth, req) => {
+    if (!auth.userId && auth.isPublicRoute) {
+      console.log("1");
+      return NextResponse.next();
+    }
+
+    if (
+      req.nextUrl.pathname.includes("/api/webhooks") ||
+      req.nextUrl.pathname.includes("/api/private")
+    ) {
+      console.log("2");
       const isValid = await validateRequest(req);
       console.log("Is Valid?: ", isValid);
       if (isValid) {
         return NextResponse.next();
-      }
+      } else {
         return new NextResponse("UNAUTHORIZED", { status: 403 });
       }
+    }
+    if (!auth.userId && !auth.isPublicRoute) {
+      console.log(req.nextUrl);
+      console.log("3");
+      return redirectToSignIn({ returnBackUrl: req.url });
+    }
   },
 });
 

src/pages/api/external/ping.ts

@@ -1,9 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from "next";
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse
-) {
-  console.log("Made it to the function!");
-  res.status(200).json({ result: "Pong!" });
-}

src/pages/api/private/ping.ts

@@ -0,0 +1,13 @@
+import { NextResponse } from "next/server";
+
+export const config = {
+  runtime: "edge",
+  regions: ["pdx1"],
+};
+
+export default async function handler() {
+  return NextResponse.json(
+    { message: "Private Pong!" },
+    { status: 200, statusText: "SUCCESS" }
+  );
+}

src/pages/api/public/ping.ts

@@ -0,0 +1,13 @@
+import { NextResponse } from "next/server";
+
+export const config = {
+  runtime: "edge",
+  regions: ["pdx1"],
+};
+
+export default async function handler() {
+  return NextResponse.json(
+    { message: "Public Pong!" },
+    { status: 200, statusText: "SUCCESS" }
+  );
+}

src/pages/api/webhooks/index.ts

@@ -10,12 +10,6 @@ export default async function handler(
   req: NextApiRequest,
   res: NextApiResponse
 ) {
-  const isValid = await validateRequest(req, res);
-
-  if (!isValid) {
-    return;
-  }
-
   try {
     const requestBody = WebhookEventBodySchema.parse(req.body);
 

src/server/unkey.ts

@@ -17,6 +17,7 @@ export const validateApiKey = async (key: string) => {
 
 export const validateRequest = async (req: NextRequest) => {
   let isValidKey: boolean = false;
+
   const authorization = req.headers.get("authorization");
   // Get the auth bearer token if it exists
   if (authorization) {