Resolve #416 demo-ui unicode support (#422)

Co-authored-by: Doug Toppin <[email protected]>
aws-solutions · Jan 17, 2023 · e4689f5 · e4689f5
1 parent 75c6b24
commit e4689f5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/source/demo-ui/scripts.js b/source/demo-ui/scripts.js
@@ -18,7 +18,7 @@ function importOriginalImage() {
     // Assemble the image request
     const request = {
         bucket: bucketName,
-        key: keyName
+        key: encodeURIComponent(keyName)
     }
     const strRequest = JSON.stringify(request);
     const encRequest = btoa(strRequest);
@@ -77,7 +77,7 @@ function getPreviewImage() {
     // Set up the request body
     const request = {
         bucket: bucketName,
-        key: keyName,
+        key: encodeURIComponent(keyName),
         edits: _edits
     }
     if (Object.keys(request.edits).length === 0) { delete request.edits }

diff --git a/source/image-handler/image-handler.ts b/source/image-handler/image-handler.ts
@@ -443,7 +443,7 @@ export class ImageHandler {
     alpha: string,
     sourceImageMetadata: sharp.Metadata
   ): Promise<Buffer> {
-    const params = { Bucket: bucket, Key: key };
+    const params = { Bucket: bucket, Key: decodeURIComponent(key) };
     try {
       const { width, height } = sourceImageMetadata;
       const overlayImage: S3.GetObjectOutput = await this.s3Client.getObject(params).promise();

diff --git a/source/image-handler/image-request.ts b/source/image-handler/image-request.ts
@@ -269,7 +269,7 @@ export class ImageRequest {
     if (requestType === RequestTypes.DEFAULT) {
       // Decode the image request and return the image key
       const { key } = this.decodeRequest(event);
-      return key;
+      return decodeURIComponent(key);
     }
 
     if (requestType === RequestTypes.THUMBOR || requestType === RequestTypes.CUSTOM) {