reverte test

Author: skadefro

OpenFlowNodeRED/package.json

@@ -22,7 +22,7 @@
     "gulp-shell": "^0.7.0",
     "jsonwebtoken": "^8.5.1",
     "node-red": "^0.20.5",
-    "node-red-contrib-auth-saml": "^1.0.7",
+    "node-red-contrib-auth-saml": "^1.0.8",
     "passport-google-oauth20": "^2.0.0",
     "passport-openid-connect": "^0.1.0",
     "passport-saml": "^1.0.0",

OpenFlowNodeRED/src/Config.ts

@@ -60,16 +60,14 @@ export class Config {
 
 
         try {
-            console.log("ssl-root-cas SKIPPED!!!!!!");
-            // rootCas.addFile(path.join(__dirname, '../config/ssl/gd_bundle-g2-g1.crt'));
-            //if (Config.tls_ca !== "") {
-                // var tls_ca: string = Buffer.from(Config.tls_ca, 'base64').toString('ascii')
-                // var rootCas = require('ssl-root-cas/latest').create();
-                // rootCas.push(tls_ca);
-                // // rootCas.addFile( tls_ca );
-                // https.globalAgent.options.ca = rootCas;
-                // require('https').globalAgent.options.ca = rootCas;
-            //}
+            if (Config.tls_ca !== "") {
+                var tls_ca: string = Buffer.from(Config.tls_ca, 'base64').toString('ascii')
+                var rootCas = require('ssl-root-cas/latest').create();
+                rootCas.push(tls_ca);
+                // rootCas.addFile( tls_ca );
+                https.globalAgent.options.ca = rootCas;
+                require('https').globalAgent.options.ca = rootCas;
+            }
         } catch (error) {
             console.log(error);
         }

OpenFlowNodeRED/src/WebServer.ts

@@ -51,18 +51,17 @@ export class WebServer {
                             key: Buffer.from(Config.tls_key, 'base64').toString('ascii')
                         };
                     }
-                    console.log("Config.tls_ca SKIPPED!!!!!!");
-                    // var ca:string = Config.tls_ca;
-                    // if (ca!== "") {
-                    //     if(ca.indexOf("---") === -1) {
-                    //         ca = Buffer.from(ca, 'base64').toString('ascii');
-                    //     }
-                    //     // if(ca.indexOf("---") > -1) {
-                    //     //     console.log(ca);
-                    //     //     options.ca = ca;
-                    //     // }
-                    //     // options.cert += "\n" + ca;
-                    // }
+                    var ca:string = Config.tls_ca;
+                    if (ca!== "") {
+                        if(ca.indexOf("---") === -1) {
+                            ca = Buffer.from(ca, 'base64').toString('ascii');
+                        }
+                        if(ca.indexOf("---") > -1) {
+                            console.log(ca);
+                            options.ca = ca;
+                        }
+                        // options.cert += "\n" + ca;
+                    }
                     if(Config.tls_passphrase!=="") {
                         options.passphrase = Config.tls_passphrase;
                     }
@@ -90,7 +89,7 @@ export class WebServer {
                 (profile:string | any, done:any)=> {
                     // profile.permissions = "*";
                     done(profile);
-                });
+                }, "");
                 // this.settings.adminAuth = await noderedcontribauthsaml.configure(this._logger, Config.baseurl());clear
 
                 // settings.adminAuth = new noderedcontribauthopenid(this._logger, Config.baseurl());

VERSION

@@ -1 +1 @@
-0.0.69
+0.0.70