Append port to the base URL if defined when generating public URLs #6

Melchyore · 2024-10-16T12:58:46Z

Hey! 👋

Following a discussion with @thetutlage on Discord and at his request, I created this PR to address an issue with the getUrl() method: if an S3 endpoint includes a port, the port is stripped when generating a public URL, resulting in an incorrect URL.

This PR fixes this behaviour by adding the port only if it's defined.

There's another problem (that should be solved in another PR: when cdnUrl is used, if it doesn't have a trailing slash, the pathname will be removed and the bucket used will not be included in the public URL generated by the getUrl() method. The following is an example for the same:

# In .env

S3_ENDPOINT=http://localhost:9000
S3_BUCKET=local

// In config/drive.ts

{
  s3: services.s3({
    cdnUrl: `${env.get('S3_ENDPOINT')}/${env.get('S3_BUCKET')}`,
  }),
}

In this case, using await drive.use().getUrl('foo/bar.png') will result in the following generated URL: http://localhost:9000/foo/bar.png which is wrong. The correct URL should be: http://localhost:9000/local/foo/bar.png.

To address this issue, we can either add a trailing slash automatically to cdnUrl, or let devs do it manually, i.e :

// In config/drive.ts configuration

{
  s3: services.s3({
    cdnUrl: `${env.get('S3_ENDPOINT')}/${env.get('S3_BUCKET')}/`,
    //                                                        ^----- Here
}

I can work on the second issue too, if necessary.

Thank you!

thetutlage · 2024-12-18T16:41:52Z

To address this issue, we can either add a trailing slash automatically to cdnUrl, or let devs do it manually, i.e :

I think this is the way to go. We can safely include the trailing slash if missing.

fix: append port to the base url if defined

96adc54

Melchyore marked this pull request as ready for review October 21, 2024 11:07

thetutlage merged commit 7295c86 into flydrive-js:develop Dec 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Append port to the base URL if defined when generating public URLs #6

Append port to the base URL if defined when generating public URLs #6

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Append port to the base URL if defined when generating public URLs #6

Append port to the base URL if defined when generating public URLs #6

Uh oh!

Conversation

Uh oh!

Uh oh!

Uh oh!

Uh oh!