add roles to nodered rpa node

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -54,7 +54,7 @@ module openflow {
             });
         }
         async loadUsers(): Promise<void> {
-            this.users = await this.api.Query("users", { $or: [{ _type: "user" }, { _type: "role" }] }, null, null);
+            this.users = await this.api.Query("users", { $or: [{ _type: "user" }, { _type: "role", rparole: true }] }, null, null);
             this.users.forEach(user => {
                 if (user._id == this.model._createdbyid || user._id == this.model._createdbyid) {
                     this.user = user;

OpenFlow/src/public/Entities.ts

@@ -163,6 +163,7 @@ module openflow {
             this.name = name;
             this._type = "role";
         }
+        public rparole: boolean;
     }
     export class TokenUser extends Base {
         public roles: Rolemember[] = [];

OpenFlow/src/public/Role.html

@@ -54,6 +54,13 @@ <h1 class="pagetitle" translate lib="web">role</h1>
             </ul>
         </div>
     </div>
+    <div class="form-group">
+        <label for="name" class="col-sm-2 control-label" translate lib="web">rparole</label>
+        <div class="col-sm-6">
+            <input type="checkbox" ng-model="ctrl.model.rparole" class="form-control input-md"
+                ng-disabled="ctrl.loading==true" />
+        </div>
+    </div>
     <div class="form-inline" ng-repeat="m in ctrl.model.members">
         <label class="col-sm-1 control-label" translate lib="web">member</label>
         <div class="col-sm-3">

OpenFlowNodeRED/src/nodered/nodes/rpa.ts

@@ -1,12 +1,10 @@
 import { Red } from "node-red";
 import * as rpa from "./rpa_nodes";
 
-
 export = function (RED: Red) {
     RED.nodes.registerType("rpa detector", rpa.rpa_detector_node);
     RED.nodes.registerType("rpa workflow", rpa.rpa_workflow_node);
     RED.httpAdmin.get("/rpa_detectors", RED.auth.needsPermission('serial.read'), rpa.get_rpa_detectors);
     RED.httpAdmin.get("/rpa_robots", RED.auth.needsPermission('serial.read'), rpa.get_rpa_robots);
     RED.httpAdmin.get("/rpa_workflows", RED.auth.needsPermission('serial.read'), rpa.get_rpa_workflows);
-
 }

OpenFlowNodeRED/src/nodered/nodes/rpa_nodes.ts

@@ -207,7 +207,7 @@ export async function get_rpa_robots(req, res) {
     try {
         var rawAssertion = req.user.getAssertionXml();
         var token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
-        var result: any[] = await NoderedUtil.Query('users', { _type: "user" },
+        var result: any[] = await NoderedUtil.Query('users', { $or: [{ _type: "user" }, { _type: "role", rparole: true }] },
             { name: 1 }, { name: -1 }, 1000, 0, token.jwt)
         res.json(result);
     } catch (error) {
@@ -220,7 +220,22 @@ export async function get_rpa_workflows(req, res) {
         var token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
         var q: any = { _type: "workflow" };
         if (req.query.queue != null && req.query.queue != undefined && req.query.queue != "" && req.query.queue != "none") {
-            q = { _type: "workflow", $or: [{ _createdbyid: req.query.queue }, { _modifiedbyid: req.query.queue }] };
+            q = {
+                _type: "workflow",
+                $or: [
+                    { _createdbyid: req.query.queue },
+                    { _modifiedbyid: req.query.queue },
+                    {
+                        _acl: {
+                            $elemMatch: {
+                                rights: { $bitsAllSet: [2] },
+                                deny: false,
+                                _id: req.query.queue
+                            }
+                        }
+                    }
+                ]
+            };
         }
         var result: any[] = await NoderedUtil.Query('openrpa', q,
             { name: 1 }, { name: -1 }, 1000, 0, token.jwt)

VERSION

@@ -1 +1 @@
-0.0.381
+0.0.382