Browse Source

Use imported configManager instead of from crowi

arvid-e 8 months ago
parent
commit
550207cb1a

+ 4 - 5
apps/app/src/server/routes/apiv3/content-disposition-settings.ts

@@ -73,7 +73,7 @@ module.exports = (crowi) => {
   router.get('/', loginRequiredStrictly, adminRequired, async(req, res) => {
     try {
 
-      const mimeTypeDefaults = crowi.configManager.getConfig('attachments:contentDisposition:mimeTypeDefaults');
+      const mimeTypeDefaults = configManager.getConfig('attachments:contentDisposition:mimeTypeDefaults');
       const contentDispositionSettings: Record<string, 'inline' | 'attachment'> = mimeTypeDefaults;
 
       return res.apiv3({ contentDispositionSettings });
@@ -135,8 +135,7 @@ module.exports = (crowi) => {
       const { disposition } = req.body;
 
       try {
-        const currentMimeTypeDefaults = crowi.configManager.getConfig('attachments:contentDisposition:mimeTypeDefaults') as Record<string, 'inline'
-          | 'attachment'>;
+        const currentMimeTypeDefaults = configManager.getConfig('attachments:contentDisposition:mimeTypeDefaults');
 
         const newDisposition: 'inline' | 'attachment' = disposition;
 
@@ -145,8 +144,8 @@ module.exports = (crowi) => {
           [mimeType]: newDisposition,
         };
 
-        await crowi.configManager.updateConfigs({ 'attachments:contentDisposition:mimeTypeDefaults': updatedMimeTypeDefaults });
-        const updatedDispositionFromDb = crowi.configManager.getConfig('attachments:contentDisposition:mimeTypeDefaults')[mimeType];
+        await configManager.updateConfigs({ 'attachments:contentDisposition:mimeTypeDefaults': updatedMimeTypeDefaults });
+        const updatedDispositionFromDb = configManager.getConfig('attachments:contentDisposition:mimeTypeDefaults')[mimeType];
 
         const parameters = {
           action: SupportedAction.ACTION_ADMIN_ATTACHMENT_DISPOSITION_UPDATE,

+ 2 - 2
apps/app/src/server/routes/attachment/get.ts

@@ -108,7 +108,7 @@ const respondForRedirectMode = async(res: Response, fileUploadService: FileUploa
   }
 };
 
-const respondForRelayMode = async(crowi: Crowi, res: Response, fileUploadService: FileUploader,
+const respondForRelayMode = async(res: Response, fileUploadService: FileUploader,
     attachment: IAttachmentDocument, opts?: RespondOptions): Promise<void> => {
   // apply content-* headers before response
   const isDownload = opts?.download ?? false;
@@ -150,7 +150,7 @@ export const getActionFactory = (crowi: Crowi, attachment: IAttachmentDocument)
         respondForRedirectMode(res, fileUploadService, attachment, opts);
         return;
       case ResponseMode.RELAY:
-        respondForRelayMode(crowi, res, fileUploadService, attachment, opts);
+        respondForRelayMode(res, fileUploadService, attachment, opts);
         return;
     }
   };