diff --git a/index.js b/index.js index 31babbf9..4d0e82f7 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,7 @@ const AttributePool = require('ep_etherpad-lite/static/js/AttributePool'); const Changeset = require('ep_etherpad-lite/static/js/Changeset'); const eejs = require('ep_etherpad-lite/node/eejs/'); const settings = require('ep_etherpad-lite/node/utils/Settings'); -const formidable = require('formidable'); +const {Formidable} = require('formidable'); const commentManager = require('./commentManager'); const apiUtils = require('./apiUtils'); const _ = require('underscore'); @@ -226,10 +226,7 @@ exports.expressCreateServer = (hookName, args, callback) => { args.app.post('/p/:pad/:rev?/comments', async (req, res) => { const fields = await new Promise((resolve, reject) => { - (new formidable.IncomingForm()).parse(req, (err, fields) => { - if (err != null) return reject(err); - resolve(fields); - }); + new Formidable().parse(req, (err, fields) => err ? reject(err) : resolve(fields)); }); // check the api key @@ -289,10 +286,7 @@ exports.expressCreateServer = (hookName, args, callback) => { args.app.post('/p/:pad/:rev?/commentReplies', async (req, res) => { const fields = await new Promise((resolve, reject) => { - (new formidable.IncomingForm()).parse(req, (err, fields) => { - if (err != null) return reject(err); - resolve(fields); - }); + new Formidable().parse(req, (err, fields) => err ? reject(err) : resolve(fields)); }); // check the api key diff --git a/package-lock.json b/package-lock.json index eeeb13f7..2ff3fa72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -282,6 +282,11 @@ "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", "dev": true }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -496,6 +501,15 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "dezalgo": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", + "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", + "requires": { + "asap": "^2.0.0", + "wrappy": "1" + } + }, "dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -1125,9 +1139,22 @@ } }, "formidable": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz", - "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz", + "integrity": "sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==", + "requires": { + "dezalgo": "1.0.3", + "hexoid": "1.0.0", + "once": "1.4.0", + "qs": "6.9.3" + }, + "dependencies": { + "qs": { + "version": "6.9.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", + "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" + } + } }, "fs.realpath": { "version": "1.0.0", @@ -1265,6 +1292,11 @@ "has-symbols": "^1.0.2" } }, + "hexoid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", + "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==" + }, "htmlparser2": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", @@ -1708,7 +1740,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } @@ -2074,6 +2105,14 @@ "qs": "^6.9.4", "readable-stream": "^3.6.0", "semver": "^7.3.2" + }, + "dependencies": { + "formidable": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz", + "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==", + "dev": true + } } }, "supports-color": { @@ -2228,8 +2267,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { "version": "7.4.6", diff --git a/package.json b/package.json index b91dfd36..3a378476 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ ], "dependencies": { "cheerio": "^0.22.0", - "formidable": "^1.2.2", + "formidable": "^2.0.1", "underscore": "^1.13.2" }, "devDependencies": {