react-ecosistema-unp 1.7.1-8.pre-0 → 1.7.1-8.pre-1

package/dist/utils/components/ProtectedRoute.js

@@ -1,74 +1,58 @@
-import { jsx as S } from "react/jsx-runtime";
-import { useState as u, useEffect as b } from "react";
-import { useNavigate as E, useLocation as j, Outlet as U } from "react-router-dom";
-import { j as h } from "../../index-CuHybtft.js";
-const V = () => {
-  const [f, l] = u(!1), [m, p] = u([]), w = E(), c = j(), s = `${window.location.protocol}//${window.location.host}/`, k = async () => {
-    if ((await fetch(`${s}api-auth/auth/refresh_token/`, {
+import { jsx as _ } from "react/jsx-runtime";
+import { useState as T, useEffect as v } from "react";
+import { useNavigate as b, useLocation as y, Outlet as g } from "react-router-dom";
+import { j as f } from "../../index-CuHybtft.js";
+const $ = () => {
+  const [w, c] = T(!1), p = b(), d = y(), s = `${window.location.protocol}//${window.location.host}/`, m = async () => {
+    if (!(await fetch(`${s}api-auth/auth/refresh_token/`, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
+      headers: { "Content-Type": "application/json" },
       credentials: "include"
     })).ok)
-      return !0;
-    throw new Error("Error al refrescar token de Microsoft");
-  }, d = (n, t, o) => {
-    if (n) {
-      const r = h(n), a = r.datos_basicos.servicios.map((e) => e.url).filter((e) => !!e), i = t, T = a.map(
-        (e) => e.startsWith("/") ? e : `/${e}`
-      ), v = i.startsWith("/") ? i : `/${i}`, y = T.some(
-        (e) => v.startsWith(e)
-      ), g = r.datos_basicos.servicios.some(
-        (e) => m.includes(e.id_rol)
-      );
-      return y && g ? !0 : (sessionStorage.removeItem("user_token"), window.location.href = o, !1);
-    } else
-      return sessionStorage.removeItem("user_token"), window.location.href = o, !1;
-  }, _ = async (n) => {
-    try {
-      const t = await fetch(`${s}api-auth/users/role_by_user`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          id_usuario: n
-        })
-      });
-      if (t.ok) {
-        const o = await t.json();
-        p(o.roles.map((r) => r.id_rol));
-      } else
-        throw new Error("Error al obtener roles del usuario");
-    } catch (t) {
-      console.error("Error al obtener roles del usuario", t), sessionStorage.removeItem("user_token"), window.location.href = s;
-    }
+      throw new Error("Error al refrescar token de Microsoft");
+    return !0;
+  }, u = async (r) => {
+    const a = await fetch(`${s}api-auth/users/role_by_user`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ id_usuario: r })
+    });
+    if (!a.ok)
+      throw new Error("Error al obtener roles del usuario");
+    return (await a.json()).roles.map((t) => t.id_rol);
+  }, h = (r, a, o) => {
+    const n = r.datos_basicos.servicios.map((e) => e.url).filter((e) => !!e).map(
+      (e) => e.startsWith("/") ? e : `/${e}`
+    ), i = o.startsWith("/") ? o : `/${o}`, l = n.some(
+      (e) => i.startsWith(e)
+    ), k = r.datos_basicos.servicios.some(
+      (e) => a.includes(e.id_rol)
+    );
+    return l && k;
   };
-  return b(() => {
+  return v(() => {
     (async () => {
       try {
-        if ((await fetch(`${s}api-auth/auth/validate_jwt/`, {
+        if (!(await fetch(`${s}api-auth/auth/validate_jwt/`, {
           method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
+          headers: { "Content-Type": "application/json" },
           credentials: "include"
-        })).ok) {
-          const o = sessionStorage.getItem("user_token");
-          if (o) {
-            const a = h(o).datos_basicos.id_busuario;
-            await _(a);
-            const i = d(o, c.pathname, s);
-            l(i);
-          }
-        } else
-          throw new Error("Token inválido");
+        })).ok) throw new Error("Token inválido");
+        const o = sessionStorage.getItem("user_token");
+        if (!o) throw new Error("Token no encontrado");
+        const t = f(o), n = t.datos_basicos.id_busuario, i = await u(n);
+        h(t, i, d.pathname) ? c(!0) : (sessionStorage.removeItem("user_token"), window.location.href = s, c(!1));
       } catch {
         try {
-          if (await k()) {
-            const r = sessionStorage.getItem("user_token"), a = d(r, c.pathname, s);
-            l(a);
+          if (await m()) {
+            const t = sessionStorage.getItem("user_token");
+            if (!t) throw new Error("Token no encontrado tras refresco");
+            const n = f(t), i = n.datos_basicos.id_busuario, l = await u(i);
+            if (h(n, l, d.pathname)) {
+              c(!0);
+              return;
+            } else
+              sessionStorage.removeItem("user_token"), window.location.href = s, c(!1);
           } else
             throw new Error("No se pudo refrescar el token.");
         } catch {
@@ -76,8 +60,8 @@ const V = () => {
         }
       }
     })();
-  }, [w, c]), f ? /* @__PURE__ */ S(U, {}) : null;
+  }, [p, d.pathname]), w ? /* @__PURE__ */ _(g, {}) : null;
 };
 export {
-  V as ProtectedRoute
+  $ as ProtectedRoute
 };

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.7.18.pre-0",
+  "version": "1.7.18.pre-1",
   "type": "module",
   "exports": {
     ".": {