@bee.js/node 0.0.43 → 0.0.45

package/lib/JWT/beeJWT.js

@@ -1,73 +1,63 @@
-const crypto = require('crypto')
-const log    = require('../beeHive/log')
+const HMACSHA256 = require("crypto-js/hmac-sha256");
+const log = require("../beeHive/log");
 
 module.exports = function token(_payload = null, header = {}) {
+  if (_payload) {
+    let { jwt, ...payload } = _payload;
 
-    if(_payload) {
+    if (!global.configs.jwt && !global.configs.jwt.secret)
+      return log("ERROR: no jwt.secret defined in configs.");
 
-        let { jwt, ...payload } = _payload
+    let secret = global.configs.jwt.secret;
+    let iat = new Date().getTime();
+    let exp = new Date().getTime() + 60 * 1000;
 
-        if(!global.configs.jwt && !global.configs.jwt.secret) return log("ERROR: no jwt.secret defined in configs.")
+    header = {
+      ...header,
+      typ: header.typ || "JWT",
+      alg: header.alg || "HS256",
+    };
 
-        let secret = global.configs.jwt.secret
-        let iat    = new Date().getTime()
-        let exp    = new Date().getTime() + 60 * 1000
-        
-        header = {...header,
-                    typ: header.typ || "JWT",
-                    alg: header.alg || "HS256"
-                }
+    payload = { ...payload, iat: iat, exp: exp };
 
-        payload = {...payload,
-                        iat: iat,
-                        exp: exp,
-                 }
+    header = JSON.stringify(header);
+    header = new Buffer.from(header).toString("base64");
 
-        header = JSON.stringify(header)
-        header = (new Buffer.from(header)).toString('base64')
+    payload = JSON.stringify(payload);
+    payload = new Buffer.from(payload).toString("base64");
 
-        payload = JSON.stringify(payload)
-        payload = (new Buffer.from(payload)).toString('base64')
+    const signature = HMACSHA256(`${header}.${payload}`, secret);
+    const token = new Buffer.from(`${header}.${payload}.${signature}`).toString(
+      "base64"
+    );
 
-        let signature = crypto
-                        .createHmac("sha256", secret)
-                        .update(`${header}.${payload}`)
-                        .digest("base64")
+    this.data.jwt =
+      this.data.jwt && typeof this.data.jwt !== "object"
+        ? [this.data.jwt]
+        : this.data.jwt;
 
-        let token = `${header}.${payload}.${signature}`
+    this.data.jwt = !this.data.jwt ? token : this.data.jwt.concat(token);
 
-        this.data.jwt = this.data.jwt && typeof this.data.jwt !== "object" 
-                        ? [this.data.jwt] 
-                        : this.data.jwt
+    this.counters.jwt = (this.counters.jwt || 0) + 1;
 
-        this.data.jwt = !this.data.jwt 
-                            ? token
-                            : this.data.jwt.concat(token)
+    log("JWT created: " + this.data.jwt);
 
-        this.counters.jwt = (this.counters.jwt||0) + 1
+    return this;
+  }
 
-        log("JWT created: " + this.data.jwt)
+  return {
+    ...this,
+    verify: function (token) {
+      const secret = global.configs.jwt.secret;
+      const array = token.split(".");
+      const header = array[0];
+      const payload = array[1];
 
-        return this
-    }
+      const signature = HMACSHA256(`${header}.${payload}`, secret);
 
-    return {...this,
-        verify: function(token) {
-
-            let secret  = global.configs.jwt.secret
-            let array   = token.split(".")
-            let header  = array[0]
-            let payload = array[1]
-
-            let signature = crypto
-                            .createHmac("sha256", secret)
-                            .update(`${header}.${payload}`)
-                            .digest("base64")
-
-            return token === `${header}.${payload}.${signature}`
-                    ? (new Buffer.from(payload, 'base64')).toString("ascii")
-                    : false
-        }
-
-    }
-}
+      return token === `${header}.${payload}.${signature}`
+        ? new Buffer.from(payload, "base64").toString("ascii")
+        : false;
+    },
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee.js/node",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "A JavaScript framework for making Node.js API´s",
   "main": "index.js",
   "scripts": {
@@ -26,15 +26,15 @@
   "license": "MIT",
   "dependencies": {
     "body-parser": "^1.19.0",
-    "crypto": "^1.0.1",
+    "crypto-js": "^4.1.1",
     "debug": "^4.1.1",
     "express": "^4.17.1",
+    "glob": "^7.1.6",
     "http": "^0.0.1-security",
     "make-error": "^1.3.6",
     "mysql2": "^2.2.5",
     "nodemon": "^2.0.6",
     "util": "^0.12.2",
-    "uuid": "^8.3.2",
-    "glob": "^7.1.6"
+    "uuid": "^9.0.0"
   }
 }

package/tools/guid.js

@@ -1,15 +1,15 @@
-const uuid   = require('uuid')
+const uuid = require("uuid");
 
 module.exports = {
-    guid: function(fn, param) {
-        return fn
-                ? uuid[fn](param)
-                : uuid.v4()
-    },
-    
-    guidToBin: function(param) {    
-        return typeof(param) == "string" && param.length == 36 //&& uuid.validate(param)
-                ? "0x" + param.replace(/-/g,'')
-                : param
-    },
-}
+  uuid: uuid.v4,
+
+  guid: function (fn, param) {
+    return fn ? uuid[fn](param) : uuid.v4();
+  },
+
+  guidToBin: function (param) {
+    return typeof param == "string" && param.length == 36
+      ? "0x" + param.replace(/-/g, "")
+      : param;
+  },
+};

package/tools/hash.js

@@ -1,13 +1,7 @@
-const crypto = require('crypto')
+const sha256 = require("crypto-js/sha256");
+const md5 = require("crypto-js/md5");
 
 module.exports = {
-    md5: function(param = "") {
-        return param
-                ? crypto.createHash('md5').update(param).digest('hex')
-                : "";
-    },
-
-    sha256: function() {
-
-    },
-}
+  md5,
+  sha256,
+};