Merge pull request #4744 from node-red/bcrypt-bump

Replace bcrypt with @node-rs/bcrypt

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

@@ -17,7 +17,7 @@
 var util = require("util");
 var clone = require("clone");
 var bcrypt;
-try { bcrypt = require('bcrypt'); }
+try { bcrypt = require('@node-rs/bcrypt'); }
 catch(e) { bcrypt = require('bcryptjs'); }
 var users = {};
 var defaultUser = null;
@@ -33,11 +33,11 @@ function authenticate() {
             if (args.length === 2) {
                 // Username/password authentication
                 var password = args[1];
-                return new Promise(function(resolve,reject) {
-                    bcrypt.compare(password, user.password, function(err, res) {
-                        resolve(res?cleanUser(user):null);
-                    });
-                });
+                return bcrypt.compare(password, user.password).then(res => {
+                    return res ? cleanUser(user) : null
+                }).catch(err => {
+                    return null
+                })
             } else {
                 // Try to extract common profile information
                 if (args[0].hasOwnProperty('photos') && args[0].photos.length > 0) {

packages/node_modules/@node-red/editor-api/package.json

@@ -35,6 +35,6 @@
         "ws": "7.5.6"
     },
     "optionalDependencies": {
-        "bcrypt": "5.1.1"
+        "@node-rs/bcrypt": "1.10.4"
     }
 }

packages/node_modules/node-red/package.json

@@ -44,7 +44,7 @@
         "semver": "7.5.4"
     },
     "optionalDependencies": {
-        "bcrypt": "5.1.1"
+        "@node-rs/bcrypt": "1.10.4"
     },
     "engines": {
         "node": ">=18.5"

packages/node_modules/node-red/red.js

@@ -38,7 +38,7 @@ var https = require('https');
 var util = require("util");
 var express = require("express");
 var crypto = require("crypto");
-try { bcrypt = require('bcrypt'); }
+try { bcrypt = require('@node-rs/bcrypt'); }
 catch(e) { bcrypt = require('bcryptjs'); }
 var nopt = require("nopt");
 var path = require("path");