npm-pkg-hook 1.6.6 → 1.6.8

package/package.json

@@ -16,6 +16,7 @@
     "@babel/preset-env": "^7.19.1",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
+    "@types/node": "^20.11.16",
     "@types/react": "^18.0.20",
     "@typescript-eslint/eslint-plugin": "5.29.0",
     "@typescript-eslint/parser": "5.29.0",
@@ -43,5 +44,5 @@
     "rm": "rm -rf node_modules package-lock.json && npm i",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.6.6"
-}
+  "version": "1.6.8"
+}

package/src/hooks/getGlobalSession/index.js

@@ -1,6 +1,6 @@
 import crypto from 'crypto'
 
-function generateEncryptionKey(password, salt) {
+function generateEncryptionKey (password, salt) {
   return crypto
     .pbkdf2Sync(password, salt, 100000, 32, 'sha256')
     .toString('hex')
@@ -46,4 +46,4 @@ export const decryptSession = (text) => {
   } catch (error) {
     return null
   }
-}
+}

package/src/hooks/index.js

@@ -7,7 +7,9 @@ export * from './useCatWithProduct'
 export * from './useManageQueryParams'
 export * from './useDeliveryTime'
 export * from './statusOpenStores'
+export * from './useLogout/helpers/BroadcastChannel'
 export * from './newMessageSubscription'
+export * from './isTokenExpired'
 export * from './useCreateDeliveryTime'
 export * from './addTenMinutes'
 export * from './useCategoriesProduct'

package/src/hooks/isTokenExpired/index.js

@@ -0,0 +1,17 @@
+/**
+ * Verifica si un token JWT ha expirado.
+ * @param {string} token El token JWT a verificar.
+ * @param {string} [expField='exp'] El nombre del campo que contiene la fecha de expiración en el token.
+ * @returns {boolean} True si el token ha expirado, false de lo contrario.
+ */
+export const isTokenExpired = (token, expField = 'exp') => {
+  try {
+    const [, payloadBase64] = token.split('.')
+    const decodedJson = Buffer.from(payloadBase64, 'base64').toString()
+    const decoded = JSON.parse(decodedJson)
+    const exp = decoded[expField] * 1000 // Convertir segundos a milisegundos
+    return Date.now() >= exp
+  } catch (error) {
+    return true
+  }
+}

package/src/hooks/useLogout/helpers/BroadcastChannel.js

@@ -1,32 +1,31 @@
-function BroadcastChannel(name = "nextauth.message") {
-    return {
-      receive: function (onReceive) {
-        const handler = function (event) {
-          if (event.key !== name) return;
-          const message = JSON.parse(event.newValue ?? "{}");
-          if (message?.event !== "session" || !message?.data) return;
-          onReceive(message);
-        };
-        window.addEventListener("storage", handler);
-        return function () {
-          window.removeEventListener("storage", handler);
-        };
-      },
-      post: function (message) {
-        if (typeof window === "undefined") return;
-        try {
-          localStorage.setItem(
-            name,
-            JSON.stringify({ ...message, timestamp: now() })
-          );
-        } catch {
-          // The localStorage API isn't always available.
-          // It won't work in private mode prior to Safari 11 for example.
-          // Notifications are simply dropped if an error is encountered.
-        }
-      },
-    };
+function BroadcastChannel (name = 'nextauth.message') {
+  return {
+    receive: function (onReceive) {
+      const handler = function (event) {
+        if (event.key !== name) return
+        const message = JSON.parse(event.newValue ?? '{}')
+        if (message?.event !== 'session' || !message?.data) return
+        onReceive(message)
+      }
+      window.addEventListener('storage', handler)
+      return function () {
+        window.removeEventListener('storage', handler)
+      }
+    },
+    post: function (message) {
+      if (typeof window === 'undefined') return
+      try {
+        localStorage.setItem(
+          name,
+          JSON.stringify({ ...message, timestamp: Date.now() })
+        )
+      } catch {
+        // The localStorage API isn't always available.
+        // It won't work in private mode prior to Safari 11 for example.
+        // Notifications are simply dropped if an error is encountered.
+      }
+    }
   }
-  
-  export { BroadcastChannel };
-  
+}
+
+export { BroadcastChannel }

package/src/hooks/useLogout/helpers/apiBaseUrl.js

@@ -1,8 +1,8 @@
-export function apiBaseUrl(__NEXTAUTH) {
-    if (typeof window === "undefined") {
-      // Return absolute path when called server side
-      return `${__NEXTAUTH.baseUrlServer}${__NEXTAUTH.basePathServer}`
-    }
-    // Return relative path when called client side
-    return __NEXTAUTH.basePath
-  }
+export function apiBaseUrl (__NEXTAUTH) {
+  if (typeof window === 'undefined') {
+    // Return absolute path when called server side
+    return `${__NEXTAUTH.baseUrlServer}${__NEXTAUTH.basePathServer}`
+  }
+  // Return relative path when called client side
+  return __NEXTAUTH.basePath
+}

package/src/hooks/useLogout/helpers/fetchData.js

@@ -1,29 +1,28 @@
-import { apiBaseUrl } from "./apiBaseUrl";
+import { apiBaseUrl } from './apiBaseUrl'
 
-async function fetchData(path, __NEXTAUTH, logger, { ctx, req } = {}) {
-    const url = `${apiBaseUrl(__NEXTAUTH)}/${path}`;
-    try {
-      const options = {
-        headers: {
-          "Content-Type": "application/json",
-          ...(req?.headers?.cookie ? { cookie: req.headers.cookie } : {}),
-        },
-      };
-
-      if (req?.body) {
-        options.body = JSON.stringify(req.body);
-        options.method = "POST";
+async function fetchData (path, __NEXTAUTH, logger, { ctx, req } = {}) {
+  const url = `${apiBaseUrl(__NEXTAUTH)}/${path}`
+  try {
+    const options = {
+      headers: {
+        'Content-Type': 'application/json',
+        ...(req?.headers?.cookie ? { cookie: req.headers.cookie } : {})
       }
+    }
 
-      const res = await fetch(url, options);
-      const data = await res.json();
-      if (!res.ok) throw data;
-      return Object.keys(data).length > 0 ? data : null; // Return null if data is empty
-    } catch (error) {
-      logger.error("CLIENT_FETCH_ERROR", { error, url });
-      return null;
+    if (req?.body) {
+      options.body = JSON.stringify(req.body)
+      options.method = 'POST'
     }
+
+    const res = await fetch(url, options)
+    const data = await res.json()
+    if (!res.ok) throw data
+    return Object.keys(data).length > 0 ? data : null // Return null if data is empty
+  } catch (error) {
+    logger.error('CLIENT_FETCH_ERROR', { error, url })
+    return null
   }
-  
-  export { fetchData };
-  
+}
+
+export { fetchData }

package/src/hooks/useLogout/helpers/getCsrfToken.js

@@ -1,30 +1,30 @@
-import { fetchData } from "./fetchData"
-import _logger, { proxyLogger } from "./logger"
-import { parseUrl } from "./parseUrl";
+import { fetchData } from './fetchData'
+import _logger, { proxyLogger } from './logger'
+import { parseUrl } from './parseUrl'
 
 const __NEXTAUTH = {
-    baseUrl: parseUrl(process.env.NEXTAUTH_URL || process.env.VERCEL_URL).origin,
-    basePath: parseUrl(process.env.NEXTAUTH_URL).path,
-    baseUrlServer: parseUrl(
-      process.env.NEXTAUTH_URL_INTERNAL ||
+  baseUrl: parseUrl(process.env.NEXTAUTH_URL || process.env.VERCEL_URL).origin,
+  basePath: parseUrl(process.env.NEXTAUTH_URL).path,
+  baseUrlServer: parseUrl(
+    process.env.NEXTAUTH_URL_INTERNAL ||
         process.env.NEXTAUTH_URL ||
         process.env.VERCEL_URL
-    ).origin,
-    basePathServer: parseUrl(
-      process.env.NEXTAUTH_URL_INTERNAL || process.env.NEXTAUTH_URL
-    ).path,
-    _lastSync: 0,
-    _session: undefined,
-    _getSession: () => {},
-  };
+  ).origin,
+  basePathServer: parseUrl(
+    process.env.NEXTAUTH_URL_INTERNAL || process.env.NEXTAUTH_URL
+  ).path,
+  _lastSync: 0,
+  _session: undefined,
+  _getSession: () => {}
+}
 const logger = proxyLogger(_logger, __NEXTAUTH.basePath)
 
-export async function getCsrfToken(params) {
-    const response = await fetchData(
-      "csrf",
-      __NEXTAUTH,
-      logger,
-      params
-    )
-    return response?.csrfToken
-  }
+export async function getCsrfToken (params) {
+  const response = await fetchData(
+    'csrf',
+    __NEXTAUTH,
+    logger,
+    params
+  )
+  return response?.csrfToken
+}

package/src/hooks/useLogout/helpers/index.js

@@ -1,54 +1,58 @@
-import { apiBaseUrl } from "./apiBaseUrl";
-import { getCsrfToken } from "./getCsrfToken";
-import { parseUrl } from "./parseUrl";
-import { BroadcastChannel } from "./BroadcastChannel";
+import { apiBaseUrl } from './apiBaseUrl'
+import { getCsrfToken } from './getCsrfToken'
+import { parseUrl } from './parseUrl'
+import { BroadcastChannel } from './BroadcastChannel'
 
 const broadcast = BroadcastChannel()
 
 export const __NEXTAUTH = {
-    baseUrl: parseUrl(process.env.NEXTAUTH_URL || process.env.VERCEL_URL).origin,
-    basePath: parseUrl(process.env.NEXTAUTH_URL).path,
-    baseUrlServer: parseUrl(
-      process.env.NEXTAUTH_URL_INTERNAL ||
-        process.env.NEXTAUTH_URL ||
-        process.env.VERCEL_URL
-    ).origin,
-    basePathServer: parseUrl(
-      process.env.NEXTAUTH_URL_INTERNAL || process.env.NEXTAUTH_URL
-    ).path,
-    _lastSync: 0,
-    _session: undefined,
-    _getSession: () => {},
-  };
+  baseUrl: parseUrl(process.env.NEXTAUTH_URL || process.env.VERCEL_URL).origin,
+  basePath: parseUrl(process.env.NEXTAUTH_URL).path,
+  baseUrlServer: parseUrl(
+    process.env.NEXTAUTH_URL_INTERNAL ||
+      process.env.NEXTAUTH_URL ||
+      process.env.VERCEL_URL
+  ).origin,
+  basePathServer: parseUrl(
+    process.env.NEXTAUTH_URL_INTERNAL || process.env.NEXTAUTH_URL
+  ).path,
+  _lastSync: 0,
+  _session: undefined,
+  _getSession: () => {}
+}
 
-  export async function signOutAuth(options) {
-    const { callbackUrl = window.location.href } = options ?? {}
-    const baseUrl = apiBaseUrl(__NEXTAUTH)
-    const fetchOptions = {
-      method: "post",
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-      },
-      // @ts-expect-error
-      body: new URLSearchParams({
-        csrfToken: await getCsrfToken(),
-        callbackUrl,
-        json: true,
-      }),
-    }
-    const res = await fetch(`${baseUrl}/signout`, fetchOptions)
-    const data = await res.json()
+export async function signOutAuth (options) {
+  const { callbackUrl = window.location.href, reload = true } = options ?? {}
+  console.log('🚀 ~ signOutAuth ~ options:', options)
+  const baseUrl = apiBaseUrl(__NEXTAUTH)
+  const fetchOptions = {
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    // @ts-expect-error
+    body: new URLSearchParams({
+      csrfToken: await getCsrfToken(),
+      callbackUrl,
+      json: true
+    })
+  }
+  const res = await fetch(`${baseUrl}/signout`, fetchOptions)
+  const data = await res.json()
 
-    broadcast.post({ event: "session", data: { trigger: "signout" } })
-
-    if (options?.redirect ?? true) {
-      const url = data.url ?? callbackUrl
-      window.location.href = url
-      // If url contains a hash, the browser does not reload the page. We reload manually
-      if (url.includes("#")) window.location.reload()
-      // @ts-expect-error
-      return
-    }
-    await __NEXTAUTH._getSession({ event: "storage" })
+  broadcast.post({ event: 'session', data: { trigger: 'signout' } })
+  if (!reload) {
+    await __NEXTAUTH._getSession({ event: 'storage' })
     return data
-  }
+  }
+  if (options?.redirect ?? true) {
+    const url = data.url ?? callbackUrl
+    window.location.href = url
+    // If url contains a hash, the browser does not reload the page. We reload manually
+    if (url.includes('#') && !reload) window.location.reload()
+    // @ts-expect-error
+    return
+  }
+  await __NEXTAUTH._getSession({ event: 'storage' })
+  return data
+}

package/src/hooks/useLogout/helpers/logger.js

@@ -1,72 +1,70 @@
-function formatError(o) {
+function formatError (o) {
   if (hasErrorProperty(o)) {
-    o.error = formatError(o.error);
-    o.message = o.message ?? o.error.message;
+    o.error = formatError(o.error)
+    o.message = o.message ?? o.error.message
   }
-  return o;
+  return o
 }
 
-function hasErrorProperty(x) {
-  return !!(x?.error);
+function hasErrorProperty (x) {
+  return !!(x?.error)
 }
 
 const _logger = {
-  error(code, metadata) {
-    metadata = formatError(metadata);
+  error (code, metadata) {
+    metadata = formatError(metadata)
     console.error(
       `[next-auth][error][${code}]`,
       `\nhttps://next-auth.js.org/errors#${code.toLowerCase()}`,
       metadata.message,
       metadata
-    );
+    )
   },
-  warn(code) {
+  warn (code) {
     console.warn(
       `[next-auth][warn][${code}]`,
       `\nhttps://next-auth.js.org/warnings#${code.toLowerCase()}`
-    );
+    )
   },
-  debug(code, metadata) {
-    console.log(`[next-auth][debug][${code}]`, metadata);
-  },
-};
-
+  debug (code, metadata) {
+    console.log(`[next-auth][debug][${code}]`, metadata)
+  }
+}
 
-export function setLogger(newLogger = {}, debug) {
-  if (!debug) _logger.debug = () => {};
+export function setLogger (newLogger = {}, debug) {
+  if (!debug) _logger.debug = () => {}
 
-  if (newLogger.error) _logger.error = newLogger.error;
-  if (newLogger.warn) _logger.warn = newLogger.warn;
-  if (newLogger.debug) _logger.debug = newLogger.debug;
+  if (newLogger.error) _logger.error = newLogger.error
+  if (newLogger.warn) _logger.warn = newLogger.warn
+  if (newLogger.debug) _logger.debug = newLogger.debug
 }
 
-export function proxyLogger(logger = _logger, basePath) {
+export function proxyLogger (logger = _logger, basePath) {
   try {
-    if (typeof window === "undefined") {
-      return logger;
+    if (typeof window === 'undefined') {
+      return logger
     }
 
-    const clientLogger = {};
+    const clientLogger = {}
     for (const level in logger) {
       clientLogger[level] = (code, metadata) => {
-        _logger[level](code, metadata);
+        _logger[level](code, metadata)
 
-        if (level === "error") {
-          metadata = formatError(metadata);
+        if (level === 'error') {
+          metadata = formatError(metadata)
         }
-        metadata.client = true;
-        const url = `${basePath}/_log`;
-        const body = new URLSearchParams({ level, code, ...metadata });
+        metadata.client = true
+        const url = `${basePath}/_log`
+        const body = new URLSearchParams({ level, code, ...metadata })
         if (navigator.sendBeacon) {
-          return navigator.sendBeacon(url, body);
+          return navigator.sendBeacon(url, body)
         }
-        return fetch(url, { method: "POST", body, keepalive: true });
-      };
+        return fetch(url, { method: 'POST', body, keepalive: true })
+      }
     }
-    return clientLogger;
+    return clientLogger
   } catch {
-    return _logger;
+    return _logger
   }
 }
-export { _logger as default };
-
+export { _logger as default }

package/src/hooks/useLogout/helpers/parseUrl.js

@@ -1,36 +1,36 @@
 /** Interface for the internal URL structure */
 const InternalUrl = {
-    origin: 'http://localhost:3000',
-    host: 'localhost:3000',
-    path: '/api/auth',
-    base: 'http://localhost:3000/api/auth',
-    toString: function() {
-      return this.base;
-    },
-  };
+  origin: 'http://localhost:3000',
+  host: 'localhost:3000',
+  path: '/api/auth',
+  base: 'http://localhost:3000/api/auth',
+  toString: function () {
+    return this.base
+  }
+}
 
-  /** Function to parse a URL-like object for server-side requests/redirects */
-  function parseUrl(url) {
-    const defaultUrl = new URL('http://localhost:3000/api/auth');
+/** Function to parse a URL-like object for server-side requests/redirects */
+function parseUrl (url) {
+  const defaultUrl = new URL('http://localhost:3000/api/auth')
 
-    if (url && !url.startsWith('http')) {
-      url = `https://${url}`;
-    }
+  if (url && !url.startsWith('http')) {
+    url = `https://${url}`
+  }
 
-    const _url = new URL(url || defaultUrl);
-    const path = (_url.pathname === '/' ? defaultUrl.pathname : _url.pathname).replace(/\/$/, '');
+  const _url = new URL(url || defaultUrl)
+  const path = (_url.pathname === '/' ? defaultUrl.pathname : _url.pathname).replace(/\/$/, '')
 
-    const base = `${_url.origin}${path}`;
+  const base = `${_url.origin}${path}`
 
-    return {
-      origin: _url.origin,
-      host: _url.host,
-      path,
-      base,
-      toString: function() {
-        return base;
-      },
-    };
+  return {
+    origin: _url.origin,
+    host: _url.host,
+    path,
+    base,
+    toString: function () {
+      return base
+    }
   }
+}
 
-  export { InternalUrl, parseUrl };
+export { InternalUrl, parseUrl }

package/src/hooks/useLogout/index.js

@@ -5,7 +5,11 @@ import { signOutAuth } from './helpers'
 import { getCurrentDomain } from '../../utils'
 export { signOutAuth } from './helpers'
 
-export const useLogout = ({ setAlertBox = () => {} } = {}) => {
+export const useLogout = ({
+  setAlertBox = ({
+    message
+  }) => { return { message } }
+} = {}) => {
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState(false)
   const client = useApolloClient()
@@ -32,17 +36,19 @@ export const useLogout = ({ setAlertBox = () => {} } = {}) => {
       throw new Error('Error al eliminar la cookie. ')
     }
   }
-
-  const onClickLogout = async () => {
+  const deleteCookie = async () => {
+    await eliminarCookie(process.env.SESSION_NAME)
+    await eliminarCookie(process.env.LOCAL_SALES_STORE)
+    await eliminarCookie('restaurant')
+    await eliminarCookie('usuario')
+    await eliminarCookie('session')
+  }
+  const onClickLogout = async ({ redirect = true } = { redirect: true }) => {
+    console.log(redirect)
     try {
+      if (!redirect) return await deleteCookie()
       setLoading(true)
-   // Eliminar la cookie process.env.SESSION_NAME
-      await eliminarCookie(process.env.SESSION_NAME)
-      await eliminarCookie(process.env.LOCAL_SALES_STORE)
-      await eliminarCookie('restaurant')
-      await eliminarCookie('usuario')
-      await eliminarCookie('session')
-
+      await deleteCookie()
       // Logout from the server
       const logoutResponse = await fetch(`${process.env.URL_BASE}/api/auth/logout/`, {
         method: 'POST',
@@ -57,8 +63,7 @@ export const useLogout = ({ setAlertBox = () => {} } = {}) => {
         return
       }
 
-      const response = await logoutResponse.json()
-      const { status } = response || {}
+      await logoutResponse.json()
       console.log('Intentando borrar cookies...')
 
       // Eliminar la cookie process.env.SESSION_NAME