Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[B2BP-1011] Normalize URI in cloudfront-functions #531

Merged
merged 11 commits into from
Jan 13, 2025
Merged

[B2BP-1011] Normalize URI in cloudfront-functions #531

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
513b44a
feat: Enabled uriEndsWithSlash check into cloudfront-functions
mamu0 Jan 10, 2025
8b82080
fix: updated tests
mamu0 Jan 10, 2025
ffd4222
fix: resolved case end with .html
mamu0 Jan 13, 2025
50b3644
fix: minor
mamu0 Jan 13, 2025
0a9db0b
Merge branch 'main' into B2BP-1011-enable-uri-ends-with-slash
mamu0 Jan 13, 2025
5fa2b52
Merge branch 'main' into B2BP-1011-enable-uri-ends-with-slash
mamu0 Jan 13, 2025
4ebe089
fix: formatting
mamu0 Jan 13, 2025
fd27551
fix: formatting
mamu0 Jan 13, 2025
a6ef931
fix: formatting
mamu0 Jan 13, 2025
c4326ee
Merge branch 'main' into B2BP-1011-enable-uri-ends-with-slash
mamu0 Jan 13, 2025
03a6d75
fix: added numbers into check extension
mamu0 Jan 13, 2025
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
18 changes: 10 additions & 8 deletions apps/cloudfront-functions/src/viewer-request-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ const handler = (
if (event.context.eventType === 'viewer-request') {
// do the rewrite
const { request } = event;
const uri = request.uri;
const uriEndsWithSlash = uri.endsWith('/');

if (uriEndsWithSlash) {
request.uri = uri.replace(/\/$/, '');
}
const uriEndsWithSlash = request.uri.endsWith('/');
const isHomepage = request.uri === '/';

// Add the .html extension if missing
if (!/\.[0-9a-zA-Z]+$/.test(uri)) {
request.uri += '.html';
if (!isHomepage) {
if (uriEndsWithSlash) {
request.uri = request.uri.replace(/\/$/, '');
}
// Always add .html if there's no file extension, including special cases
if (!/\.[0-9a-zA-Z]+$/.test(request.uri)) {
request.uri += '.html';
}
}

return request;
Expand Down
Loading