Commit Graph

4632 Commits

Author SHA1 Message Date
Eneko Lakasta
5ad1e1b645 merge master 2018-03-12 11:52:38 +01:00
Eneko Lakasta
f9cbb3aac8 use assert.equal instead of assert.ok 2018-03-07 10:51:17 +01:00
Eneko Lakasta
0185cdf785 please jshint 2018-03-06 15:34:29 +01:00
Eneko Lakasta
8d22ca66ba fix tests 2018-03-06 15:26:35 +01:00
Eneko Lakasta
b0eacb2a79 add vary header to honor authorization header when caching 2018-03-06 12:46:38 +01:00
Daniel
39bd6694f2
Merge pull request #883 from CartoDB/fix-named-map-format
Do not force format for default named tiles
2018-03-05 11:29:43 +01:00
Daniel García Aubert
5de8c4f9c3 Make explicit that forceFormat is optional 2018-03-05 11:19:17 +01:00
Daniel García Aubert
f03d98cd0d Going green: fix test 2018-03-02 18:37:13 +01:00
Daniel García Aubert
6331bebb30 Going green: be able to request defaul named tiles in vector format 2018-03-02 18:25:23 +01:00
Daniel García Aubert
fdd4c4aaa0 Going red: get default named map vector tile 2018-03-02 18:22:53 +01:00
Daniel García Aubert
3e0981978a Update NEWS 2018-02-28 17:31:03 +01:00
Eneko Lakasta
35e5170907
Merge pull request #877 from CartoDB/project-auth-api
Auth API
2018-02-28 17:20:21 +01:00
Eneko Lakasta
8eba5dcc01 update cartodb-redis to 0.16.0 2018-02-28 17:07:31 +01:00
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
46587e3cf1
Merge pull request #874 from CartoDB/project-auth-api-fallback
add fallback for using metadata fallback
2018-02-19 18:55:24 +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
Daniel García Aubert
47ccb7ded8 Point to main development branch of cartodb-redis 2018-02-19 17:57:46 +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
5823859b2a update package.json to use the same branch form carto redis 2018-02-16 12:00:05 +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
e84d88b7a3 remove test 2018-02-15 17:53:15 +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
11aa4d12bd add tests for getting api key token from requests 2018-02-15 15:27:41 +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
140441b777 fix test 2018-02-15 12:53:01 +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
Raul Marin
6b0ab45e63 Update Windshaft to 4.5.3 2018-02-13 12:09:59 +01:00
Rafa de la Torre
0b475ab5e2 Stub next version 2018-02-13 09:07:48 +01:00
Rafa de la Torre
97972ac73f Update NEWS.md with v5.3.1 2018-02-13 09:05:06 +01:00
Rafa de la Torre
c3b38b2f60
Merge pull request #865 from CartoDB/perf-boost-agg-dataview
Improve the speed of the aggregation dataview
2018-02-13 09:04:00 +01:00
Rafa de la Torre
b4e06ec1ac Update NEWS.md and stub version 2018-02-12 19:35:34 +01:00
Rafa de la Torre
d0a8bd428f Merge remote-tracking branch 'origin/master' into perf-boost-agg-dataview 2018-02-12 19:33:35 +01:00
Rafa de la Torre
251fe96509 Cosmetic fix, as suggested in PR 2018-02-12 19:24:53 +01:00
Eneko Lakasta
32986e3ebd Merge branch 'master' into project-auth-api 2018-02-12 12:25:46 +01:00
Eneko Lakasta
f106f27df4 Merge branch 'master' into project-auth-api 2018-02-12 12:21:09 +01:00
Raul Marin
3539b658fb Update Windshaft to 4.5.2 2018-02-12 12:19:36 +01:00
Javier Goizueta
abf33a1c68 Release 5.3.0 2018-02-12 12:03:02 +01:00
Javier Goizueta
fc6790ea1e
Merge pull request #866 from CartoDB/update-camshaft-to-0.61.2
Update camshaft to 0.61.2
2018-02-12 11:56:31 +01:00