From 17a966b89cef0df48628235c4561dd6e6f29f629 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 11 Jun 2016 21:01:06 +0100 Subject: [PATCH 1/2] Remove redundant variables. --- src/clientManager.js | 4 +--- src/command-line/reset.js | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/clientManager.js b/src/clientManager.js index 420d4bf2ab..f759186471 100644 --- a/src/clientManager.js +++ b/src/clientManager.js @@ -125,10 +125,8 @@ ClientManager.prototype.readUserConfig = function(name) { if (users.indexOf(name) === -1) { return false; } - var user = {}; var data = fs.readFileSync(Helper.getUserConfigPath(name), "utf-8"); - user = JSON.parse(data); - return user; + return JSON.parse(data); }; ClientManager.prototype.removeUser = function(name) { diff --git a/src/command-line/reset.js b/src/command-line/reset.js index 38449fa4f0..096a604d11 100644 --- a/src/command-line/reset.js +++ b/src/command-line/reset.js @@ -23,8 +23,7 @@ program return; } var salt = bcrypt.genSaltSync(8); - var hash = bcrypt.hashSync(password, salt); - user.password = hash; + user.password = bcrypt.hashSync(password, salt); fs.writeFileSync( file, JSON.stringify(user, null, " ") From 6d29cebd8ca208c2a9ee099d0fad819c78d85d04 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 12 Jun 2016 00:13:28 +0100 Subject: [PATCH 2/2] Remove redundant salt variable. --- src/command-line/reset.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/command-line/reset.js b/src/command-line/reset.js index 096a604d11..d337c80940 100644 --- a/src/command-line/reset.js +++ b/src/command-line/reset.js @@ -22,8 +22,7 @@ program if (err) { return; } - var salt = bcrypt.genSaltSync(8); - user.password = bcrypt.hashSync(password, salt); + user.password = bcrypt.hashSync(password, bcrypt.genSaltSync(8)); fs.writeFileSync( file, JSON.stringify(user, null, " ")