react-ecosistema-unp 1.6.0-pre.0 → 1.6.0-pre.2

package/dist/lib/main.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/main.js

@@ -1 +1 @@
-import "./utils/components/fetchInterceptor.js";
+

package/dist/utils/components/ProtectedRoute.js

@@ -1,9 +1,10 @@
-import { jsx as h } from "react/jsx-runtime";
-import { useState as m, useEffect as p } from "react";
+import { jsx as m } from "react/jsx-runtime";
+import { useState as h, useEffect as p } from "react";
 import { useNavigate as w, useLocation as u, Outlet as k } from "react-router-dom";
 import { j as v } from "../../index-CuHybtft.js";
-const V = () => {
-  const [i, e] = m(!1), r = w(), c = u(), o = `${window.location.protocol}//${window.location.host}/`;
+import "./fetchInterceptor.js";
+const W = () => {
+  const [i, e] = h(!1), r = w(), c = u(), o = `${window.location.protocol}//${window.location.host}/`;
   return p(() => {
     (async () => {
       try {
@@ -34,8 +35,8 @@ const V = () => {
       } finally {
       }
     })();
-  }, [r]), i ? /* @__PURE__ */ h(k, {}) : null;
+  }, [r]), i ? /* @__PURE__ */ m(k, {}) : null;
 };
 export {
-  V as ProtectedRoute
+  W as ProtectedRoute
 };

package/dist/utils/components/UserRoute.js

@@ -1,8 +1,9 @@
 import { jsx as a } from "react/jsx-runtime";
 import { useState as i, useEffect as s } from "react";
 import { useNavigate as l, Outlet as c } from "react-router-dom";
-const h = () => {
-  const [e, n] = i(!1), r = l(), o = `${window.location.protocol}//${window.location.host}/`;
+import "./fetchInterceptor.js";
+const w = () => {
+  const [e, r] = i(!1), n = l(), o = `${window.location.protocol}//${window.location.host}/`;
   return s(() => {
     (async () => {
       try {
@@ -16,7 +17,7 @@ const h = () => {
             credentials: "include"
           }
         )).ok)
-          n(!0);
+          r(!0);
         else
           return window.location.href = o;
       } catch (t) {
@@ -24,8 +25,8 @@ const h = () => {
       } finally {
       }
     })();
-  }, [r]), e ? /* @__PURE__ */ a(c, {}) : null;
+  }, [n]), e ? /* @__PURE__ */ a(c, {}) : null;
 };
 export {
-  h as UserRoute
+  w as UserRoute
 };

package/dist/utils/components/fetchInterceptor.js

@@ -1,20 +1,23 @@
 window.originalFetch = window.fetch.bind(window);
-let c = !1, i = null;
-const o = [];
-async function g() {
-  const t = `${window.location.protocol}//${window.location.host}/`, e = await window.originalFetch(
-    `${t}api-auth/auth/refresh_token/`,
-    {
-      method: "POST",
-      credentials: "include"
-    }
-  );
-  if (!e.ok)
-    throw new Error("Error al refrescar token");
-  const r = (await e.json()).token;
-  return sessionStorage.setItem("user_token", `Bearer ${r}`), `Bearer ${r}`;
+let i = !1, h = null;
+const s = [];
+async function k() {
+  const e = `${`${window.location.protocol}//${window.location.host}/`}api-auth/auth/refresh_token/`, o = await window.originalFetch(e, {
+    method: "POST",
+    credentials: "include"
+  });
+  if (!o.ok)
+    throw new Error("Error al refrescar token, status " + o.status);
+  const n = await o.json();
+  if (!n.token)
+    throw new Error("No se recibió token en la respuesta de refresh");
+  const t = n.token;
+  return sessionStorage.setItem("user_token", `Bearer ${t}`), `Bearer ${t}`;
 }
-window.fetch = async function(t, e) {
+window.fetch = async function(r, e) {
+  const o = typeof r == "string" ? r : r.toString();
+  if (o.includes("/auth/refresh_token") || o.includes("/auth/validate"))
+    return window.originalFetch(r, e);
   e = e || {};
   const n = sessionStorage.getItem("user_token");
   e.headers = {
@@ -22,20 +25,23 @@ window.fetch = async function(t, e) {
     ...n ? { Authorization: n } : {}
   };
   try {
-    const r = await window.originalFetch(t, e);
-    return r.status !== 401 ? r : new Promise((w, l) => {
-      o.push({ input: t, init: e, resolve: w, reject: l }), c || (c = !0, i = g(), i.then((s) => {
-        o.forEach(({ input: a, init: h, resolve: u, reject: d }) => {
-          const f = { ...h, headers: { ...h.headers, Authorization: s } };
-          window.originalFetch(a, f).then(u).catch(d);
+    const t = await window.originalFetch(r, e);
+    return t.status !== 401 ? t : new Promise((u, w) => {
+      s.push({ input: r, init: e, resolve: u, reject: w }), i || (i = !0, h = k(), h.then((a) => {
+        s.forEach(({ input: c, init: l, resolve: d, reject: f }) => {
+          const g = {
+            ...l,
+            headers: { ...l.headers, Authorization: a }
+          };
+          window.originalFetch(c, g).then(d).catch(f);
         });
-      }).catch((s) => {
-        o.forEach(({ reject: a }) => a(s));
+      }).catch((a) => {
+        s.forEach(({ reject: c }) => c(a));
       }).finally(() => {
-        o.length = 0, c = !1, i = null;
+        s.length = 0, i = !1, h = null;
       }));
     });
-  } catch (r) {
-    return Promise.reject(r);
+  } catch (t) {
+    return Promise.reject(t);
   }
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "react-ecosistema-unp",
   "author": "Ecosistema de Información - Unidad Nacional de Protección",
   "private": false,
-  "version": "1.6.0-pre.0",
+  "version": "1.6.0-pre.2",
   "type": "module",
   "exports": {
     ".": {