add an arg to getConfig()

src/server/crowi/index.js

@@ -546,20 +546,17 @@ Crowi.prototype.setUpApp = async function() {
 /**
  * setup FileUploadService
  */
-Crowi.prototype.setUpFileUpload = async function() {
-  if (this.fileUploadService == null) {
-    const FileUploadServiceFactory = require('../service/file-uploader');
-    this.fileUploadServiceFactory = new FileUploadServiceFactory(this);
-    this.fileUploadService = this.fileUploadServiceFactory.getUploader(this);
-
-    this.fileUploadMessageService = require('../service/file-uploader/s2sMessage')(this);
-
-    // add as a message handler
-    if (this.s2sMessagingService != null) {
-      this.s2sMessagingService.addMessageHandler(this.fileUploadService);
-    }
+Crowi.prototype.setUpFileUpload = async function(isForceUpdate) {
+  if (this.fileUploadService == null || isForceUpdate) {
+    this.fileUploadService = require('../service/file-uploader')(this, isForceUpdate);
   }
 
+  const FileUploadMessageService = require('../service/file-uploader/s2sMessage');
+  this.fileUploadMessageService = new FileUploadMessageService(this);
+  // add as a message handler
+  if (this.s2sMessagingService != null) {
+    this.s2sMessagingService.addMessageHandler(this.fileUploadMessageService);
+  }
 };
 
 /**

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

@@ -581,8 +581,7 @@ module.exports = (crowi) => {
 
     try {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestAwsSettingParams, true);
-      crowi.fileUploadServiceFactory.initializeUploader(crowi);
-      crowi.fileUploadService = crowi.fileUploadServiceFactory.getUploader(crowi);
+      await crowi.setUpFileUpload(true);
       crowi.fileUploadMessageService.publishUpdatedMessage();
 
       const awsSettingParams = {
@@ -635,8 +634,7 @@ module.exports = (crowi) => {
 
     try {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestGcpSettingParams, true);
-      crowi.fileUploadServiceFactory.initializeUploader(crowi);
-      crowi.fileUploadService = crowi.fileUploadServiceFactory.getUploader(crowi);
+      await crowi.setUpFileUpload(true);
       crowi.fileUploadMessageService.publishUpdatedMessage();
 
       const gcpSettingParams = {

src/server/service/file-uploader/index.js

@@ -26,8 +26,8 @@ class FileUploadServiceFactory {
     }
   }
 
-  getUploader(crowi) {
-    if (this.uploader == null) {
+  getUploader(crowi, isForceUpdate) {
+    if (this.uploader == null || isForceUpdate) {
       this.initializeUploader(crowi);
     }
     return this.uploader;
@@ -35,4 +35,7 @@ class FileUploadServiceFactory {
 
 }
 
-module.exports = FileUploadServiceFactory;
+module.exports = (crowi, isForceUpdate) => {
+  const factory = new FileUploadServiceFactory(crowi);
+  return factory.getUploader(crowi, isForceUpdate);
+};