From f03ee4b836e303ab6be652bc124f55cc9a5eeef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 26 Feb 2018 11:20:31 +0100 Subject: [PATCH] removing hardcoded user --- lib/cartodb/middleware/rate-limit.js | 11 ++++++----- test/acceptance/rate-limit.test.js | 2 +- test/unit/cartodb/rate-limit.test.js | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/cartodb/middleware/rate-limit.js b/lib/cartodb/middleware/rate-limit.js index a3194731..6016cb47 100644 --- a/lib/cartodb/middleware/rate-limit.js +++ b/lib/cartodb/middleware/rate-limit.js @@ -26,11 +26,12 @@ function rateLimitMiddleware(metadataBackend, endpointGroup = null) { return next(); } - const user = 'cdb'; - // const user = res.locals.user; - if (!endpointGroup) { - endpointGroup = getEndpointGroup(); - } + const user = res.locals.user; + + // TODO: remove comments to move it to global + // if (!endpointGroup) { + // endpointGroup = getEndpointGroup(); + // } if (!endpointGroup || !isRateLimitEnabledByEndpoint(endpointGroup)) { return next(); diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index 08846334..d8f18d63 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -12,7 +12,7 @@ const { let redisClient; let testClient; let keysToDelete = ['user:localhost:mapviews:global']; -const user = 'cdb'; +const user = 'localhost'; const query = ` SELECT diff --git a/test/unit/cartodb/rate-limit.test.js b/test/unit/cartodb/rate-limit.test.js index f6ad874a..b68258eb 100644 --- a/test/unit/cartodb/rate-limit.test.js +++ b/test/unit/cartodb/rate-limit.test.js @@ -13,7 +13,7 @@ const { let redisClient; let rateLimit; -const user = 'cdb'; +const user = 'localhost'; let keysToDelete = []; function setLimit(count, period, burst) {