Skip to content

Commit 3a9442a

Browse files
authored
refactor: Upgrade to mime 4.0.4 (#9363)
1 parent 412e724 commit 3a9442a

File tree

5 files changed

+36
-58
lines changed

5 files changed

+36
-58
lines changed

package-lock.json

Lines changed: 30 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"ldapjs": "3.0.7",
4646
"lodash": "4.17.21",
4747
"lru-cache": "10.4.0",
48-
"mime": "3.0.0",
48+
"mime": "4.0.4",
4949
"mongodb": "5.9.0",
5050
"mustache": "4.2.0",
5151
"otpauth": "9.3.4",

src/Controllers/FilesController.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { randomHexString } from '../cryptoUtils';
33
import AdaptableController from './AdaptableController';
44
import { validateFilename, FilesAdapter } from '../Adapters/Files/FilesAdapter';
55
import path from 'path';
6-
import mime from 'mime';
76
const Parse = require('parse').Parse;
87

98
const legacyFilesRegex = new RegExp(
@@ -19,7 +18,7 @@ export class FilesController extends AdaptableController {
1918
const extname = path.extname(filename);
2019

2120
const hasExtension = extname.length > 0;
22-
21+
const mime = (await import('mime')).default
2322
if (!hasExtension && contentType && mime.getExtension(contentType)) {
2423
filename = filename + '.' + mime.getExtension(contentType);
2524
} else if (hasExtension && !contentType) {

src/GraphQL/loaders/filesMutations.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { GraphQLNonNull } from 'graphql';
22
import { request } from 'http';
3-
import { getExtension } from 'mime';
43
import { mutationWithClientMutationId } from 'graphql-relay';
54
import Parse from 'parse/node';
65
import * as defaultGraphQLTypes from './defaultGraphQLTypes';
@@ -17,8 +16,9 @@ const handleUpload = async (upload, config) => {
1716
delete headers['host'];
1817
delete headers['content-length'];
1918
const stream = createReadStream();
19+
const mime = (await import('mime')).default;
2020
try {
21-
const ext = getExtension(mimetype);
21+
const ext = mime.getExtension(mimetype);
2222
const fullFileName = filename.endsWith(`.${ext}`) ? filename : `${filename}.${ext}`;
2323
const serverUrl = new URL(config.serverURL);
2424
const fileInfo = await new Promise((resolve, reject) => {

src/Routers/FilesRouter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import BodyParser from 'body-parser';
33
import * as Middlewares from '../middlewares';
44
import Parse from 'parse/node';
55
import Config from '../Config';
6-
import mime from 'mime';
76
import logger from '../logger';
87
const triggers = require('../triggers');
98
const http = require('http');
@@ -67,7 +66,7 @@ export class FilesRouter {
6766
return router;
6867
}
6968

70-
getHandler(req, res) {
69+
async getHandler(req, res) {
7170
const config = Config.get(req.params.appId);
7271
if (!config) {
7372
res.status(403);
@@ -77,6 +76,7 @@ export class FilesRouter {
7776
}
7877
const filesController = config.filesController;
7978
const filename = req.params.filename;
79+
const mime = (await import('mime')).default;
8080
const contentType = mime.getType(filename);
8181
if (isFileStreamable(req, filesController)) {
8282
filesController.handleFileStream(config, filename, req, res, contentType).catch(() => {

0 commit comments

Comments
 (0)