fix amqp_force

Author: skadefro

OpenFlow/src/amqpwrapper.ts

@@ -198,22 +198,27 @@ export class amqpwrapper {
                 queue = name + queue;
             }
         } else if (queue.length == 24) {
-            var isrole = tuser.roles.filter(x => x._id == queue);
-            if (isrole.length == 0 && tuser._id != queue) {
-                var skip: boolean = false;
-                var arr = await Config.db.query({ _id: queue }, { name: 1 }, 1, 0, null, "users", jwt);
-                if (arr.length == 0) skip = true;
-                if (!skip) {
-                    var arr = await Config.db.query({ _id: queue }, { name: 1 }, 1, 0, null, "openrpa", jwt);
-                    if (arr.length == 0) skip = true;
-                }
-                if (!skip) {
-                    var arr = await Config.db.query({ _id: queue }, { name: 1 }, 1, 0, null, "workflow", jwt);
+            if (NoderedUtil.IsNullEmpty(jwt)) {
+                var tuser = Crypt.verityToken(jwt);
+
+                var isrole = tuser.roles.filter(x => x._id == queue);
+                if (isrole.length == 0 && tuser._id != queue) {
+                    var skip: boolean = false;
+                    var arr = await Config.db.query({ _id: queue }, { name: 1 }, 1, 0, null, "users", jwt);
                     if (arr.length == 0) skip = true;
+                    if (!skip) {
+                        var arr = await Config.db.query({ _id: queue }, { name: 1 }, 1, 0, null, "openrpa", jwt);
+                        if (arr.length == 0) skip = true;
+                    }
+                    if (!skip) {
+                        var arr = await Config.db.query({ _id: queue }, { name: 1 }, 1, 0, null, "workflow", jwt);
+                        if (arr.length == 0) skip = true;
+                    }
+                    if (!skip) {
+                        throw new Error("Access denied creating consumer for " + queue);
+                    }
                 }
-                if (!skip) {
-                    throw new Error("Access denied creating consumer for " + queue);
-                }
+
             }
         }
         // if (!await amqpwrapper.TestInstance().checkQueue(queue)) {

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.0.88",
+  "version": "1.0.89",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -22,20 +22,20 @@
   "dependencies": {
     "@nodemailer/mailparser2": "^1.0.3",
     "@types/compression": "1.7.0",
-    "@types/node": "^14.0.24",
+    "@types/node": "^14.0.27",
     "async-retry": "^1.3.1",
     "body-parser": "^1.19.0",
     "command-line-args": "^5.1.1",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.5",
     "cookie-session": "^1.4.0",
-    "envfile": "^6.11.0",
+    "envfile": "^6.12.0",
     "express": "^4.17.1",
     "file-system-cache": "^1.0.5",
-    "google-auth-library": "^6.0.5",
+    "google-auth-library": "^6.0.6",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
-    "node-red": "^1.1.2",
+    "node-red": "^1.1.3",
     "node-red-node-email": "^1.7.8",
     "openflow-api": "^1.0.20",
     "os-service": "^2.2.0",

VERSION

@@ -1 +1 @@
-1.0.88
+1.0.89

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.0.88",
+  "version": "1.0.89",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -32,17 +32,17 @@
     "async-retry": "^1.3.1",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.19.0",
-    "bootstrap": "^4.5.0",
+    "bootstrap": "^4.5.2",
     "chart.js": "^2.9.3",
     "command-line-args": "^5.1.1",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.5",
     "cookie-session": "^1.4.0",
-    "envfile": "^6.11.0",
+    "envfile": "^6.12.0",
     "express": "^4.17.1",
     "flash": "^1.1.0",
     "formBuilder": "^3.4.2",
-    "got": "^11.5.1",
+    "got": "^11.5.2",
     "gulp": "^4.0.2",
     "gulp-replace": "^1.0.0",
     "gulp-shell": "^0.8.0",
@@ -54,7 +54,7 @@
     "jsondiffpatch": "^0.4.1",
     "jsonwebtoken": "^8.5.1",
     "mimetype": "0.0.8",
-    "mongodb": "^3.5.9",
+    "mongodb": "^3.6.0",
     "morgan": "^1.10.0",
     "multer": "^1.4.2",
     "multer-gridfs-storage": "^4.2.0",
@@ -69,7 +69,7 @@
     "readline-sync": "^1.4.10",
     "request": "^2.88.2",
     "saml20": "^0.1.14",
-    "samlp": "^3.4.1",
+    "samlp": "^3.4.3",
     "unhandled-rejection": "^1.0.0",
     "winston": "^3.3.3",
     "ws": "^7.3.1"
@@ -78,14 +78,12 @@
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@types/angular": "^1.7.2",
     "@types/angular-route": "^1.7.1",
-    "@types/jquery": "^3.5.0",
-    "browserify": "^16.5.1",
-    "css-loader": "^3.6.0",
+    "@types/jquery": "^3.5.1",
+    "browserify": "^16.5.2",
     "expose-loader": "^1.0.0",
     "merge-stream": "^2.0.0",
     "style-loader": "^1.2.1",
-    "tsify": "^4.0.2",
-    "typescript": "^3.9.7",
-    "webpack": "^4.43.0"
+    "tsify": "^5.0.1",
+    "typescript": "^3.9.7"
   }
 }