try id = user && !_.isEmpty(user.get()) && user.get()[0].id , see #7

Conflicts: lib/server/auth.js src/server/auth.coffee
HabitRPG · Oct 18, 2012 · d504cbe · d504cbe
1 parent 79fd3f0
commit d504cbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/server/auth.js b/lib/server/auth.js
diff --git a/src/server/auth.coffee b/src/server/auth.coffee
@@ -1,6 +1,7 @@
 derby = require('derby')
 schema = require('../app/schema')
 content = require('../app/content')
+_ = require('lodash')
 
 # Need this for later use by EveryAuth in the MiddleWare
 req = undefined
@@ -49,7 +50,7 @@ module.exports.setupEveryauth = (everyauth) ->
       model = req.getModel()
       q = model.query('users').withEveryauth('facebook', fbUserMetadata.id)
       model.fetch q, (err, user) ->
-        id = user && user.get().length>0 && user.get()[0].id
+        id = user && !_.isEmpty(user.get()) && user.get()[0].id
         console.log {err:err, id:id, fbUserMetadata:fbUserMetadata}
         # Has user been tied to facebook account already?
         if (id && id!=session.userId)