FB

src/server/models/config.js

@@ -185,8 +185,8 @@ module.exports = function(crowi) {
         confidential: crowi.appService.getAppConfidential(),
       },
       upload: {
-        image: crowi.fileUploadService.fileUploader.getIsUploadable(),
-        file: crowi.fileUploadService.fileUploader.getFileUploadEnabled(),
+        image: crowi.fileUploadService.getIsUploadable(),
+        file: crowi.fileUploadService.getFileUploadEnabled(),
       },
       registrationWhiteList: crowi.configManager.getConfig('crowi', 'security:registrationWhiteList'),
       layoutType: crowi.configManager.getConfig('crowi', 'customize:layout'),

src/server/routes/attachment.js

@@ -191,13 +191,13 @@ module.exports = function(crowi, app) {
       return res.sendStatus(304);
     }
 
-    if (fileUploadService.fileUploader.canRespond()) {
-      return fileUploadService.fileUploader.respond(res, attachment);
+    if (fileUploadService.canRespond()) {
+      return fileUploadService.respond(res, attachment);
     }
 
     let fileStream;
     try {
-      fileStream = await fileUploadService.fileUploader.findDeliveryFile(attachment);
+      fileStream = await fileUploadService.findDeliveryFile(attachment);
     }
     catch (e) {
       logger.error(e);
@@ -241,7 +241,7 @@ module.exports = function(crowi, app) {
     // retrieve data from DB to get a completely populated instance
     const attachment = await Attachment.findById(attachmentId);
 
-    await fileUploadService.fileUploader.deleteFile(attachment);
+    await fileUploadService.deleteFile(attachment);
 
     return attachment.remove();
   }
@@ -395,7 +395,7 @@ module.exports = function(crowi, app) {
    */
   api.limit = async function(req, res) {
     const fileSize = Number(req.query.fileSize);
-    return res.json(ApiResponse.success(await fileUploadService.fileUploader.checkLimit(fileSize)));
+    return res.json(ApiResponse.success(await fileUploadService.checkLimit(fileSize)));
   };
 
   /**

src/server/service/attachment.js

@@ -16,7 +16,7 @@ class AttachmentService {
     const { fileUploadService } = this.crowi;
 
     // check limit
-    const res = await fileUploadService.fileUploader.checkLimit(file.size);
+    const res = await fileUploadService.checkLimit(file.size);
     if (!res.isUploadable) {
       throw new Error(res.errorMessage);
     }
@@ -31,7 +31,7 @@ class AttachmentService {
     let attachment;
     try {
       attachment = Attachment.createWithoutSave(pageId, user, fileStream, file.originalname, file.mimetype, file.size);
-      await fileUploadService.fileUploader.uploadFile(fileStream, attachment);
+      await fileUploadService.uploadFile(fileStream, attachment);
       await attachment.save();
     }
     catch (err) {
@@ -48,7 +48,7 @@ class AttachmentService {
     const { fileUploadService } = this.crowi;
 
     const attachment = await Attachment.findById(attachmentId);
-    await fileUploadService.fileUploader.deleteFile(attachment);
+    await fileUploadService.deleteFile(attachment);
 
     return attachment.remove();
   }