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

fix(User.requestAuthEmail): Conditionally check for email availibility

Browse Source 
Only check if email is available if it is not already associated with
this account
This commit is contained in:
Berkeley Martinez
2017-12-27 11:18:48 -08:00
committed by mrugesh mohapatra
parent 60e2baf307
commit 0682ef33db
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
common/models/user.js
View File

@ -544,33 +544,19 @@ module.exports = function(User) {
return Observable.defer(() => {
const ownEmail = newEmail === this.email;
if (!isEmail('' + newEmail)) {
debug('invalid email:', newEmail );
throw createEmailError();
}
// email is already associated and verified with this account
if (ownEmail && this.emailVerified) {
throw wrapHandledError(
new Error('email is already associated with account'),
{
type: 'info',
message: `${newEmail} is already associated with this account.`
}
);
}
// defer prevents the promise from firing prematurely
return Observable.defer(() => User.doesExist(null, newEmail));
})
.flatMap(exists => {
// not associated with this account, but is associated with another
if (!exists) {
if (ownEmail) {
if (this.emailVerified) {
throw wrapHandledError(
new Error('email already in use'),
new Error('email is already verified'),
{
type: 'info',
message: `${newEmail} is already associated with another account.`
message: `${newEmail} is already associated with this account.`
}
);
} else {
const messageOrNull = getWaitMessage(this.emailVerifyTTL);
// email is already associated but unverified
if (messageOrNull) {
@ -584,7 +570,33 @@ module.exports = function(User) {
);
}
}
}
// at this point email is not associated with the account
// or has not been verified but user is requesting another token
// outside of the time limit
return Observable.if(
() => ownEmail,
Observable.empty(),
// defer prevents the promise from firing prematurely (before subscribe)
Observable.defer(() => User.doesExist(null, newEmail))
)
.do(exists => {
// not associated with this account, but is associated with another
if (exists) {
throw wrapHandledError(
new Error('email already in use'),
{
type: 'info',
message:
`${newEmail} is already associated with another account.`
}
);
}
})
.defaultIfEmpty();
})
.flatMap(() => {
const emailVerified = false;
const data = {
newEmail,