yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-10 23:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16467 from strapi/fix/provider-s3-video-uploads

Browse Source
This commit is contained in:
Marc 2023-04-21 14:43:38 +02:00 committed by GitHub
commit cd4c3298d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/providers/upload-aws-s3/src/index.ts
View File

@ -27,7 +27,7 @@ interface File {
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
require('aws-sdk/lib/maintenance_mode_message').suppress = true; require('aws-sdk/lib/maintenance_mode_message').suppress = true;
function assertUrlProtocol(url: string) { function hasUrlProtocol(url: string) {
// Regex to test protocol like "http://", "https://" // Regex to test protocol like "http://", "https://"
return /^\w*:\/\//.test(url); return /^\w*:\/\//.test(url);
} }
@ -93,11 +93,13 @@ export = {
} }
// set the bucket file url // set the bucket file url
if (assertUrlProtocol(data.Location)) { if (baseUrl) {
file.url = baseUrl ? `${baseUrl}/${fileKey}` : data.Location; // Construct the url with the baseUrl
file.url = `${baseUrl}/${fileKey}`;
} else { } else {
// Default protocol to https protocol // Add the protocol if it is missing
file.url = `https://${data.Location}`; // Some providers like DigitalOcean Spaces return the url without the protocol
file.url = hasUrlProtocol(data.Location) ? data.Location : `https://${data.Location}`;
} }
resolve(); resolve();
}; };