@greatapps/common 1.1.298 → 1.1.299

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

@@ -1,10 +1,11 @@
 import { NextResponse } from "next/server";
 import { continueChain, stopChain } from "./types";
+import { whitelabelService } from "../modules/whitelabel/services/whitelabel.service";
 function isRouteEquals(pathname, routes) {
   return routes.some((route) => pathname === route || pathname.startsWith(`${route}/`));
 }
 function createAuthMiddleware(options) {
-  return (request) => {
+  return async (request) => {
     const { pathname } = request.nextUrl;
     const token = process.env.DUMMY_AUTH_TOKEN || request.cookies.get("greatapps")?.value;
     const isPublicRoute = isRouteEquals(pathname, options?.publicRoutes || []);
@@ -13,7 +14,10 @@ function createAuthMiddleware(options) {
       return stopChain(NextResponse.redirect(new URL("/", request.url)));
     }
     if (!token && !isPublicRoute && !isAuthRoute) {
-      const loginUrl = new URL("/login", request.url);
+      const host = request.headers.get("host") || "";
+      const whitelabel = await whitelabelService.getTokenByDomain(host).catch(() => null);
+      const accountsUrl = whitelabel?.accounts_url;
+      const loginUrl = accountsUrl ? new URL("/login", accountsUrl) : 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 = process.env.DUMMY_AUTH_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      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,IAAI,oBAAoB,QAAQ,QAAQ,IAAI,WAAW,GAAG;AAChF,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;AAC5C,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\nimport { whitelabelService } from '../modules/whitelabel/services/whitelabel.service';\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 async (request: NextRequest) => {\r\n    const { pathname } = request.nextUrl;\r\n    const token = process.env.DUMMY_AUTH_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      const host = request.headers.get('host') || '';\r\n      const whitelabel = await whitelabelService.getTokenByDomain(host).catch(() => null);\r\n      const accountsUrl = whitelabel?.accounts_url;\r\n\r\n      const loginUrl = accountsUrl\r\n        ? new URL('/login', accountsUrl)\r\n        : 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;AACjG,SAAS,yBAAyB;AAElC,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,OAAO,YAAyB;AACrC,UAAM,EAAE,SAAS,IAAI,QAAQ;AAC7B,UAAM,QAAQ,QAAQ,IAAI,oBAAoB,QAAQ,QAAQ,IAAI,WAAW,GAAG;AAChF,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;AAC5C,YAAM,OAAO,QAAQ,QAAQ,IAAI,MAAM,KAAK;AAC5C,YAAM,aAAa,MAAM,kBAAkB,iBAAiB,IAAI,EAAE,MAAM,MAAM,IAAI;AAClF,YAAM,cAAc,YAAY;AAEhC,YAAM,WAAW,cACb,IAAI,IAAI,UAAU,WAAW,IAC7B,IAAI,IAAI,UAAU,QAAQ,GAAG;AAEjC,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.1.298",
+  "version": "1.1.299",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",

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

@@ -1,6 +1,7 @@
 import { NextRequest, NextResponse } from 'next/server';
 
 import { continueChain, MiddlewareConfig, MiddlewareFunction, MiddlewareResult, stopChain } from './types';
+import { whitelabelService } from '../modules/whitelabel/services/whitelabel.service';
 
 function isRouteEquals(pathname: string, routes: string[]): boolean {
   return routes.some((route) => pathname === route || pathname.startsWith(`${route}/`));
@@ -12,7 +13,7 @@ interface CreateAuthMiddlewareOptions {
 }
 
 export function createAuthMiddleware(options?: CreateAuthMiddlewareOptions): MiddlewareFunction {
-  return (request: NextRequest) => {
+  return async (request: NextRequest) => {
     const { pathname } = request.nextUrl;
     const token = process.env.DUMMY_AUTH_TOKEN || request.cookies.get('greatapps')?.value;
     const isPublicRoute = isRouteEquals(pathname, options?.publicRoutes || []);
@@ -23,7 +24,13 @@ export function createAuthMiddleware(options?: CreateAuthMiddlewareOptions): Mid
     }
 
     if (!token && !isPublicRoute && !isAuthRoute) {
-      const loginUrl = new URL('/login', request.url);
+      const host = request.headers.get('host') || '';
+      const whitelabel = await whitelabelService.getTokenByDomain(host).catch(() => null);
+      const accountsUrl = whitelabel?.accounts_url;
+
+      const loginUrl = accountsUrl
+        ? new URL('/login', accountsUrl)
+        : new URL('/login', request.url);
 
       if (pathname !== '/') {
         loginUrl.searchParams.set('redirect', pathname);