itizawa 5 лет назад
Родитель
Сommit
86e44e46ef

+ 4 - 0
src/client/js/services/AdminAppContainer.js

@@ -86,6 +86,8 @@ export default class AdminAppContainer extends Container {
       smtpPassword: appSettingsParams.smtpPassword,
       sesAccessKeyId: appSettingsParams.sesAccessKeyId,
       sesSecretAccessKey: appSettingsParams.sesSecretAccessKey,
+
+      fileUploadType: appSettingsParams.fileUploadType,
       s3Region: appSettingsParams.s3Region,
       s3CustomEndpoint: appSettingsParams.s3CustomEndpoint,
       s3Bucket: appSettingsParams.s3Bucket,
@@ -353,6 +355,7 @@ export default class AdminAppContainer extends Container {
    */
   async updateAwsSettingHandler() {
     const response = await this.appContainer.apiv3.put('/app-settings/aws-setting', {
+      fileUploadType: this.state.fileUploadType,
       s3Region: this.state.s3Region,
       s3CustomEndpoint: this.state.s3CustomEndpoint,
       s3Bucket: this.state.s3Bucket,
@@ -370,6 +373,7 @@ export default class AdminAppContainer extends Container {
    */
   async updateGcpSettingHandler() {
     const response = await this.appContainer.apiv3.put('/app-settings/gcp-setting', {
+      fileUploadType: this.state.fileUploadType,
       gcsApiKeyJsonPath: this.state.gcsApiKeyJsonPath,
       gcsBucket: this.state.gcsBucket,
       gcsUploadNamespace: this.state.gcsUploadNamespace,

+ 3 - 0
src/server/routes/apiv3/app-settings.js

@@ -224,6 +224,7 @@ module.exports = (crowi) => {
       sesAccessKeyId: crowi.configManager.getConfig('crowi', 'mail:sesAccessKeyId'),
       sesSecretAccessKey: crowi.configManager.getConfig('crowi', 'mail:sesSecretAccessKey'),
 
+      fileUploadType: crowi.configManager.getConfig('crowi', 'app:fileUploadType'),
       s3Region: crowi.configManager.getConfig('crowi', 'aws:s3Region'),
       s3CustomEndpoint: crowi.configManager.getConfig('crowi', 'aws:s3CustomEndpoint'),
       s3Bucket: crowi.configManager.getConfig('crowi', 'aws:s3Bucket'),
@@ -568,6 +569,7 @@ module.exports = (crowi) => {
    */
   router.put('/aws-setting', loginRequiredStrictly, adminRequired, csrf, validator.awsSetting, apiV3FormValidator, async(req, res) => {
     const requestAwsSettingParams = {
+      'app:fileUploadType': req.body.fileUploadType,
       'aws:s3Region': req.body.s3Region,
       'aws:s3CustomEndpoint': req.body.s3CustomEndpoint,
       'aws:s3Bucket': req.body.s3Bucket,
@@ -622,6 +624,7 @@ module.exports = (crowi) => {
    */
   router.put('/gcp-setting', loginRequiredStrictly, adminRequired, csrf, validator.gcpSetting, apiV3FormValidator, async(req, res) => {
     const requestGcpSettingParams = {
+      'app:fileUploadType': req.body.fileUploadType,
       'gcs:apiKeyJsonPath': req.body.gcsApiKeyJsonPath,
       'gcs:bucket': req.body.gcsBucket,
       'gcs:uploadNamespace': req.body.gcsUploadNamespace,