@appwarden/middleware 3.0.0 → 3.0.2

package/chunk-4JGYMZTR.js

@@ -0,0 +1,50 @@
+import {
+  getErrors
+} from "./chunk-B5IE7V77.js";
+import {
+  printMessage
+} from "./chunk-7UTT3M2S.js";
+
+// src/utils/build-lock-page-url.ts
+function normalizeLockPageSlug(lockPageSlug) {
+  return lockPageSlug.startsWith("/") ? lockPageSlug : `/${lockPageSlug}`;
+}
+function buildLockPageUrl(lockPageSlug, requestUrl) {
+  const normalizedSlug = normalizeLockPageSlug(lockPageSlug);
+  return new URL(normalizedSlug, requestUrl);
+}
+function normalizeTrailingSlash(path) {
+  if (path === "/") return path;
+  return path.endsWith("/") ? path.slice(0, -1) : path;
+}
+function isOnLockPage(lockPageSlug, requestUrl) {
+  const normalizedSlug = normalizeTrailingSlash(
+    normalizeLockPageSlug(lockPageSlug)
+  );
+  const url = typeof requestUrl === "string" ? new URL(requestUrl) : requestUrl;
+  const normalizedPathname = normalizeTrailingSlash(url.pathname);
+  return normalizedPathname === normalizedSlug;
+}
+
+// src/utils/validate-config.ts
+function validateConfig(config, schema) {
+  const result = schema.safeParse(config);
+  const hasErrors = !result.success;
+  if (hasErrors) {
+    const mappedErrors = getErrors(result.error);
+    if (mappedErrors.length > 0) {
+      for (const error of mappedErrors) {
+        console.error(printMessage(error));
+      }
+    } else {
+      console.error(printMessage(result.error.message));
+    }
+  }
+  return hasErrors;
+}
+
+export {
+  buildLockPageUrl,
+  isOnLockPage,
+  validateConfig
+};

package/{chunk-N6AUTMZO.js → chunk-6M7BE3AW.js}

@@ -1,9 +1,3 @@
-// src/utils/build-lock-page-url.ts
-function buildLockPageUrl(lockPageSlug, requestUrl) {
-  const normalizedSlug = lockPageSlug.startsWith("/") ? lockPageSlug : `/${lockPageSlug}`;
-  return new URL(normalizedSlug, requestUrl);
-}
-
 // src/utils/create-redirect.ts
 var TEMPORARY_REDIRECT_STATUS = 302;
 var createRedirect = (url) => {
@@ -16,7 +10,6 @@ var createRedirect = (url) => {
 };
 
 export {
-  buildLockPageUrl,
   TEMPORARY_REDIRECT_STATUS,
   createRedirect
 };

package/cloudflare/astro.js

@@ -1,11 +1,12 @@
 import {
   TEMPORARY_REDIRECT_STATUS,
-  buildLockPageUrl,
   createRedirect
-} from "../chunk-N6AUTMZO.js";
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -54,6 +55,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/cloudflare/nextjs.js

@@ -1,10 +1,11 @@
 import {
-  TEMPORARY_REDIRECT_STATUS,
-  buildLockPageUrl
-} from "../chunk-N6AUTMZO.js";
+  TEMPORARY_REDIRECT_STATUS
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -49,6 +50,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return NextResponse.next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return NextResponse.next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/cloudflare/react-router.js

@@ -1,10 +1,11 @@
 import {
-  buildLockPageUrl,
   createRedirect
-} from "../chunk-N6AUTMZO.js";
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -52,6 +53,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/cloudflare/tanstack-start.js

@@ -1,10 +1,11 @@
 import {
-  buildLockPageUrl,
   createRedirect
-} from "../chunk-N6AUTMZO.js";
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -55,6 +56,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",

package/vercel.js

@@ -3,8 +3,9 @@ import {
   isValidCacheUrl
 } from "./chunk-QEFORWCW.js";
 import {
+  isOnLockPage,
   validateConfig
-} from "./chunk-6PUA5YXP.js";
+} from "./chunk-4JGYMZTR.js";
 import {
   LockValue,
   MemoryCache
@@ -210,6 +211,9 @@ function createAppwardenMiddleware(config) {
       if (!parsedConfig.lockPageSlug) {
         return NextResponse.next();
       }
+      if (isOnLockPage(parsedConfig.lockPageSlug, request.url)) {
+        return NextResponse.next();
+      }
       const provider = isCacheUrl.edgeConfig(parsedConfig.cacheUrl) ? "edge-config" : "upstash";
       const cacheValue = memoryCache.get(APPWARDEN_CACHE_KEY);
       const shouldRecheck = MemoryCache.isExpired(cacheValue);

package/chunk-6PUA5YXP.js

@@ -1,27 +0,0 @@
-import {
-  getErrors
-} from "./chunk-B5IE7V77.js";
-import {
-  printMessage
-} from "./chunk-7UTT3M2S.js";
-
-// src/utils/validate-config.ts
-function validateConfig(config, schema) {
-  const result = schema.safeParse(config);
-  const hasErrors = !result.success;
-  if (hasErrors) {
-    const mappedErrors = getErrors(result.error);
-    if (mappedErrors.length > 0) {
-      for (const error of mappedErrors) {
-        console.error(printMessage(error));
-      }
-    } else {
-      console.error(printMessage(result.error.message));
-    }
-  }
-  return hasErrors;
-}
-
-export {
-  validateConfig
-};