cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow urls like /u/:user/

Browse Source
This commit is contained in:
javi 2015-03-18 15:54:05 +01:00
parent a30ed5ce04
commit c1c6d493b7
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/environments/development.js.example
View File

@ -14,11 +14,11 @@ var config = {
// Base url for the Templated Maps API
// "/api/v1/map/named" is the new API,
// "/tiles/template" is for compatibility with versions up to 1.6.x
,base_url_templated: '(?:/api/v1/map/named|/tiles/template)'
,base_url_templated: '(?:/api/v1/map/named|/tiles/template|/u/:user/api/v1/map/named)'
// Base url for the Detached Maps API
// "maps" is the the new API,
// "tiles/layergroup" is for compatibility with versions up to 1.6.x
,base_url_detached: '(?:/api/v1/map|/tiles/layergroup)'
,base_url_detached: '(?:/api/v1/map|/tiles/layergroup|/u/:user/api/v1/map)'
// Base url for the Inline Maps and Table Maps API
,base_url_legacy: '/tiles/:table'

4
config/environments/production.js.example
View File

@ -14,11 +14,11 @@ var config = {
// Base url for the Templated Maps API
// "/api/v1/map/named" is the new API,
// "/tiles/template" is for compatibility with versions up to 1.6.x
,base_url_templated: '(?:/api/v1/map/named|/tiles/template)'
,base_url_templated: '(?:/api/v1/map/named|/tiles/template|/u/:user/api/v1/map/named)'
// Base url for the Detached Maps API
// "maps" is the the new API,
// "tiles/layergroup" is for compatibility with versions up to 1.6.x
,base_url_detached: '(?:/api/v1/map|/tiles/layergroup)'
,base_url_detached: '(?:/api/v1/map|/tiles/layergroup|/u/:user/api/v1/map)'
// Base url for the Inline Maps and Table Maps API
,base_url_legacy: '/tiles/:table'

4
config/environments/staging.js.example
View File

@ -14,11 +14,11 @@ var config = {
// Base url for the Templated Maps API
// "/api/v1/maps/named" is the new API,
// "/tiles/template" is for compatibility with versions up to 1.6.x
,base_url_templated: '(?:/api/v1/maps/named|/tiles/template)'
,base_url_templated: '(?:/api/v1/map/named|/tiles/template|/u/:user/api/v1/map/named)'
// Base url for the Detached Maps API
// "/api/v1/maps" is the the new API,
// "/tiles/layergroup" is for compatibility with versions up to 1.6.x
,base_url_detached: '(?:/api/v1/maps|/tiles/layergroup)'
,base_url_detached: '(?:/api/v1/map|/tiles/layergroup|/u/:user/api/v1/map)'
// Base url for the Inline Maps and Table Maps API
,base_url_legacy: '/tiles/:table'

3
lib/cartodb/server_options.js
View File

@ -377,6 +377,9 @@ module.exports = function(redisPool) {
me.userByReq = function(req) {
var host = req.headers.host;
if (req.params.user) {
return req.params.user;
}
var mat = host.match(this.re_userFromHost);
if ( ! mat ) {
console.error("ERROR: user pattern '" + this.re_userFromHost + "' does not match hostname '" + host + "'");