@solidxai/core-ui 0.1.8-beta.1 → 0.1.8-beta.3

package/dist/routes/guards/AuthGuard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthGuard.d.ts","sourceRoot":"","sources":["../../../src/routes/guards/AuthGuard.tsx"],"names":[],"mappings":"AAGA,KAAK,cAAc,GAAG;IACpB,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C,CAAC;AAEF,wBAAgB,SAAS,CAAC,EAAE,aAAa,EAAE,EAAE,cAAc,2CAiC1D"}
+{"version":3,"file":"AuthGuard.d.ts","sourceRoot":"","sources":["../../../src/routes/guards/AuthGuard.tsx"],"names":[],"mappings":"AAGA,KAAK,cAAc,GAAG;IACpB,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C,CAAC;AAEF,wBAAgB,SAAS,CAAC,EAAE,aAAa,EAAE,EAAE,cAAc,2CAsC1D"}

package/dist/routes/guards/AuthGuard.js

@@ -10,8 +10,11 @@ export function AuthGuard(_a) {
         if (segments.length === 0)
             return "/auth/login";
         var base = segments[0];
-        if (base === "auth")
+        // routes that should NOT be treated as tenant
+        var systemRoutes = ["admin", "auth"];
+        if (systemRoutes.includes(base)) {
             return "/auth/login";
+        }
         return "/".concat(base, "/auth/login");
     };
     var resolveLoginRoute = getLoginRoute || defaultGetLoginRoute;

package/dist/routes/guards/AuthGuard.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthGuard.js","sourceRoot":"","sources":["../../../src/routes/guards/AuthGuard.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,MAAM,UAAU,SAAS,CAAC,EAAiC;QAA/B,aAAa,mBAAA;IACvC,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IACvB,IAAA,MAAM,GAAK,UAAU,EAAE,OAAjB,CAAkB;IAEhC,IAAM,oBAAoB,GAAG,UAAC,QAAgB;QAC5C,IAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAErD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,aAAa,CAAC;QAEhD,IAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAEzB,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO,aAAa,CAAC;QAE1C,OAAO,WAAI,IAAI,gBAAa,CAAC;IAC/B,CAAC,CAAC;IAEF,IAAM,iBAAiB,GAAG,aAAa,IAAI,oBAAoB,CAAC;IAEhE,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,uCAAqB,CAAC;KAC9B;IAED,IAAI,MAAM,KAAK,iBAAiB,EAAE;QAChC,OAAO,CACL,KAAC,QAAQ,IACP,EAAE,EAAE,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACxC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EACzB,OAAO,SACP,CACH,CAAC;KACH;IAED,OAAO,KAAC,MAAM,KAAG,CAAC;AACpB,CAAC","sourcesContent":["import { Navigate, Outlet, useLocation } from \"react-router-dom\";\nimport { useSession } from \"../../hooks/useSession\";\n\ntype AuthGuardProps = {\n  getLoginRoute?: (pathname: string) => string;\n};\n\nexport function AuthGuard({ getLoginRoute }: AuthGuardProps) {\n  const location = useLocation();\n  const { status } = useSession();\n\n  const defaultGetLoginRoute = (pathname: string) => {\n    const segments = pathname.split(\"/\").filter(Boolean);\n\n    if (segments.length === 0) return \"/auth/login\";\n\n    const base = segments[0];\n\n    if (base === \"auth\") return \"/auth/login\";\n\n    return `/${base}/auth/login`;\n  };\n\n  const resolveLoginRoute = getLoginRoute || defaultGetLoginRoute;\n\n  if (status === \"loading\") {\n    return <div>Loading...</div>;\n  }\n\n  if (status === \"unauthenticated\") {\n    return (\n      <Navigate\n        to={resolveLoginRoute(location.pathname)}\n        state={{ from: location }}\n        replace\n      />\n    );\n  }\n\n  return <Outlet />;\n}"]}
+{"version":3,"file":"AuthGuard.js","sourceRoot":"","sources":["../../../src/routes/guards/AuthGuard.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,MAAM,UAAU,SAAS,CAAC,EAAiC;QAA/B,aAAa,mBAAA;IACvC,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IACvB,IAAA,MAAM,GAAK,UAAU,EAAE,OAAjB,CAAkB;IAEhC,IAAM,oBAAoB,GAAG,UAAC,QAAgB;QAC5C,IAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAErD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,aAAa,CAAC;QAEhD,IAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAEzB,8CAA8C;QAC9C,IAAM,YAAY,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAEvC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO,aAAa,CAAC;SACtB;QAED,OAAO,WAAI,IAAI,gBAAa,CAAC;IAC/B,CAAC,CAAC;IAEF,IAAM,iBAAiB,GAAG,aAAa,IAAI,oBAAoB,CAAC;IAEhE,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,uCAAqB,CAAC;KAC9B;IAED,IAAI,MAAM,KAAK,iBAAiB,EAAE;QAChC,OAAO,CACL,KAAC,QAAQ,IACP,EAAE,EAAE,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACxC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EACzB,OAAO,SACP,CACH,CAAC;KACH;IAED,OAAO,KAAC,MAAM,KAAG,CAAC;AACpB,CAAC","sourcesContent":["import { Navigate, Outlet, useLocation } from \"react-router-dom\";\nimport { useSession } from \"../../hooks/useSession\";\n\ntype AuthGuardProps = {\n  getLoginRoute?: (pathname: string) => string;\n};\n\nexport function AuthGuard({ getLoginRoute }: AuthGuardProps) {\n  const location = useLocation();\n  const { status } = useSession();\n\n  const defaultGetLoginRoute = (pathname: string) => {\n    const segments = pathname.split(\"/\").filter(Boolean);\n\n    if (segments.length === 0) return \"/auth/login\";\n\n    const base = segments[0];\n\n    // routes that should NOT be treated as tenant\n    const systemRoutes = [\"admin\", \"auth\"];\n\n    if (systemRoutes.includes(base)) {\n      return \"/auth/login\";\n    }\n\n    return `/${base}/auth/login`;\n  };\n\n  const resolveLoginRoute = getLoginRoute || defaultGetLoginRoute;\n\n  if (status === \"loading\") {\n    return <div>Loading...</div>;\n  }\n\n  if (status === \"unauthenticated\") {\n    return (\n      <Navigate\n        to={resolveLoginRoute(location.pathname)}\n        state={{ from: location }}\n        replace\n      />\n    );\n  }\n\n  return <Outlet />;\n}"]}

package/dist/routes/guards/AuthGuard.tsx

@@ -16,7 +16,12 @@ export function AuthGuard({ getLoginRoute }: AuthGuardProps) {
 
     const base = segments[0];
 
-    if (base === "auth") return "/auth/login";
+    // routes that should NOT be treated as tenant
+    const systemRoutes = ["admin", "auth"];
+
+    if (systemRoutes.includes(base)) {
+      return "/auth/login";
+    }
 
     return `/${base}/auth/login`;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core-ui",
-  "version": "0.1.8-beta.1",
+  "version": "0.1.8-beta.3",
   "scripts": {
     "prebuild": "npm run copy-resources && npm run copy-styles",
     "build": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",