@variamosple/variamos-components 0.0.19 → 0.0.22

package/dist/Components/AuthWrapper/index.js

@@ -1,52 +1,55 @@
-import { j as o } from "../../jsx-runtime-Drh4NO5G.js";
-import * as d from "react";
+import { j as a } from "../../jsx-runtime-Drh4NO5G.js";
+import * as p from "react";
 import f, { useEffect as u } from "react";
 import "../../Context/AnalyticsContext.js";
 import "../../Context/MenuContext.js";
-import { useRouter as l } from "../../Context/RouterContext.js";
-import { useSession as h } from "../../Context/SessionsContext.js";
-import { u as g, c as x } from "../../ThemeProvider-Q3gZ4GF2.js";
-const p = /* @__PURE__ */ d.forwardRef(({
-  bsPrefix: e,
-  variant: i,
-  animation: n = "border",
-  size: a,
+import { useRouter as h } from "../../Context/RouterContext.js";
+import { useSession as l } from "../../Context/SessionContext.js";
+import { u as g, c as w } from "../../ThemeProvider-Q3gZ4GF2.js";
+const d = /* @__PURE__ */ p.forwardRef(({
+  bsPrefix: t,
+  variant: n,
+  animation: i = "border",
+  size: c,
   // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
-  as: t = "div",
-  className: r,
+  as: r = "div",
+  className: s,
   ...m
-}, c) => {
-  e = g(e, "spinner");
-  const s = `${e}-${n}`;
-  return /* @__PURE__ */ o.jsx(t, {
-    ref: c,
+}, e) => {
+  t = g(t, "spinner");
+  const o = `${t}-${i}`;
+  return /* @__PURE__ */ a.jsx(r, {
+    ref: e,
     ...m,
-    className: x(r, s, a && `${s}-${a}`, i && `text-${i}`)
+    className: w(s, o, c && `${o}-${c}`, n && `text-${n}`)
   });
 });
-p.displayName = "Spinner";
-const v = ({
-  redirectPath: e,
-  children: i
+d.displayName = "Spinner";
+const k = ({
+  redirectPath: t,
+  children: n
 }) => {
-  const [n, a] = f.useState(!1), { isAuthenticated: t, isLoading: r } = h(), { navigate: m } = l();
+  const [i, c] = f.useState(!1), { isAuthenticated: r, isLoading: s } = l(), { navigate: m } = h();
   return u(() => {
-    if (!r && !t && !n) {
-      const c = window.location.href, s = new URLSearchParams();
-      s.set("redirectTo", encodeURIComponent(c)), a(!0), setTimeout(
-        () => m(`${e}?${s.toString()}`),
+    if (!s && !r && !i) {
+      const e = window.location.href, o = new URLSearchParams();
+      o.set("redirectTo", encodeURIComponent(e)), c(!0), setTimeout(
+        () => m(`${t}?${o.toString()}`),
         300
       );
     }
-  }, [t, r, e, m, n]), r || !t ? /* @__PURE__ */ o.jsx("div", { className: "d-flex justify-content-center align-items-center w-100 h-100", children: /* @__PURE__ */ o.jsx(
-    p,
+  }, [r, s, t, m, i]), u(() => {
+    const e = new URL(window.location.href);
+    e.searchParams.has("authToken") && (localStorage.setItem("authToken", e.searchParams.get("authToken")), e.searchParams.delete("authToken"), window.history.replaceState({}, "", e));
+  }, []), s || !r ? /* @__PURE__ */ a.jsx("div", { className: "d-flex justify-content-center align-items-center w-100 h-100", children: /* @__PURE__ */ a.jsx(
+    d,
     {
       animation: "border",
       variant: "primary",
       style: { width: "3rem", height: "3rem", borderWidth: "0.5rem" }
     }
-  ) }) : /* @__PURE__ */ o.jsx(o.Fragment, { children: i });
+  ) }) : /* @__PURE__ */ a.jsx(a.Fragment, { children: n });
 };
 export {
-  v as AuthWrapper
+  k as AuthWrapper
 };

package/dist/Components/Header/HeaderOptions.js

@@ -3,7 +3,7 @@ import { useMemo as p } from "react";
 import "../../Context/AnalyticsContext.js";
 import { useMenu as w } from "../../Context/MenuContext.js";
 import { useRouter as x } from "../../Context/RouterContext.js";
-import { useSession as j } from "../../Context/SessionsContext.js";
+import { useSession as j } from "../../Context/SessionContext.js";
 import { mapToWebTarget as R } from "../../Model/Router.js";
 import { N as a } from "../../NavDropdown-AuV3RgfC.js";
 const E = () => {

package/dist/Components/Header/MenuItem.js

@@ -3,7 +3,7 @@ import { useMemo as N } from "react";
 import "../../Context/AnalyticsContext.js";
 import "../../Context/MenuContext.js";
 import { useRouter as R } from "../../Context/RouterContext.js";
-import { useSession as k } from "../../Context/SessionsContext.js";
+import { useSession as k } from "../../Context/SessionContext.js";
 import { mapToWebTarget as m } from "../../Model/Router.js";
 import { N as h } from "../../Nav-CdxSljzW.js";
 import { N as d } from "../../NavDropdown-AuV3RgfC.js";

package/dist/Components/Header/SubHeader.js

@@ -3,8 +3,8 @@ import "react";
 import "../../Context/AnalyticsContext.js";
 import "../../Context/MenuContext.js";
 import "../../Context/RouterContext.js";
-import "../../Context/SessionsContext.js";
-import { S as d } from "../../SubHeader-DNc4qWBV.js";
+import "../../Context/SessionContext.js";
+import { S as d } from "../../SubHeader-gTVD9DIX.js";
 import "../../Container-BLjzOisH.js";
 import "../../Nav-CdxSljzW.js";
 export {

package/dist/Components/Header/index.js

@@ -2,10 +2,10 @@ import { j as s } from "../../jsx-runtime-Drh4NO5G.js";
 import "../../Context/AnalyticsContext.js";
 import { useMenu as d } from "../../Context/MenuContext.js";
 import { useRouter as x } from "../../Context/RouterContext.js";
-import { useSession as j } from "../../Context/SessionsContext.js";
+import { useSession as j } from "../../Context/SessionContext.js";
 import { HeaderOptions as u } from "./HeaderOptions.js";
 import { MenuItemComponent as o } from "./MenuItem.js";
-import { N as r, S as f } from "../../SubHeader-DNc4qWBV.js";
+import { N as r, S as f } from "../../SubHeader-gTVD9DIX.js";
 import { C as h } from "../../Container-BLjzOisH.js";
 import { N as t } from "../../Nav-CdxSljzW.js";
 const I = ({

package/dist/Components/NotAuthorized/index.js

@@ -2,7 +2,7 @@ import { j as t } from "../../jsx-runtime-Drh4NO5G.js";
 import "../../Context/AnalyticsContext.js";
 import "../../Context/MenuContext.js";
 import { useRouter as o } from "../../Context/RouterContext.js";
-import "../../Context/SessionsContext.js";
+import "../../Context/SessionContext.js";
 import { C as s } from "../../Container-BLjzOisH.js";
 import { B as i } from "../../Button-GQJKgb76.js";
 const d = ({ homePath: e }) => {

package/dist/Components/ProtectedRoute/index.js

@@ -3,7 +3,7 @@ import { useEffect as f } from "react";
 import "../../Context/AnalyticsContext.js";
 import "../../Context/MenuContext.js";
 import { useRouter as g } from "../../Context/RouterContext.js";
-import { useSession as x } from "../../Context/SessionsContext.js";
+import { useSession as x } from "../../Context/SessionContext.js";
 const v = ({
   notAuthorizedPath: e,
   allowedPermissions: i = [],

package/dist/Context/MenuContext.js

@@ -2,7 +2,7 @@ import { j as F } from "../jsx-runtime-Drh4NO5G.js";
 import { createContext as j, useMemo as d, useEffect as E, useContext as L } from "react";
 import { useQuery as S } from "../Hooks/useQuery.js";
 import { useRouter as y } from "./RouterContext.js";
-import { useSession as m } from "./SessionsContext.js";
+import { useSession as m } from "./SessionContext.js";
 const P = j({
   items: [],
   isLoading: !0

package/dist/Context/{SessionsContext.d.ts → SessionContext.d.ts}

@@ -1,5 +1,5 @@
 import { FC, ReactNode } from 'react';
-import { Credentials, ResponseModel, SessionUser, singInResponse, UserRegistration } from '../Model';
+import { Credentials, ResponseModel, SessionInfoResponse, SessionUser, singInResponse, UserRegistration } from '../Model';
 interface SessionContextType {
     user: SessionUser | null;
     isLoading: boolean;
@@ -10,7 +10,8 @@ interface SessionContextType {
     logout: () => void;
 }
 export interface SessionProviderProps {
-    getSessionInfo: () => Promise<ResponseModel<SessionUser>>;
+    loginUrl: string;
+    getSessionInfo: () => Promise<ResponseModel<SessionInfoResponse>>;
     requestLogout: () => Promise<ResponseModel<void>>;
     requestSignIn?: (request: Credentials) => Promise<ResponseModel<singInResponse>>;
     requestSignInAsGuest?: (guestId?: string | null) => Promise<ResponseModel<singInResponse>>;

package/dist/Context/SessionContext.js

@@ -0,0 +1,97 @@
+import { j as G } from "../jsx-runtime-Drh4NO5G.js";
+import { createContext as K, useState as S, useEffect as T, useContext as N } from "react";
+import { Events as R } from "../Common/Events.js";
+import { usePageVisibility as V } from "../Hooks/usePageVisibility.js";
+const y = K(void 0), k = "guestId", f = (d) => {
+  d && R.publish("variamosNavigate", d);
+}, m = (d) => {
+  d && sessionStorage.setItem("authToken", d);
+}, H = ({
+  loginUrl: d,
+  getSessionInfo: h,
+  requestSignUp: v,
+  requestSignIn: w,
+  requestSignInAsGuest: C,
+  requestLogout: P,
+  children: b
+}) => {
+  const [E, t] = S(null), [j, c] = S(!0), g = !!E, x = V();
+  T(() => {
+    c(!0), h().then((o) => {
+      var i, n, a;
+      o != null && o.errorCode ? t(null) : (m((i = o == null ? void 0 : o.data) == null ? void 0 : i.authToken), t(((n = o == null ? void 0 : o.data) == null ? void 0 : n.user) ?? null), f((a = o == null ? void 0 : o.data) == null ? void 0 : a.redirect));
+    }).catch(() => {
+      t(null);
+    }).finally(() => c(!1));
+  }, [h]), T(() => {
+    if (g && x) {
+      const o = () => {
+        h().then((n) => {
+          var a, r, e;
+          n != null && n.errorCode ? t(null) : (m((a = n == null ? void 0 : n.data) == null ? void 0 : a.authToken), t(((r = n == null ? void 0 : n.data) == null ? void 0 : r.user) ?? null), f((e = n == null ? void 0 : n.data) == null ? void 0 : e.redirect));
+        }).catch(() => {
+          t(null);
+        });
+      };
+      o();
+      const i = setInterval(() => {
+        o();
+      }, 6e4);
+      return () => clearInterval(i);
+    }
+  }, [g, x, h]);
+  const A = (o) => {
+    if (!v)
+      throw new Error("requestSignUp is not defined.");
+    return c(!0), v(o).finally(() => c(!1));
+  }, L = (o) => {
+    if (!w)
+      throw new Error("requestSignIn is not defined.");
+    return c(!0), w(o).then((i) => i != null && i.errorCode ? i : h().then((n) => {
+      var a, r, e;
+      return n != null && n.errorCode ? (t(null), i.withError(n.errorCode, n.message)) : (m((a = n == null ? void 0 : n.data) == null ? void 0 : a.authToken), t(((r = n == null ? void 0 : n.data) == null ? void 0 : r.user) ?? null), f((e = n == null ? void 0 : n.data) == null ? void 0 : e.redirect)), i;
+    }).catch(() => (t(null), i.withError(500, "Sign in error.")))).finally(() => c(!1));
+  }, U = () => {
+    if (!C)
+      throw new Error("requestSignInAsGuest is not defined.");
+    c(!0);
+    const o = localStorage.getItem(k);
+    return C(o).then((i) => {
+      var n;
+      return i != null && i.errorCode ? i : (localStorage.setItem(k, ((n = i == null ? void 0 : i.data) == null ? void 0 : n.id) || ""), h().then((a) => {
+        var r, e, I;
+        return a != null && a.errorCode ? (t(null), i.withError(a.errorCode, a.message)) : (m((r = a == null ? void 0 : a.data) == null ? void 0 : r.authToken), t(((e = a == null ? void 0 : a.data) == null ? void 0 : e.user) ?? null), f((I = a == null ? void 0 : a.data) == null ? void 0 : I.redirect)), i;
+      }).catch(() => (t(null), i.withError(500, "Sign in error."))));
+    }).finally(() => c(!1));
+  }, q = () => {
+    P().then(() => {
+      sessionStorage.removeItem("authToken"), f(d), setTimeout(() => {
+        t(null);
+      }, 200);
+    });
+  };
+  return /* @__PURE__ */ G.jsx(
+    y.Provider,
+    {
+      value: {
+        user: E,
+        isAuthenticated: g,
+        logout: q,
+        signUp: A,
+        signIn: L,
+        signInAsGuest: U,
+        isLoading: j
+      },
+      children: b
+    }
+  );
+}, J = () => {
+  const d = N(y);
+  if (d === void 0)
+    throw new Error("useSession must be used within a SessionProvider");
+  return d;
+};
+export {
+  H as SessionProvider,
+  J as useSession
+};

package/dist/Context/index.d.ts

@@ -1,4 +1,4 @@
 export * from './AnalyticsContext';
 export * from './MenuContext';
 export * from './RouterContext';
-export * from './SessionsContext';
+export * from './SessionContext';

package/dist/Context/index.js

@@ -1,7 +1,7 @@
 import { AnalyticsContext as t, AnalyticsProvider as r, PAGE_VISIT_EVENT as s } from "./AnalyticsContext.js";
 import { MenuContext as u, MenuContextProvider as i, useMenu as x } from "./MenuContext.js";
 import { RouterContext as a, getBasePath as f, isAbsoluteUrl as l, useRouter as m } from "./RouterContext.js";
-import { SessionProvider as A, useSession as C } from "./SessionsContext.js";
+import { SessionProvider as A, useSession as C } from "./SessionContext.js";
 export {
   t as AnalyticsContext,
   r as AnalyticsProvider,

package/dist/Model/SessionInfoResponse.d.ts

@@ -0,0 +1,6 @@
+import { SessionUser } from './SessionUser';
+export interface SessionInfoResponse {
+    user: SessionUser;
+    authToken?: string;
+    redirect?: string;
+}

package/dist/Model/SessionInfoResponse.js

@@ -0,0 +1 @@
+

package/dist/Model/index.d.ts

@@ -3,6 +3,7 @@ export * from './Menu';
 export * from './PagedModel';
 export * from './ResponseModel';
 export * from './Router';
+export * from './SessionInfoResponse';
 export * from './SessionUser';
 export * from './SingInResponse';
 export * from './UserRegistration';

package/dist/{SubHeader-DNc4qWBV.js → SubHeader-gTVD9DIX.js}

@@ -4,7 +4,7 @@ import z, { useMemo as j, useContext as M, useState as Z, useRef as we, useEffec
 import "./Context/AnalyticsContext.js";
 import { useMenu as je } from "./Context/MenuContext.js";
 import { useRouter as $e } from "./Context/RouterContext.js";
-import { useSession as Te } from "./Context/SessionsContext.js";
+import { useSession as Te } from "./Context/SessionContext.js";
 import { c as N, u as w } from "./ThemeProvider-Q3gZ4GF2.js";
 import { d as B, e as Ce, c as Re, S as Oe } from "./NavLink-ebvp1HCw.js";
 import { T as V, a as I, b as q, s as J, c as be, E as P, e as L, f as ee, h as Be, A as Se, d as ke, M as He, B as De, F as Fe, i as Me, g as Le } from "./AbstractModalHeader-UzCRSxIO.js";

package/dist/main.js

@@ -9,7 +9,7 @@ import { ProtectedRoute as g } from "./Components/ProtectedRoute/index.js";
 import { AnalyticsContext as M, AnalyticsProvider as c, PAGE_VISIT_EVENT as y } from "./Context/AnalyticsContext.js";
 import { MenuContext as R, MenuContextProvider as V, useMenu as b } from "./Context/MenuContext.js";
 import { RouterContext as v, getBasePath as E, isAbsoluteUrl as T, useRouter as S } from "./Context/RouterContext.js";
-import { SessionProvider as I, useSession as N } from "./Context/SessionsContext.js";
+import { SessionProvider as I, useSession as N } from "./Context/SessionContext.js";
 import { withPageVisit as U } from "./HOC/WithPageVisit.js";
 import { useDebouncedValue as _ } from "./Hooks/useDebouncedValue.js";
 import { usePageVisibility as z } from "./Hooks/usePageVisibility.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@variamosple/variamos-components",
   "private": false,
-  "version": "0.0.19",
+  "version": "0.0.22",
   "type": "module",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",

package/dist/Context/SessionsContext.js

@@ -1,81 +0,0 @@
-import { j } from "../jsx-runtime-Drh4NO5G.js";
-import { createContext as A, useState as w, useEffect as m, useContext as b } from "react";
-import { usePageVisibility as L } from "../Hooks/usePageVisibility.js";
-const C = A(void 0), u = "guestId", K = ({
-  getSessionInfo: o,
-  requestSignUp: d,
-  requestSignIn: f,
-  requestSignInAsGuest: h,
-  requestLogout: v,
-  children: E
-}) => {
-  const [l, r] = w(null), [x, a] = w(!0), c = !!l, g = L();
-  m(() => {
-    a(!0), o().then((i) => {
-      i != null && i.errorCode ? r(null) : r((i == null ? void 0 : i.data) ?? null);
-    }).catch(() => {
-      r(null);
-    }).finally(() => a(!1));
-  }, [o]), m(() => {
-    if (c && g) {
-      const i = () => {
-        o().then((t) => {
-          t != null && t.errorCode ? r(null) : r((t == null ? void 0 : t.data) ?? null);
-        }).catch(() => {
-          r(null);
-        });
-      };
-      i();
-      const n = setInterval(() => {
-        i();
-      }, 6e4);
-      return () => clearInterval(n);
-    }
-  }, [c, g, o]);
-  const y = (i) => {
-    if (!d)
-      throw new Error("requestSignUp is not defined.");
-    return a(!0), d(i).finally(() => a(!1));
-  }, I = (i) => {
-    if (!f)
-      throw new Error("requestSignIn is not defined.");
-    return a(!0), f(i).then((n) => n != null && n.errorCode ? n : o().then((t) => (t != null && t.errorCode ? (r(null), n.withError(t.errorCode, t.message)) : r((t == null ? void 0 : t.data) ?? null), n)).catch(() => (r(null), n.withError(500, "Sign in error.")))).finally(() => a(!1));
-  }, S = () => {
-    if (!h)
-      throw new Error("requestSignInAsGuest is not defined.");
-    a(!0);
-    const i = localStorage.getItem(u);
-    return h(i).then((n) => {
-      var t;
-      return n != null && n.errorCode ? n : (localStorage.setItem(u, ((t = n == null ? void 0 : n.data) == null ? void 0 : t.id) || ""), o().then((e) => (e != null && e.errorCode ? (r(null), n.withError(e.errorCode, e.message)) : r((e == null ? void 0 : e.data) ?? null), n)).catch(() => (r(null), n.withError(500, "Sign in error."))));
-    }).finally(() => a(!1));
-  }, P = () => {
-    v().then(() => {
-      r(null);
-    });
-  };
-  return /* @__PURE__ */ j.jsx(
-    C.Provider,
-    {
-      value: {
-        user: l,
-        isAuthenticated: c,
-        logout: P,
-        signUp: y,
-        signIn: I,
-        signInAsGuest: S,
-        isLoading: x
-      },
-      children: E
-    }
-  );
-}, R = () => {
-  const o = b(C);
-  if (o === void 0)
-    throw new Error("useSession must be used within a SessionProvider");
-  return o;
-};
-export {
-  K as SessionProvider,
-  R as useSession
-};