Fix event emit on MQlobberServer

coverage/lcov-report/index.html

@@ -77,7 +77,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Sep 17 2016 07:36:17 GMT+0100 (BST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Sep 17 2016 08:00:00 GMT+0100 (BST)
 </div>
 </div>
 <script src="prettify.js"></script>

coverage/lcov-report/mqlobber-access-control/index.html

@@ -77,7 +77,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Sep 17 2016 07:36:17 GMT+0100 (BST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Sep 17 2016 08:00:00 GMT+0100 (BST)
 </div>
 </div>
 <script src="../prettify.js"></script>

coverage/lcov-report/mqlobber-access-control/index.js.html

@@ -1288,7 +1288,7 @@ <h1>
         if (allow(ths._matchers.subscribe, topic))
         {
             if (!ths.emit('subscribe_requested', this, topic, done) &amp;&amp;
-                !this.emit('subscribe_requested', this, topic, done))
+                !this.emit('subscribe_requested', topic, done))
             {
                 this.subscribe(topic, done);
             }
@@ -1304,7 +1304,7 @@ <h1>
         if (allow(ths._matchers.publish, topic))
         {
             if (!ths.emit('publish_requested', this, topic, duplex, options, done) &amp;&amp;
-                !this.emit('publish_requested', this, topic, duplex, options, done))
+                !this.emit('publish_requested', topic, duplex, options, done))
             {
                 duplex.pipe(this.fsq.publish(topic, options, done));
             }
@@ -1474,7 +1474,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Sep 17 2016 07:36:17 GMT+0100 (BST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Sep 17 2016 08:00:00 GMT+0100 (BST)
 </div>
 </div>
 <script src="../prettify.js"></script>

index.js

@@ -293,7 +293,7 @@ function AccessControl(options)
         if (allow(ths._matchers.subscribe, topic))
         {
             if (!ths.emit('subscribe_requested', this, topic, done) &&
-                !this.emit('subscribe_requested', this, topic, done))
+                !this.emit('subscribe_requested', topic, done))
             {
                 this.subscribe(topic, done);
             }
@@ -309,7 +309,7 @@ function AccessControl(options)
         if (allow(ths._matchers.publish, topic))
         {
             if (!ths.emit('publish_requested', this, topic, duplex, options, done) &&
-                !this.emit('publish_requested', this, topic, duplex, options, done))
+                !this.emit('publish_requested', topic, duplex, options, done))
             {
                 duplex.pipe(this.fsq.publish(topic, options, done));
             }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mqlobber-access-control",
   "description": "Access control for mqlobber message queues",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/davedoesdev/mqlobber-access-control",
   "author": {
     "name": "David Halls",

test/runner.js

@@ -749,12 +749,14 @@ describe('dedup=' + dedup, function () {
 
         ac.on('subscribe_requested', function (server, topic, cb)
         {
+            expect(topic).to.equal('foo.*');
             sub_event = true;
             server.subscribe(topic, cb);
         });
 
         ac.on('publish_requested', function (server, topic, stream, options, cb)
         {
+            expect(topic).to.equal('foo.bar');
             pub_event = true;
             stream.pipe(server.fsq.publish(topic, options, cb));
         });
@@ -795,16 +797,18 @@ describe('dedup=' + dedup, function () {
 
         ac.attach(mq.server);
 
-        mq.server.on('subscribe_requested', function (server, topic, cb)
+        mq.server.on('subscribe_requested', function (topic, cb)
         {
+            expect(topic).to.equal('foo.*');
             mq_sub_event = true;
-            server.subscribe(topic, cb);
+            this.subscribe(topic, cb);
         });
 
-        mq.server.on('publish_requested', function (server, topic, stream, options, cb)
+        mq.server.on('publish_requested', function (topic, stream, options, cb)
         {
+            expect(topic).to.equal('foo.bar');
             mq_pub_event = true;
-            stream.pipe(server.fsq.publish(topic, options, cb));
+            stream.pipe(this.fsq.publish(topic, options, cb));
         });
 
         mq.client.subscribe('foo.*', function (s, info)
@@ -837,24 +841,28 @@ describe('dedup=' + dedup, function () {
 
         ac.on('subscribe_requested', function (server, topic, cb)
         {
+            expect(topic).to.equal('foo.*');
             sub_event = true;
             server.emit('subscribe_requested', topic, cb);
         });
 
         ac.on('publish_requested', function (server, topic, stream, options, cb)
         {
+            expect(topic).to.equal('foo.bar');
             pub_event = true;
             server.emit('publish_requested', topic, stream, options, cb);
         });
 
         mq.server.on('subscribe_requested', function (topic, cb)
         {
+            expect(topic).to.equal('foo.*');
             mq_sub_event = true;
             this.subscribe(topic, cb);
         });
 
         mq.server.on('publish_requested', function (topic, stream, options, cb)
         {
+            expect(topic).to.equal('foo.bar');
             mq_pub_event = true;
             stream.pipe(this.fsq.publish(topic, options, cb));
         });