sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-17 17:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[#1446] add change-password back in

Browse source
This commit is contained in:
Tyler Renelle 2013-09-06 09:55:24 -04:00
parent c12de954a4
commit e6d61d1145
4 changed files with 48 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assets/js/controllers/settingsCtrl.js
View file

@ -35,5 +35,19 @@ habitrpg.controller('SettingsCtrl',
})
}
$scope.changePassword = function(changePass){
if (!changePass.oldPassword || !changePass.newPassword || !changePass.confirmNewPassword) {
return alert("Please fill out all fields");
}
$http.post(API_URL + '/api/v1/user/change-password', changePass)
.success(function(){
alert("Password successfully changed");
$scope.changePass = {};
})
.error(function(data){
alert(data);
});
}
}
]);

23
src/controllers/auth.js
View file

@ -184,6 +184,29 @@ api.resetPassword = function(req, res, next){
});
};
api.changePassword = function(req, res, next) {
var user = res.locals.user,
oldPassword = req.body.oldPassword,
newPassword = req.body.newPassword,
confirmNewPassword = req.body.confirmNewPassword;
if (newPassword != confirmNewPassword)
return res.json(500, {err: "Password & Confirm don't match"});
var salt = user.auth.local.salt,
hashed_old_password = utils.encryptPassword(oldPassword, salt),
hashed_new_password = utils.encryptPassword(newPassword, salt);
if (hashed_old_password !== user.auth.local.hashed_password)
return res.json(500, {err:"Old password doesn't match"});
user.auth.local.hashed_password = hashed_new_password;
user.save(function(err, saved){
if (err) res.json(500,{err:err});
res.send(200);
})
}
/*
Registers a new user. Only accepting username/password registrations, no Facebook
*/

1
src/routes/auth.js
View file

@ -8,5 +8,6 @@ router.post('/api/v1/register', auth.registerUser);
router.post('/api/v1/user/auth/local', auth.loginLocal);
router.post('/api/v1/user/auth/facebook', auth.loginFacebook);
router.post('/api/v1/user/reset-password', auth.resetPassword);
router.post('/api/v1/user/change-password', auth.auth, auth.changePassword);
module.exports = router;

12
views/options/settings.jade
View file

@ -15,8 +15,16 @@
div(ng-show='user.auth.local')
hr
h4 Change Password
derby-auth:changepassword
hr
form(ng-submit='changePassword(changePass)', ng-show='user.auth.local')
.control-group
input(type='password', placeholder='Old Password', ng-model='changePass.oldPassword', required)
.control-group
input(type='password', placeholder='New Password', ng-model='changePass.newPassword', required)
.control-group
input(type='password', placeholder='Confirm New Password', ng-model='changePass.confirmNewPassword', required)
input.btn(type='submit', value='Submit')
hr
h4 Danger Zone
a.btn.btn-danger(ng-click='notPorted()', data-target='#reset-modal', data-toggle='modal', tooltip='Resets your entire account (dangerous).') Reset
a.btn.btn-danger(ng-click='notPorted()', data-target='#restore-modal', data-toggle='modal', tooltip='Restores attributes to your character.') Restore