gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change update email endpoint

Browse Source
This commit is contained in:
Berkeley Martinez
2016-05-02 17:20:41 -07:00
parent 5830d69613
commit e65d55a3f7
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/models/user.js
View File

@ -308,20 +308,18 @@ module.exports = function(User) {
User.prototype.updateEmail = function updateEmail(email) {
if (this.email && this.email === email) {
debug('same email as current User', email);
return Promise.reject(new Error(
`${email} is already associated with this account.`
));
}
return User.doesExist(null, email)
.then(exists => {
if (!exists) {
return this.update$({ email }).toPromise();
if (exists) {
return Promise.reject(
new Error(`${email} is already associated with another account.`)
);
}
debug('same email as another User', email);
return Promise.reject(new Error(
`${email} is already associated with an account.`
));
return this.update$({ email }).toPromise();
});
};
@ -344,7 +342,7 @@ module.exports = function(User) {
}
],
http: {
path: '/email-update',
path: '/update-email',
verb: 'POST'
}
}

2
server/boot/user.js
View File

@ -149,7 +149,7 @@ module.exports = function(app) {
router.get('/email-signup', getEmailSignup);
router.get('/email-signin', getEmailSignin);
router.get('/deprecated-signin', getDepSignin);
router.get('/email-update', getUpdateEmail);
router.get('/update-email', getUpdateEmail);
router.get(
'/toggle-lockdown-mode',
sendNonUserToMap,

6
server/views/account/email-update.jade
View File

@ -8,12 +8,12 @@ block content
span.ion-close-circled#flash-close
#flash-content
h2.text-center Update your email address here:
form.form-horizontal.email-update(method='POST', action='/api/users/#{user.id}/email-update', name="updateEmailForm")
form.form-horizontal.email-update(method='POST', action='/api/users/#{user.id}/update-email', name="updateEmailForm")
.row
.col-sm-6.col-sm-offset-3
input(type='hidden', name='_csrf', value=_csrf)
.form-group
input.input-lg.form-control(type='email', name='email', id='email', placeholder='Enter your new email', autofocus, required, autocomplete="off")
input.input-lg.form-control(type='email', name='email', id='email', value=user.email || '', placeholder=user.email || 'Enter your new email', autofocus, required, autocomplete="off")
.form-group
button.btn.btn-lg.btn-primary.btn-block(type='submit')
| Update my Email
@ -41,7 +41,7 @@ block content
$('#flash-content').html(data.error.message);
$('#flash-board')
.removeClass('alert-success')
.addClass('alert-danger')
.addClass('alert-info')
.fadeIn();
}
})