@greatapps/common 1.0.0 → 1.0.1

package/dist/middlewares/create-auth-middleware.mjs

@@ -12,7 +12,7 @@ function createAuthMiddleware(options) {
     if (token && isAuthRoute) {
       return stopChain(NextResponse.redirect(new URL("/", request.url)));
     }
-    if (!token && !isPublicRoute) {
+    if (!token && !isPublicRoute && !isAuthRoute) {
       const loginUrl = new URL("/login", request.url);
       if (pathname !== "/") {
         loginUrl.searchParams.set("redirect", pathname);

package/dist/middlewares/create-auth-middleware.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middlewares/create-auth-middleware.ts"],"sourcesContent":["import { NextRequest, NextResponse } from 'next/server';\r\n\r\nimport { continueChain, MiddlewareConfig, MiddlewareFunction, MiddlewareResult, stopChain } from './types';\r\n\r\nfunction isRouteEquals(pathname: string, routes: string[]): boolean {\r\n  return routes.some((route) => pathname === route || pathname.startsWith(`${route}/`));\r\n}\r\n\r\ninterface CreateAuthMiddlewareOptions {\r\n  publicRoutes?: string[];\r\n  authRoutes?: string[];\r\n}\r\n\r\nexport function createAuthMiddleware(options?: CreateAuthMiddlewareOptions): MiddlewareFunction {\r\n  return (request: NextRequest) => {\r\n    const { pathname } = request.nextUrl;\r\n    const token = request.cookies.get('greatapps')?.value;\r\n    const isPublicRoute = isRouteEquals(pathname, options?.publicRoutes || []);\r\n    const isAuthRoute = isRouteEquals(pathname, options?.authRoutes || []);\r\n\r\n    if (token && isAuthRoute) {\r\n      return stopChain(NextResponse.redirect(new URL('/', request.url)));\r\n    }\r\n\r\n    if (!token && !isPublicRoute) {\r\n\r\n      const loginUrl = new URL('/login', request.url);\r\n\r\n      if (pathname !== '/') {\r\n        loginUrl.searchParams.set('redirect', pathname);\r\n      }\r\n\r\n      return stopChain(NextResponse.redirect(loginUrl));\r\n    }\r\n\r\n    return continueChain();\r\n  }\r\n}"],"mappings":"AAAA,SAAsB,oBAAoB;AAE1C,SAAS,eAAuE,iBAAiB;AAEjG,SAAS,cAAc,UAAkB,QAA2B;AAClE,SAAO,OAAO,KAAK,CAAC,UAAU,aAAa,SAAS,SAAS,WAAW,GAAG,KAAK,GAAG,CAAC;AACtF;AAOO,SAAS,qBAAqB,SAA2D;AAC9F,SAAO,CAAC,YAAyB;AAC/B,UAAM,EAAE,SAAS,IAAI,QAAQ;AAC7B,UAAM,QAAQ,QAAQ,QAAQ,IAAI,WAAW,GAAG;AAChD,UAAM,gBAAgB,cAAc,UAAU,SAAS,gBAAgB,CAAC,CAAC;AACzE,UAAM,cAAc,cAAc,UAAU,SAAS,cAAc,CAAC,CAAC;AAErE,QAAI,SAAS,aAAa;AACxB,aAAO,UAAU,aAAa,SAAS,IAAI,IAAI,KAAK,QAAQ,GAAG,CAAC,CAAC;AAAA,IACnE;AAEA,QAAI,CAAC,SAAS,CAAC,eAAe;AAE5B,YAAM,WAAW,IAAI,IAAI,UAAU,QAAQ,GAAG;AAE9C,UAAI,aAAa,KAAK;AACpB,iBAAS,aAAa,IAAI,YAAY,QAAQ;AAAA,MAChD;AAEA,aAAO,UAAU,aAAa,SAAS,QAAQ,CAAC;AAAA,IAClD;AAEA,WAAO,cAAc;AAAA,EACvB;AACF;","names":[]}
+{"version":3,"sources":["../../src/middlewares/create-auth-middleware.ts"],"sourcesContent":["import { NextRequest, NextResponse } from 'next/server';\r\n\r\nimport { continueChain, MiddlewareConfig, MiddlewareFunction, MiddlewareResult, stopChain } from './types';\r\n\r\nfunction isRouteEquals(pathname: string, routes: string[]): boolean {\r\n  return routes.some((route) => pathname === route || pathname.startsWith(`${route}/`));\r\n}\r\n\r\ninterface CreateAuthMiddlewareOptions {\r\n  publicRoutes?: string[];\r\n  authRoutes?: string[];\r\n}\r\n\r\nexport function createAuthMiddleware(options?: CreateAuthMiddlewareOptions): MiddlewareFunction {\r\n  return (request: NextRequest) => {\r\n    const { pathname } = request.nextUrl;\r\n    const token = request.cookies.get('greatapps')?.value;\r\n    const isPublicRoute = isRouteEquals(pathname, options?.publicRoutes || []);\r\n    const isAuthRoute = isRouteEquals(pathname, options?.authRoutes || []);\r\n\r\n    if (token && isAuthRoute) {\r\n      return stopChain(NextResponse.redirect(new URL('/', request.url)));\r\n    }\r\n\r\n    if (!token && !isPublicRoute && !isAuthRoute) {\r\n\r\n      const loginUrl = new URL('/login', request.url);\r\n\r\n      if (pathname !== '/') {\r\n        loginUrl.searchParams.set('redirect', pathname);\r\n      }\r\n\r\n      return stopChain(NextResponse.redirect(loginUrl));\r\n    }\r\n\r\n    return continueChain();\r\n  }\r\n}"],"mappings":"AAAA,SAAsB,oBAAoB;AAE1C,SAAS,eAAuE,iBAAiB;AAEjG,SAAS,cAAc,UAAkB,QAA2B;AAClE,SAAO,OAAO,KAAK,CAAC,UAAU,aAAa,SAAS,SAAS,WAAW,GAAG,KAAK,GAAG,CAAC;AACtF;AAOO,SAAS,qBAAqB,SAA2D;AAC9F,SAAO,CAAC,YAAyB;AAC/B,UAAM,EAAE,SAAS,IAAI,QAAQ;AAC7B,UAAM,QAAQ,QAAQ,QAAQ,IAAI,WAAW,GAAG;AAChD,UAAM,gBAAgB,cAAc,UAAU,SAAS,gBAAgB,CAAC,CAAC;AACzE,UAAM,cAAc,cAAc,UAAU,SAAS,cAAc,CAAC,CAAC;AAErE,QAAI,SAAS,aAAa;AACxB,aAAO,UAAU,aAAa,SAAS,IAAI,IAAI,KAAK,QAAQ,GAAG,CAAC,CAAC;AAAA,IACnE;AAEA,QAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,aAAa;AAE5C,YAAM,WAAW,IAAI,IAAI,UAAU,QAAQ,GAAG;AAE9C,UAAI,aAAa,KAAK;AACpB,iBAAS,aAAa,IAAI,YAAY,QAAQ;AAAA,MAChD;AAEA,aAAO,UAAU,aAAa,SAAS,QAAQ,CAAC;AAAA,IAClD;AAEA,WAAO,cAAc;AAAA,EACvB;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",
@@ -10,7 +10,10 @@
       "types": "./src/index.ts"
     }
   },
-  "files": ["dist", "src"],
+  "files": [
+    "dist",
+    "src"
+  ],
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",

package/src/middlewares/create-auth-middleware.ts

@@ -22,7 +22,7 @@ export function createAuthMiddleware(options?: CreateAuthMiddlewareOptions): Mid
       return stopChain(NextResponse.redirect(new URL('/', request.url)));
     }
 
-    if (!token && !isPublicRoute) {
+    if (!token && !isPublicRoute && !isAuthRoute) {
 
       const loginUrl = new URL('/login', request.url);