Create new wrapXCallback methods that delegate to old callbacks

Angular and react-native data callbacks did not properly delegate to
original callbacks. (Forgot to return the truthy return value of the
callback)

Author: Thomas Grainger

plugins/angular.js

@@ -38,10 +38,8 @@ function angularPlugin(Raven, angular) {
         .provider('Raven',  RavenProvider)
         .config(['$provide', ExceptionHandlerProvider]);
 
-    Raven.setDataCallback(function(data, original) {
-        angularPlugin._normalizeData(data);
-
-        original && original(data);
+    Raven.wrapDataCallback(function(data) {
+        return angularPlugin._normalizeData(data);
     });
 }
 
@@ -62,6 +60,8 @@ angularPlugin._normalizeData = function (data) {
             data.extra.angularDocs = matches[3].substr(0, 250);
         }
     }
+
+    return data;
 };
 
 module.exports = angularPlugin;

plugins/react-native.js

@@ -60,8 +60,8 @@ function reactNativePlugin(Raven, options) {
     Raven.setTransport(reactNativePlugin._transport);
 
     // Use data callback to strip device-specific paths from stack traces
-    Raven.setDataCallback(function(data) {
-        reactNativePlugin._normalizeData(data, options.pathStrip)
+    Raven.wrapDataCallback(function(data) {
+        return reactNativePlugin._normalizeData(data, options.pathStrip);
     });
 
     // Check for a previously persisted payload, and report it.
@@ -224,6 +224,7 @@ reactNativePlugin._normalizeData = function (data, pathStripRe) {
             frame.filename = normalizeUrl(frame.filename, pathStripRe);
         });
     }
+    return data;
 };
 
 module.exports = reactNativePlugin;

src/raven.js

@@ -26,6 +26,25 @@ var _window = typeof window !== 'undefined' ? window
 var _document = _window.document;
 var _navigator = _window.navigator;
 
+
+function keepOriginalCallback(original, callback) {
+    return isFunction(callback) ?
+    function (data) { return callback(data, original) } :
+    callback;
+}
+
+function wrappedCallback(callback) {
+    function dataCallback(data, original) {
+      var normalizedData = callback(data) || data;
+      if (original) {
+          return original(normalizedData) || normalizedData;
+      }
+      return normalizedData;
+    }
+
+    return dataCallback;
+}
+
 // First, check for JSON support
 // If there is no JSON, we no-op the core features of Raven
 // since JSON is required to encode the payload
@@ -550,13 +569,15 @@ Raven.prototype = {
      */
     setDataCallback: function(callback) {
         var original = this._globalOptions.dataCallback;
-        this._globalOptions.dataCallback = isFunction(callback)
-          ? function (data) { return callback(data, original); }
-          : callback;
-
+        this._globalOptions.dataCallback =
+          keepOriginalCallback(original, callback);
         return this;
     },
 
+    wrapDataCallback: function(callback) {
+      return this.setDataCallback(wrappedCallback(callback));
+    },
+
     /*
      * Set the breadcrumbCallback option
      *
@@ -566,13 +587,15 @@ Raven.prototype = {
      */
     setBreadcrumbCallback: function(callback) {
         var original = this._globalOptions.breadcrumbCallback;
-        this._globalOptions.breadcrumbCallback = isFunction(callback)
-          ? function (data) { return callback(data, original); }
-          : callback;
-
+        this._globalOptions.breadcrumbCallback =
+          keepOriginalCallback(original, callback);
         return this;
     },
 
+    wrapBreadcrumbCallback: function(callback) {
+      return this.setBreadcrumbCallback(wrappedCallback(callback));
+    },
+
     /*
      * Set the shouldSendCallback option
      *
@@ -582,13 +605,15 @@ Raven.prototype = {
      */
     setShouldSendCallback: function(callback) {
         var original = this._globalOptions.shouldSendCallback;
-        this._globalOptions.shouldSendCallback = isFunction(callback)
-            ? function (data) { return callback(data, original); }
-            : callback;
-
+        this._globalOptions.shouldSendCallback =
+          keepOriginalCallback(original, callback);
         return this;
     },
 
+    wrapShouldSendCallback: function(callback) {
+      return this.setShouldSendCallback(wrappedCallback(callback));
+    },
+
     /**
      * Override the default HTTP transport mechanism that transmits data
      * to the Sentry server.