From d95dccdf366dcbdf43ba11f48c06208a0a0e73f9 Mon Sep 17 00:00:00 2001
From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com>
Date: Fri, 17 Nov 2023 19:26:11 -0700
Subject: [PATCH] now?

---
 middleware.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/middleware.ts b/middleware.ts
index cf9644c..460129e 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -22,19 +22,7 @@ export default authMiddleware({
     "/api/webhooks/(.*)",
   ],
   afterAuth: async (auth, req) => {
-    const isAMA = auth.user?.emailAddresses.map((email) =>
-      email.emailAddress.includes("ama.ab.ca")
-    );
-
-    console.log("ISAMA: ", isAMA);
-
-    if (isAMA && isAMA?.length > 0) {
-      return NextResponse.redirect(
-        "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
-      );
-    }
-
-    if (!auth.userId && auth.isPublicRoute && !isAMA) {
+    if (!auth.userId && auth.isPublicRoute) {
       const { success } = await rateLimit.limit(req.ip || "");
       if (success) {
         return NextResponse.next();
@@ -43,6 +31,18 @@ export default authMiddleware({
         status: 429,
         statusText: "Too many requests!",
       });
+    } else {
+      const isAMA = auth.user?.emailAddresses.map((email) =>
+        email.emailAddress.includes("ama.ab.ca")
+      );
+
+      console.log("ISAMA: ", isAMA);
+
+      if (isAMA && isAMA?.length > 0) {
+        return NextResponse.redirect(
+          "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+        );
+      }
     }
 
     if (req.nextUrl.pathname.includes("/api/internal")) {