Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

only exposing password at setup end if one is autogenerated

Browse Source
This commit is contained in:
Julian Lam
2015-04-22 10:58:40 -04:00
parent 7632997a99
commit 8f5c393b12
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/install.js
View File

@@ -335,7 +335,7 @@ function createAdmin(callback) {
} }
Groups.join('administrators', uid, function(err) { Groups.join('administrators', uid, function(err) {
callback(err, results); callback(err, password ? results : undefined);
}); });
}); });
}, },
@@ -362,7 +362,7 @@ function createAdmin(callback) {
prompt.get(questions, success); prompt.get(questions, success);
} else { } else {
// If automated setup did not provide a user password, generate one, it will be shown to the user upon setup completion // If automated setup did not provide a user password, generate one, it will be shown to the user upon setup completion
if (!install.values.hasOwnProperty('admin:password')) { if (!install.values.hasOwnProperty('admin:password') && !nconf.get('admin:password')) {
process.stdout.write('Password was not provided during automated setup, generating one...\n') process.stdout.write('Password was not provided during automated setup, generating one...\n')
password = utils.generateUUID().slice(0, 8); password = utils.generateUUID().slice(0, 8);
} }
@@ -370,8 +370,8 @@ function createAdmin(callback) {
var results = { var results = {
username: install.values['admin:username'] || 'admin', username: install.values['admin:username'] || 'admin',
email: install.values['admin:email'] || '', email: install.values['admin:email'] || '',
password: install.values['admin:password'] || password, password: install.values['admin:password'] || nconf.get('admin:password') || password,
'password:confirm': install.values['admin:password:confirm'] || password 'password:confirm': install.values['admin:password:confirm'] || nconf.get('admin:password') || password
}; };
success(null, results); success(null, results);