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

Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
terakilobyte
2015-06-11 15:18:45 -04:00
parent 3115ba6404 0d32cf701f
commit 0b1c23207d
3 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
common/models/User-Identity.js
View File

@ -1,27 +1,41 @@
// var debug = require('debug')('freecc:models:userIdent'); var debug = require('debug')('freecc:models:userIdent');
//
// module.exports = function(UserIdent) { var defaultProfileImage =
// require('../utils/constantStrings.json').defaultProfileImage;
// UserIdent.observe('before save', function(ctx, next) {
// module.exports = function(UserIdent) {
// var userIdent = ctx.instance;
// userIdent.user(function(err, user) { UserIdent.observe('before save', function(ctx, next) {
// if (err) { return next(err); } var userIdent = ctx.currentInstance || ctx.instance;
// debug('got user', user.username); if (userIdent) {
// debug('no user identity instance found');
// // check if user has picture return next();
// // set user.picture from twitter }
// if (!user.picture) { userIdent.user(function(err, user) {
// debug('use has no pic'); if (err) { return next(err); }
// user.picture = userIdent.profile.photos[0].value; if (!user) {
// user.save(function(err) { debug('no user attached to identity!');
// if (err) { return next(err); } return next();
// next(); }
// }); debug('got user', user.username);
// } else {
// debug('exiting after user ident'); var picture = userIdent.profile && userIdent.profile[0] ?
// next(); userIdent.profile[0].value :
// } null;
// });
// }); // check if user has picture
// }; // set user.picture from twitter
if (picture && !user.picture || user.picture === defaultProfileImage) {
debug('use has no pic');
user.picture = userIdent.profile.photos[0].value;
user.save(function(err) {
if (err) { return next(err); }
next();
});
} else {
debug('exiting after user ident');
next();
}
});
});
};

3
common/utils/constantStrings.json Normal file
View File

@ -0,0 +1,3 @@
{
"defaultProfileImage": "https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png"
}

5
server/boot/home.js
View File

@ -1,3 +1,5 @@
var defaultProfileImage =
require('../../common/utils/constantStrings.json').defaultProfileImage;
var message = var message =
'Learn to Code JavaScript and get a Coding Job by Helping Nonprofits'; 'Learn to Code JavaScript and get a Coding Job by Helping Nonprofits';
@ -9,8 +11,7 @@ module.exports = function(app) {
function index(req, res, next) { function index(req, res, next) {
if (req.user && !req.user.picture) { if (req.user && !req.user.picture) {
req.user.picture = req.user.picture = defaultProfileImage;
'https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png';
req.user.save(function(err) { req.user.save(function(err) {
if (err) { return next(err); } if (err) { return next(err); }