add isFileUploadTypeForced

src/client/js/components/Admin/App/FileUploadSetting.jsx

@@ -66,6 +66,7 @@ function FileUploadSetting(props) {
               );
             })}
         </div>
+        {adminAppContainer.isFileUploadTypeForced && <p>forced</p>}
       </div>
 
       {fileUploadType === 'aws' && <AwsSetting />}

src/client/js/services/AdminAppContainer.js

@@ -36,6 +36,7 @@ export default class AdminAppContainer extends Container {
       sesSecretAccessKey: '',
 
       fileUploadType: '',
+      envFileUploadType: '',
 
       gcsApiKeyJsonPath: '',
       envGcsApiKeyJsonPath: '',
@@ -88,6 +89,8 @@ export default class AdminAppContainer extends Container {
       sesSecretAccessKey: appSettingsParams.sesSecretAccessKey,
 
       fileUploadType: appSettingsParams.fileUploadType,
+      envFileUploadType: appSettingsParams.envFileUploadType,
+
       s3Region: appSettingsParams.s3Region,
       s3CustomEndpoint: appSettingsParams.s3CustomEndpoint,
       s3Bucket: appSettingsParams.s3Bucket,
@@ -103,6 +106,14 @@ export default class AdminAppContainer extends Container {
     });
   }
 
+  /**
+   * get isFileUploadTypeForced
+   * @return {bool} isWikiModeForced
+   */
+  get isFileUploadTypeForced() {
+    return this.state.envFileUploadType === 'aws' || this.state.envFileUploadType === 'gcs';
+  }
+
   /**
    * Change title
    */

src/server/routes/apiv3/app-settings.js

@@ -225,6 +225,8 @@ module.exports = (crowi) => {
       sesSecretAccessKey: crowi.configManager.getConfig('crowi', 'mail:sesSecretAccessKey'),
 
       fileUploadType: crowi.configManager.getConfig('crowi', 'app:fileUploadType'),
+      envFileUploadType: crowi.configManager.getConfigFromEnvVars('crowi', 'app:fileUploadType'),
+
       s3Region: crowi.configManager.getConfig('crowi', 'aws:s3Region'),
       s3CustomEndpoint: crowi.configManager.getConfig('crowi', 'aws:s3CustomEndpoint'),
       s3Bucket: crowi.configManager.getConfig('crowi', 'aws:s3Bucket'),

src/server/service/config-loader.js

@@ -23,12 +23,12 @@ const TYPES = {
  *  So, parameters of these are under consideration.
  */
 const ENV_VAR_NAME_TO_CONFIG_INFO = {
-  // FILE_UPLOAD: {
-  //   ns:      ,
-  //   key:     ,
-  //   type:    ,
-  //   default:
-  // },
+  FILE_UPLOAD: {
+    ns:      'crowi',
+    key:     'app:fileUploadType',
+    type:    TYPES.STRING,
+    default: null,
+  },
   // HACKMD_URI: {
   //   ns:      ,
   //   key:     ,