@bee.js/node 0.0.46 → 0.0.48

package/lib/DBA/beeDBA.js

@@ -98,13 +98,12 @@ module.exports.actions = {
 
     MODEL_CREATE_CONSTRAINT: function (model, configsDB) {
       let q = beeORM.quote;
-      let SQL = "\n\n\n\n";
+      let SQL = "\n\n\n";
 
-      SQL += `/*----- Constraints for table ${q(model.table)} -----*/\n\n`;
-      SQL += `ALTER TABLE ${q(model.table)}\n`;
+      SQL += `/*----- Constraints for table ${q(model.table)} -----*/\n`;
 
       for (let field in model.relations)
-        SQL += `    ADD CONSTRAINT ${q(
+        SQL += `\n\n  ALTER TABLE ${q(model.table)}\n    ADD CONSTRAINT ${q(
           `FK_${model.relations[field].split(".")[0]}_X_${
             model.table
           }_${field}`.slice(0, 64)

package/lib/JWT/beeJWT.js

@@ -1,6 +1,15 @@
-const HMACSHA256 = require("crypto-js/hmac-sha256");
+const CryptoJS = require("crypto-js");
 const log = require("../beeHive/log");
 
+function base64url(source) {
+  encodedSource = CryptoJS.enc.Base64.stringify(source);
+  encodedSource = encodedSource.replace(/=+$/, "");
+  encodedSource = encodedSource.replace(/\+/g, "-");
+  encodedSource = encodedSource.replace(/\//g, "_");
+
+  return encodedSource;
+}
+
 module.exports = function token(_payload = null, header = {}) {
   if (_payload) {
     let { jwt, ...payload } = _payload;
@@ -20,16 +29,13 @@ module.exports = function token(_payload = null, header = {}) {
 
     payload = { ...payload, iat: iat, exp: exp };
 
-    header = JSON.stringify(header);
-    header = new Buffer.from(header).toString("base64");
-
-    payload = JSON.stringify(payload);
-    payload = new Buffer.from(payload).toString("base64");
+    header = base64url(CryptoJS.enc.Utf8.parse(JSON.stringify(header)));
+    payload = base64url(CryptoJS.enc.Utf8.parse(JSON.stringify(payload)));
 
-    const signature = HMACSHA256(`${header}.${payload}`, secret).toString();
-    const token = new Buffer.from(`${header}.${payload}.${signature}`).toString(
-      "base64"
+    const signature = base64url(
+      CryptoJS.HmacSHA256(`${header}.${payload}`, secret)
     );
+    const token = `${header}.${payload}.${signature}`;
 
     this.data.jwt =
       this.data.jwt && typeof this.data.jwt !== "object"
@@ -53,7 +59,9 @@ module.exports = function token(_payload = null, header = {}) {
       const header = array[0];
       const payload = array[1];
 
-      const signature = HMACSHA256(`${header}.${payload}`, secret).toString();
+      const signature = base64url(
+        CryptoJS.HmacSHA256(`${header}.${payload}`, secret)
+      );
 
       return token === `${header}.${payload}.${signature}`
         ? new Buffer.from(payload, "base64").toString("ascii")

package/package.json

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