Escape keys as well

bee-queue · Jan 19, 2018 · 1122103 · 1122103
1 parent c8b8ac6
commit 1122103
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/server/views/helpers/handlebars.js b/src/server/views/helpers/handlebars.js
@@ -1,16 +1,27 @@
 const _ = require('lodash');
 const Handlebars = require('handlebars');
 
-const replacer = (key, value) =>
-    _.isString(value) ? Handlebars.Utils.escapeExpression(value) : value;
+const { SafeString, Util: { escapeExpression } } = Handlebars;
+
+const replacer = (key, value) => {
+  if (_.isObject(value)) {
+    return _.transform(value, (result, v, k) => {
+      result[escapeExpression(k)] = v;
+    });
+  } else if (_.isString(value)) {
+    return escapeExpression(value);
+  } else {
+    return value;
+  }
+}
 
 const helpers = {
   json(obj, pretty = false) {
     const args = [obj, replacer];
     if (pretty) {
       args.push(2);
     }
-    return new Handlebars.SafeString(JSON.stringify(...args));
+    return new SafeString(JSON.stringify(...args));
   },
 
   adjustedPage(currentPage, pageSize, newPageSize) {