diff --git a/src/serve_style.js b/src/serve_style.js index 5f196a0..b4f8b32 100644 --- a/src/serve_style.js +++ b/src/serve_style.js @@ -85,6 +85,8 @@ module.exports = function (options, repo, params, id, reportTiles, reportFont) { app.get('/' + id + '/style.json', function (req, res, next) { var fixUrl = function (url, opt_nokey, opt_nostyle) { + console.log("URL:", url); + console.log("current options:", options); if (!url || (typeof url !== 'string') || (url.indexOf('local://') !== 0 && !isWhitelistedUrl(url))) { return url; } @@ -97,18 +99,33 @@ module.exports = function (options, repo, params, id, reportTiles, reportFont) { queryParams[options.auth.keyName] = req.query[options.auth.keyName]; } + console.log("params:", queryParams); if (url.indexOf('local://') === 0) { var query = querystring.stringify(queryParams); if (query.length) { query = '?' + query; } + + console.log(url.replace( + 'local://', req.protocol + '://' + req.headers.host + '/') + query); + return url.replace( 'local://', req.protocol + '://' + req.headers.host + '/') + query; } else { // whitelisted url. might have existing parameters var parsedUrl = nodeUrl.parse(url); + console.log("parsed url:", parsedUrl); var parsedQS = querystring.parse(url.query); + + console.log("parsedQS:", parsedQS); var newParams = Object.assign(parsedQS, queryParams); + + console.log("newParams:", newParams); parsedUrl.search = querystring.stringify(parsedQS); + + console.log("new parsed url:", parsedUrl); + + console.log(url.format(parsedUrl)); + return url.format(parsedUrl); } }; diff --git a/src/server.js b/src/server.js index 96731c8..d067263 100644 --- a/src/server.js +++ b/src/server.js @@ -71,6 +71,8 @@ function start(opts) { options.auth.keyName = options.auth.keyName || 'key'; options.auth.keyDomains = options.auth.keyDomains || []; + console.log("options:", options); + var paths = options.paths || {}; options.paths = paths; paths.root = path.resolve(