Skip to content

Commit

Permalink
[Fix] Fixes new user instantiation and bad requests for events when n…
Browse files Browse the repository at this point in the history
…ot logged in.
  • Loading branch information
kamronbatman committed Aug 17, 2015
1 parent 31f3718 commit 8bccfc3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 8 additions & 1 deletion server/bookshelf/models/user.js
Expand Up @@ -32,6 +32,10 @@ var User = db.Model.extend( {
return new this( { fb_id: fbid } ).fetch( { require: true } );
},

newUser: function() {
return new this();
},

serializeUser: function ( user, done ) {
if ( user ) {
done( null, user.get( 'email' ) );
Expand All @@ -51,6 +55,8 @@ var User = db.Model.extend( {
},

fbAuthentication: function ( req, accessToken, refreshToken, profile, done ) {
var self = this;

db.model( 'User' ).fetchUserbyFBId( profile.id )
.then( function ( user ) {
if ( !req.user || req.user.get( 'email' ) === user.get( 'email' ) ) {
Expand All @@ -60,7 +66,7 @@ var User = db.Model.extend( {
return done( null, false );
})
.catch( function ( error ) {
var user = req.user || new this();
var user = req.user || db.model( 'User' ).newUser();

if ( user ) {
user.set( 'fb_id', profile.id );
Expand All @@ -70,6 +76,7 @@ var User = db.Model.extend( {
if (profile.emails && profile.emails.length > 0) {
user.set( 'email', profile.emails[0].value );
}

user.save();

return done( null, user );
Expand Down
2 changes: 1 addition & 1 deletion server/express/api/events.js
Expand Up @@ -44,7 +44,7 @@ module.exports = function ( app, router ) {
chef = req.user;

// Our user is not logged in.
if ( !chef ) { res.redirect( '/' ); return; }
if ( !chef ) { res.sendStatus( 400 ); return; }

// Create our ingredients models and their promise
var ingredients = _.map( data.ingredients, function ( ingredient ) {
Expand Down

0 comments on commit 8bccfc3

Please sign in to comment.