rename

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

@@ -9,7 +9,7 @@ import AdminAppContainer from '../../../services/AdminAppContainer';
 
 function AwsSetting(props) {
   const { t, adminAppContainer } = props;
-  const { s3IsEnabledInternalStreamSystem } = adminAppContainer.state;
+  const { s3ReferenceFileWithRelayMode } = adminAppContainer.state;
 
   return (
     <React.Fragment>
@@ -24,26 +24,26 @@ function AwsSetting(props) {
             <button
               className="btn btn-outline-secondary dropdown-toggle"
               type="button"
-              id="ddS3IsEnabledInternalStreamSystem"
+              id="ddS3ReferenceFileWithRelayMode"
               data-toggle="dropdown"
               aria-haspopup="true"
               aria-expanded="true"
             >
-              {s3IsEnabledInternalStreamSystem && t('admin:app_setting.file_delivery_method_relay')}
-              {!s3IsEnabledInternalStreamSystem && t('admin:app_setting.file_delivery_method_redirect')}
+              {s3ReferenceFileWithRelayMode && t('admin:app_setting.file_delivery_method_relay')}
+              {!s3ReferenceFileWithRelayMode && t('admin:app_setting.file_delivery_method_redirect')}
             </button>
-            <div className="dropdown-menu" aria-labelledby="ddS3IsEnabledInternalStreamSystem">
+            <div className="dropdown-menu" aria-labelledby="ddS3ReferenceFileWithRelayMode">
               <button
                 className="dropdown-item"
                 type="button"
-                onClick={() => { adminAppContainer.changeS3IsEnabledInternalStreamSystem(true) }}
+                onClick={() => { adminAppContainer.changeS3ReferenceFileWithRelayMode(true) }}
               >
                 {t('admin:app_setting.file_delivery_method_relay')}
               </button>
               <button
                 className="dropdown-item"
                 type="button"
-                onClick={() => { adminAppContainer.changeS3IsEnabledInternalStreamSystem(false) }}
+                onClick={() => { adminAppContainer.changeS3ReferenceFileWithRelayMode(false) }}
               >
                 { t('admin:app_setting.file_delivery_method_redirect')}
               </button>

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

@@ -11,7 +11,7 @@ import AdminAppContainer from '../../../services/AdminAppContainer';
 
 function GcsSetting(props) {
   const { t, adminAppContainer } = props;
-  const { gcsIsEnabledInternalStreamSystem, gcsUseOnlyEnvVars } = adminAppContainer.state;
+  const { gcsReferenceFileWithRelayMode, gcsUseOnlyEnvVars } = adminAppContainer.state;
 
   return (
     <>
@@ -26,26 +26,26 @@ function GcsSetting(props) {
             <button
               className="btn btn-outline-secondary dropdown-toggle"
               type="button"
-              id="ddGcsIsEnabledInternalStreamSystem"
+              id="ddGcsReferenceFileWithRelayMode"
               data-toggle="dropdown"
               aria-haspopup="true"
               aria-expanded="true"
             >
-              {gcsIsEnabledInternalStreamSystem && t('admin:app_setting.file_delivery_method_relay')}
-              {!gcsIsEnabledInternalStreamSystem && t('admin:app_setting.file_delivery_method_redirect')}
+              {gcsReferenceFileWithRelayMode && t('admin:app_setting.file_delivery_method_relay')}
+              {!gcsReferenceFileWithRelayMode && t('admin:app_setting.file_delivery_method_redirect')}
             </button>
-            <div className="dropdown-menu" aria-labelledby="ddGcsIsEnabledInternalStreamSystem">
+            <div className="dropdown-menu" aria-labelledby="ddGcsReferenceFileWithRelayMode">
               <button
                 className="dropdown-item"
                 type="button"
-                onClick={() => { adminAppContainer.changeGcsIsEnabledInternalStreamSystem(true) }}
+                onClick={() => { adminAppContainer.changeGcsReferenceFileWithRelayMode(true) }}
               >
                 {t('admin:app_setting.file_delivery_method_relay')}
               </button>
               <button
                 className="dropdown-item"
                 type="button"
-                onClick={() => { adminAppContainer.changeGcsIsEnabledInternalStreamSystem(false) }}
+                onClick={() => { adminAppContainer.changeGcsReferenceFileWithRelayMode(false) }}
               >
                 { t('admin:app_setting.file_delivery_method_redirect')}
               </button>

src/client/js/services/AdminAppContainer.js

@@ -46,14 +46,14 @@ export default class AdminAppContainer extends Container {
       envGcsBucket: '',
       gcsUploadNamespace: '',
       envGcsUploadNamespace: '',
-      gcsIsEnabledInternalStreamSystem: false,
+      gcsReferenceFileWithRelayMode: false,
 
       s3Region: '',
       s3CustomEndpoint: '',
       s3Bucket: '',
       s3AccessKeyId: '',
       s3SecretAccessKey: '',
-      s3IsEnabledInternalStreamSystem: false,
+      s3ReferenceFileWithRelayMode: false,
 
       isEnabledPlugins: true,
     };
@@ -101,13 +101,13 @@ export default class AdminAppContainer extends Container {
       s3Bucket: appSettingsParams.s3Bucket,
       s3AccessKeyId: appSettingsParams.s3AccessKeyId,
       s3SecretAccessKey: appSettingsParams.s3SecretAccessKey,
-      s3IsEnabledInternalStreamSystem: appSettingsParams.s3IsEnabledInternalStreamSystem,
+      s3ReferenceFileWithRelayMode: appSettingsParams.s3ReferenceFileWithRelayMode,
 
       gcsUseOnlyEnvVars: appSettingsParams.gcsUseOnlyEnvVars,
       gcsApiKeyJsonPath: appSettingsParams.gcsApiKeyJsonPath,
       gcsBucket: appSettingsParams.gcsBucket,
       gcsUploadNamespace: appSettingsParams.gcsUploadNamespace,
-      gcsIsEnabledInternalStreamSystem: appSettingsParams.gcsIsEnabledInternalStreamSystem,
+      gcsReferenceFileWithRelayMode: appSettingsParams.gcsReferenceFileWithRelayMode,
       envGcsApiKeyJsonPath: appSettingsParams.envGcsApiKeyJsonPath,
       envGcsBucket: appSettingsParams.envGcsBucket,
       envGcsUploadNamespace: appSettingsParams.envGcsUploadNamespace,
@@ -244,10 +244,10 @@ export default class AdminAppContainer extends Container {
   }
 
   /**
-   * Change s3IsEnabledInternalStreamSystem
+   * Change s3ReferenceFileWithRelayMode
    */
-  changeS3IsEnabledInternalStreamSystem(s3IsEnabledInternalStreamSystem) {
-    this.setState({ s3IsEnabledInternalStreamSystem });
+  changeS3ReferenceFileWithRelayMode(s3ReferenceFileWithRelayMode) {
+    this.setState({ s3ReferenceFileWithRelayMode });
   }
 
   /**
@@ -272,10 +272,10 @@ export default class AdminAppContainer extends Container {
   }
 
   /**
-   * Change gcsIsEnabledInternalStreamSystem
+   * Change gcsReferenceFileWithRelayMode
    */
-  changeGcsIsEnabledInternalStreamSystem(gcsIsEnabledInternalStreamSystem) {
-    this.setState({ gcsIsEnabledInternalStreamSystem });
+  changeGcsReferenceFileWithRelayMode(gcsReferenceFileWithRelayMode) {
+    this.setState({ gcsReferenceFileWithRelayMode });
   }
 
   /**
@@ -386,7 +386,7 @@ export default class AdminAppContainer extends Container {
       requestParams.gcsApiKeyJsonPath = this.state.gcsApiKeyJsonPath;
       requestParams.gcsBucket = this.state.gcsBucket;
       requestParams.gcsUploadNamespace = this.state.gcsUploadNamespace;
-      requestParams.gcsIsEnabledInternalStreamSystem = this.state.gcsIsEnabledInternalStreamSystem;
+      requestParams.gcsReferenceFileWithRelayMode = this.state.gcsReferenceFileWithRelayMode;
     }
 
     if (fileUploadType === 'aws') {
@@ -395,7 +395,7 @@ export default class AdminAppContainer extends Container {
       requestParams.s3Bucket = this.state.s3Bucket;
       requestParams.s3AccessKeyId = this.state.s3AccessKeyId;
       requestParams.s3SecretAccessKey = this.state.s3SecretAccessKey;
-      requestParams.s3IsEnabledInternalStreamSystem = this.state.s3IsEnabledInternalStreamSystem;
+      requestParams.s3ReferenceFileWithRelayMode = this.state.s3ReferenceFileWithRelayMode;
     }
 
     const response = await this.appContainer.apiv3.put('/app-settings/file-upload-setting', requestParams);

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

@@ -108,7 +108,7 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *          s3SecretAccessKey:
  *            type: string
  *            description: secret key for authentification of AWS
- *          s3IsEnabledInternalStreamSystem:
+ *          s3ReferenceFileWithRelayMode:
  *            type: boolean
  *            description: is enable internal stream system for s3 file request
  *          gcsApiKeyJsonPath:
@@ -120,7 +120,7 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *          gcsUploadNamespace:
  *            type: string
  *            description: name space of gcs
- *          gcsIsEnabledInternalStreamSystem:
+ *          gcsReferenceFileWithRelayMode:
  *            type: boolean
  *            description: is enable internal stream system for gcs file request
  *          envGcsApiKeyJsonPath:
@@ -177,7 +177,7 @@ module.exports = (crowi) => {
       body('gcsApiKeyJsonPath').trim(),
       body('gcsBucket').trim(),
       body('gcsUploadNamespace').trim(),
-      body('gcsIsEnabledInternalStreamSystem').if(value => value != null).isBoolean(),
+      body('gcsReferenceFileWithRelayMode').if(value => value != null).isBoolean(),
       body('s3Region').trim().if(value => value !== '').matches(/^[a-z]+-[a-z]+-\d+$/)
         .withMessage((value, { req }) => req.t('validation.aws_region')),
       body('s3CustomEndpoint').trim().if(value => value !== '').matches(/^(https?:\/\/[^/]+|)$/)
@@ -185,7 +185,7 @@ module.exports = (crowi) => {
       body('s3Bucket').trim(),
       body('s3AccessKeyId').trim().if(value => value !== '').matches(/^[\da-zA-Z]+$/),
       body('s3SecretAccessKey').trim(),
-      body('s3IsEnabledInternalStreamSystem').if(value => value != null).isBoolean(),
+      body('s3ReferenceFileWithRelayMode').if(value => value != null).isBoolean(),
     ],
     pluginSetting: [
       body('isEnabledPlugins').isBoolean(),
@@ -240,13 +240,13 @@ module.exports = (crowi) => {
       s3Bucket: crowi.configManager.getConfig('crowi', 'aws:s3Bucket'),
       s3AccessKeyId: crowi.configManager.getConfig('crowi', 'aws:s3AccessKeyId'),
       s3SecretAccessKey: crowi.configManager.getConfig('crowi', 'aws:s3SecretAccessKey'),
-      s3IsEnabledInternalStreamSystem: crowi.configManager.getConfig('crowi', 'aws:isEnabledInternalStreamSystem'),
+      s3ReferenceFileWithRelayMode: crowi.configManager.getConfig('crowi', 'aws:isEnabledInternalStreamSystem'),
 
       gcsUseOnlyEnvVars: crowi.configManager.getConfig('crowi', 'gcs:useOnlyEnvVarsForSomeOptions'),
       gcsApiKeyJsonPath: crowi.configManager.getConfig('crowi', 'gcs:apiKeyJsonPath'),
       gcsBucket: crowi.configManager.getConfig('crowi', 'gcs:bucket'),
       gcsUploadNamespace: crowi.configManager.getConfig('crowi', 'gcs:uploadNamespace'),
-      gcsIsEnabledInternalStreamSystem: crowi.configManager.getConfig('crowi', 'gcs:isEnabledInternalStreamSystem'),
+      gcsReferenceFileWithRelayMode: crowi.configManager.getConfig('crowi', 'gcs:isEnabledInternalStreamSystem'),
 
       envGcsApiKeyJsonPath: crowi.configManager.getConfigFromEnvVars('crowi', 'gcs:apiKeyJsonPath'),
       envGcsBucket: crowi.configManager.getConfigFromEnvVars('crowi', 'gcs:bucket'),
@@ -593,7 +593,7 @@ module.exports = (crowi) => {
       requestParams['gcs:apiKeyJsonPath'] = req.body.gcsApiKeyJsonPath;
       requestParams['gcs:bucket'] = req.body.gcsBucket;
       requestParams['gcs:uploadNamespace'] = req.body.gcsUploadNamespace;
-      requestParams['gcs:isEnabledInternalStreamSystem'] = req.body.gcsIsEnabledInternalStreamSystem;
+      requestParams['gcs:isEnabledInternalStreamSystem'] = req.body.gcsReferenceFileWithRelayMode;
     }
 
     if (fileUploadType === 'aws') {
@@ -602,7 +602,7 @@ module.exports = (crowi) => {
       requestParams['aws:s3Bucket'] = req.body.s3Bucket;
       requestParams['aws:s3AccessKeyId'] = req.body.s3AccessKeyId;
       requestParams['aws:s3SecretAccessKey'] = req.body.s3SecretAccessKey;
-      requestParams['aws:isEnabledInternalStreamSystem'] = req.body.s3IsEnabledInternalStreamSystem;
+      requestParams['aws:isEnabledInternalStreamSystem'] = req.body.s3ReferenceFileWithRelayMode;
     }
 
     try {
@@ -618,7 +618,7 @@ module.exports = (crowi) => {
         responseParams.gcsApiKeyJsonPath = crowi.configManager.getConfig('crowi', 'gcs:apiKeyJsonPath');
         responseParams.gcsBucket = crowi.configManager.getConfig('crowi', 'gcs:bucket');
         responseParams.gcsUploadNamespace = crowi.configManager.getConfig('crowi', 'gcs:uploadNamespace');
-        responseParams.gcsIsEnabledInternalStreamSystem = crowi.configManager.getConfig('crowi', 'gcs:isEnabledInternalStreamSystem');
+        responseParams.gcsReferenceFileWithRelayMode = crowi.configManager.getConfig('crowi', 'gcs:isEnabledInternalStreamSystem');
       }
 
       if (fileUploadType === 'aws') {
@@ -627,7 +627,7 @@ module.exports = (crowi) => {
         responseParams.s3Bucket = crowi.configManager.getConfig('crowi', 'aws:s3Bucket');
         responseParams.s3AccessKeyId = crowi.configManager.getConfig('crowi', 'aws:s3AccessKeyId');
         responseParams.s3SecretAccessKey = crowi.configManager.getConfig('crowi', 'aws:s3SecretAccessKey');
-        responseParams.s3IsEnabledInternalStreamSystem = crowi.configManager.getConfig('crowi', 'aws:isEnabledInternalStreamSystem');
+        responseParams.s3ReferenceFileWithRelayMode = crowi.configManager.getConfig('crowi', 'aws:isEnabledInternalStreamSystem');
       }
 
       return res.apiv3({ responseParams });