X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fservers.ts;h=ebfa03e6ca02ccc0747d93d4dfe0988140299be9;hb=0c691a182c7aeaf0d0e6f7f71d46d6f558e2843b;hp=488f9c36848dab2c6c97925a7da525032ecacfd8;hpb=d4f1e94c89336255537b0b82913591f00e716201;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/servers.ts b/server/middlewares/servers.ts
index 488f9c368..ebfa03e6c 100644
--- a/server/middlewares/servers.ts
+++ b/server/middlewares/servers.ts
@@ -1,7 +1,6 @@
-import 'express-validator'
-import * as express from 'express'
-
-import { REMOTE_SCHEME } from '../initializers'
+import express from 'express'
+import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
+import { getHostWithPort } from '../helpers/express-utils'
 
 function setBodyHostsPort (req: express.Request, res: express.Response, next: express.NextFunction) {
   if (!req.body.hosts) return next()
@@ -11,7 +10,10 @@ function setBodyHostsPort (req: express.Request, res: express.Response, next: ex
 
     // Problem with the url parsing?
     if (hostWithPort === null) {
-      return res.sendStatus(500)
+      return res.fail({
+        status: HttpStatusCode.INTERNAL_SERVER_ERROR_500,
+        message: 'Could not parse hosts'
+      })
     }
 
     req.body.hosts[i] = hostWithPort
@@ -25,18 +27,3 @@ function setBodyHostsPort (req: express.Request, res: express.Response, next: ex
 export {
   setBodyHostsPort
 }
-
-// ---------------------------------------------------------------------------
-
-function getHostWithPort (host: string) {
-  const splitted = host.split(':')
-
-  // The port was not specified
-  if (splitted.length === 1) {
-    if (REMOTE_SCHEME.HTTP === 'https') return host + ':443'
-
-    return host + ':80'
-  }
-
-  return host
-}