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

added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)

Browse Source
This commit is contained in:
Julian Lam
2014-03-06 15:32:06 -05:00
parent 4a1513eabf
commit e9e53ad95e
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/forum/accountedit.js
View File

@@ -189,8 +189,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
password_confirm.on('blur', onPasswordConfirmChanged); password_confirm.on('blur', onPasswordConfirmChanged);
$('#changePasswordBtn').on('click', function() { $('#changePasswordBtn').on('click', function() {
if ((passwordvalid && passwordsmatch) || app.isAdmin) {
if (passwordvalid && passwordsmatch && (currentPassword.val() || app.isAdmin)) {
socket.emit('user.changePassword', { socket.emit('user.changePassword', {
'currentPassword': currentPassword.val(), 'currentPassword': currentPassword.val(),
'newPassword': password.val(), 'newPassword': password.val(),

2
public/templates/accountedit.tpl
View File

@@ -115,7 +115,7 @@
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label> <label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
<div class="controls"> <div class="controls">
<input class="form-control" type="password" id="inputCurrentPassword" placeholder="Current Password" value=""> <input class="form-control" type="password" id="inputCurrentPassword" placeholder="Current Password" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword-->>
</div> </div>
</div> </div>

12
src/user.js
View File

@@ -185,8 +185,13 @@ var bcrypt = require('bcryptjs'),
return callback(err); return callback(err);
} }
if (data && data.password) { if (data) {
if (data.password) {
delete data.password; delete data.password;
data.hasPassword = true;
} else {
data.hasPassword = false;
}
} }
callback(err, data); callback(err, data);
}); });
@@ -467,6 +472,7 @@ var bcrypt = require('bcryptjs'),
return callback(err); return callback(err);
} }
if (currentPassword !== null) {
bcrypt.compare(data.currentPassword, currentPassword, function(err, res) { bcrypt.compare(data.currentPassword, currentPassword, function(err, res) {
if (err || !res) { if (err || !res) {
return callback(err || new Error('Your current password is not correct!')); return callback(err || new Error('Your current password is not correct!'));
@@ -474,6 +480,10 @@ var bcrypt = require('bcryptjs'),
hashAndSetPassword(callback); hashAndSetPassword(callback);
}); });
} else {
// No password in account (probably SSO login)
hashAndSetPassword(callback);
}
}); });
} }
}; };