@skylabs-digital/react-identity-access 2.10.0 → 2.10.1

package/dist/components/ProtectedRoute.d.ts

@@ -4,10 +4,10 @@ import { UserType, Permission } from '../types/api';
 export interface ProtectedRouteProps {
     children: ReactNode;
     redirectTo?: string;
-    minUserType?: UserType;
+    requiredUserType?: UserType;
     requiredPermissions?: (string | Permission)[];
     requireAllPermissions?: boolean;
     fallback?: ReactNode;
 }
-export declare function ProtectedRoute({ children, redirectTo, minUserType, requiredPermissions, requireAllPermissions, fallback, }: ProtectedRouteProps): import("react/jsx-runtime").JSX.Element;
+export declare function ProtectedRoute({ children, redirectTo, requiredUserType, requiredPermissions, requireAllPermissions, fallback, }: ProtectedRouteProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ProtectedRoute.d.ts.map

package/dist/components/ProtectedRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProtectedRoute.d.ts","sourceRoot":"","sources":["../../src/components/ProtectedRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEpD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,mBAAmB,CAAC,EAAE,CAAC,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC;IAC9C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAsGD,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,UAAqB,EACrB,WAAW,EACX,mBAAmB,EACnB,qBAA6B,EAC7B,QAAQ,GACT,EAAE,mBAAmB,2CAiDrB"}
+{"version":3,"file":"ProtectedRoute.d.ts","sourceRoot":"","sources":["../../src/components/ProtectedRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEpD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC5B,mBAAmB,CAAC,EAAE,CAAC,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC;IAC9C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAgGD,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,UAAqB,EACrB,gBAAgB,EAChB,mBAAmB,EACnB,qBAA6B,EAC7B,QAAQ,GACT,EAAE,mBAAmB,2CAsDrB"}

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import { jsx as n, Fragment as j, jsxs as d } from "react/jsx-runtime";
-import { createContext as he, useMemo as te, useState as k, useCallback as ie, useEffect as re, useContext as se, useRef as Ne } from "react";
+import { createContext as ue, useMemo as te, useState as k, useCallback as ie, useEffect as re, useContext as se, useRef as Ne } from "react";
 import { useLocation as Te, Navigate as fe } from "react-router-dom";
 class ne {
   // SessionManager instance
@@ -124,7 +124,7 @@ class Fe {
     })).data;
   }
 }
-const xe = he(null);
+const xe = ue(null);
 function Jt({ config: i, children: e }) {
   const t = te(
     () => {
@@ -209,7 +209,7 @@ function Jt({ config: i, children: e }) {
     r ? S() : g();
   }, []), /* @__PURE__ */ n(xe.Provider, { value: b, children: e });
 }
-function ge() {
+function he() {
   const i = se(xe);
   if (!i)
     throw new Error("useApp must be used within an AppProvider");
@@ -218,7 +218,7 @@ function ge() {
 function Ue() {
   return se(xe);
 }
-const Kt = ge;
+const Kt = he;
 class ke {
   constructor(e = {}) {
     this.refreshPromise = null, this.refreshQueue = [], e.tenantSlug !== void 0 ? this.storageKey = e.tenantSlug ? `auth_tokens_${e.tenantSlug}` : "auth_tokens" : this.storageKey = e.storageKey || "auth_tokens", this.autoRefresh = e.autoRefresh ?? !0, this.refreshThreshold = e.refreshThreshold || 3e5, this.onRefreshFailed = e.onRefreshFailed, this.baseUrl = e.baseUrl || "", this.tokenStorage = e.tokenStorage || this.createTokenStorage(this.storageKey);
@@ -544,7 +544,7 @@ class rt {
     });
   }
 }
-class ue {
+class de {
   constructor(e, t, r) {
     this.httpService = e, this.appId = t, this.sessionManager = r;
   }
@@ -693,9 +693,9 @@ function dt() {
     newUrl: i.toString()
   }), window.history.replaceState({}, "", i.toString());
 }
-const Ae = he(null);
+const Ae = ue(null);
 function Yt({ config: i, children: e }) {
-  const { baseUrl: t, appInfo: r, appId: s } = ge(), o = ie(() => typeof window > "u" ? null : it(
+  const { baseUrl: t, appInfo: r, appId: s } = he(), o = ie(() => typeof window > "u" ? null : it(
     {
       tenantMode: i.tenantMode || "selector",
       baseDomain: i.baseDomain,
@@ -738,7 +738,7 @@ function Yt({ config: i, children: e }) {
       if (!(!H && y.enabled && b && b.domain === l))
         try {
           f(!0), I(null);
-          const M = new ne(t), u = await new ue(M, s).getPublicTenantInfo(l);
+          const M = new ne(t), u = await new de(M, s).getPublicTenantInfo(l);
           if (g(u), y.enabled)
             try {
               const w = {
@@ -765,14 +765,14 @@ function Yt({ config: i, children: e }) {
         if (!l) return;
         const H = JSON.parse(l);
         if (Date.now() - H.timestamp > y.ttl * 0.5) {
-          const p = new ne(t), w = await new ue(p, s).getPublicTenantInfo(a);
+          const p = new ne(t), w = await new de(p, s).getPublicTenantInfo(a);
           g(w);
-          const G = {
+          const _ = {
             data: w,
             timestamp: Date.now(),
             tenantSlug: a
           };
-          localStorage.setItem(y.storageKey, JSON.stringify(G));
+          localStorage.setItem(y.storageKey, JSON.stringify(_));
         }
       } catch (l) {
         console.warn("Background tenant refresh failed:", l);
@@ -781,7 +781,7 @@ function Yt({ config: i, children: e }) {
     if (b != null && b.id)
       try {
         h(!0), A(null);
-        const l = new ne(t), M = await new ue(l, b.appId).getTenantSettings(b.id);
+        const l = new ne(t), M = await new de(l, b.appId).getTenantSettings(b.id);
         R(M);
       } catch (l) {
         const H = l instanceof Error ? l : new Error("Failed to load tenant settings");
@@ -806,8 +806,8 @@ function Yt({ config: i, children: e }) {
           }
           if (u != null) {
             if (p.type) {
-              const G = p.type, K = typeof u;
-              G === "string" && K !== "string" ? H.push(`Field '${M}' must be a string`) : (G === "number" || G === "integer") && K !== "number" ? H.push(`Field '${M}' must be a number`) : G === "boolean" && K !== "boolean" ? H.push(`Field '${M}' must be a boolean`) : G === "array" && !Array.isArray(u) && H.push(`Field '${M}' must be an array`);
+              const _ = p.type, K = typeof u;
+              _ === "string" && K !== "string" ? H.push(`Field '${M}' must be a string`) : (_ === "number" || _ === "integer") && K !== "number" ? H.push(`Field '${M}' must be a number`) : _ === "boolean" && K !== "boolean" ? H.push(`Field '${M}' must be a boolean`) : _ === "array" && !Array.isArray(u) && H.push(`Field '${M}' must be an array`);
             }
             p.minLength !== void 0 && typeof u == "string" && u.length < p.minLength && H.push(
               `Field '${M}' must be at least ${p.minLength} characters long`
@@ -837,15 +837,15 @@ function Yt({ config: i, children: e }) {
     (l, H) => {
       const { mode: M = "reload", tokens: p, redirectPath: u } = H || {}, w = i.tenantMode || "selector";
       if (localStorage.setItem("tenant", l), w === "subdomain") {
-        const G = window.location.hostname, K = ot(
+        const _ = window.location.hostname, K = ot(
           l,
-          G,
+          _,
           i.baseDomain
         );
         if (!K) {
           console.warn(
             "[TenantProvider] Cannot switch subdomain, invalid hostname:",
-            G
+            _
           );
           return;
         }
@@ -854,12 +854,12 @@ function Yt({ config: i, children: e }) {
           J !== me && q.searchParams.set(J, v);
         }), p && q.searchParams.set(me, at(p)), window.location.href = q.toString();
       } else if (w === "selector") {
-        const G = u || window.location.pathname, K = new URLSearchParams(window.location.search);
+        const _ = u || window.location.pathname, K = new URLSearchParams(window.location.search);
         if (K.set(i.selectorParam || "tenant", l), M === "reload") {
-          const U = `${G}?${K.toString()}${window.location.hash}`;
+          const U = `${_}?${K.toString()}${window.location.hash}`;
           window.location.href = U;
         } else {
-          const U = `${G}?${K.toString()}${window.location.hash}`;
+          const U = `${_}?${K.toString()}${window.location.hash}`;
           window.history.pushState({}, "", U), m(l), N(l);
         }
       }
@@ -919,7 +919,7 @@ function Xt() {
     validateSettings: s
   };
 }
-function ce() {
+function le() {
   const { tenant: i, tenantSlug: e, isTenantLoading: t, tenantError: r, retryTenant: s } = ye();
   return {
     tenant: i,
@@ -929,9 +929,9 @@ function ce() {
     retry: s
   };
 }
-const Pe = he(null);
+const Pe = ue(null);
 function Zt({ config: i = {}, children: e }) {
-  const { appId: t, baseUrl: r } = ge(), { tenant: s, tenantSlug: o, switchTenant: a } = ye(), [m, y] = k(i.initialRoles || []), [b, g] = k(!i.initialRoles), [S, f] = k(null), [T, I] = k(!1), [C, R] = k(null), [x, h] = k(0), [$, A] = k(() => {
+  const { appId: t, baseUrl: r } = he(), { tenant: s, tenantSlug: o, switchTenant: a } = ye(), [m, y] = k(i.initialRoles || []), [b, g] = k(!i.initialRoles), [S, f] = k(null), [T, I] = k(!1), [C, R] = k(null), [x, h] = k(0), [$, A] = k(() => {
     try {
       const v = localStorage.getItem("userTenants");
       return v ? JSON.parse(v) : [];
@@ -959,7 +959,7 @@ function Zt({ config: i = {}, children: e }) {
   }, [o, r, i.onRefreshFailed]), L = D.current.done && !P, F = te(() => {
     const v = new ne(r);
     return v.setSessionManager(c), v;
-  }, [r, c]), l = te(() => new tt(new ne(r)), [r]), H = te(() => new rt(F, c), [F, c]), M = te(() => new Ce(new ne(r)), [r]), p = te(() => S || c.getUser(), [S, c]), u = te(() => p != null && p.roleId && m.find((v) => v.id === p.roleId) || null, [p, m]), w = te(() => (u == null ? void 0 : u.permissions) || [], [u]), G = te(() => c.hasValidSession() && S !== null, [c, S]), K = 5 * 60 * 1e3, U = te(() => {
+  }, [r, c]), l = te(() => new tt(new ne(r)), [r]), H = te(() => new rt(F, c), [F, c]), M = te(() => new Ce(new ne(r)), [r]), p = te(() => S || c.getUser(), [S, c]), u = te(() => p != null && p.roleId && m.find((v) => v.id === p.roleId) || null, [p, m]), w = te(() => (u == null ? void 0 : u.permissions) || [], [u]), _ = te(() => c.hasValidSession() && S !== null, [c, S]), K = 5 * 60 * 1e3, U = te(() => {
     const v = async (B = !1) => {
       try {
         if (!c.hasValidSession())
@@ -983,62 +983,62 @@ function Zt({ config: i = {}, children: e }) {
       }
     }, J = async () => {
       await v();
-    }, le = async (B) => {
+    }, ae = async (B) => {
       var Le;
       const { username: z, password: Y, tenantSlug: W, redirectPath: Q } = B;
       let X = s == null ? void 0 : s.id, Z = o, ee = c;
-      W && (X = (await new ue(F, t).getPublicTenantInfo(W)).id, Z = W);
-      const _ = await l.login({
+      W && (X = (await new de(F, t).getPublicTenantInfo(W)).id, Z = W);
+      const G = await l.login({
         username: z,
         password: Y,
         appId: t,
         tenantId: X
-      }), de = W && W !== o;
-      if (de && (ee = new ke({
+      }), ce = W && W !== o;
+      if (ce && (ee = new ke({
         tenantSlug: Z,
         baseUrl: r
       })), ee.setTokens({
-        accessToken: _.accessToken,
-        refreshToken: _.refreshToken,
-        expiresIn: _.expiresIn
-      }), _.user) {
-        ee.setUser(_.user), f(_.user);
+        accessToken: G.accessToken,
+        refreshToken: G.refreshToken,
+        expiresIn: G.expiresIn
+      }), G.user) {
+        ee.setUser(G.user), f(G.user);
         try {
           await v();
-        } catch (pe) {
-          console.warn("Failed to load complete user data after login:", pe);
+        } catch (ge) {
+          console.warn("Failed to load complete user data after login:", ge);
         }
       }
-      if (_.tenants && _.tenants.length > 0) {
-        A(_.tenants);
+      if (G.tenants && G.tenants.length > 0) {
+        A(G.tenants);
         try {
-          localStorage.setItem("userTenants", JSON.stringify(_.tenants));
+          localStorage.setItem("userTenants", JSON.stringify(G.tenants));
         } catch {
         }
       }
-      const ve = ((Le = _.user) == null ? void 0 : Le.tenantId) !== null;
-      if (N(ve), de && Z && Z !== o && a(Z, {
+      const ve = ((Le = G.user) == null ? void 0 : Le.tenantId) !== null;
+      if (N(ve), ce && Z && Z !== o && a(Z, {
         tokens: {
-          accessToken: _.accessToken,
-          refreshToken: _.refreshToken,
-          expiresIn: _.expiresIn
+          accessToken: G.accessToken,
+          refreshToken: G.refreshToken,
+          expiresIn: G.expiresIn
         },
         redirectPath: Q
-      }), !ve && _.tenants && _.tenants.length > 0) {
-        const pe = i.autoSwitchSingleTenant !== !1;
-        if (_.tenants.length === 1 && pe) {
-          const Ee = _.tenants[0];
+      }), !ve && G.tenants && G.tenants.length > 0) {
+        const ge = i.autoSwitchSingleTenant !== !1;
+        if (G.tenants.length === 1 && ge) {
+          const Ee = G.tenants[0];
           a(Ee.subdomain, {
             tokens: {
-              accessToken: _.accessToken,
-              refreshToken: _.refreshToken,
-              expiresIn: _.expiresIn
+              accessToken: G.accessToken,
+              refreshToken: G.refreshToken,
+              expiresIn: G.expiresIn
             },
             redirectPath: Q
           });
-        } else _.tenants.length > 1 && i.onTenantSelectionRequired && i.onTenantSelectionRequired(_.tenants);
+        } else G.tenants.length > 1 && i.onTenantSelectionRequired && i.onTenantSelectionRequired(G.tenants);
       }
-      return _;
+      return G;
     }, be = async (B) => {
       const { email: z, phoneNumber: Y, name: W, password: Q, lastName: X, tenantId: Z } = B;
       if (!z && !Y)
@@ -1081,7 +1081,7 @@ function Zt({ config: i = {}, children: e }) {
     }, Ve = async (B) => {
       const { token: z, newPassword: Y } = B;
       await l.confirmPasswordReset({ token: z, newPassword: Y });
-    }, _e = async (B) => {
+    }, Ge = async (B) => {
       const { email: z, frontendUrl: Y, name: W, lastName: Q, tenantId: X } = B, Z = X ?? (s == null ? void 0 : s.id);
       if (!Z)
         throw new Error("tenantId is required for magic link authentication");
@@ -1093,17 +1093,17 @@ function Zt({ config: i = {}, children: e }) {
         lastName: Q,
         appId: t
       });
-    }, Ge = async (B) => {
+    }, _e = async (B) => {
       const { token: z, email: Y, tenantSlug: W } = B;
       let Q = s == null ? void 0 : s.id, X = o, Z = c;
-      W && (Q = (await new ue(F, t).getPublicTenantInfo(W)).id, X = W);
+      W && (Q = (await new de(F, t).getPublicTenantInfo(W)).id, X = W);
       const ee = await l.verifyMagicLink({
         token: z,
         email: Y,
         appId: t,
         tenantId: Q
-      }), _ = W && W !== o;
-      if (_ && (Z = new ke({
+      }), G = W && W !== o;
+      if (G && (Z = new ke({
         tenantSlug: X,
         baseUrl: r
       })), Z.setTokens({
@@ -1114,11 +1114,11 @@ function Zt({ config: i = {}, children: e }) {
         Z.setUser(ee.user), f(ee.user);
         try {
           await v();
-        } catch (de) {
-          console.warn("Failed to load complete user data after magic link login:", de);
+        } catch (ce) {
+          console.warn("Failed to load complete user data after magic link login:", ce);
         }
       }
-      return _ && X && X !== o && a(X, {
+      return G && X && X !== o && a(X, {
         tokens: {
           accessToken: ee.accessToken,
           refreshToken: ee.refreshToken,
@@ -1170,14 +1170,14 @@ function Zt({ config: i = {}, children: e }) {
     };
     return {
       // RFC-003: Authentication state
-      isAuthenticated: G,
+      isAuthenticated: _,
       sessionManager: c,
       authenticatedHttpService: F,
-      login: le,
+      login: ae,
       signup: be,
       signupTenantAdmin: Oe,
-      sendMagicLink: _e,
-      verifyMagicLink: Ge,
+      sendMagicLink: Ge,
+      verifyMagicLink: _e,
       changePassword: We,
       requestPasswordReset: je,
       confirmPasswordReset: Ve,
@@ -1240,7 +1240,7 @@ function Zt({ config: i = {}, children: e }) {
       }
     };
   }, [
-    G,
+    _,
     c,
     F,
     l,
@@ -1266,7 +1266,7 @@ function Zt({ config: i = {}, children: e }) {
     !i.initialRoles && t && (async () => {
       try {
         g(!0);
-        const J = new ne(r), le = new Ce(J), { roles: be } = await le.getRolesByApp(t);
+        const J = new ne(r), ae = new Ce(J), { roles: be } = await ae.getRolesByApp(t);
         y(be);
       } catch (J) {
         console.error("Failed to fetch roles:", J);
@@ -1298,7 +1298,7 @@ function Zt({ config: i = {}, children: e }) {
     return () => clearInterval(v);
   }, [c, S, U, K]), /* @__PURE__ */ n(Pe.Provider, { value: U, children: e });
 }
-function ae() {
+function oe() {
   const i = se(Pe);
   if (!i)
     throw new Error("useAuth must be used within an AuthProvider");
@@ -1387,7 +1387,7 @@ class ut {
     })).data;
   }
 }
-const Ie = he(null);
+const Ie = ue(null);
 function er({ config: i = {}, children: e }) {
   const t = Ue(), r = we(), s = (t == null ? void 0 : t.baseUrl) ?? "", o = (t == null ? void 0 : t.appId) ?? "", a = (r == null ? void 0 : r.tenant) ?? null, [m, y] = k([]), [b, g] = k(!1), [S, f] = k(null), [T, I] = k(!1), C = te(() => {
     const h = new ne(s);
@@ -1512,7 +1512,7 @@ class gt {
     )).data;
   }
 }
-const Re = he(void 0);
+const Re = ue(void 0);
 function tr({ config: i = {}, children: e }) {
   const t = Ue(), r = we(), s = (t == null ? void 0 : t.baseUrl) ?? "", o = (r == null ? void 0 : r.tenant) ?? null, [a, m] = k(null), [y, b] = k(!1), [g, S] = k(null), [f, T] = k(!1), I = te(() => {
     const x = new ne(s);
@@ -1572,7 +1572,7 @@ function pt() {
 function qe() {
   return se(Re) ?? null;
 }
-var oe = /* @__PURE__ */ ((i) => (i.SUPERUSER = "SUPERUSER", i.TENANT_ADMIN = "TENANT_ADMIN", i.USER = "USER", i))(oe || {});
+var pe = /* @__PURE__ */ ((i) => (i.SUPERUSER = "SUPERUSER", i.TENANT_ADMIN = "TENANT_ADMIN", i.USER = "USER", i))(pe || {});
 const De = () => /* @__PURE__ */ d(
   "div",
   {
@@ -1653,9 +1653,9 @@ const De = () => /* @__PURE__ */ d(
   }
 ), ft = (i, e) => {
   const t = {
-    [oe.USER]: 1,
-    [oe.TENANT_ADMIN]: 2,
-    [oe.SUPERUSER]: 3
+    [pe.USER]: 1,
+    [pe.TENANT_ADMIN]: 2,
+    [pe.SUPERUSER]: 3
   };
   return t[i] >= t[e];
 };
@@ -1666,7 +1666,7 @@ function rr({
   requiredPermissions: r,
   requireAllPermissions: s = !1
 }) {
-  const { hasValidSession: o, sessionManager: a, hasPermission: m, hasAnyPermission: y, hasAllPermissions: b } = ae();
+  const { hasValidSession: o, sessionManager: a, hasPermission: m, hasAnyPermission: y, hasAllPermissions: b } = oe();
   if (!o())
     return /* @__PURE__ */ n(j, { children: e || /* @__PURE__ */ n(De, {}) });
   const g = a.getUser();
@@ -1718,7 +1718,7 @@ const mt = ({ redirectPath: i }) => /* @__PURE__ */ n(
   }
 ), He = ({
   userType: i,
-  minUserType: e,
+  requiredUserType: e,
   missingPermissions: t
 }) => /* @__PURE__ */ n(
   "div",
@@ -1750,10 +1750,10 @@ const mt = ({ redirectPath: i }) => /* @__PURE__ */ n(
             /* @__PURE__ */ d("p", { style: { color: "#6b7280", marginBottom: "1rem" }, children: [
               "This page requires ",
               /* @__PURE__ */ n("strong", { children: e }),
-              " access level or higher."
+              " access."
             ] }),
             /* @__PURE__ */ d("p", { style: { color: "#9ca3af", fontSize: "0.875rem" }, children: [
-              "Your current access level: ",
+              "Your current user type: ",
               /* @__PURE__ */ n("strong", { children: i })
             ] })
           ] }) : /* @__PURE__ */ d(j, { children: [
@@ -1767,23 +1767,16 @@ const mt = ({ redirectPath: i }) => /* @__PURE__ */ n(
       }
     )
   }
-), yt = (i, e) => {
-  const t = {
-    [oe.USER]: 1,
-    [oe.TENANT_ADMIN]: 2,
-    [oe.SUPERUSER]: 3
-  };
-  return t[i] >= t[e];
-};
+), yt = (i, e) => i === e;
 function nr({
   children: i,
   redirectTo: e = "/login",
-  minUserType: t,
+  requiredUserType: t,
   requiredPermissions: r,
   requireAllPermissions: s = !1,
   fallback: o
 }) {
-  const { hasValidSession: a, sessionManager: m, hasPermission: y, hasAnyPermission: b, hasAllPermissions: g } = ae(), S = Te();
+  const { hasValidSession: a, sessionManager: m, hasPermission: y, hasAnyPermission: b, hasAllPermissions: g } = oe(), S = Te();
   if (!a())
     return o ? /* @__PURE__ */ n(j, { children: o }) : /* @__PURE__ */ d(j, { children: [
       /* @__PURE__ */ n(mt, { redirectPath: e }),
@@ -1793,7 +1786,13 @@ function nr({
   if (!f)
     return /* @__PURE__ */ n(fe, { to: e, state: { from: S.pathname }, replace: !0 });
   if (t && !yt(f.userType, t))
-    return /* @__PURE__ */ n(He, { userType: f.userType, minUserType: t });
+    return /* @__PURE__ */ n(
+      He,
+      {
+        userType: f.userType,
+        requiredUserType: t
+      }
+    );
   if (r && r.length > 0 && !(s ? g(r) : b(r))) {
     const I = r.filter((C) => !y(C)).map((C) => typeof C == "string" ? C : C.name);
     return /* @__PURE__ */ n(He, { missingPermissions: I });
@@ -1838,7 +1837,7 @@ const wt = ({ redirectPath: i }) => /* @__PURE__ */ n(
   }
 );
 function sr({ children: i, redirectTo: e = "/", fallback: t }) {
-  const { tenant: r, isLoading: s, error: o } = ce(), a = Te();
+  const { tenant: r, isLoading: s, error: o } = le(), a = Te();
   return s || o ? null : r ? /* @__PURE__ */ n(j, { children: i }) : t ? /* @__PURE__ */ n(j, { children: t }) : /* @__PURE__ */ d(j, { children: [
     /* @__PURE__ */ n(wt, { redirectPath: e }),
     /* @__PURE__ */ n(fe, { to: e, state: { from: a.pathname }, replace: !0 })
@@ -1882,7 +1881,7 @@ const bt = ({ redirectPath: i }) => /* @__PURE__ */ n(
   }
 );
 function ir({ children: i, redirectTo: e = "/dashboard", fallback: t }) {
-  const { tenant: r, isLoading: s, error: o } = ce(), a = Te();
+  const { tenant: r, isLoading: s, error: o } = le(), a = Te();
   return s || o ? null : r ? t ? /* @__PURE__ */ n(j, { children: t }) : /* @__PURE__ */ d(j, { children: [
     /* @__PURE__ */ n(bt, { redirectPath: e }),
     /* @__PURE__ */ n(fe, { to: e, state: { from: a.pathname }, replace: !0 })
@@ -2140,7 +2139,7 @@ function lr({
   showMagicLinkOption: g = !0,
   className: S
 }) {
-  const [f, T] = k(""), [I, C] = k(""), [R, x] = k(!1), [h, $] = k(!1), [A, E] = k(""), [N, D] = k({}), { login: P } = ae(), { tenant: O } = ce(), c = { ...At, ...i }, L = { ...Pt, ...e }, F = { ...xt, ...t }, l = () => {
+  const [f, T] = k(""), [I, C] = k(""), [R, x] = k(!1), [h, $] = k(!1), [A, E] = k(""), [N, D] = k({}), { login: P } = oe(), { tenant: O } = le(), c = { ...At, ...i }, L = { ...Pt, ...e }, F = { ...xt, ...t }, l = () => {
     const u = {};
     return f.trim() || (u.username = !0), I.trim() || (u.password = !0), D(u), Object.keys(u).length === 0;
   }, H = async (u) => {
@@ -2158,8 +2157,8 @@ function lr({
         });
         r == null || r(w);
       } catch (w) {
-        const G = w.message || c.errorMessage;
-        E(G), s == null || s(G);
+        const _ = w.message || c.errorMessage;
+        E(_), s == null || s(_);
       } finally {
         $(!1);
       }
@@ -2389,11 +2388,11 @@ function cr({
   showMagicLinkOption: y = !0,
   className: b
 }) {
-  const [g, S] = k(""), [f, T] = k(""), [I, C] = k(""), [R, x] = k(""), [h, $] = k(""), [A, E] = k(""), [N, D] = k(""), [P, O] = k(!1), [c, L] = k(""), [F, l] = k({}), { signup: H, signupTenantAdmin: M } = ae(), { tenant: p } = ce(), u = { ...Mt, ...i }, w = { ...It, ...e }, G = () => {
+  const [g, S] = k(""), [f, T] = k(""), [I, C] = k(""), [R, x] = k(""), [h, $] = k(""), [A, E] = k(""), [N, D] = k(""), [P, O] = k(!1), [c, L] = k(""), [F, l] = k({}), { signup: H, signupTenantAdmin: M } = oe(), { tenant: p } = le(), u = { ...Mt, ...i }, w = { ...It, ...e }, _ = () => {
     const v = {};
     return g.trim() || (v.name = !0), !I.trim() && !R.trim() && (v.email = !0, v.phoneNumber = !0), h.trim() || (v.password = !0), A.trim() || (v.confirmPassword = !0), t === "tenant" && !N.trim() && (v.tenantName = !0), l(v), Object.keys(v).length === 0;
   }, K = async (v) => {
-    if (v.preventDefault(), !!G()) {
+    if (v.preventDefault(), !!_()) {
       if (h !== A) {
         L(u.passwordMismatchError), l({ confirmPassword: !0 });
         return;
@@ -2421,8 +2420,8 @@ function cr({
           lastName: f || void 0
         }), r == null || r(J);
       } catch (J) {
-        const le = J.message || u.errorMessage;
-        L(le), s == null || s(le);
+        const ae = J.message || u.errorMessage;
+        L(ae), s == null || s(ae);
       } finally {
         O(!1);
       }
@@ -2729,7 +2728,7 @@ function dr({
   verifyToken: y,
   frontendUrl: b
 }) {
-  const [g, S] = k(""), [f, T] = k(""), [I, C] = k(""), [R, x] = k(!1), [h, $] = k(!1), [A, E] = k(""), [N, D] = k(""), [P, O] = k({}), [c, L] = k(!1), { sendMagicLink: F, verifyMagicLink: l } = ae(), { tenant: H } = ce(), M = { ...Rt, ...i }, p = { ...Lt, ...e };
+  const [g, S] = k(""), [f, T] = k(""), [I, C] = k(""), [R, x] = k(!1), [h, $] = k(!1), [A, E] = k(""), [N, D] = k(""), [P, O] = k({}), [c, L] = k(!1), { sendMagicLink: F, verifyMagicLink: l } = oe(), { tenant: H } = le(), M = { ...Rt, ...i }, p = { ...Lt, ...e };
   re(() => {
     y && u(y);
   }, [y]);
@@ -2755,7 +2754,7 @@ function dr({
   }, w = () => {
     const q = {};
     return g.trim() || (q.email = !0), c && !f.trim() && (q.name = !0), O(q), Object.keys(q).length === 0;
-  }, G = async (q) => {
+  }, _ = async (q) => {
     if (q.preventDefault(), !!w()) {
       if (!(H != null && H.id)) {
         E("Tenant not found");
@@ -2792,7 +2791,7 @@ function dr({
   ] }) : /* @__PURE__ */ d("div", { className: m, style: p.container, children: [
     /* @__PURE__ */ n("h2", { style: p.title, children: M.title }),
     /* @__PURE__ */ n("p", { style: p.description, children: M.description }),
-    /* @__PURE__ */ d("form", { onSubmit: G, style: p.form, children: [
+    /* @__PURE__ */ d("form", { onSubmit: _, style: p.form, children: [
       /* @__PURE__ */ d("div", { style: p.fieldGroup, children: [
         /* @__PURE__ */ n("label", { style: p.label, children: M.emailLabel }),
         /* @__PURE__ */ n(
@@ -3054,7 +3053,7 @@ function ur({
   tenantSlug: S,
   autoRedirectDelay: f = 3e3
 }) {
-  const [T, I] = k("verifying"), [C, R] = k(""), { verifyMagicLink: x } = ae(), h = { ...Et, ...i }, $ = { ...ze, ...e }, A = { ...$t, ...t }, E = () => {
+  const [T, I] = k("verifying"), [C, R] = k(""), { verifyMagicLink: x } = oe(), h = { ...Et, ...i }, $ = { ...ze, ...e }, A = { ...$t, ...t }, E = () => {
     if (typeof window > "u") return {};
     const c = new URLSearchParams(window.location.search);
     return {
@@ -3281,7 +3280,7 @@ function hr({
   onModeChange: m,
   className: y
 }) {
-  const [b, g] = k(""), [S, f] = k(r), [T, I] = k(""), [C, R] = k(""), [x, h] = k(!1), [$, A] = k(""), [E, N] = k(""), [D, P] = k({}), { requestPasswordReset: O, confirmPasswordReset: c } = ae(), { tenant: L } = ce(), F = { ...Ht, ...i }, l = { ...Nt, ...e }, H = () => {
+  const [b, g] = k(""), [S, f] = k(r), [T, I] = k(""), [C, R] = k(""), [x, h] = k(!1), [$, A] = k(""), [E, N] = k(""), [D, P] = k({}), { requestPasswordReset: O, confirmPasswordReset: c } = oe(), { tenant: L } = le(), F = { ...Ht, ...i }, l = { ...Nt, ...e }, H = () => {
     const U = {};
     return b.trim() || (U.email = !0), P(U), Object.keys(U).length === 0;
   }, M = () => {
@@ -3322,7 +3321,7 @@ function hr({
   }, w = (U) => ({
     ...l.input,
     ...D[U] ? l.inputError : {}
-  }), G = () => ({
+  }), _ = () => ({
     ...l.button,
     ...x ? l.buttonLoading : {}
   });
@@ -3386,7 +3385,7 @@ function hr({
             type: "submit",
             disabled: !U || x,
             style: {
-              ...G(),
+              ..._(),
               ...!U || x ? l.buttonDisabled : {}
             },
             children: x ? F.resetLoadingText : F.resetSubmitButton
@@ -3431,7 +3430,7 @@ function hr({
           type: "submit",
           disabled: !K || x,
           style: {
-            ...G(),
+            ..._(),
             ...!K || x ? l.buttonDisabled : {}
           },
           children: x ? F.loadingText : F.submitButton
@@ -3501,7 +3500,7 @@ function gr({
   errorFallback: t,
   requireTenant: r = !0
 }) {
-  const { isAppLoading: s, appError: o, retryApp: a } = ge(), m = we(), y = Me(), b = Be(), g = qe(), S = (m == null ? void 0 : m.isTenantLoading) ?? !1, f = (m == null ? void 0 : m.tenantError) ?? null, T = (m == null ? void 0 : m.tenantSlug) ?? null, I = (m == null ? void 0 : m.retryTenant) ?? (() => {
+  const { isAppLoading: s, appError: o, retryApp: a } = he(), m = we(), y = Me(), b = Be(), g = qe(), S = (m == null ? void 0 : m.isTenantLoading) ?? !1, f = (m == null ? void 0 : m.tenantError) ?? null, T = (m == null ? void 0 : m.tenantSlug) ?? null, I = (m == null ? void 0 : m.retryTenant) ?? (() => {
   }), C = (y == null ? void 0 : y.isAuthReady) ?? !0, R = (b == null ? void 0 : b.isReady) ?? !0, x = (g == null ? void 0 : g.isReady) ?? !0, h = r && m && T, N = s || h && S || y && !C || b && !R || g && !x, D = o || (h ? f : null), P = () => {
     o && a(), f && m && I();
   };
@@ -3514,7 +3513,7 @@ function gr({
   return /* @__PURE__ */ n(j, { children: i });
 }
 function pr(i = !0) {
-  const { isAppLoading: e, appError: t, retryApp: r, appInfo: s } = ge(), o = we(), a = Me(), m = Be(), y = qe(), b = (o == null ? void 0 : o.isTenantLoading) ?? !1, g = (o == null ? void 0 : o.tenantError) ?? null, S = (o == null ? void 0 : o.tenant) ?? null, f = (o == null ? void 0 : o.tenantSlug) ?? null, T = (o == null ? void 0 : o.retryTenant) ?? (() => {
+  const { isAppLoading: e, appError: t, retryApp: r, appInfo: s } = he(), o = we(), a = Me(), m = Be(), y = qe(), b = (o == null ? void 0 : o.isTenantLoading) ?? !1, g = (o == null ? void 0 : o.tenantError) ?? null, S = (o == null ? void 0 : o.tenant) ?? null, f = (o == null ? void 0 : o.tenantSlug) ?? null, T = (o == null ? void 0 : o.retryTenant) ?? (() => {
   }), I = (a == null ? void 0 : a.isAuthReady) ?? !0, C = (m == null ? void 0 : m.isReady) ?? !0, R = (y == null ? void 0 : y.isReady) ?? !0, x = i && o && f, E = e || x && b || a && !I || m && !C || y && !R, N = t || (x ? g : null);
   return {
     isLoading: E,
@@ -3904,21 +3903,21 @@ export {
   or as SubscriptionGuard,
   yr as SubscriptionPlanApiService,
   tr as SubscriptionProvider,
-  ue as TenantApiService,
+  de as TenantApiService,
   Yt as TenantProvider,
   sr as TenantRoute,
   fr as TenantSelector,
   rt as UserApiService,
-  oe as UserType,
+  pe as UserType,
   Kt as useApi,
-  ge as useApp,
+  he as useApp,
   pr as useAppLoaderState,
-  ae as useAuth,
+  oe as useAuth,
   ht as useFeatureFlags,
   Xt as useSettings,
   pt as useSubscription,
   ye as useTenant,
-  ce as useTenantInfo,
+  le as useTenantInfo,
   we as useTenantOptional,
   Qt as useTenantSettings
 };