Support service callbacks with 1 or 2 arguments

rubicon-project · Aug 20, 2015 · 91a8f7a · 91a8f7a
1 parent 92c55f1
commit 91a8f7a
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/lib/DfpUser.js b/lib/DfpUser.js
@@ -53,17 +53,30 @@ DfpUser.prototype.getService = function (service, callback, version) {
     }
   };
 
+  // If the callback accepts two arguments, make note that we should pass errors
+  // to the callback.
+  //
+  var callbackSupportsError = callback.length === 2;
+
   this.getTokens(function (err, tokens) {
 
     if (err) {
       console.log('getTokens Error ' + err);
-      return callback(new Error('getTokens Error'));
+      var error = new Error('getTokens Error');
+      if (callbackSupportsError) {
+        return callback(error);
+      }
+      throw error;
     }
 
     soap.createClient(soap_wsdl, options, function (err, client) {
       if (err) {
         console.log('Create Client Error ' + err);
-        return callback(new Error('Unable to get token'));
+        var error = new Error('Unable to get token');
+        if (callbackSupportsError) {
+          return callback(error);
+        }
+        throw error;
       }
 
       client.addSoapHeader(dfpUser.getSOAPHeader(), '', '', '');
@@ -88,8 +101,10 @@ DfpUser.prototype.getService = function (service, callback, version) {
         }
       }
 
-      return callback(null, serviceInstance);
-
+      if (callbackSupportsError) {
+        return callback(null, serviceInstance);
+      }
+      callback(serviceInstance);
     });
   });