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

Move api hooks to user.js

Browse Source
This commit is contained in:
terakilobyte
2015-06-11 19:11:07 -04:00
parent f7bb14803e
commit 34c3fef7d4
6 changed files with 286 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
common/models/user.js Normal file
View File

@@ -0,0 +1,140 @@
var debug = require('debug')('freecc:user:remote');
module.exports = function(User) {
// NOTE(berks): user email validation currently not needed but build in. This
// work around should let us sneak by
// see:
// https://github.com/strongloop/loopback/issues/1137#issuecomment-109200135
delete User.validations.email;
debug('setting up user hooks');
// send verification email to new camper
User.afterRemote('create', function(ctx, user, next) {
debug('user created, sending email');
if (!user.email) { return next(); }
var mailOptions = {
type: 'email',
to: user.email,
from: 'Team@freecodecamp.com',
subject: 'Welcome to Free Code Camp!',
redirect: '/',
text: [
'Greetings from San Francisco!\n\n',
'Thank you for joining our community.\n',
'Feel free to email us at this address if you have ',
'any questions about Free Code Camp.\n',
'And if you have a moment, check out our blog: ',
'blog.freecodecamp.com.\n',
'Good luck with the challenges!\n\n',
'- the Free Code Camp Volunteer Team'
].join('')
};
user.verify(mailOptions, function(err) {
if (err) { return next(err); }
debug('verification email sent');
ctx.req.flash('success', {
msg: [
'Please check your email and click on the verification link '
+ 'before logging in.'
]
});
ctx.res.redirect('/');
});
});
User.beforeRemote('login', function(ctx, instance, next) {
debug('before called');
debug(ctx, instance, next);
next();
});
User.afterRemote('login', function(ctx, instance, next) {
var res = ctx.res;
var req = ctx.req;
if (!instance || instance.emailVerified !== true) {
debug(instance);
req.flash('errors', {
msg: [
'Please verify your email address.'
]
});
return res.redirect('/');
}
var config = {
signed: !!req.signedCookies,
maxAge: 1000 * accessToken.ttl
};
if (accessToken && accessToken.id) {
res.cookie('access_token', accessToken.id, config);
res.cookie('userId', accessToken.userId, config);
}
res.redirect('/');
});
User.afterRemote('logout', function(ctx, result, next) {
var res = ctx.result;
res.clearCookie('access_token');
res.clearCookie('userId');
next();
});
User.doesExist = function doesExist(username, email, cb) {
if (!username && !email) {
return process.nextTick(function() {
cb(null, false);
});
}
debug('checking existence');
var where = {};
if (username) {
where.username = username.toLowerCase();
} else {
where.email = email ? email.toLowerCase() : email;
}
debug('where', where);
User.count(
where,
function (err, count) {
if (err) {
debug('err checking existance: ', err);
return cb(err);
}
if (count > 0) {
return cb(null, true);
}
return cb(null, false);
}
);
};
User.remoteMethod(
'doesExist',
{
description: 'checks whether a user exists using email or username',
accepts: [
{
arg: 'username',
type: 'string'
},
{
arg: 'email',
type: 'string'
}
],
returns: [
{
arg: 'exists',
type: 'boolean'
}
],
http: {
path: '/exists',
verb: 'get'
}
}
);
};

2
common/models/user.json
View File

@@ -242,5 +242,5 @@
"property": "doesExist"
}
],
"methods": []
"methods": ["login"]
}

261
server/boot/a-extendUser.js
View File

@@ -1,121 +1,140 @@
var debug = require('debug')('freecc:extendUser');
module.exports = function(app) {
var User = app.models.User;
// NOTE(berks): user email validation currently not needed but build in. This
// work around should let us sneak by
// see:
// https://github.com/strongloop/loopback/issues/1137#issuecomment-109200135
delete User.validations.email;
debug('setting up user hooks');
// send verification email to new camper
User.afterRemote('create', function(ctx, user, next) {
debug('user created, sending email');
if (!user.email) { return next(); }
var mailOptions = {
type: 'email',
to: user.email,
from: 'Team@freecodecamp.com',
subject: 'Welcome to Free Code Camp!',
redirect: '/',
text: [
'Greetings from San Francisco!\n\n',
'Thank you for joining our community.\n',
'Feel free to email us at this address if you have ',
'any questions about Free Code Camp.\n',
'And if you have a moment, check out our blog: ',
'blog.freecodecamp.com.\n',
'Good luck with the challenges!\n\n',
'- the Free Code Camp Volunteer Team'
].join('')
};
user.verify(mailOptions, function(err) {
if (err) { return next(err); }
debug('verification email sent');
ctx.req.flash({
msg: 'Please check your email and click on the verification link '
+ 'before logging in.'
});
ctx.res.redirect('/');
});
});
User.afterRemote('login', function(ctx, accessToken) {
var res = ctx.res;
var req = ctx.req;
var config = {
signed: !!req.signedCookies,
maxAge: 1000 * accessToken.ttl
};
if (accessToken && accessToken.id) {
res.cookie('access_token', accessToken.id, config);
res.cookie('userId', accessToken.userId, config);
}
res.redirect('/');
});
User.afterRemote('logout', function(ctx, result, next) {
var res = ctx.result;
res.clearCookie('access_token');
res.clearCookie('userId');
next();
});
User.doesExist = function doesExist(username, email, cb) {
if (!username && !email) {
return process.nextTick(function() {
cb(null, false);
});
}
debug('checking existence');
var where = {};
if (username) {
where.username = username.toLowerCase();
} else {
where.email = email ? email.toLowerCase() : email;
}
debug('where', where);
User.count(
where,
function (err, count) {
if (err) {
debug('err checking existance: ', err);
return cb(err);
}
if (count > 0) {
return cb(null, true);
}
return cb(null, false);
}
);
};
User.remoteMethod(
'doesExist',
{
description: 'checks whether a user exists using email or username',
accepts: [
{
arg: 'username',
type: 'string'
},
{
arg: 'email',
type: 'string'
}
],
returns: [
{
arg: 'exists',
type: 'boolean'
}
],
http: {
path: '/exists',
verb: 'get'
}
}
);
};
//var debug = require('debug')('freecc:extendUser');
//
//module.exports = function(app) {
// var User = app.models.User;
// // NOTE(berks): user email validation currently not needed but build in. This
// // work around should let us sneak by
// // see:
// // https://github.com/strongloop/loopback/issues/1137#issuecomment-109200135
// delete User.validations.email;
// debug('setting up user hooks');
// // send verification email to new camper
// User.afterRemote('create', function(ctx, user, next) {
// debug('user created, sending email');
// if (!user.email) { return next(); }
//
// var mailOptions = {
// type: 'email',
// to: user.email,
// from: 'Team@freecodecamp.com',
// subject: 'Welcome to Free Code Camp!',
// redirect: '/',
// text: [
// 'Greetings from San Francisco!\n\n',
// 'Thank you for joining our community.\n',
// 'Feel free to email us at this address if you have ',
// 'any questions about Free Code Camp.\n',
// 'And if you have a moment, check out our blog: ',
// 'blog.freecodecamp.com.\n',
// 'Good luck with the challenges!\n\n',
// '- the Free Code Camp Volunteer Team'
// ].join('')
// };
// user.verify(mailOptions, function(err) {
// if (err) { return next(err); }
// debug('verification email sent');
// ctx.req.flash('success', {
// msg: [
// 'Please check your email and click on the verification link '
// + 'before logging in.'
// ]
// });
// ctx.res.redirect('/');
// });
// });
//
// User.beforeRemote('login', function(ctx, results, next) {
// debug('before called');
// next();
// });
//
// User.afterRemote('login', function(ctx, instance, next) {
// debug('after called');
// var res = ctx.res;
// var req = ctx.req;
//
// if (!instance || !instance.emailVerified) {
// req.flash('errors', {
// msg: [
// 'Please verify your email address.'
// ]
// });
// return res.redirect('/');
// }
//
// var config = {
// signed: !!req.signedCookies,
// maxAge: 1000 * accessToken.ttl
// };
// if (accessToken && accessToken.id) {
// res.cookie('access_token', accessToken.id, config);
// res.cookie('userId', accessToken.userId, config);
// }
// res.redirect('/');
// });
//
//
//
// User.afterRemote('logout', function(ctx, result, next) {
// var res = ctx.result;
// res.clearCookie('access_token');
// res.clearCookie('userId');
// next();
// });
//
// User.doesExist = function doesExist(username, email, cb) {
// if (!username && !email) {
// return process.nextTick(function() {
// cb(null, false);
// });
// }
// debug('checking existence');
// var where = {};
// if (username) {
// where.username = username.toLowerCase();
// } else {
// where.email = email ? email.toLowerCase() : email;
// }
// debug('where', where);
// User.count(
// where,
// function (err, count) {
// if (err) {
// debug('err checking existance: ', err);
// return cb(err);
// }
// if (count > 0) {
// return cb(null, true);
// }
// return cb(null, false);
// }
// );
// };
//
// User.remoteMethod(
// 'doesExist',
// {
// description: 'checks whether a user exists using email or username',
// accepts: [
// {
// arg: 'username',
// type: 'string'
// },
// {
// arg: 'email',
// type: 'string'
// }
// ],
// returns: [
// {
// arg: 'exists',
// type: 'boolean'
// }
// ],
// http: {
// path: '/exists',
// verb: 'get'
// }
// }
// );
//};

2
server/boot/user.js
View File

@@ -654,7 +654,6 @@ module.exports = function(app) {
R.forEach(function (comment) {
comment.author.picture = picture;
comment.author.username = username;
comment.markModified('author');
tasks.push(function (cb) {
comment.save(cb);
});
@@ -663,7 +662,6 @@ module.exports = function(app) {
R.forEach(function (story) {
story.author.picture = picture;
story.author.username = username;
story.markModified('author');
tasks.push(function (cb) {
story.save(cb);
});

5
server/model-config.json
View File

@@ -61,7 +61,10 @@
},
"user": {
"dataSource": "db",
"public": true
"public": true,
"options": {
"emailVerificationRequired": true
}
},
"userCredential": {
"dataSource": "db",

2
server/views/account/email-signin.jade
View File

@@ -2,7 +2,7 @@ extends ../layout
block content
.jumbotron.text-center(ng-controller="emailSignInController")
h2 Sign in with an email address here:
form(method='POST', action='/auth/local')
form(method='POST', action='/api/users/login')
input(type='hidden', name='_csrf', value=_csrf)
.col-sm-6.col-sm-offset-3
.form-group