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

Donot render per request email

Browse Source
This commit is contained in:
Mrugesh Mohapatra
2016-11-23 19:54:08 +05:30
committed by Berkeley Martinez
parent 19e5ff537e
commit 26c1389c3a
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/models/user.js
View File

@ -27,6 +27,26 @@ function destroyAll(id, Model) {
)({ userId: id }); )({ userId: id });
} }
const renderSignUpEmail = loopback.template(path.join(
__dirname,
'..',
'..',
'server',
'views',
'emails',
'user-request-sign-up.ejs'
));
const renderSignInEmail = loopback.template(path.join(
__dirname,
'..',
'..',
'server',
'views',
'emails',
'user-request-sign-in.ejs'
));
function getAboutProfile({ function getAboutProfile({
username, username,
githubProfile: github, githubProfile: github,
@ -513,7 +533,7 @@ module.exports = function(User) {
email: email, email: email,
emailVerified: false emailVerified: false
}; };
return User.findOrCreate$({ where: { email: userObj.email }}, userObj) return User.findOrCreate$({ where: { email }}, userObj)
.map(([ err, user, isCreated ]) => { .map(([ err, user, isCreated ]) => {
if (err) { if (err) {
return dedent` return dedent`
@ -532,10 +552,8 @@ module.exports = function(User) {
`; `;
} }
let emailTemplate = 'user-request-sign-in.ejs'; const renderAuthEmail = isCreated ?
if (isCreated) { renderSignUpEmail : renderSignInEmail;
emailTemplate = 'user-request-sign-up.ejs';
}
// create a temporary access token with ttl for 1 hour // create a temporary access token with ttl for 1 hour
user.createAccessToken({ ttl: 60 * 60 * 1000 }, (err, token) => { user.createAccessToken({ ttl: 60 * 60 * 1000 }, (err, token) => {
@ -543,15 +561,7 @@ module.exports = function(User) {
const { id: loginToken } = token; const { id: loginToken } = token;
const loginEmail = user.email; const loginEmail = user.email;
const renderAuthEmail = loopback.template(path.join(
__dirname,
'..',
'..',
'server',
'views',
'emails',
emailTemplate
));
const mailOptions = { const mailOptions = {
type: 'email', type: 'email',
to: user.email, to: user.email,