Merge branch 'alpha' into pr/9362

Author: mtrezza

package-lock.json

@@ -45,7 +45,7 @@
     "ldapjs": "3.0.7",
     "lodash": "4.17.21",
     "lru-cache": "10.4.0",
-    "mime": "3.0.0",
+    "mime": "4.0.4",
     "mongodb": "6.10.0",
     "mustache": "4.2.0",
     "otpauth": "9.3.4",

package.json

@@ -3,7 +3,6 @@ import { randomHexString } from '../cryptoUtils';
 import AdaptableController from './AdaptableController';
 import { validateFilename, FilesAdapter } from '../Adapters/Files/FilesAdapter';
 import path from 'path';
-import mime from 'mime';
 const Parse = require('parse').Parse;
 
 const legacyFilesRegex = new RegExp(
@@ -19,7 +18,7 @@ export class FilesController extends AdaptableController {
     const extname = path.extname(filename);
 
     const hasExtension = extname.length > 0;
-
+    const mime = (await import('mime')).default
     if (!hasExtension && contentType && mime.getExtension(contentType)) {
       filename = filename + '.' + mime.getExtension(contentType);
     } else if (hasExtension && !contentType) {

src/Controllers/FilesController.js

@@ -1,6 +1,5 @@
 import { GraphQLNonNull } from 'graphql';
 import { request } from 'http';
-import { getExtension } from 'mime';
 import { mutationWithClientMutationId } from 'graphql-relay';
 import Parse from 'parse/node';
 import * as defaultGraphQLTypes from './defaultGraphQLTypes';
@@ -17,8 +16,9 @@ const handleUpload = async (upload, config) => {
   delete headers['host'];
   delete headers['content-length'];
   const stream = createReadStream();
+  const mime = (await import('mime')).default;
   try {
-    const ext = getExtension(mimetype);
+    const ext = mime.getExtension(mimetype);
     const fullFileName = filename.endsWith(`.${ext}`) ? filename : `${filename}.${ext}`;
     const serverUrl = new URL(config.serverURL);
     const fileInfo = await new Promise((resolve, reject) => {

src/GraphQL/loaders/filesMutations.js

@@ -3,7 +3,6 @@ import BodyParser from 'body-parser';
 import * as Middlewares from '../middlewares';
 import Parse from 'parse/node';
 import Config from '../Config';
-import mime from 'mime';
 import logger from '../logger';
 const triggers = require('../triggers');
 const http = require('http');
@@ -67,7 +66,7 @@ export class FilesRouter {
     return router;
   }
 
-  getHandler(req, res) {
+  async getHandler(req, res) {
     const config = Config.get(req.params.appId);
     if (!config) {
       res.status(403);
@@ -77,6 +76,7 @@ export class FilesRouter {
     }
     const filesController = config.filesController;
     const filename = req.params.filename;
+    const mime = (await import('mime')).default;
     const contentType = mime.getType(filename);
     if (isFileStreamable(req, filesController)) {
       filesController.handleFileStream(config, filename, req, res, contentType).catch(() => {