rename file-uploader-switch and adjust methods for init uploader

src/server/crowi/index.js

@@ -105,6 +105,7 @@ Crowi.prototype.init = async function() {
     this.setupSlack(),
     this.setupCsrf(),
     this.setUpFileUpload(),
+    this.setUpFileUploaderSwitchService(),
     this.setupAttachmentService(),
     this.setUpAcl(),
     this.setUpCustomize(),
@@ -548,14 +549,19 @@ Crowi.prototype.setUpApp = async function() {
  */
 Crowi.prototype.setUpFileUpload = async function(isForceUpdate = false) {
   if (this.fileUploadService == null || isForceUpdate) {
-    this.fileUploadService = require('../service/file-uploader')(this, isForceUpdate);
+    this.fileUploadService = require('../service/file-uploader')(this);
   }
+};
 
-  const FileUploadMessageService = require('../service/file-uploader/s2sMessage');
-  this.fileUploadMessageService = new FileUploadMessageService(this);
+/**
+ * setup FileUploaderSwitchService
+ */
+Crowi.prototype.setUpFileUploaderSwitchService = async function() {
+  const FileUploaderSwitchService = require('../service/file-uploader-switch');
+  this.fileUploaderSwitchService = new FileUploaderSwitchService(this);
   // add as a message handler
   if (this.s2sMessagingService != null) {
-    this.s2sMessagingService.addMessageHandler(this.fileUploadMessageService);
+    this.s2sMessagingService.addMessageHandler(this.fileUploaderSwitchService);
   }
 };
 

src/server/service/file-uploader/s2sMessage.js → src/server/service/file-uploader-switch.js

@@ -1,9 +1,9 @@
 const logger = require('@alias/logger')('growi:service:FileUploader');
 
-const S2sMessage = require('../../models/vo/s2s-message');
-const S2sMessageHandlable = require('../s2s-messaging/handlable');
+const S2sMessage = require('../models/vo/s2s-message');
+const S2sMessageHandlable = require('./s2s-messaging/handlable');
 
-class FileUploaderS2sMessageHandle extends S2sMessageHandlable {
+class fileUploaderSwitch extends S2sMessageHandlable {
 
   constructor(crowi) {
     super();
@@ -40,7 +40,6 @@ class FileUploaderS2sMessageHandle extends S2sMessageHandlable {
     await this.crowi.setUpFileUpload(true);
   }
 
-
   async publishUpdatedMessage() {
     const { s2sMessagingService } = this;
 
@@ -58,4 +57,4 @@ class FileUploaderS2sMessageHandle extends S2sMessageHandlable {
 
 }
 
-module.exports = FileUploaderS2sMessageHandle;
+module.exports = fileUploaderSwitch;

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

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