try id = user && !_.isEmpty(user.get()) && user.get()[0].id , see https://github.com/lefnire/habitrpg/issues/7

Conflicts:
	lib/server/auth.js
	src/server/auth.coffee
This commit is contained in:
Tyler Renelle
2012-10-17 23:27:41 -04:00
parent 79fd3f0689
commit d504cbea38
2 changed files with 6 additions and 3 deletions
+4 -2
View File
@@ -1,5 +1,5 @@
// Generated by CoffeeScript 1.3.3
var content, derby, req, schema;
var content, derby, req, schema, _;
derby = require('derby');
@@ -7,6 +7,8 @@ schema = require('../app/schema');
content = require('../app/content');
_ = require('lodash');
req = void 0;
module.exports.setRequest = function(r) {
@@ -41,7 +43,7 @@ module.exports.setupEveryauth = function(everyauth) {
q = model.query('users').withEveryauth('facebook', fbUserMetadata.id);
model.fetch(q, function(err, user) {
var id;
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,
+2 -1
View File
@@ -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)