2 files changed, 14 insertions, 11 deletions
diff --git a/src/server/ApiManagers/PDFManager.ts b/src/server/ApiManagers/PDFManager.ts
index 2b4212588..e419d3ac4 100644
--- a/src/server/ApiManagers/PDFManager.ts
+++ b/src/server/ApiManagers/PDFManager.ts
@@ -2,8 +2,7 @@ import ApiManager, { Registration } from "./ApiManager";
 import { Method } from "../RouteManager";
 import RouteSubscriber from "../RouteSubscriber";
 import { existsSync, createReadStream, createWriteStream } from "fs";
-const pdfjs = require('pdfjs-dist/es5/build/pdf.js');
-import * as Pdfjs from 'pdfjs-dist';
+import * as Pdfjs from 'pdfjs-dist/legacy/build/pdf';
 import { createCanvas } from "canvas";
 const imageSize = require("probe-image-size");
 import * as express from "express";
@@ -84,7 +83,7 @@ async function CreateThumbnail(coreFilename: string, pageNum: number, res: expre
     });
 }
 
-function dispatchThumbnail(res: express.Response, { width, height }: Pdfjs.PDFPageViewport, thumbnailName: string) {
+function dispatchThumbnail(res: express.Response, { width, height }: Pdfjs.PageViewport, thumbnailName: string) {
     res.send({
         path: clientPathToFile(Directory.pdf_thumbnails, thumbnailName),
         width,
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 597ff1ce0..8da08fe33 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -48,15 +48,19 @@ export default class UploadManager extends ApiManager {
             method: Method.POST,
             subscription: "/uploadFormData",
             secureHandler: async ({ req, res }) => {
-                const form = new formidable.IncomingForm();
-                form.uploadDir = pathToDirectory(Directory.parsed_files);
-                form.keepExtensions = true;
+                const form = new formidable.IncomingForm({
+                    keepExtensions: true,
+                    uploadDir: pathToDirectory(Directory.parsed_files)
+                });
                 return new Promise<void>(resolve => {
                     form.parse(req, async (_err, _fields, files) => {
                         const results: Upload.FileResponse[] = [];
                         for (const key in files) {
-                            const result = await DashUploadUtils.upload(files[key]);
-                            result && !(result.result instanceof Error) && results.push(result);
+                            const f = files[key];
+                            if (!Array.isArray(f)) {
+                                const result = await DashUploadUtils.upload(f);
+                                result && !(result.result instanceof Error) && results.push(result);
+                            }
                         }
                         _success(res, results);
                         resolve();
@@ -140,8 +144,7 @@ export default class UploadManager extends ApiManager {
             subscription: "/uploadDoc",
             secureHandler: ({ req, res }) => {
 
-                const form = new formidable.IncomingForm();
-                form.keepExtensions = true;
+                const form = new formidable.IncomingForm({ keepExtensions: true });
                 // let path = req.body.path;
                 const ids: { [id: string]: string } = {};
                 let remap = true;
@@ -192,7 +195,8 @@ export default class UploadManager extends ApiManager {
                         let id: string = "";
                         try {
                             for (const name in files) {
-                                const path_2 = files[name].path;
+                                const f = files[name];
+                                const path_2 = Array.isArray(f) ? "" : f.path;
                                 const zip = new AdmZip(path_2);
                                 zip.getEntries().forEach((entry: any) => {
                                     if (!entry.entryName.startsWith("files/")) return;