Use mustache to process connection template (#1110)

sqlpad · Mar 14, 2022 · 3f92be3 · 3f92be3
1 parent 2e15670
commit 3f92be3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/server/lib/render-connection.js b/server/lib/render-connection.js
@@ -1,4 +1,9 @@
-const _ = require('lodash');
+const mustache = require('mustache');
+
+// Disable HTML escaping. We're not using it for HTML
+mustache.escape = function (text) {
+  return text;
+};
 
 /**
  * Iterates over connection object, replacing any template strings with values from user
@@ -19,9 +24,7 @@ function renderConnection(connection, user) {
     } else {
       const value = connection[key];
       if (typeof value === 'string') {
-        _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
-        const compiled = _.template(value);
-        replaced[key] = compiled({ user });
+        replaced[key] = mustache.render(value, { user });
       } else {
         replaced[key] = value;
       }

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -69,6 +69,7 @@
     "mkdirp": "^1.0.4",
     "moment": "^2.29.1",
     "mssql": "^8.0.2",
+    "mustache": "^4.2.0",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
     "node-crate": "^2.0.6",