Sanitize response on notify callback

mikaelbr · Feb 28, 2016 · a44454a · a44454a · gucong3000 · Apr 13, 2016
1 parent 905e063
commit a44454a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -161,11 +161,15 @@ module.exports.mapToMac = function (options) {
 module.exports.actionJackerDecorator = function (emitter, options, fn, mapper) {
   options = clone(options);
   fn = fn || function (err, data) {};
-  return function (err, data) {
-    fn.apply(emitter, [err, data]);
-    if (err || !mapper || !data) return;
-
-    var key = mapper(data);
+  return function (err, data) {
+    var cleanedData = data.toLowerCase().trim();
+    if(cleanedData.match(/^activate/)) {
+      cleanedData = 'activate';
+    }
+    fn.apply(emitter, [err, cleanedData]);
+    if (err || !mapper || !cleanedData) return;
+
+    var key = mapper(cleanedData);
     if (!key) return;
     emitter.emit(key, emitter, options);
   };

diff --git a/notifiers/balloon.js b/notifiers/balloon.js
@@ -59,13 +59,12 @@ WindowsBalloon.prototype.notify = function (options, callback) {
       title: 'node-notifier',
       message: options
   };
-  
+
   var actionJackedCallback = utils.actionJackerDecorator(this, options, callback, function (data) {
-    var cleaned = data.toLowerCase().trim();
-    if (cleaned === 'activate') {
+    if (data === 'activate') {
       return 'click';
     }
-    if (cleaned === 'timeout') {
+    if (data === 'timeout') {
       return 'timeout';
     }
     return false;

diff --git a/notifiers/growl.js b/notifiers/growl.js
@@ -39,11 +39,10 @@ Growl.prototype.notify = function (options, callback) {
   };
 
   callback = utils.actionJackerDecorator(this, options, callback, function (data) {
-    var cleaned = data.toLowerCase().trim();
-    if (cleaned === 'click') {
+    if (data === 'click') {
       return 'click';
     }
-    if (cleaned === 'timedout') {
+    if (data === 'timedout') {
       return 'timeout';
     }
     return false;

diff --git a/notifiers/notificationcenter.js b/notifiers/notificationcenter.js
@@ -41,11 +41,10 @@ NotificationCenter.prototype.notify = function (options, callback) {
   var actionJackedCallback = utils.actionJackerDecorator(this, options, callback, function (data) {
     if (activeId !== id) return false;
 
-    var cleaned = data.toLowerCase().trim();
-    if (cleaned === 'activate') {
+    if (data === 'activate') {
       return 'click';
     }
-    if (cleaned === 'timeout') {
+    if (data === 'timeout') {
       return 'timeout';
     }
     return false;

diff --git a/notifiers/toaster.js b/notifiers/toaster.js
@@ -34,13 +34,12 @@ WindowsToaster.prototype.notify = function (options, callback) {
       title: 'node-notifier',
       message: options
   };
-  
+
   var actionJackedCallback = utils.actionJackerDecorator(this, options, callback, function (data) {
-    var cleaned = data.toLowerCase().trim();
-    if (cleaned === 'activated') {
+    if (data === 'activate') {
       return 'click';
     }
-    if (cleaned === 'timeout') {
+    if (data === 'timeout') {
       return 'timeout';
     }
     return false;