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

Fix indenting and remove isDev from wait time.

Browse Source
This commit is contained in:
Mrugesh Mohapatra
2016-11-20 16:21:13 +05:30
committed by Berkeley Martinez
parent 09174c9687
commit 19e5ff537e
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
common/models/user.js
View File

@ -505,7 +505,7 @@ module.exports = function(User) {
if (!isEmail(email)) { if (!isEmail(email)) {
return Promise.reject( return Promise.reject(
new Error('The submitted email not valid.') new Error('The submitted email not valid.')
); );
} }
var userObj = { var userObj = {
@ -517,19 +517,19 @@ module.exports = function(User) {
.map(([ err, user, isCreated ]) => { .map(([ err, user, isCreated ]) => {
if (err) { if (err) {
return dedent` return dedent`
Oops, something is not right, please try again later.`; Oops, something is not right, please try again later.
`;
} }
if (!isDev) { const minutesLeft = getWaitPeriod(user.emailAuthLinkTTL);
const minutesLeft = getWaitPeriod(user.emailAuthLinkTTL); if (minutesLeft) {
if (minutesLeft) { const timeToWait = minutesLeft ?
const timeToWait = minutesLeft ? `${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` :
`${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` : 'a few seconds';
'a few seconds'; debug('request before wait time : ' + timeToWait);
debug('request before wait time : ' + timeToWait); return dedent`
return dedent` Please wait ${timeToWait} to resend an authentication link.
Please wait ${timeToWait} to resend an authentication link.`; `;
}
} }
let emailTemplate = 'user-request-sign-in.ejs'; let emailTemplate = 'user-request-sign-in.ejs';
@ -574,13 +574,15 @@ module.exports = function(User) {
}); });
return dedent` return dedent`
If you entered a valid email, a magic link is on its way. If you entered a valid email, a magic link is on its way.
Please follow that link to sign in.`; Please follow that link to sign in.
`;
}) })
.map((msg) => { .map((msg) => {
if (msg) { return msg; } if (msg) { return msg; }
return dedent` return dedent`
Oops, something is not right, please try again later.`; Oops, something is not right, please try again later.
`;
}) })
.catch(error => { .catch(error => {
debug(error); debug(error);
@ -619,17 +621,15 @@ module.exports = function(User) {
)); ));
} }
if (!isDev) { const minutesLeft = getWaitPeriod(this.emailVerifyTTL);
const minutesLeft = getWaitPeriod(this.emailVerifyTTL); if (ownEmail && minutesLeft) {
if (ownEmail && minutesLeft) { const timeToWait = minutesLeft ?
const timeToWait = minutesLeft ? `${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` :
`${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` : 'a few seconds';
'a few seconds'; debug('request before wait time : ' + timeToWait);
debug('request before wait time : ' + timeToWait); return Observable.throw(new Error(
return Observable.throw(new Error( `Please wait ${timeToWait} to resend email verification.`
`Please wait ${timeToWait} to resend email verification.` ));
));
}
} }
return Observable.fromPromise(User.doesExist(null, email)) return Observable.fromPromise(User.doesExist(null, email))

3
server/boot/user.js
View File

@ -161,7 +161,8 @@ module.exports = function(app) {
} }
AccessToken.findOne$ = Observable.fromNodeCallback( AccessToken.findOne$ = Observable.fromNodeCallback(
AccessToken.findOne, AccessToken); AccessToken.findOne, AccessToken
);
router.get('/login', function(req, res) { router.get('/login', function(req, res) {
res.redirect(301, '/signin'); res.redirect(301, '/signin');