btrz-liquid-templates 1.7.0 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "btrz-liquid-templates",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Extension and helpers for liquid templates to deal with our data and other things we need to encapsulate",
   "main": "src/index.js",
   "scripts": {

package/src/httpimg.js

@@ -1,13 +1,5 @@
 const axios = require("axios");
 
-function getPrefix(url) {
-  const extention = url.split(".").pop();
-  if (extention.toLowerCase() === "png") {
-    return "data:image/png;base64,";
-  }
-  return "data:image/jpeg;base64,";
-}
-
 function HttpImg(engine) {
   this.registerTag("httpImg", {
     parse: function(tagToken, remainTokens) {
@@ -19,7 +11,16 @@ function HttpImg(engine) {
         const response = await axios.get(url, {
           responseType: "arraybuffer"
         });
-        return `${getPrefix(url)}${Buffer.from(response.data, "binary").toString("base64")}`;
+        if (response && response.headers && response.headers["content-type"]) {
+          const contentType = response.headers["content-type"];
+          if (contentType.startsWith("image/png")) {
+            return `data:image/png;base64,${Buffer.from(response.data, "binary").toString("base64")}`;
+          } else if (contentType.startsWith("image/jpeg")) {
+            return `data:image/jpeg;base64,${Buffer.from(response.data, "binary").toString("base64")}`;
+          }
+        }
+        //default to a placeholder image if the content type is not recognized
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAH0lEQVR42mP8P4PhPwMVAeOogaMGjho4auCogSPVQACqOzPNQ/wwqAAAAABJRU5ErkJggg==';
       } catch (e) {
         console.log(e);
         return "";

package/test/index-test.js

@@ -198,6 +198,26 @@ and some more here`,
     });
   });
 
+
+  it("should not load non image urls", async () => {
+    const tpl = require("../src/index");
+    const template = `{
+      "content": [
+        {
+          "image" : "{% httpImg 'https://www.google.com' %}"
+        }
+      ]
+    }`;
+    const documentDefinition = await tpl.processToObj(template, data);
+    expect(documentDefinition).to.be.eql({
+      "content": [
+        {
+          "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAH0lEQVR42mP8P4PhPwMVAeOogaMGjho4auCogSPVQACqOzPNQ/wwqAAAAABJRU5ErkJggg=="
+        }
+      ]
+    });
+  });
+
   it("should apply tag after translations", async () => {
     const tpl = require("../src/index");
     const template = `{