Fix redirect issue for pasive / Add aggregate

skadefro · skadefro · commit 6d9c656475ad · 2019-10-03T18:24:16.000+02:00
diff --git a/OpenFlow/src/DatabaseConnection.ts b/OpenFlow/src/DatabaseConnection.ts
@@ -207,7 +207,16 @@ export class DatabaseConnection {
      */
     async aggregate<T extends Base>(aggregates: object[], collectionname: string, jwt: string): Promise<T[]> {
         await this.connect();
-        aggregates.unshift(this.getbasequery(jwt, "_acl", [Rights.read]));
+
+        if (typeof aggregates === "string" || aggregates instanceof String) {
+            aggregates = JSON.parse((aggregates as any));
+        }
+        var base = this.getbasequery(jwt, "_acl", [Rights.read]);
+        if (Array.isArray(aggregates)) {
+            aggregates.unshift({ $match: base });
+        } else {
+            aggregates = [{ $match: base }, aggregates];
+        }
         // todo: add permissions check on aggregates
         // aggregates.unshift(this.getbasequery(jwt, [Rights.read]));
         var items: T[] = await this.db.collection(collectionname).aggregate(aggregates).toArray();
diff --git a/OpenFlow/src/LoginProvider.ts b/OpenFlow/src/LoginProvider.ts
@@ -443,20 +443,58 @@ export class LoginProvider {
         });
         passport.use("local", strategy);
         // http://www.passportjs.org/docs/authenticate/#custom-callback
+        // app.use("/local",
+        //     bodyParser.urlencoded({ extended: false }),
+        //     //passport.authenticate("local", { failureRedirect: "/login?failed=true", failureFlash: true }),
+        //     passport.authenticate("local", { failureRedirect: "/" }),
+        //     function (req: any, res: any): void {
+        //         var originalUrl: any = req.cookies.originalUrl;
+        //         if (!Util.IsNullEmpty(originalUrl)) {
+        //             res.cookie("originalUrl", "", { expires: new Date(0) });
+        //             LoginProvider.redirect(res, originalUrl);
+        //         } else {
+        //             res.redirect("/");
+        //         }
+        //     }
+        // );
         app.use("/local",
             bodyParser.urlencoded({ extended: false }),
-            //passport.authenticate("local", { failureRedirect: "/login?failed=true", failureFlash: true }),
-            passport.authenticate("local", { failureRedirect: "/" }),
-            function (req: any, res: any): void {
-                var originalUrl: any = req.cookies.originalUrl;
-                if (!Util.IsNullEmpty(originalUrl)) {
-                    res.cookie("originalUrl", "", { expires: new Date(0) });
-                    LoginProvider.redirect(res, originalUrl);
-                } else {
-                    res.redirect("/");
-                }
+            function (req: any, res: any, next: any): void {
+                passport.authenticate("local", function (err, user, info) {
+                    var originalUrl: any = req.cookies.originalUrl;
+                    if (!err && user) {
+                        req.logIn(user, function (err: any) {
+                            if (err) { }
+                            // if (err) { return next(err); }
+                            if (!Util.IsNullEmpty(originalUrl)) {
+                                try {
+                                    res.cookie("originalUrl", "", { expires: new Date(0) });
+                                } catch (error) {
+                                }
+                                LoginProvider.redirect(res, originalUrl);
+                            } else {
+                                res.redirect("/");
+                            }
+                        });
+                    }
+                    if (!Util.IsNullEmpty(originalUrl)) {
+                        if (originalUrl.indexOf("?") == -1) {
+                            originalUrl = originalUrl + "?error=1"
+                        } else if (originalUrl.indexOf("error=1") == -1) {
+                            originalUrl = originalUrl + "&error=1"
+                        }
+                        try {
+                            res.cookie("originalUrl", "", { expires: new Date(0) });
+                        } catch (error) {
+                        }
+                        LoginProvider.redirect(res, originalUrl);
+                    } else {
+                        res.redirect("/");
+                    }
+                })(req, res, next);
             }
         );
+
         return strategy;
     }
     static async samlverify(profile: any, done: IVerifyFunction): Promise<void> {
diff --git a/OpenFlow/src/public/PassiveLogin.html b/OpenFlow/src/public/PassiveLogin.html
@@ -17,6 +17,32 @@
 </head>
 
 <script>
+  function getCookieValue(a) {
+    console.log(document.cookie);
+    var b = document.cookie.match('(^|[^;]+)\\s*' + a + '\\s*=\\s*([^;]+)');
+    return b ? b.pop() : '';
+  }
+  function parse_query_string(query) {
+    var vars = query.split("&");
+    var query_string = {};
+    for (var i = 0; i < vars.length; i++) {
+      var pair = vars[i].split("=");
+      var key = decodeURIComponent(pair[0]);
+      var value = decodeURIComponent(pair[1]);
+      // If first entry with this name
+      if (typeof query_string[key] === "undefined") {
+        query_string[key] = decodeURIComponent(value);
+        // If second entry with this name
+      } else if (typeof query_string[key] === "string") {
+        var arr = [query_string[key], decodeURIComponent(value)];
+        query_string[key] = arr;
+        // If third or later entry with this name
+      } else {
+        query_string[key].push(decodeURIComponent(value));
+      }
+    }
+    return query_string;
+  }
   function getJSON(url, callback) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
@@ -39,9 +65,25 @@
   function SettingsController2($scope, $http) {
     this.user = null;
     this.name = 'John Smith';
+    this.message = '';
     // this.domain = "Donald duck";
     this.localenabled = false;
     this.domain = window.location.hostname;
+    var cerror = getCookieValue("error");
+
+    // var url_string = window.location.href;
+    // var url = new URL(url_string);
+    // var cerror = url.searchParams.get("error");
+
+    var query = window.location.search.substring(1);
+    var qs = parse_query_string(query);
+    var cerror = qs.error;
+    console.log(query);
+    console.log(qs);
+    console.log(cerror);
+    if (cerror !== null && cerror !== undefined && cerror != "") {
+      this.message = "Unknown user or bad password";
+    }
     this.process = function (error, data) {
       console.log(data);
       this.providers = data;
@@ -98,6 +140,10 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
                   placeholder="Password" required autocomplete="current-password">
                 <label for="password" translate lib="web">password</label>
               </div>
+              <div class="mb-3">
+
+                <label class="text-danger">{{ctrl.message}}</label>
+              </div>
               <button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit" ng-show="ctrl.localenabled"
                 translate lib="web">signin</button>
               <hr class="my-4" ng-show="ctrl.localenabled">
diff --git a/OpenFlowNodeRED/src/nodered/nodes/NoderedUtil.ts b/OpenFlowNodeRED/src/nodered/nodes/NoderedUtil.ts
@@ -1,5 +1,5 @@
 import { Red } from "node-red";
-import { QueryMessage, Message, InsertOneMessage, UpdateOneMessage, DeleteOneMessage, InsertOrUpdateOneMessage, SigninMessage, TokenUser, mapFunc, reduceFunc, finalizeFunc, MapReduceMessage, JSONfn, UpdateManyMessage, GetFileMessage, SaveFileMessage } from "../../Message";
+import { QueryMessage, Message, InsertOneMessage, UpdateOneMessage, DeleteOneMessage, InsertOrUpdateOneMessage, SigninMessage, TokenUser, mapFunc, reduceFunc, finalizeFunc, MapReduceMessage, JSONfn, UpdateManyMessage, GetFileMessage, SaveFileMessage, AggregateMessage } from "../../Message";
 import { WebSocketClient } from "../../WebSocketClient";
 import { Crypt } from "../../Crypt";
 import { Config } from "../../Config";
@@ -152,6 +152,15 @@ export class NoderedUtil {
         return result.result;
     }
 
+    public static async Aggregate(collection: string, aggregates: object[], jwt: string): Promise<any> {
+        var q: AggregateMessage = new AggregateMessage();
+        q.collectionname = collection; q.aggregates = aggregates; q.jwt = jwt;
+        var msg: Message = new Message(); msg.command = "aggregate";
+        msg.data = JSONfn.stringify(q);
+        var result: QueryMessage = await WebSocketClient.instance.Send<QueryMessage>(msg);
+        return result.result;
+    }
+
     public static async GetFile(filename: string, id: string, jwt: string): Promise<GetFileMessage> {
         var q: GetFileMessage = new GetFileMessage(); q.filename = filename;
         q.id = id; q.jwt = jwt;
diff --git a/OpenFlowNodeRED/src/nodered/nodes/api.html b/OpenFlowNodeRED/src/nodered/nodes/api.html
@@ -1052,14 +1052,15 @@
                     clearInterval: false
                 }
             });
+            var that = this;
             $("#node-function-expand-js-updatedocument").click(function (e) {
                 e.preventDefault();
                 var value = that.updatedocumenteditor.getValue();
                 RED.editor.editJavaScript({
                     value: value,
                     width: "Infinity",
                     cursor: that.updatedocumenteditor.getCursorPosition(),
-                    mode: "ace/mode/nrjavascript",
+                    mode: "ace/mode/json",
                     complete: function (v, cursor) {
                         that.updatedocumenteditor.setValue(v, -1);
                         that.updatedocumenteditor.gotoLine(cursor.row + 1, cursor.column, false);
@@ -1099,6 +1100,119 @@
 
 
 
+
+
+
+<script type="text/x-red" data-template-name="api aggregate">
+    <div class="form-row" style="margin-bottom: 0px;">
+        <label for="node-input-aggregates"><i class="fa fa-wrench"></i> Aggregates</label>
+        <input type="hidden" id="node-input-aggregates" autofocus="autofocus">
+        <input type="hidden" id="node-input-noerr-aggregates">
+    </div>
+    <div class="form-row node-text-editor-row" style="position:relative">
+        <div style="position: absolute; right:0; bottom:calc(100% + 3px);"><button id="node-function-expand-js-aggregates" class="editor-button editor-button-small"><i class="fa fa-expand"></i></button></div>
+        <div style="height: 100px; min-height:100px;" class="node-text-editor" id="node-input-aggregates-editor" ></div>
+    </div>
+    <div class="form-row">
+        <label><i class="fa fa-tag"></i> Collection</label>
+        <input type="text" id="node-input-collection" placeholder="Collection">
+    </div>
+    <div class="form-row">
+        <label><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+</script>
+<script type="text/x-red" data-help-name="api aggregate">
+    <p>Send an aggregate request to an collection 
+        read more about the 
+        <a tagret="_blank" href="https://docs.mongodb.com/manual/reference/command/aggregate/index.html/">
+            aggregate here</a> and the <a tagret="_blank" href="https://docs.mongodb.com/manual/reference/operator/aggregation-pipeline//">aggregation-pipeline</a>
+    </p>
+</script>
+<script type="text/javascript">
+    RED.nodes.registerType('api aggregate', {
+        category: 'api',
+        color: "#a6bbcf",
+        defaults: {
+            name: { value: "" },
+            aggregates: { value: "[ {\"$group\" : {\"_id\":\"$_type\", \"count\":{\"$sum\":1}} } ]", required: true },
+            collection: { value: "entities", required: true }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "bridge.png",
+        label: function () {
+            return this.name || "api aggregate";
+        },
+        labelStyle: function () {
+            return this.name ? "node_label_italic" : "";
+        },
+        oneditprepare: function () {
+            this.aggregateseditor = RED.editor.createEditor({
+                id: 'node-input-aggregates-editor',
+                mode: 'ace/mode/json',
+                value: $("#node-input-aggregates").val(),
+                globals: {
+                    msg: false,
+                    context: false,
+                    RED: false,
+                    util: false,
+                    flow: false,
+                    global: false,
+                    console: false,
+                    Buffer: false,
+                    setTimeout: false,
+                    clearTimeout: false,
+                    setInterval: false,
+                    clearInterval: false
+                }
+            });
+            var that = this;
+            $("#node-function-expand-js-aggregates").click(function (e) {
+                e.preventDefault();
+                var value = that.aggregateseditor.getValue();
+                RED.editor.editJavaScript({
+                    value: value,
+                    width: "Infinity",
+                    cursor: that.aggregateseditor.getCursorPosition(),
+                    mode: "ace/mode/json",
+                    complete: function (v, cursor) {
+                        that.aggregateseditor.setValue(v, -1);
+                        that.aggregateseditor.gotoLine(cursor.row + 1, cursor.column, false);
+                        setTimeout(function () {
+                            that.aggregateseditor.focus();
+                        }, 300);
+                    }
+                })
+            });
+
+        },
+        oneditcancel: function () {
+            this.aggregateseditor.destroy();
+            delete this.aggregateseditor;
+        },
+        oneditsave: function () {
+            annot = this.aggregateseditor.getSession().getAnnotations();
+            $("#node-input-noerr-aggregates").val(0);
+            for (var k = 0; k < annot.length; k++) {
+                if (annot[k].type === "error") {
+                    $("#node-input-noerr-aggregates").val(annot.length);
+                    this.noerr = annot.length;
+                }
+            }
+
+            $("#node-input-aggregates").val(this.aggregateseditor.getValue());
+            this.aggregateseditor.destroy();
+            delete this.aggregateseditor;
+        }
+
+    });
+
+</script>
+
+
+
+
 <script type="text/x-red" data-template-name="api download file">
 <div class="form-row">
     <label><i class="fa fa-tag"></i> fileid</label>
diff --git a/OpenFlowNodeRED/src/nodered/nodes/api.ts b/OpenFlowNodeRED/src/nodered/nodes/api.ts
@@ -20,6 +20,7 @@ export = function (RED: Red) {
 
     RED.nodes.registerType("map reduce", api.api_map_reduce);
     RED.nodes.registerType("api updatedocument", api.api_updatedocument);
+    RED.nodes.registerType("api aggregate", api.api_aggregate);
 
     RED.nodes.registerType("grant permission", api.grant_permission);
     RED.nodes.registerType("revoke permission", api.revoke_permission);
diff --git a/OpenFlowNodeRED/src/nodered/nodes/api_nodes.ts b/OpenFlowNodeRED/src/nodered/nodes/api_nodes.ts
@@ -802,3 +802,43 @@ export class upload_file {
     onclose() {
     }
 }
+
+
+
+
+
+
+export interface Iapi_aggregate {
+    collection: string;
+    aggregates: object[];
+}
+export class api_aggregate {
+    public node: Red = null;
+
+    constructor(public config: Iapi_aggregate) {
+        RED.nodes.createNode(this, config);
+        this.node = this;
+        this.node.status({});
+        this.node.on("input", this.oninput);
+        this.node.on("close", this.onclose);
+    }
+    async oninput(msg: any) {
+        try {
+            this.node.status({});
+            // if (NoderedUtil.IsNullEmpty(msg.jwt)) { return NoderedUtil.HandleError(this, "Missing jwt token"); }
+
+            if (!NoderedUtil.IsNullEmpty(msg.collection)) { this.config.collection = msg.collection; }
+            if (!NoderedUtil.IsNullUndefinded(msg.aggregates)) { this.config.aggregates = msg.aggregates; }
+
+            this.node.status({ fill: "blue", shape: "dot", text: "Running mapreduce" });
+            var result = await NoderedUtil.Aggregate(this.config.collection, this.config.aggregates, msg.jwt);
+            msg.payload = result;
+            this.node.send(msg);
+            this.node.status({});
+        } catch (error) {
+            NoderedUtil.HandleError(this, error);
+        }
+    }
+    onclose() {
+    }
+}
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.347
+0.0.348
