Check that subscriptions are ready before using

Author: garth

client/js/helpers/pubsub.js

@@ -72,7 +72,10 @@ module.exports = function (App, Faye, RSVP, endPoint, clientChannelId, localStor
         done(message, true);
       });
 
-      pubsub.publish('/server' + channel, message || {});
+      // when subscriptions are ready, publish the message
+      RSVP.all([subscriptionGet, subscriptionError]).then(function () {
+        pubsub.publish('/server' + channel, message || {});
+      });
     });
   };
 

server/authorise.js

@@ -82,7 +82,7 @@ module.exports = function (app, config, db) {
               // accept this request
               message.data = message.data || {};
               message.data.meta = message.data.meta || {};
-              message.data.meta.userId = session.userId;
+              message.data.meta.userId = session.userId.toString();
 
               // extend the session once per day
               var ttl = new Date(new Date().getTime() + config.sessionTtl - 1000 * 60 * 60 * 24);

test/pubsub.js

@@ -5,5 +5,5 @@ var pubsub = require('../client/js/helpers/pubsub');
 
 module.exports = function (sessionId) {
   return pubsub(null, Faye, RSVP, 'http://localhost:3001/pubsub',
-    uuid.v1(), { sessionId: sessionId });
+    uuid.v4(), { sessionId: sessionId });
 };

test/server/api.session.js

@@ -35,22 +35,23 @@ describe('sessions api', function () {
     }, done);
   });
 
-  it('cannot delete a session when not authenticated', function (done){
-    var pubsub = require('../pubsub')('');
-    pubsub.subscribeToClient('/error/session', function (message) {
+  it('cannot delete a session when not authenticated', function (done) {
+    var pubsubNoSession = require('../pubsub')();
+    pubsubNoSession.subscribeToClient('/error/session', function (message) {
       expect(message.errorCode).to.equal(401);
       done();
-    });
-    pubsub.publishAwait('/session/destroy', {
-      sessionId: '62875455e3e2812b6e000001'
-    }).then(function (message) {
-      done(new Error('Invalid session deleted'));
-    }, function (error) {
-      done(new Error('Delete session returned error'));
+    }).then(function () {
+      pubsubNoSession.publishAwait('/session/destroy', {
+        sessionId: '62875455e3e2812b6e000001'
+      }).then(function (message) {
+        done(new Error('Invalid session deleted'));
+      }, function (error) {
+        done(new Error('Delete session returned error'));
+      });
     });
   });
 
-  it('cannot delete a session with an invalid id', function (done){
+  it('cannot delete a session with an invalid id', function (done) {
     pubsub.publishAwait('/session/destroy', {
       sessionId: '62875455e3e2812b6e000099'
     }).then(function (message) {