Merge pull request #193 from buddycloud/develop

Merging with develop

Author: abmargb

package.json

@@ -25,7 +25,7 @@
     "primus-emitter": "~3.0.2",
     "primus": "~2.3.0",
     "xmpp-ftw": "~1.14.4",
-    "xmpp-ftw-buddycloud": "~1.12.1",
+    "xmpp-ftw-buddycloud": "~1.15.0",
     "socket.io": "~0.9.16",
     "winston": "0.7.x",
     "express-winston": "0.2.x"

src/subscriptions.js

@@ -91,7 +91,7 @@ function findUserAffiliations(rootEl) {
    return rootEl.getChildrenByFilter(function (c) {
      return typeof c != 'string' && 
        c.getName() == 'affiliation' && 
-       c.getNS() == pubsub.ns &&
+       c.getNS() == pubsub.ownerNS &&
        c.attr('node') && c.attr('node').indexOf('/user/') == 0; 
    }, true);
 }
@@ -100,7 +100,7 @@ function findNodeAffiliations(rootEl) {
    return rootEl.getChildrenByFilter(function (c) {
      return typeof c != 'string' && 
        c.getName() == 'affiliation' && 
-       c.getNS() == pubsub.ownerNS &&
+       c.getNS() == pubsub.ns &&
        c.attr('jid') && c.attr('jid').indexOf('@') != 0; 
    }, true);
 }
@@ -236,6 +236,11 @@ function changeNodeSubscriptions(req, res) {
 //// GET /<channel>/subscribers/<node>/approve /////////////////////////////////////////
 
 function getPendingNodeSubscriptions(req, res) {
+  if (!req.user) {
+    api.sendUnauthorized(res);
+    return;
+  }
+  
   var channel = req.params.channel;
   var node = req.params.node;
   requestNodeSubscriptions(req, res, channel, node, function(reply) {

src/websocket.js

@@ -3,6 +3,8 @@ var Emitter    = require('primus-emitter')
   , xmpp       = require('xmpp-ftw')
   , Buddycloud = require('xmpp-ftw-buddycloud');
 
+var cache = {}
+
 module.exports = function(config, server, logger) {
     var options = {
         transformer: 'socket.io',
@@ -23,12 +25,14 @@ module.exports = function(config, server, logger) {
     primus.on('connection', function(socket) {
         logger.debug('Websocket connection made');
         var xmppFtw = new xmpp.Xmpp(socket);
-        xmppFtw.addListener(new Buddycloud());
+        var buddycloud = new Buddycloud();
+        buddycloud.setCache(cache);
+        xmppFtw.addListener(buddycloud);
         socket.xmppFtw = xmppFtw; 
     })
 
     primus.on('disconnection', function(socket) {
         logger.debug('Client disconnected, logging them out');
         socket.xmppFtw.logout();
     })
-}
+}

test/subscriptions.js

@@ -50,7 +50,7 @@ var mockConfig = {
        </pubsub>\
      </iq>':
     '<iq type="result">\
-       <pubsub xmlns="http://jabber.org/protocol/pubsub">\
+       <pubsub xmlns="http://jabber.org/protocol/pubsub#owner">\
          <affiliations>\
            <affiliation node="/user/alice@localhost/posts" \
                         affiliation="owner"/>\
@@ -67,7 +67,7 @@ var mockConfig = {
        </pubsub>\
      </iq>':
     '<iq type="result">\
-       <pubsub xmlns="http://jabber.org/protocol/pubsub#owner">\
+       <pubsub xmlns="http://jabber.org/protocol/pubsub">\
          <affiliations node="/user/alice@localhost/posts">\
            <affiliation jid="alice@localhost" affiliation="owner"/>\
            <affiliation jid="bob@localhost" affiliation="subscriber"/>\
@@ -98,7 +98,7 @@ var mockConfig = {
          </pubsub>\
        </iq>':
       '<iq type="result">\
-         <pubsub xmlns="http://jabber.org/protocol/pubsub#owner">\
+         <pubsub xmlns="http://jabber.org/protocol/pubsub">\
            <affiliations node="/user/alice@localhost/posts">\
              <affiliation jid="alice@localhost" affiliation="owner"/>\
              <affiliation jid="bob@localhost" affiliation="subscriber"/>\
@@ -125,7 +125,7 @@ var mockConfig = {
          </pubsub>\
        </iq>':
       '<iq type="result">\
-         <pubsub xmlns="http://jabber.org/protocol/pubsub#owner">\
+         <pubsub xmlns="http://jabber.org/protocol/pubsub">\
            <affiliations node="/user/alice@localhost/posts">\
              <affiliation jid="alice@localhost" affiliation="owner"/>\
              <affiliation jid="bob@localhost" affiliation="subscriber"/>\