Просмотр исходного кода

rm config (app:fileUploadDisabled)

Shun Miyazawa 3 месяцев назад
Родитель
Сommit
d18c634b62

+ 0 - 4
apps/app/src/server/service/config-manager/config-definition.ts

@@ -55,7 +55,6 @@ export const CONFIG_KEYS = [
   'app:maxFileSize',
   'app:fileUploadTimeout',
   'app:fileUploadTotalLimit',
-  'app:fileUploadDisabled',
   'app:elasticsearchVersion',
   'app:elasticsearchUri',
   'app:elasticsearchRequestTimeout',
@@ -387,9 +386,6 @@ export const CONFIG_DEFINITIONS = {
   'app:globalLang': defineConfig<string>({
     defaultValue: 'en_US',
   }),
-  'app:fileUploadDisabled': defineConfig<boolean>({
-    defaultValue: false,
-  }),
   'app:fileUploadType': defineConfig<AttachmentMethodType>({
     envVarName: 'FILE_UPLOAD',
     defaultValue: AttachmentMethodType.aws,

+ 4 - 4
apps/app/src/server/service/file-uploader/file-uploader.ts

@@ -79,10 +79,10 @@ export abstract class AbstractFileUploader implements FileUploader {
   }
 
   getIsUploadable() {
-    return (
-      !configManager.getConfig('app:fileUploadDisabled') &&
-      this.isValidUploadSettings()
-    );
+    const isFileUploadDisabled =
+      configManager.getConfig('app:fileUploadType') === 'none';
+
+    return !isFileUploadDisabled && this.isValidUploadSettings();
   }
 
   /**

+ 2 - 3
apps/app/src/server/service/g2g-transfer.ts

@@ -618,9 +618,8 @@ export class G2GTransferReceiverService implements Receiver {
     const { fileUploadService } = this.crowi;
     const version = getGrowiVersion();
     const userUpperLimit = configManager.getConfig('security:userUpperLimit');
-    const fileUploadDisabled = configManager.getConfig(
-      'app:fileUploadDisabled',
-    );
+    const fileUploadDisabled =
+      configManager.getConfig('app:fileUploadType') === 'none';
     const fileUploadTotalLimit = fileUploadService.getFileUploadTotalLimit();
     const isWritable = await fileUploadService.isWritable();