fix for thumbor watermark issue, add unit tests (#432)

Co-authored-by: Doug Toppin <[email protected]>

Author: dougtoppin

source/image-handler/image-request.ts

@@ -291,7 +291,12 @@ export class ImageRequest {
       }
 
       return decodeURIComponent(
-        path.replace(/\/\d+x\d+:\d+x\d+\/|(?<=\/)\d+x\d+\/|filters:[^/]+|\/fit-in(?=\/)|^\/+/g, "").replace(/^\/+/, "")
+        path
+          .replace(
+            /\/\d+x\d+:\d+x\d+\/|(?<=\/)\d+x\d+\/|filters:watermark\(.*\)|filters:[^/]+|\/fit-in(?=\/)|^\/+/g,
+            ""
+          )
+          .replace(/^\/+/, "")
       );
     }
 

source/image-handler/test/image-request/parse-image-key.spec.ts

@@ -261,4 +261,34 @@ describe("parseImageKey", () => {
       });
     }
   });
+
+  it("Should pass if an image key value is provided in the thumbor request format with a watermark containing a slash", () => {
+    // Arrange
+    const event = {
+      path: "/fit-in/400x400/filters:watermark(bucket,folder/key.png,0,0)/image.jpg",
+    };
+
+    // Act
+    const imageRequest = new ImageRequest(s3Client, secretProvider);
+    const result = imageRequest.parseImageKey(event, RequestTypes.THUMBOR);
+
+    // Assert
+    const expectedResult = "image.jpg";
+    expect(result).toEqual(expectedResult);
+  });
+
+  it("Should pass if an image key value is provided in the thumbor request format with a watermark not containing a slash", () => {
+    // Arrange
+    const event = {
+      path: "/fit-in/400x400/filters:watermark(bucket,key.png,0,0)/image.jpg",
+    };
+
+    // Act
+    const imageRequest = new ImageRequest(s3Client, secretProvider);
+    const result = imageRequest.parseImageKey(event, RequestTypes.THUMBOR);
+
+    // Assert
+    const expectedResult = "image.jpg";
+    expect(result).toEqual(expectedResult);
+  });
 });

source/image-handler/test/thumbor-mapper/filter.spec.ts

@@ -638,4 +638,68 @@ describe("filter", () => {
     };
     expect(edits).toEqual(expectedResult.edits);
   });
+
+  it("Should pass for fit-in combined with watermark in folder", () => {
+    // watermark params: bucket, key, xPos, yPos, alpha, wRatio, hRatio
+    const path = "/fit-in/400x400/filters:watermark(bucket,folder/key.png,0,0)/image.jpg";
+
+    // Act
+    const thumborMapper = new ThumborMapper();
+    const edits = thumborMapper.mapPathToEdits(path);
+
+    // Assert
+    const expectedResult = {
+      edits: {
+        resize: {
+          width: 400,
+          height: 400,
+          fit: "inside",
+        },
+        overlayWith: {
+          bucket: "bucket",
+          key: "folder/key.png",
+          alpha: undefined,
+          wRatio: undefined,
+          hRatio: undefined,
+          options: {
+            left: "0",
+            top: "0",
+          },
+        },
+      },
+    };
+    expect(edits).toEqual(expectedResult.edits);
+  });
+
+  it("Should pass for fit-in combined with watermark not in folder", () => {
+    // watermark params: bucket, key, xPos, yPos, alpha, wRatio, hRatio
+    const path = "/fit-in/400x400/filters:watermark(bucket,key.png,0,0)/image.jpg";
+
+    // Act
+    const thumborMapper = new ThumborMapper();
+    const edits = thumborMapper.mapPathToEdits(path);
+
+    // Assert
+    const expectedResult = {
+      edits: {
+        resize: {
+          width: 400,
+          height: 400,
+          fit: "inside",
+        },
+        overlayWith: {
+          bucket: "bucket",
+          key: "key.png",
+          alpha: undefined,
+          wRatio: undefined,
+          hRatio: undefined,
+          options: {
+            left: "0",
+            top: "0",
+          },
+        },
+      },
+    };
+    expect(edits).toEqual(expectedResult.edits);
+  });
 });