Eneko Lakasta
|
7b21bd26d0
|
Merge branch 'project-auth-api' into project-auth-api-fallback
|
2018-02-16 11:29:36 +01:00 |
|
Eneko Lakasta
|
4ac224688c
|
in fallback mode, use default api key if api key token doesnt exist
|
2018-02-16 11:20:04 +01:00 |
|
Eneko Lakasta
|
cda2616a8a
|
get and check api key credentials from api key: username and token
|
2018-02-15 17:49:47 +01:00 |
|
Eneko Lakasta
|
18dbeea003
|
get apikey token from request in named maps admin middleware
|
2018-02-15 15:20:52 +01:00 |
|
Eneko Lakasta
|
3e916c6054
|
check if req.query exist before getting req.query.api_key/map_key
|
2018-02-15 15:20:05 +01:00 |
|
Eneko Lakasta
|
fc420c2c0f
|
use for compatibility res.locals.api_key instead of res.locals.apikeyToken
|
2018-02-15 15:19:09 +01:00 |
|
Eneko Lakasta
|
5db0e9c8d8
|
add middleware for apikeyToken
|
2018-02-15 12:50:42 +01:00 |
|
Eneko Lakasta
|
963737d3fb
|
create lib for getting api key token from request
|
2018-02-15 11:36:42 +01:00 |
|
Eneko Lakasta
|
890f0d1ef6
|
add fallback for using metadata fallback
|
2018-02-14 17:31:05 +01:00 |
|
Eneko Lakasta
|
e1a2ee2381
|
control API access grants
|
2018-02-08 13:07:25 +01:00 |
|
Eneko Lakasta
|
b82d26527a
|
remove comment
|
2018-02-08 12:35:44 +01:00 |
|
Eneko Lakasta
|
b0e9df1400
|
add pgConnection.getDatabaseParams
|
2018-02-08 12:04:03 +01:00 |
|
Eneko Lakasta
|
6ebf51ce45
|
let select apikey type in setDBAuth: regular, default, master
|
2018-02-08 11:29:17 +01:00 |
|
Eneko Lakasta
|
41f3606572
|
return unauthorized error when api key not found
|
2018-02-07 19:12:14 +01:00 |
|
Eneko Lakasta
|
ea0542dcb1
|
remove use of step
|
2018-02-07 18:48:59 +01:00 |
|
Eneko Lakasta
|
a4dbc1bac2
|
remove step and check existance of proper api key
|
2018-02-07 18:20:56 +01:00 |
|
Eneko Lakasta
|
95538707c9
|
add parameter asMaster to setDBAuth
|
2018-02-07 17:14:13 +01:00 |
|
Eneko Lakasta
|
4c76a921b1
|
use res.locals instead of req.params
|
2018-02-07 16:02:13 +01:00 |
|
Eneko Lakasta
|
85c1c987af
|
refactor setDBConn to not use step
|
2018-02-07 15:49:32 +01:00 |
|
Eneko Lakasta
|
bde86323fd
|
use master api key in setDBAuth
|
2018-02-07 15:36:24 +01:00 |
|
Eneko Lakasta
|
880e3f388d
|
remove use of _.extend calls
|
2018-02-07 12:46:10 +01:00 |
|
Eneko Lakasta
|
c1535b1a12
|
refactor setDBAuth to not use step
|
2018-02-07 12:40:36 +01:00 |
|
Raul Marin
|
f9fe3ace37
|
Add mapnik metrics option
|
2018-02-06 16:07:22 +01:00 |
|
Javier Goizueta
|
2e7784ddf2
|
Add comment to clafify aggregation resolution limit
|
2018-02-01 10:26:52 +01:00 |
|
Javier Goizueta
|
d88fbbaa87
|
Use camelCase
|
2018-01-31 18:55:28 +01:00 |
|
Javier Goizueta
|
7db0744f67
|
Simplify expression
|
2018-01-31 17:54:40 +01:00 |
|
Javier Goizueta
|
d1fcd797a3
|
Limit the minimum size of the the aggregation grid
Fixes #860
|
2018-01-31 17:46:13 +01:00 |
|
Javier Goizueta
|
27b5420358
|
Merge pull request #856 from CartoDB/841-the_geom_webmercator-type
Check the type of the_geom_webmercator for aggregation
|
2018-01-29 16:13:19 +01:00 |
|
Javier Goizueta
|
7641542e67
|
Check the type of the_geom_webmercator for aggregation
Fixes #841
|
2018-01-29 15:48:35 +01:00 |
|
Eneko Lakasta
|
2bd4c9e814
|
Merge pull request #851 from CartoDB/1259-category-widget-error-group-by-missing
use original column name in group by instead of alias
|
2018-01-29 15:38:07 +01:00 |
|
Eneko Lakasta
|
941ebf7d80
|
Merge branch 'master' into 1259-category-widget-error-group-by-missing
|
2018-01-29 14:51:59 +01:00 |
|
Simon Martín
|
c38bf6ade8
|
Merge branch 'master' into respect-types-aggreagation
|
2018-01-29 14:51:20 +01:00 |
|
Javier Goizueta
|
f644b3a226
|
Add cartodb_id to point-grid aggregation
Fixes #846
|
2018-01-29 12:49:27 +01:00 |
|
Simon Martín
|
8c839e214d
|
changing the value of string
|
2018-01-26 15:44:21 +01:00 |
|
Simon Martín
|
99421b613c
|
moving 'other' outside of the query allowing queries of different types
|
2018-01-26 15:24:21 +01:00 |
|
Simon Martín
|
bc7a556297
|
removing category cast to string in aggregation
|
2018-01-26 12:37:10 +01:00 |
|
Eneko Lakasta
|
220f1d6a73
|
use original column name in group by instead of alias
|
2018-01-18 15:27:54 +01:00 |
|
Daniel García Aubert
|
da32d96607
|
Fix regression: default to all layers if layer filter is not provided
|
2018-01-16 17:57:22 +01:00 |
|
Daniel García Aubert
|
76da828168
|
Use error label as middleware argument
|
2018-01-16 17:55:09 +01:00 |
|
Daniel García Aubert
|
ce4050e3e3
|
Extrac method to get only user params
|
2018-01-15 18:09:54 +01:00 |
|
Daniel García Aubert
|
b82767c60d
|
Pass a copy of res.locals w/o new data boud to named-map-provider-cache
|
2018-01-15 17:40:34 +01:00 |
|
Eneko Lakasta
|
0236935212
|
please jshint
|
2018-01-11 12:22:51 +01:00 |
|
Eneko Lakasta
|
ae48a01e26
|
extract setICUEnvVariable() to it's own module
|
2018-01-11 11:57:11 +01:00 |
|
Daniel
|
fc82ca7490
|
Merge pull request #834 from CartoDB/middlewarify-named-maps-controller
Middlewarify named maps controller
|
2018-01-09 11:40:59 +01:00 |
|
Daniel García Aubert
|
183c8291bc
|
Use arrow functions when it applies
|
2018-01-09 11:20:20 +01:00 |
|
Daniel García Aubert
|
d908ffdbca
|
Don't use arrow functions when there is no needed
|
2018-01-09 11:17:07 +01:00 |
|
Raul Ochoa
|
d5b5ef584d
|
Be explicit about requesting urlTemplate+subdomains format
|
2018-01-03 23:33:59 +00:00 |
|
Raul Ochoa
|
2cda43dc8d
|
Promote https urls over http
|
2018-01-03 22:18:59 +00:00 |
|
Raul Ochoa
|
f7f513a61a
|
Add urlTemplate URLs to metadata
This is useful when using client libraries like leaflet.
|
2018-01-03 20:53:03 +00:00 |
|
Raul Ochoa
|
f297374449
|
Merge pull request #837 from CartoDB/tilejson
Return tilejson in metadata
|
2018-01-03 20:13:44 +01:00 |
|