fix: These middleware should insert html content only on html pages

abecms · Jul 13, 2017 · 688503e · 688503e
1 parent cc660e9
commit 688503e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/server/middlewares/liveReload.js b/src/server/middlewares/liveReload.js
@@ -11,11 +11,15 @@ var middleware = function(req, res, next) {
   if( req.url.indexOf('/abe/') > -1) {
     var send = res.send
     res.send = function (string) {
-      var body = string instanceof Buffer ? string.toString() : string
-      body = body.replace(/<\/body>/g, function (w) {
-        return '<script src="/abecms/libs/livereload.js?snipver=1&host=localhost&port='+port+'"></script>\n<script>document.addEventListener("LiveReloadDisconnect", function() {\nsetTimeout(function() {\nwindow.top.location.reload()\n}, 2000);\n})\n</script>' + w
-      })
-      send.call(this, body)
+      if(typeof string === 'string' || string instanceof Buffer){
+        var body = string instanceof Buffer ? string.toString() : string
+        body = body.replace(/<\/body>/g, function (w) {
+          return '<script src="/abecms/libs/livereload.js?snipver=1&host=localhost&port='+port+'"></script>\n<script>document.addEventListener("LiveReloadDisconnect", function() {\nsetTimeout(function() {\nwindow.top.location.reload()\n}, 2000);\n})\n</script>' + w
+        })
+        send.call(this, body)
+      } else {
+        send.call(this, string)
+      }
     }
     next()
   } else {

diff --git a/src/server/middlewares/login.js b/src/server/middlewares/login.js
@@ -1,15 +1,19 @@
 var middleware = function(req, res, next) {
-  if( req.url.indexOf('/abe/') > -1) {
+  if( req.url.indexOf('/abe/') > -1 && req.url.indexOf('/abe/rest/') < 0) {
     var send = res.send
     res.send = function (string) {
-      var body = string instanceof Buffer ? string.toString() : string
-      body = body.replace(/<\/body>/g, function (w) {
-        return '<input type=\'hidden\' id=\'globalCsrfToken\' value=\'' + res.locals._csrf + '\' /><script src=\'/abecms/scripts/user-login-compiled.js\'></script>' + w
-      })
-      body = body.replace(/<\/form>/g, function (w) {
-        return '<input type=\'hidden\' name=\'_csrf\' value=\'' + res.locals._csrf + '\' />' + w
-      })
-      send.call(this, body)
+      if(typeof string === 'string' || string instanceof Buffer){
+        var body = string instanceof Buffer ? string.toString() : string
+        body = body.replace(/<\/body>/g, function (w) {
+          return '<input type=\'hidden\' id=\'globalCsrfToken\' value=\'' + res.locals._csrf + '\' /><script src=\'/abecms/scripts/user-login-compiled.js\'></script>' + w
+        })
+        body = body.replace(/<\/form>/g, function (w) {
+          return '<input type=\'hidden\' name=\'_csrf\' value=\'' + res.locals._csrf + '\' />' + w
+        })
+        send.call(this, body)
+      } else {
+        send.call(this, string)
+      }
     }
     // res.locals.csrfToken = token
     next()