From a1e46b1fbdf996b3279bb381c7f22a28ca5add97 Mon Sep 17 00:00:00 2001
From: "Jose F. Romaniello" <jfromaniello@gmail.com>
Date: Mon, 7 Jan 2013 11:30:15 -0300
Subject: [PATCH] fix bug calling both success and accept

---
 lib/index.js          | 11 ++++-------
 test/fixture/index.js | 15 +++++++++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index fc5856a..a4bdf8c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -46,15 +46,12 @@ function authorize(options) {
         return accept(null, false);
       }
 
-      if( auth.success ) {
-        auth.passport.deserializeUser(userKey, function(err, user) {
-          data[ auth.userProperty ] = user;
-          return auth.success( data, accept );
-        });
-      }
       auth.passport.deserializeUser(userKey, function(err, user) {
         data[ auth.userProperty ] = user;
-        return accept(null, true);
+        if( auth.success ) {
+          return auth.success( data, accept );
+        }
+        accept(null, true);
       });
 
     });
diff --git a/test/fixture/index.js b/test/fixture/index.js
index 9071dd4..0b4b952 100644
--- a/test/fixture/index.js
+++ b/test/fixture/index.js
@@ -1,7 +1,8 @@
 var express = require('express'),
     connect   = require('connect'),
     passport  = require('passport'),
-    http = require('http');
+    http = require('http'),
+    xtend = require('xtend');
 
 var socketIo = require('socket.io'),
     passportSocketIo = require('../../lib');
@@ -14,7 +15,13 @@ var server;
 
 require('./setupPassport');
 
-exports.start = function (callback) {
+exports.start = function (options, callback) {
+  
+  if(typeof options == 'function'){
+    callback = options;
+    options = {};
+  }
+
   var app = express();
   app.configure(function(){
     app.use(express.cookieParser(cookieSecret));
@@ -48,11 +55,11 @@ exports.start = function (callback) {
 
   var sio = socketIo.listen(server);
   sio.configure(function(){
-    this.set('authorization', passportSocketIo.authorize({
+    this.set('authorization', passportSocketIo.authorize(xtend({
       sessionKey:    sessionKey,
       sessionStore:  sessionStore,
       sessionSecret: cookieSecret
-    }));
+    }, options)));
 
     this.set('log level', 0);