imageRouter/filesystem: make callback path-independent

WilliButz · WilliButz · commit 12cd74727065 · 2018-09-26T20:55:15.000+02:00
Images are now properly served when `config.uploadsPath`
differs from its default value.

Signed-off-by: WilliButz &lt;wbutz@cyberfnord.de&gt;
diff --git a/lib/web/imageRouter/filesystem.js b/lib/web/imageRouter/filesystem.js
@@ -1,5 +1,6 @@
 'use strict'
 const url = require('url')
+const path = require('path')
 
 const config = require('../../config')
 const logger = require('../../logger')
@@ -15,5 +16,5 @@ exports.uploadImage = function (imagePath, callback) {
     return
   }
 
-  callback(null, url.resolve(config.serverURL + '/', imagePath.match(/public\/(.+)$/)[1]))
+  callback(null, url.resolve(config.serverURL + '/uploads/', path.basename(imagePath)))
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`'use strict'`
`2`	`2`	`const url = require('url')`
	`3`	`+const path = require('path')`
`3`	`4`
`4`	`5`	`const config = require('../../config')`
`5`	`6`	`const logger = require('../../logger')`
`@@ -15,5 +16,5 @@ exports.uploadImage = function (imagePath, callback) {`
`15`	`16`	`return`
`16`	`17`	`}`
`17`	`18`
`18`		`- callback(null, url.resolve(config.serverURL + '/', imagePath.match(/public\/(.+)$/)[1]))`
	`19`	`+ callback(null, url.resolve(config.serverURL + '/uploads/', path.basename(imagePath)))`
`19`	`20`	`}`