@node-red/editor-api 2.2.1 → 3.0.0-beta.2

package/lib/admin/diagnostics.js

@@ -0,0 +1,23 @@
+let runtimeAPI;
+let settings;
+const apiUtil = require("../util");
+module.exports = {
+    init: function(_settings, _runtimeAPI) {
+        settings = _settings;
+        runtimeAPI = _runtimeAPI;
+    },
+    getReport: function(req, res) {
+        const diagnosticsOpts = settings.diagnostics || {};
+        const opts = {
+            user: req.user,
+            scope: diagnosticsOpts.level || "basic"
+        }
+        if(diagnosticsOpts.enabled === false || diagnosticsOpts.enabled === "false") {
+            apiUtil.rejectHandler(req, res, {message: "diagnostics are disabled", status: 403, code: "diagnostics.disabled" })
+        } else {
+            runtimeAPI.diagnostics.get(opts)
+            .then(function(result) { res.json(result); })
+            .catch(err => apiUtil.rejectHandler(req, res, err))
+        }
+    }
+}

package/lib/admin/index.js

@@ -23,6 +23,7 @@ var context = require("./context");
 var auth = require("../auth");
 var info = require("./settings");
 var plugins = require("./plugins");
+var diagnostics = require("./diagnostics");
 
 var apiUtil = require("../util");
 
@@ -34,6 +35,7 @@ module.exports = {
         context.init(runtimeAPI);
         info.init(settings,runtimeAPI);
         plugins.init(runtimeAPI);
+        diagnostics.init(settings, runtimeAPI);
 
         var needsPermission = auth.needsPermission;
 
@@ -95,6 +97,8 @@ module.exports = {
         adminApp.get("/plugins", needsPermission("plugins.read"), plugins.getAll, apiUtil.errorHandler);
         adminApp.get("/plugins/messages", needsPermission("plugins.read"), plugins.getCatalogs, apiUtil.errorHandler);
 
+        adminApp.get("/diagnostics", needsPermission("diagnostics.read"), diagnostics.getReport, apiUtil.errorHandler);
+
         return adminApp;
     }
 }

package/lib/auth/index.js

@@ -106,9 +106,15 @@ async function login(req,res) {
                 urlPrefix += "/";
             }
             response = {
-                "type":"strategy",
-                "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]
+                "type":"strategy"
             }
+            if (mergedAdminAuth.strategy.autoLogin) {
+                response.autoLogin = true
+                response.loginRedirect = urlPrefix + "auth/strategy"
+            }
+            response.prompts = [
+                {type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}
+            ]
             if (mergedAdminAuth.strategy.icon) {
                 response.prompts[0].icon = mergedAdminAuth.strategy.icon;
             }
@@ -185,7 +191,7 @@ function genericStrategy(adminApp,strategy) {
                 }
             };
 
-            options.verify.apply(null,args);
+            options.verify.apply(this,args);
         } else {
             var profile = arguments[arguments.length - 2];
             return completeVerify(profile,originalDone);

package/lib/auth/strategies.js

@@ -92,10 +92,16 @@ var passwordTokenExchange = function(client, username, password, scope, done) {
                 loginAttempts = loginAttempts.filter(function(logEntry) {
                     return logEntry.user !== username;
                 });
-                Tokens.create(username,client.id,scope).then(function(tokens) {
-                    log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
-                    done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
-                });
+                // Check if the user contains a user defined token and use it
+                // instead of generating a new token
+                if(user.token){
+                    done(null,user.token,null,null);
+                } else {
+                    Tokens.create(username,client.id,scope).then(function(tokens) {
+                        log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
+                        done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
+                    });
+                }
             } else {
                 log.audit({event: "auth.login.fail.permissions",username:username,client:client.id,scope:scope});
                 done(null,false);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "2.2.1",
+    "version": "3.0.0-beta.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,14 +16,14 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.2.1",
-        "@node-red/editor-client": "2.2.1",
+        "@node-red/util": "3.0.0-beta.2",
+        "@node-red/editor-client": "3.0.0-beta.2",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.1",
+        "body-parser": "1.20.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.17.2",
-        "express": "4.17.2",
+        "express-session": "1.17.3",
+        "express": "4.18.1",
         "memorystore": "1.6.7",
         "mime": "3.0.0",
         "multer": "1.4.4",