Remove checks for protocol before removing port

Thor77 · Thor77 · commit 87ba625d46f5 · 2018-12-12T12:47:07.000+01:00
Signed-off-by: Thor77 &lt;thor77@thor77.org&gt;
diff --git a/lib/web/imageRouter/minio.js b/lib/web/imageRouter/minio.js
@@ -40,7 +40,7 @@ exports.uploadImage = function (imagePath, callback) {
         callback(new Error(err), null)
         return
       }
-      let hidePort = (protocol === 'http' && config.minio.port === 80) || (protocol === 'https' && config.minio.port === 443)
+      let hidePort = [80, 443].includes(config.minio.port)
       let urlPort = hidePort ? '' : `:${config.minio.port}`
       callback(null, `${protocol}://${config.minio.endPoint}${urlPort}/${config.s3bucket}/${key}`)
     })

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ exports.uploadImage = function (imagePath, callback) {`
`40`	`40`	`callback(new Error(err), null)`
`41`	`41`	`return`
`42`	`42`	`}`
`43`		`- let hidePort = (protocol === 'http' && config.minio.port === 80) \|\| (protocol === 'https' && config.minio.port === 443)`
	`43`	`+ let hidePort = [80, 443].includes(config.minio.port)`
`44`	`44`	let urlPort = hidePort ? '' : `:${config.minio.port}`
`45`	`45`	callback(null, `${protocol}://${config.minio.endPoint}${urlPort}/${config.s3bucket}/${key}`)
`46`	`46`	`})`