@bee.js/node 0.0.97 → 0.0.99

package/lib/JWT/beeJWT.js

@@ -2,7 +2,7 @@ const CryptoJS = require("crypto-js");
 const log = require("../beeHive/log");
 
 function base64url(source) {
-  encodedSource = CryptoJS.enc.Base64.stringify(source);
+  let encodedSource = CryptoJS.enc.Base64.stringify(source);
   encodedSource = encodedSource.replace(/=+$/, "");
   encodedSource = encodedSource.replace(/\+/g, "-");
   encodedSource = encodedSource.replace(/\//g, "_");
@@ -10,7 +10,17 @@ function base64url(source) {
   return encodedSource;
 }
 
-module.exports = function token(_payload = null, header = {}) {
+function base64urlDecode(input = "") {
+  if (!input) return "";
+
+  let normalized = input.replace(/-/g, "+").replace(/_/g, "/");
+  const pad = normalized.length % 4;
+  if (pad) normalized += "=".repeat(4 - pad);
+
+  return Buffer.from(normalized, "base64").toString("utf8");
+}
+
+module.exports = function token(_payload = null, header = {}, options = {}) {
   if (_payload) {
     let { jwt, ...payload } = _payload;
 
@@ -19,7 +29,10 @@ module.exports = function token(_payload = null, header = {}) {
 
     let secret = global.configs.jwt.secret;
     let iat = new Date().getTime();
-    let exp = new Date().getTime() + 60 * 1000;
+    // options.expires is in minutes (default: 1 minute)
+    const expiresInMinutes =
+      typeof options.expires === "number" ? options.expires : 1;
+    let exp = new Date().getTime() + expiresInMinutes * 60 * 1000;
 
     header = {
       ...header,
@@ -55,7 +68,9 @@ module.exports = function token(_payload = null, header = {}) {
     ...this,
     verify: function (token) {
       const secret = global.configs.jwt.secret;
+      if (!token || typeof token !== "string") return false;
       const array = token.split(".");
+      if (array.length !== 3) return false;
       const header = array[0];
       const payload = array[1];
 
@@ -63,9 +78,21 @@ module.exports = function token(_payload = null, header = {}) {
         CryptoJS.HmacSHA256(`${header}.${payload}`, secret)
       );
 
-      return token === `${header}.${payload}.${signature}`
-        ? new Buffer.from(payload, "base64").toString("ascii")
-        : false;
+      if (token !== `${header}.${payload}.${signature}`) return false;
+
+      let payloadDecoded = base64urlDecode(payload);
+      let payloadJson;
+      try {
+        payloadJson = JSON.parse(payloadDecoded);
+      } catch (error) {
+        return false;
+      }
+
+      if (payloadJson?.exp && new Date().getTime() > payloadJson.exp) {
+        return { error: { message: "TOKEN_EXPIRED", status: 419 } };
+      }
+
+      return payloadDecoded;
     },
   };
 };

package/lib/WEB/route.js

@@ -16,7 +16,10 @@ module.exports = async function(req, res, next, ignoreMiddlewares = false) {
             log(`Token verify: ${token}`)
 
             token = beeJWT().verify(token)
-            
+
+            if (token?.error?.message === "TOKEN_EXPIRED")
+                return res.status(token.error.status).send({data: null, error: {message: 'TOKEN_EXPIRED'}, action: 'TOKEN_EXPIRED'})
+
             if(!token)
                 return res.status(validSession.errorCode || 401).send({data: null, error: {message: validSession.error || 'NOT_AUTHENTICATED'}, action: validSession.failAction || 'NOT_AUTHENTICATED'})
 
@@ -25,4 +28,4 @@ module.exports = async function(req, res, next, ignoreMiddlewares = false) {
     }
 
     next()
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee.js/node",
-  "version": "0.0.97",
+  "version": "0.0.99",
   "description": "A JavaScript framework for making Node.js API´s",
   "main": "index.js",
   "scripts": {