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

package/dist/utils/components/ProtectedRoute.js

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