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

Merge pull request #16019 from strapi/private-s3-bucket/fix-default-acl

Browse Source
This commit is contained in:
Marc 2023-03-08 10:50:39 +01:00 committed by GitHub
commit 2106d4ed3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/providers/upload-aws-s3/lib/index.js
View File

@ -6,7 +6,7 @@
/* eslint-disable no-unused-vars */ /* eslint-disable no-unused-vars */
// Public node modules. // Public node modules.
const { get } = require('lodash/fp'); const { getOr } = require('lodash/fp');
const AWS = require('aws-sdk'); const AWS = require('aws-sdk');
const { getBucketFromUrl } = require('./utils'); const { getBucketFromUrl } = require('./utils');
@ -22,7 +22,7 @@ module.exports = {
...config, ...config,
}); });
const ACL = get(['params', 'ACL'], config, 'public-read'); const ACL = getOr('public-read', ['params', 'ACL'], config);
const upload = (file, customParams = {}) => const upload = (file, customParams = {}) =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
@ -82,7 +82,7 @@ module.exports = {
{ {
Bucket: config.params.Bucket, Bucket: config.params.Bucket,
Key: fileKey, Key: fileKey,
Expires: get(['params', 'signedUrlExpires'], config, 60 * 60 * 24 * 7), // 7 days Expires: getOr(60 * 60 * 24 * 7, ['params', 'signedUrlExpires'], config), // 7 days
}, },
(err, url) => { (err, url) => {
if (err) { if (err) {