From 166b64dd68a30d127f98e1c309bf184da3a0cb37 Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Mon, 22 Apr 2013 11:42:48 -0400 Subject: [PATCH 1/3] Allow gzip headers --- src/server/middleware.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee index 3a3304ae00..8e9cb29cb8 100644 --- a/src/server/middleware.coffee +++ b/src/server/middleware.coffee @@ -16,7 +16,7 @@ module.exports.view = (req, res, next) -> module.exports.allowCrossDomain = (req, res, next) -> res.header "Access-Control-Allow-Origin", (req.headers.origin || "*") res.header "Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE" - res.header "Access-Control-Allow-Headers", "Content-Type,X-Requested-With,x-api-user,x-api-key" + res.header "Access-Control-Allow-Headers", "Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key" # wtf is this for? if req.method is 'OPTIONS' From 855372ae7a22586e06827e166b7598739c378f7d Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 24 Apr 2013 18:21:01 +0100 Subject: [PATCH 2/3] try deleting model.session.userId when session is corrupted, first attempting just by redirecting user to logout --- src/app/party.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/party.coffee b/src/app/party.coffee index 8baeacf869..56041077e0 100644 --- a/src/app/party.coffee +++ b/src/app/party.coffee @@ -33,7 +33,9 @@ module.exports.partySubscribe = partySubscribe = (page, model, params, next, cb) selfQ = model.query('users').withId (model.get('_userId') or model.session.userId) # see http://goo.gl/TPYIt selfQ.fetch (err, user) -> return next(err) if err - return next("User not found - this shouldn't be happening!") unless user.get() + unless user.get() + return page.redirect('/logout') #delete model.session.userId + #return next("User not found - this shouldn't be happening!") finished = (descriptors, paths) -> model.subscribe.apply model, descriptors.concat -> From 70243614c8c77fec064f0f2003a9383b8284cc3c Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 24 Apr 2013 18:21:59 +0100 Subject: [PATCH 3/3] also flag error --- src/app/party.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/party.coffee b/src/app/party.coffee index 56041077e0..a22565c099 100644 --- a/src/app/party.coffee +++ b/src/app/party.coffee @@ -34,8 +34,9 @@ module.exports.partySubscribe = partySubscribe = (page, model, params, next, cb) selfQ.fetch (err, user) -> return next(err) if err unless user.get() - return page.redirect('/logout') #delete model.session.userId #return next("User not found - this shouldn't be happening!") + console.error "User not found - this shouldn't be happening!" + return page.redirect('/logout') #delete model.session.userId finished = (descriptors, paths) -> model.subscribe.apply model, descriptors.concat ->