Browse Source

rm implementation that uses environment variables.

Shun Miyazawa 3 months ago
parent
commit
f36400eaea

+ 0 - 2
apps/app/src/client/components/Admin/App/AppSetting.jsx

@@ -35,14 +35,12 @@ const AppSetting = (props) => {
       globalLang: adminAppContainer.state.globalLang || 'en-US',
       // Convert boolean to string for radio button value
       isEmailPublishedForNewUser: String(adminAppContainer.state.isEmailPublishedForNewUser ?? true),
-      fileUpload: adminAppContainer.state.fileUpload ?? false,
     });
   }, [
     adminAppContainer.state.title,
     adminAppContainer.state.confidential,
     adminAppContainer.state.globalLang,
     adminAppContainer.state.isEmailPublishedForNewUser,
-    adminAppContainer.state.fileUpload,
     reset,
   ]);
 

+ 0 - 4
apps/app/src/server/routes/apiv3/app-settings/index.ts

@@ -327,7 +327,6 @@ module.exports = (crowi) => {
       body('confidential'),
       body('globalLang').isIn(i18n.locales),
       body('isEmailPublishedForNewUser').isBoolean(),
-      body('fileUpload').isBoolean(),
     ],
     siteUrlSetting: [
       // https://regex101.com/r/5Xef8V/1
@@ -401,7 +400,6 @@ module.exports = (crowi) => {
         isEmailPublishedForNewUser: configManager.getConfig(
           'customize:isEmailPublishedForNewUser',
         ),
-        fileUpload: configManager.getConfig('app:fileUpload'),
         useOnlyEnvVarsForIsBulkExportPagesEnabled: configManager.getConfig(
           'env:useOnlyEnvVars:app:isBulkExportPagesEnabled',
         ),
@@ -564,7 +562,6 @@ module.exports = (crowi) => {
         'app:globalLang': req.body.globalLang,
         'customize:isEmailPublishedForNewUser':
           req.body.isEmailPublishedForNewUser,
-        'app:fileUpload': req.body.fileUpload,
       };
 
       try {
@@ -576,7 +573,6 @@ module.exports = (crowi) => {
           isEmailPublishedForNewUser: configManager.getConfig(
             'customize:isEmailPublishedForNewUser',
           ),
-          fileUpload: configManager.getConfig('app:fileUpload'),
         };
 
         const parameters = {

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

@@ -117,11 +117,7 @@ export abstract class AbstractFileUploader implements FileUploader {
   abstract isValidUploadSettings(): boolean;
 
   getFileUploadEnabled() {
-    if (!this.getIsUploadable()) {
-      return false;
-    }
-
-    return !!configManager.getConfig('app:fileUpload');
+    return this.getIsUploadable();
   }
 
   abstract listFiles();

+ 0 - 1
apps/app/src/server/service/installer.ts

@@ -127,7 +127,6 @@ export class InstallerService {
     await configManager.updateConfigs(
       {
         'app:installed': true,
-        'app:fileUpload': true,
         'app:isV5Compatible': true,
         'app:globalLang': globalLang,
       },