Merge remote-tracking branch 'refs/remotes/origin/master' into blocks

This commit is contained in:
Barış Soner Uşaklı
2018-07-03 18:43:43 -04:00
5 changed files with 20 additions and 24 deletions

View File

@@ -109,13 +109,6 @@ module.exports = function (SocketUser) {
], callback);
}
SocketUser.checkPassword = function (socket, data, callback) {
isPrivilegedOrSelfAndPasswordMatch(socket.uid, data, function (err) {
// Return a bool (without delayed response to prevent brute-force checking of password validity)
setTimeout(callback.bind(null, null, !err), 1000);
});
};
SocketUser.changePassword = function (socket, data, callback) {
if (!socket.uid) {
return callback(new Error('[[error:invalid-uid]]'));