Merge branch 'canary'

Author: knalli

bower.json

@@ -2,7 +2,7 @@
   "author": "Jan Philipp",
   "name": "angular-vertxbus",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "homepage": "http://github.com/knalli/angular-vertxbus",
   "main": "./dist/angular-vertxbus.js",
   "keywords": [
@@ -29,7 +29,7 @@
   "dependencies": {
     "angular": ">=1.2 <=1.5",
     "sockjs-client": "1.0.3",
-    "vertx3-eventbus-client": "3.2.1"
+    "vertx3-eventbus-client": "~3.2.1"
   },
   "devDependencies": {
     "angular": "~1.4.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-vertxbus",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
   "main": "dist/angular-vertxbus.js",
   "keywords": [
@@ -45,14 +45,14 @@
     "babel": "^6.5.0",
     "babel-cli": "^6.5.0",
     "babel-core": "^6.0.2",
-    "babel-eslint": "^5.0.0",
+    "babel-eslint": "^6.0.1",
     "babel-istanbul-loader": "^0.1.0",
     "babel-loader": "^6.2.3",
     "babel-plugin-transform-runtime": "^6.5.2",
     "babel-polyfill": "^6.0.14",
     "babel-preset-es2015": "^6.5.0",
     "bower": "1.7.7",
-    "eslint": "^2.4.0",
+    "eslint": "^2.5.3",
     "eslint-loader": "^1.3.0",
     "eslint-plugin-angular": "^1.0.0",
     "estraverse": "^4.1.0",

src/lib/VertxEventBusServiceProvider.js

@@ -13,6 +13,7 @@ import Delegator from './service/Delegator';
 const DEFAULTS = {
   enabled : true,
   debugEnabled : false,
+  authRequired : false,
   prefix : 'vertx-eventbus.',
   sockjsStateInterval : 10000,
   messageBuffer : 10000
@@ -110,6 +111,28 @@ let VertxEventBusServiceProvider = function () {
     return this;
   };
 
+  /**
+   * @ngdoc method
+   * @module knalli.angular-vertxbus
+   * @methodOf knalli.angular-vertxbus.vertxEventBusServiceProvider
+   * @name .#authHandler
+   *
+   * @description
+   * Function or service reference name for function checking the authorization state.
+   *
+   * The result of the function must be a boolean or promise. The handler can (but is not required) to create authorization on demand.
+   * If it is resolved, the authorization is valid.
+   * If it is rejected, the authorization is invalid.
+   *
+   * @param {string|function} value authorization handler (either a function or a service name)
+   * @returns {object} promise
+   */
+  this.authHandler = (value) => {
+    options.authHandler = value;
+    options.authRequired = !!value;
+    return this;
+  };
+
   /**
    * @ngdoc service
    * @module knalli.angular-vertxbus
@@ -140,14 +163,15 @@ let VertxEventBusServiceProvider = function () {
    * @requires $q
    * @requires $interval
    * @requires $log
+   * @requires $injector
    */
   /* @ngInject */
-  this.$get = ($rootScope, $q, $interval, vertxEventBus, $log) => {
+  this.$get = ($rootScope, $q, $interval, vertxEventBus, $log, $injector) => {
     // Current options (merged defaults with application-wide settings)
     let instanceOptions = angular.extend({}, vertxEventBus.getOptions(), options);
     if (instanceOptions.enabled) {
       return new Delegator(
-        new EventBusDelegate($rootScope, $interval, $log, $q, vertxEventBus, instanceOptions),
+        new EventBusDelegate($rootScope, $interval, $log, $q, $injector, vertxEventBus, instanceOptions),
         $log
       );
     } else {

src/lib/adapter/BaseAdapter.js

@@ -44,4 +44,29 @@ export default class BaseAdapter {
   onclose() {
   }
 
+  // private
+  getDefaultHeaders() {
+    return this.defaultHeaders;
+  }
+
+  /**
+   * @ngdoc method
+   * @module knalli.angular-vertxbus
+   * @methodOf knalli.angular-vertxbus.vertxEventBus
+   * @name .#applyDefaultHeaders
+   *
+   * @description
+   * Stores the given default headers
+   *
+   * @param {object} headers additional standard headers
+   */
+  applyDefaultHeaders(headers = {}) {
+    this.defaultHeaders = angular.extend({}, headers);
+  }
+
+  // private
+  getMergedHeaders(headers = {}) {
+    return angular.extend({}, this.defaultHeaders, headers);
+  }
+
 }

src/lib/adapter/EventBusAdapter.js

@@ -27,6 +27,7 @@ import ConnectionConfigHolder from './../support/ConnectionConfigHolder';
  *
  * @param {string} address target address
  * @param {object} message payload message
+ * @param {object=} headers headers
  * @param {function=} replyHandler optional callback
  * @param {function=} failureHandler optional callback
  */
@@ -39,6 +40,7 @@ import ConnectionConfigHolder from './../support/ConnectionConfigHolder';
  *
  * @param {string} address target address
  * @param {object} message payload message
+ * @param {object=} headers headers
  */
 
 /**
@@ -49,6 +51,7 @@ import ConnectionConfigHolder from './../support/ConnectionConfigHolder';
  *
  * @param {string} address target address
  * @param {function} handler callback handler
+ * @param {object=} headers headers
  */
 
 /**
@@ -59,6 +62,7 @@ import ConnectionConfigHolder from './../support/ConnectionConfigHolder';
  *
  * @param {string} address target address
  * @param {function} handler callback handler to be removed
+ * @param {object=} headers headers
  */
 
 /**
@@ -115,6 +119,7 @@ export default class EventBusAdapter extends BaseAdapter {
       sockjsOptions
     };
     this.disconnectTimeoutEnabled = true;
+    this.applyDefaultHeaders();
     if (initialConnectEnabled) {
       // asap create connection
       this.connect();
@@ -253,18 +258,13 @@ export default class EventBusAdapter extends BaseAdapter {
    *
    * @param {string} address target address
    * @param {object} message payload message
-   * @param {object=} headers
+   * @param {object} headers optional headers
    * @param {function=} replyHandler optional callback
-   * @param {function=} failureHandler optional callback (since Vert.x 3.0.0)
    */
-  send(address, message, headers, replyHandler, failureHandler) {
+  send(address, message, headers, replyHandler) {
     if (this.instance) {
-      if (angular.isFunction(headers)) {
-        failureHandler = replyHandler;
-        replyHandler = headers;
-        headers = undefined;
-      }
-      this.instance.send(address, message, headers, replyHandler, failureHandler);
+      const mergedHeaders = this.getMergedHeaders(headers);
+      this.instance.send(address, message, mergedHeaders, replyHandler);
     }
   }
 
@@ -286,7 +286,8 @@ export default class EventBusAdapter extends BaseAdapter {
    */
   publish(address, message, headers) {
     if (this.instance) {
-      this.instance.publish(address, message, headers);
+      const mergedHeaders = this.getMergedHeaders(headers);
+      this.instance.publish(address, message, mergedHeaders);
     }
   }
 
@@ -303,7 +304,7 @@ export default class EventBusAdapter extends BaseAdapter {
    * - {@link global.EventBus#methods_registerHandler EventBus.registerHandler()}
    *
    * @param {string} address target address
-   * @param {object} headers optional headers
+   * @param {object=} headers optional headers
    * @param {function} handler callback handler
    */
   registerHandler(address, headers, handler) {
@@ -312,10 +313,11 @@ export default class EventBusAdapter extends BaseAdapter {
         handler = headers;
         headers = undefined;
       }
-      this.instance.registerHandler(address, headers, handler);
+      const mergedHeaders = this.getMergedHeaders(headers);
+      this.instance.registerHandler(address, mergedHeaders, handler);
       // and return the deregister callback
       let deconstructor = () => {
-        this.unregisterHandler(address, headers, handler);
+        this.unregisterHandler(address, mergedHeaders, handler);
       };
       deconstructor.displayName = `${moduleName}.wrapper.eventbus.registerHandler.deconstructor`;
       return deconstructor;
@@ -335,7 +337,7 @@ export default class EventBusAdapter extends BaseAdapter {
    * - {@link global.EventBus#methods_unregisterHandler EventBus.unregisterHandler()}
    *
    * @param {string} address target address
-   * @param {object} headers optional headers
+   * @param {object=} headers optional headers
    * @param {function} handler callback handler to be removed
    */
   unregisterHandler(address, headers, handler) {
@@ -344,7 +346,8 @@ export default class EventBusAdapter extends BaseAdapter {
         handler = headers;
         headers = undefined;
       }
-      this.instance.unregisterHandler(address, headers, handler);
+      const mergedHeaders = this.getMergedHeaders(headers);
+      this.instance.unregisterHandler(address, mergedHeaders, handler);
     }
   }