Merge branch 'master' into dev

packages/node_modules/@node-red/editor-api/lib/auth/strategies.js

@@ -146,7 +146,7 @@ function authenticateUserToken(req) {
                 } else {
                     reject();
                 }
-            });
+            }).catch(reject);
         } else {
             reject();
         }
@@ -163,6 +163,9 @@ TokensStrategy.prototype.authenticate = function(req) {
     authenticateUserToken(req).then(user => {
         this.success(user,{scope:user.permissions});
     }).catch(err => {
+        if (err) {
+            log.trace("token authentication failure: "+err.stack?err.stack:err)
+        }
         this.fail(401);
     });
 }

packages/node_modules/@node-red/editor-api/lib/index.js

@@ -90,6 +90,8 @@ function init(settings,_server,storage,runtimeAPI) {
                     auth.getToken,
                     auth.errorHandler
                 );
+            } else if (settings.adminAuth.tokens) {
+                adminApp.use(passport.initialize());
             }
             adminApp.post("/auth/revoke",auth.needsPermission(""),auth.revoke,apiUtil.errorHandler);
         }