coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Closes #482

Browse Source
This commit is contained in:
Tom Moor
2018-06-02 19:00:16 -04:00
parent 329d23828d
commit 466033964f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/utils/s3.js
View File

@ -37,15 +37,18 @@ export const signPolicy = (policy: any) => {
return signature; return signature;
}; };
export const publicS3Endpoint = () => { export const publicS3Endpoint = (isServerUpload?: boolean) => {
// lose trailing slash if there is one and convert fake-s3 url to localhost // lose trailing slash if there is one and convert fake-s3 url to localhost
// for access outside of docker containers in local development // for access outside of docker containers in local development
const isDocker = process.env.AWS_S3_UPLOAD_BUCKET_URL.match(/http:\/\/s3:/);
const host = process.env.AWS_S3_UPLOAD_BUCKET_URL.replace( const host = process.env.AWS_S3_UPLOAD_BUCKET_URL.replace(
's3:', 's3:',
'localhost:' 'localhost:'
).replace(/\/$/, ''); ).replace(/\/$/, '');
return `${host}/${process.env.AWS_S3_UPLOAD_BUCKET_NAME}`; return `${host}/${isServerUpload && isDocker ? 's3/' : ''}${
process.env.AWS_S3_UPLOAD_BUCKET_NAME
}`;
}; };
export const uploadToS3FromUrl = async (url: string, key: string) => { export const uploadToS3FromUrl = async (url: string, key: string) => {
@ -73,7 +76,7 @@ export const uploadToS3FromUrl = async (url: string, key: string) => {
}) })
.promise(); .promise();
const endpoint = publicS3Endpoint(); const endpoint = publicS3Endpoint(true);
return `${endpoint}/${key}`; return `${endpoint}/${key}`;
} catch (err) { } catch (err) {
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {