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

Merge pull request #3597 from 3onyc/feature/username-change

Browse source 
Implement "Change username" feature
This commit is contained in:
Tyler Renelle 2014-07-19 16:48:20 -06:00
commit acc874c60d
4 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,20 @@ habitrpg.controller('SettingsCtrl',
$rootScope.$state.go('tasks');
}
$scope.changeUsername = function(changeUser){
if (!changeUser.newUsername || !changeUser.password) {
return alert(window.env.t('fillAll'));
}
$http.post(API_URL + '/api/v2/user/change-username', changeUser)
.success(function(){
alert(window.env.t('usernameSuccess'));
$scope.changeUser = {};
})
.error(function(data){
alert(data);
});
}
$scope.changePassword = function(changePass){
if (!changePass.oldPassword || !changePass.newPassword || !changePass.confirmNewPassword) {
return alert(window.env.t('fillAll'));

25
src/controllers/auth.js
View file

@ -195,6 +195,31 @@ api.resetPassword = function(req, res, next){
});
};
api.changeUsername = function(req, res, next) {
var user = res.locals.user,
password = req.body.password
newUsername = req.body.newUsername;
User.findOne({'auth.local.username': newUsername}, function(err, result) {
if (err) next(err);
if(result)
return res.json(401, {err: "Username already taken"});
var salt = user.auth.local.salt,
hashed_password = utils.encryptPassword(password, salt);
if (hashed_password !== user.auth.local.hashed_password)
return res.json(401, {err:"Incorrect password"});
user.auth.local.username = newUsername;
user.save(function(err, saved){
if (err) next(err);
res.send(200);
})
});
}
api.changePassword = function(req, res, next) {
var user = res.locals.user,
oldPassword = req.body.oldPassword,

1
src/routes/auth.js
View file

@ -10,6 +10,7 @@ router.post('/api/v2/user/auth/local', i18n.getUserLanguage, auth.loginLocal);
router.post('/api/v2/user/auth/facebook', i18n.getUserLanguage, auth.loginFacebook);
router.post('/api/v2/user/reset-password', i18n.getUserLanguage, auth.resetPassword);
router.post('/api/v2/user/change-password', i18n.getUserLanguage, auth.auth, auth.changePassword);
router.post('/api/v2/user/change-username', i18n.getUserLanguage, auth.auth, auth.changeUsername);
router.post('/api/v1/register', i18n.getUserLanguage, auth.registerUser);
router.post('/api/v1/user/auth/local', i18n.getUserLanguage, auth.loginLocal);

12
views/options/settings.jade
View file

@ -83,6 +83,18 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
input.form-control(type='text', ng-model='_couponCode', placeholder='Enter Coupon Code')
button.btn.btn-primary(type='submit') Submit
div(ng-if='user.auth.local.username')
.panel.panel-default
.panel-heading
span=env.t('changeUsername')
.panel-body
form(ng-submit='changeUsername(changeUser)', ng-show='user.auth.local')
.form-group
input.form-control(type='text', placeholder=env.t('newUsername'), ng-model='changeUser.newUsername', required)
.form-group
input.form-control(type='password', placeholder=env.t('password'), ng-model='changeUser.password', required)
input.btn.btn-default(type='submit', value=env.t('submit'))
//- Why is ng-if='user.auth.local' validating for users *without* user.auth.local (facebook users)? adding .username here for extra
div(ng-if='user.auth.local.username')
.panel.panel-default