X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fexpress-utils.ts;h=c299b70f139ef590432574fe57e524c1c55715e9;hb=f645af439669b084dc7ea360751a0e4c1980c81b;hp=ba23557ba9eed73f22e488bf3952a3286a07670f;hpb=30bc55c88b3b7416c2224925e88639694fd32746;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index ba23557ba..c299b70f1 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -1,11 +1,12 @@
 import * as express from 'express'
 import * as multer from 'multer'
+import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
+import { CONFIG } from '../initializers/config'
 import { REMOTE_SCHEME } from '../initializers/constants'
-import { logger } from './logger'
-import { deleteFileAsync, generateRandomString } from './utils'
-import { extname } from 'path'
+import { getLowercaseExtension } from './core-utils'
 import { isArray } from './custom-validators/misc'
-import { CONFIG } from '../initializers/config'
+import { logger } from './logger'
+import { deleteFileAndCatch, generateRandomString } from './utils'
 import { getExtFromMimetype } from './video'
 
 function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
@@ -29,21 +30,19 @@ function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
   return null
 }
 
-function cleanUpReqFiles (req: { files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[] }) {
-  const files = req.files
-
-  if (!files) return
+function cleanUpReqFiles (req: express.Request) {
+  const filesObject = req.files
+  if (!filesObject) return
 
-  if (isArray(files)) {
-    (files as Express.Multer.File[]).forEach(f => deleteFileAsync(f.path))
+  if (isArray(filesObject)) {
+    filesObject.forEach(f => deleteFileAndCatch(f.path))
     return
   }
 
-  for (const key of Object.keys(files)) {
-    const file = files[key]
+  for (const key of Object.keys(filesObject)) {
+    const files = filesObject[key]
 
-    if (isArray(file)) file.forEach(f => deleteFileAsync(f.path))
-    else deleteFileAsync(file.path)
+    files.forEach(f => deleteFileAndCatch(f.path))
   }
 }
 
@@ -61,7 +60,9 @@ function getHostWithPort (host: string) {
 }
 
 function badRequest (req: express.Request, res: express.Response) {
-  return res.type('json').status(400).end()
+  return res.type('json')
+            .status(HttpStatusCode.BAD_REQUEST_400)
+            .end()
 }
 
 function createReqFiles (
@@ -76,7 +77,7 @@ function createReqFiles (
 
     filename: async (req, file, cb) => {
       let extension: string
-      const fileExtension = extname(file.originalname)
+      const fileExtension = getLowercaseExtension(file.originalname)
       const extensionFromMimetype = getExtFromMimetype(mimeTypes, file.mimetype)
 
       // Take the file extension if we don't understand the mime type