Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
166a820
Add github actions
gsingh04 Dec 9, 2022
4e42ee1
Move workflow files
gsingh04 Dec 9, 2022
6ae6e49
Remove redundant workflow file
gsingh04 Dec 9, 2022
d5fa2f8
Run pipeline job for only aws solutions owned repo
gsingh04 Dec 9, 2022
3912c4d
Run unit test workflow on push in forks
gsingh04 Dec 20, 2022
5ae1ee4
Fix workflow file syntax
gsingh04 Dec 20, 2022
7201343
Run workflow with push on forks
gsingh04 Dec 20, 2022
b6c02f4
Merge pull request #402 from gsingh04/develop
gsingh04 Dec 20, 2022
4d989bc
Address eslint, CodeQL recommendations and issues
Dec 23, 2022
d0ead90
Merge pull request #413 from dougtoppin/feature/eslint
dougtoppin Dec 23, 2022
50ad5e8
Add package-lock to gitignore
Dec 28, 2022
130afa6
Merge branch 'develop' into chore/ignore-package-lock
dougtoppin Dec 28, 2022
c71bc7e
Add pipeline related configuration files
Jan 4, 2023
025e81d
Merge pull request #419 from aws-solutions/chore/pipeline-config
dougtoppin Jan 5, 2023
8cfd4a3
Merge branch 'develop' into chore/ignore-package-lock
dougtoppin Jan 6, 2023
c72ba3b
Merge pull request #415 from aws-solutions/chore/ignore-package-lock
dougtoppin Jan 6, 2023
75c6b24
chore(docs): Update contributing for develop branch and PR steps (#421)
dougtoppin Jan 13, 2023
e4689f5
Resolve #416 demo-ui unicode support (#422)
dougtoppin Jan 17, 2023
66fa67a
Update code-style-lint.yml (#425)
gsingh04 Jan 18, 2023
4ea6c93
chore(package-lock): Add package dependency files (#426)
dougtoppin Jan 19, 2023
f69392b
Bump json5 from 1.0.1 to 1.0.2 in /source (#428)
dependabot[bot] Jan 19, 2023
1659062
CHANGELOG additions and version set to 6.1.1 (#431)
dougtoppin Jan 23, 2023
d5f9f5d
Update CHANGELOG.md
dougtoppin Feb 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve #416 demo-ui unicode support (#422)
Co-authored-by: Doug Toppin <[email protected]>
  • Loading branch information
dougtoppin and Doug Toppin authored Jan 17, 2023
commit e4689f5cb18a8958eada0b7aebbfc88a863409ce
4 changes: 2 additions & 2 deletions source/demo-ui/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion source/image-handler/image-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion source/image-handler/image-request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down