frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

add bcrypt as optional dependency to speed up Pi,

Browse Source 
but not force compile on Windows.
Fix to close Issue #585
This commit is contained in:
dceejay 2015-03-19 11:36:48 +00:00
parent 2d91be8814
commit a9789697e7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -59,6 +59,9 @@
"passport-oauth2-client-password":"0.1.2", "passport-oauth2-client-password":"0.1.2",
"oauth2orize":"1.0.1" "oauth2orize":"1.0.1"
}, },
"optionalDependencies": {
"bcrypt":"0.8.1"
},
"devDependencies": { "devDependencies": {
"grunt": "0.4.5", "grunt": "0.4.5",
"grunt-cli": "0.1.13", "grunt-cli": "0.1.13",

8
red/api/auth/users.js
View File

@ -16,8 +16,9 @@
var when = require("when"); var when = require("when");
var util = require("util"); var util = require("util");
var bcrypt = require('bcryptjs'); var bcrypt;
try { bcrypt = require('bcrypt'); }
catch(e) { bcrypt = require('bcryptjs'); }
var users = {}; var users = {};
var passwords = {}; var passwords = {};
var defaultUser = null; var defaultUser = null;
@ -56,6 +57,7 @@ function init(config) {
api.get = config.users; api.get = config.users;
} else { } else {
var us = config.users; var us = config.users;
/* istanbul ignore else */
if (!util.isArray(us)) { if (!util.isArray(us)) {
us = [us]; us = [us];
} }
@ -97,5 +99,3 @@ module.exports = {
authenticate: function(username,password) { return api.authenticate(username,password) }, authenticate: function(username,password) { return api.authenticate(username,password) },
default: function() { return api.default(); } default: function() { return api.default(); }
}; };