add administrator role work around

skadefro · skadefro · commit f74fc1ce3dc5 · 2021-08-03T17:48:29.000+02:00
diff --git a/OpenFlow/src/DatabaseConnection.ts b/OpenFlow/src/DatabaseConnection.ts
@@ -880,7 +880,11 @@ export class DatabaseConnection {
                 if ((item._type === "user" || item._type === "role") &&
                     (this.WellknownNamesArray.indexOf(item.name) > -1 || this.WellknownNamesArray.indexOf((item as any).username) > -1)) {
                     if (this.WellknownIdsArray.indexOf(item._id) == -1) {
-                        throw new Error("Access denied");
+                        if (item._type == "role" && item.name == "administrator") {
+                            // temp, allow this
+                        } else {
+                            throw new Error("Access denied");
+                        }
                     }
                 }
             }
@@ -1113,7 +1117,11 @@ export class DatabaseConnection {
                     if ((item._type === "user" || item._type === "role") &&
                         (this.WellknownNamesArray.indexOf(item.name) > -1 || this.WellknownNamesArray.indexOf((item as any).username) > -1)) {
                         if (this.WellknownIdsArray.indexOf(item._id) == -1) {
-                            throw new Error("Access denied");
+                            if (item._type == "role" && item.name == "administrator") {
+                                // temp, allow this
+                            } else {
+                                throw new Error("Access denied");
+                            }
                         }
                     }
                 }
@@ -1313,7 +1321,12 @@ export class DatabaseConnection {
                     if ((q.item._type === "user" || q.item._type === "role") &&
                         (this.WellknownNamesArray.indexOf(q.item.name) > -1 || this.WellknownNamesArray.indexOf((q.item as any).username) > -1)) {
                         if (this.WellknownIdsArray.indexOf(q.item._id) == -1) {
-                            throw new Error("Access denied");
+                            if (q.item._type == "role" && q.item.name == "administrator") {
+                                // temp, allow this
+                            } else {
+                                throw new Error("Access denied");
+                            }
+
                         }
                     }
                 }
diff --git a/OpenFlowNodeRED/package.json b/OpenFlowNodeRED/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.3.55",
+  "version": "1.3.56",
   "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": {
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.55
+1.3.56
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.3.55",
+  "version": "1.3.56",
   "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": {

Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,11 @@ export class DatabaseConnection {`
`880`	`880`	`if ((item._type === "user" \|\| item._type === "role") &&`
`881`	`881`	`(this.WellknownNamesArray.indexOf(item.name) > -1 \|\| this.WellknownNamesArray.indexOf((item as any).username) > -1)) {`
`882`	`882`	`if (this.WellknownIdsArray.indexOf(item._id) == -1) {`
`883`		`- throw new Error("Access denied");`
	`883`	`+ if (item._type == "role" && item.name == "administrator") {`
	`884`	`+ // temp, allow this`
	`885`	`+ } else {`
	`886`	`+ throw new Error("Access denied");`
	`887`	`+ }`
`884`	`888`	`}`
`885`	`889`	`}`
`886`	`890`	`}`
`@@ -1113,7 +1117,11 @@ export class DatabaseConnection {`
`1113`	`1117`	`if ((item._type === "user" \|\| item._type === "role") &&`
`1114`	`1118`	`(this.WellknownNamesArray.indexOf(item.name) > -1 \|\| this.WellknownNamesArray.indexOf((item as any).username) > -1)) {`
`1115`	`1119`	`if (this.WellknownIdsArray.indexOf(item._id) == -1) {`
`1116`		`- throw new Error("Access denied");`
	`1120`	`+ if (item._type == "role" && item.name == "administrator") {`
	`1121`	`+ // temp, allow this`
	`1122`	`+ } else {`
	`1123`	`+ throw new Error("Access denied");`
	`1124`	`+ }`
`1117`	`1125`	`}`
`1118`	`1126`	`}`
`1119`	`1127`	`}`
`@@ -1313,7 +1321,12 @@ export class DatabaseConnection {`
`1313`	`1321`	`if ((q.item._type === "user" \|\| q.item._type === "role") &&`
`1314`	`1322`	`(this.WellknownNamesArray.indexOf(q.item.name) > -1 \|\| this.WellknownNamesArray.indexOf((q.item as any).username) > -1)) {`
`1315`	`1323`	`if (this.WellknownIdsArray.indexOf(q.item._id) == -1) {`
`1316`		`- throw new Error("Access denied");`
	`1324`	`+ if (q.item._type == "role" && q.item.name == "administrator") {`
	`1325`	`+ // temp, allow this`
	`1326`	`+ } else {`
	`1327`	`+ throw new Error("Access denied");`
	`1328`	`+ }`
	`1329`	`+`
`1317`	`1330`	`}`
`1318`	`1331`	`}`
`1319`	`1332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@openiap/nodered",`
`3`		`- "version": "1.3.55",`
	`3`	`+ "version": "1.3.56",`
`4`	`4`	`"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)",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@openiap/openflow",`
`3`		`- "version": "1.3.55",`
	`3`	`+ "version": "1.3.56",`
`4`	`4`	`"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)",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`