@@ -13,7 +13,7 @@ interface UploaderOptions extends UploadObjectOptions {
13
13
allowedMimeTypes ?: string [ ] | null
14
14
}
15
15
16
- const { globalS3Bucket } = getConfig ( )
16
+ const { globalS3Bucket, fileSizeLimitStandardUpload } = getConfig ( )
17
17
18
18
export interface UploadObjectOptions {
19
19
bucketId : string
@@ -247,13 +247,7 @@ export class Uploader {
247
247
options ?: Pick < UploaderOptions , 'fileSizeLimit' >
248
248
) {
249
249
const contentType = request . headers [ 'content-type' ]
250
- let fileSizeLimit = await getFileSizeLimit ( request . tenantId )
251
-
252
- if ( typeof options ?. fileSizeLimit === 'number' ) {
253
- if ( options . fileSizeLimit <= fileSizeLimit ) {
254
- fileSizeLimit = options . fileSizeLimit
255
- }
256
- }
250
+ const fileSizeLimit = await this . getFileSizeLimit ( request . tenantId , options ?. fileSizeLimit )
257
251
258
252
let body : NodeJS . ReadableStream
259
253
let mimeType : string
@@ -297,4 +291,18 @@ export class Uploader {
297
291
isTruncated,
298
292
}
299
293
}
294
+
295
+ protected async getFileSizeLimit ( tenantId : string , bucketSizeLimit ?: number | null ) {
296
+ let globalFileSizeLimit = await getFileSizeLimit ( tenantId )
297
+
298
+ if ( typeof bucketSizeLimit === 'number' ) {
299
+ globalFileSizeLimit = Math . min ( bucketSizeLimit , globalFileSizeLimit )
300
+ }
301
+
302
+ if ( fileSizeLimitStandardUpload && fileSizeLimitStandardUpload > 0 ) {
303
+ globalFileSizeLimit = Math . min ( fileSizeLimitStandardUpload , globalFileSizeLimit )
304
+ }
305
+
306
+ return globalFileSizeLimit
307
+ }
300
308
}
0 commit comments