npm - react-ecosistema-unp - Versions diffs - 1.8.0-pre.12 → 1.8.0-pre.13 - Mend

react-ecosistema-unp 1.8.0-pre.12 → 1.8.0-pre.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/utils/components/ProtectedRoute.js +34 -29
package/dist/utils/components/UserRoute.js +21 -21
package/package.json +1 -1

package/dist/utils/components/ProtectedRoute.js CHANGED Viewed

@@ -1,61 +1,66 @@
-import { jsx as g } from "react/jsx-runtime";
-import { useState as S, useEffect as v } from "react";
-import { useLocation as p, Outlet as I } from "react-router-dom";
-const T = () => {
-  const [k, o] = S(!1), h = p(), s = `${window.location.protocol}//${window.location.host}/`, c = `${window.location.host}`, w = async () => {
-    const l = await fetch(`${s}api-auth/auth/refresh_token/`, {
+import { jsx as w } from "react/jsx-runtime";
+import { useState as p, useEffect as S } from "react";
+import { useLocation as v, Outlet as I } from "react-router-dom";
+import _ from "../fingerprint/fingerprintService.js";
+const E = () => {
+  const [g, o] = p(!1), d = v(), r = `${window.location.protocol}//${window.location.host}/`, c = `${window.location.host}`, k = async () => {
+    const m = await _.getFingerprint(), h = localStorage.getItem("refresh_token"), s = await fetch(`${r}api-auth/auth/refresh_token/`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        Authorization: `Bearer ${localStorage.getItem("access_token")}`
+        Authorization: `Bearer ${localStorage.getItem("access_token")}`,
+        "X-Fingerprint": m
       },
-      credentials: "include"
+      credentials: "include",
+      body: JSON.stringify({
+        refresh: h
+      })
     });
-    if (l.ok) {
-      const r = (await l.json()).token;
-      return localStorage.setItem("access_token", r), !0;
+    if (s.ok) {
+      const l = (await s.json()).token;
+      return localStorage.setItem("access_token", l), !0;
     } else
       throw new Error("Error al refrescar token de Microsoft");
   };
-  return v(() => {
-    const l = async () => {
+  return S(() => {
+    const m = async () => {
       try {
         if (localStorage.getItem("access_token")) {
-          const r = localStorage.getItem("auth_state");
-          if (r) {
-            const f = JSON.parse(r).user.servicios.map((e) => e.url).filter((e) => !!e), a = h.pathname, n = f.map(
+          const s = localStorage.getItem("auth_state");
+          if (s) {
+            const l = JSON.parse(s).user.servicios.map((e) => e.url).filter((e) => !!e), a = d.pathname, n = l.map(
               (e) => e.startsWith("/") ? e : `/${e}`
-            ), m = a.startsWith("/") ? a : `/${a}`;
+            ), f = a.startsWith("/") ? a : `/${a}`;
             n.some(
-              (e) => m.startsWith(e)
-            ) ? o(!0) : (console.warn("No hay match con los roles del usuario"), o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = s);
+              (e) => f.startsWith(e)
+            ) ? o(!0) : (console.warn("No hay match con los roles del usuario"), o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = r);
           } else
-            o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = s;
+            o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = r;
         } else
           throw new Error("Token inválido");
       } catch {
         try {
-          if (await w()) {
+          if (await k()) {
             const i = localStorage.getItem("auth_state");
             if (i) {
-              const a = JSON.parse(i).user.servicios.map((t) => t.url).filter((t) => !!t), n = h.pathname, m = a.map(
+              const a = JSON.parse(i).user.servicios.map((t) => t.url).filter((t) => !!t), n = d.pathname, f = a.map(
                 (t) => t.startsWith("/") ? t : `/${t}`
               ), u = n.startsWith("/") ? n : `/${n}`;
-              m.some(
+              f.some(
                 (t) => u.startsWith(t)
-              ) ? o(!0) : (o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = s);
+              ) ? o(!0) : (o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = r);
             } else
-              o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = s;
+              o(!1), sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = r;
           } else
             throw new Error("No se pudo refrescar el token.");
         } catch {
-          sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = s, o(!1);
+          sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = r, o(!1);
         }
       }
     };
-    c.includes("ecosistemadesarrollo") || c.includes("ecosistemapruebas") || c.includes("ecosistemaprov") || c.includes("ecosistema") ? l() : (console.warn("ProtectedRoute is disabled in the local development environment."), o(!0));
-  }, []), k ? /* @__PURE__ */ g(I, {}) : null;
+    c.includes("ecosistemadesarrollo") || c.includes("ecosistemapruebas") || c.includes("ecosistemaprov") || c.includes("ecosistema") ? m() : (console.warn("ProtectedRoute is disabled in the local development environment."), o(!0));
+  }, []), g ? /* @__PURE__ */ w(I, {}) : null;
 };
 export {
-  T as ProtectedRoute
+  E as ProtectedRoute
 };

package/dist/utils/components/UserRoute.js CHANGED Viewed

@@ -1,35 +1,35 @@
 import { jsx as c } from "react/jsx-runtime";
-import { useState as d, useEffect as h } from "react";
-import { useNavigate as u, Outlet as m } from "react-router-dom";
-const k = () => {
-  const [a, e] = d(!1), s = u(), t = `${window.location.protocol}//${window.location.host}/`, o = `${window.location.host}`;
-  if (o.includes("localhost"))
+import { useState as d, useEffect as f } from "react";
+import { useNavigate as h, Outlet as m } from "react-router-dom";
+import u from "../fingerprint/fingerprintService.js";
+const S = () => {
+  const [a, e] = d(!1), i = h(), t = `${window.location.protocol}//${window.location.host}/`, n = `${window.location.host}`;
+  if (n.includes("localhost"))
     return console.warn("ProtectedRoute is disabled in the local development environment."), null;
-  const n = async () => {
+  const l = async () => {
+    const o = await u.getFingerprint(), r = localStorage.getItem("refresh_token");
     if ((await fetch(`${t}api-auth/auth/refresh_token/`, {
       method: "POST",
       headers: {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        "X-Fingerprint": o
       },
-      credentials: "include"
+      credentials: "include",
+      body: JSON.stringify({
+        refresh: r
+      })
     })).ok)
       return !0;
     throw new Error("Error al refrescar token de Microsoft");
   };
-  return h(() => {
-    const r = async () => {
+  return f(() => {
+    const o = async () => {
       try {
-        if ((await fetch(`${t}api-auth/auth/validate_jwt/`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
-          credentials: "include"
-        })).ok)
+        if (localStorage.getItem("access_token"))
           e(!0);
         else
           try {
-            if (await n())
+            if (await l())
               (await fetch(
                 `${t}api-auth/auth/validate_jwt/`,
                 {
@@ -49,9 +49,9 @@ const k = () => {
         sessionStorage.removeItem("user_token"), localStorage.removeItem("auth_state"), localStorage.removeItem("access_token"), window.location.href = t, e(!1);
       }
     };
-    o.includes("localhost") ? (console.warn("ProtectedRoute is disabled in the local development environment."), e(!0)) : r();
-  }, [s]), a ? /* @__PURE__ */ c(m, {}) : null;
+    n.includes("localhost") ? (console.warn("ProtectedRoute is disabled in the local development environment."), e(!0)) : o();
+  }, [i]), a ? /* @__PURE__ */ c(m, {}) : null;
 };
 export {
-  k as UserRoute
+  S as UserRoute
 };

package/package.json CHANGED Viewed

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