Daniel García Aubert
5c2248d419
Merge branch 'master' into project-auth-api
2018-02-28 14:43:12 +01:00
Daniel García Aubert
102b11b1b5
Follow middleware naming convention
2018-02-28 13:10:46 +01:00
Eneko Lakasta
26df09b13f
require debug at the top of file
2018-02-28 11:42:44 +01:00
Eneko Lakasta
8867cdbc02
use anonymous function instead of arrow function in middleware export to don't bind this
2018-02-26 15:57:42 +01:00
Eneko Lakasta
521b441da5
default apikey is returned by metadata module if no apikey found, remove this code because is never going to be run
2018-02-20 12:53:33 +01:00
Eneko Lakasta
59ca00b33b
move apikey credentials getter to middleware file
2018-02-20 12:31:36 +01:00
Daniel García Aubert
7c7d606aa7
Remove trailing spaces
2018-02-19 19:05:13 +01:00
Daniel García Aubert
603ef4044c
Reduce cyclomatic complexity
2018-02-19 18:48:02 +01:00
Daniel García Aubert
2e3abfb2cd
Catch "name not found" errors from metadata backend and set http code status 404
2018-02-19 18:28:58 +01:00
Eneko Lakasta
7e14247ea9
remove cause of unreachable code/dead code. Not necessary because carto redis assures at least the default api key
2018-02-19 17:06:59 +01:00
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
Rafa de la Torre
251fe96509
Cosmetic fix, as suggested in PR
2018-02-12 19:24:53 +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
Rafa de la Torre
065f56e161
Improve the speed of the aggregation dataview
...
Improve the performance of the aggregation dataview.
Instead of using a CTE (WITH) for filtered_source, which is only used in
one place to calculate ranks, inject it as a subquery.
This way the planner has a chance to ignore uneeded columns as well as
to parallelize the exectution of the window function (WindowAgg in the
query plan).
That is the part that takes most of the time of the query.
The improvement is about 20-40% in speed on PG10 with 4 cores.
2018-02-07 18:10:13 +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
