@uppy/companion: fix default getKey for non-standalone too (transload…

…it#3945) And update docs.
docsend · Aug 4, 2022 · f39a683 · f39a683
1 parent 1133f79
commit f39a683
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/config/companion.js b/src/config/companion.js
@@ -2,6 +2,7 @@ const ms = require('ms')
 const fs = require('node:fs')
 const { isURL } = require('validator')
 const logger = require('../server/logger')
+const { defaultGetKey } = require('../server/helpers/utils')
 
 const defaultOptions = {
   server: {
@@ -13,7 +14,7 @@ const defaultOptions = {
     endpoint: 'https://{service}.{region}.amazonaws.com',
     conditions: [],
     useAccelerateEndpoint: false,
-    getKey: (req, filename) => filename,
+    getKey: defaultGetKey,
     expires: ms('5 minutes') / 1000,
   },
   allowLocalUrls: false,

diff --git a/src/server/helpers/utils.js b/src/server/helpers/utils.js
@@ -164,3 +164,5 @@ module.exports.requestStream = async (req, convertResponseToError) => {
 
   return { stream: resp }
 }
+
+module.exports.defaultGetKey = (req, filename) => `${crypto.randomUUID()}-${filename}`
diff --git a/src/standalone/helper.js b/src/standalone/helper.js
@@ -72,7 +72,7 @@ const getConfigFromEnv = () => {
     },
     s3: {
       key: process.env.COMPANION_AWS_KEY,
-      getKey: (req, filename) => `${crypto.randomUUID()}-${filename}`,
+      getKey: utils.defaultGetKey,
       secret: getSecret('COMPANION_AWS_SECRET'),
       bucket: process.env.COMPANION_AWS_BUCKET,
       endpoint: process.env.COMPANION_AWS_ENDPOINT,