From fc420c2c0f123ff372022471e12a78ca8309f5c1 Mon Sep 17 00:00:00 2001
From: Eneko Lakasta <eneko@cartodb.com>
Date: Thu, 15 Feb 2018 15:19:09 +0100
Subject: [PATCH] use for compatibility res.locals.api_key instead of
 res.locals.apikeyToken

---
 lib/cartodb/api/auth_api.js                    | 2 +-
 lib/cartodb/backends/pg_connection.js          | 2 +-
 lib/cartodb/middleware/context/apikey-token.js | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/cartodb/api/auth_api.js b/lib/cartodb/api/auth_api.js
index 22aca1ca..9b24a16e 100644
--- a/lib/cartodb/api/auth_api.js
+++ b/lib/cartodb/api/auth_api.js
@@ -59,7 +59,7 @@ function isValidApiKey(apikey) {
 //        NOTE: authorized is expected to be 0 or 1 (integer)
 //
 AuthApi.prototype.authorizedByAPIKey = function(user, res, callback) {
-    const apikeyToken = res.locals.apikeyToken;
+    const apikeyToken = res.locals.api_key;
 
     if ( ! apikeyToken ) {
         return callback(null, false); // no api key, no authorization...
diff --git a/lib/cartodb/backends/pg_connection.js b/lib/cartodb/backends/pg_connection.js
index 37023c90..b7d81721 100644
--- a/lib/cartodb/backends/pg_connection.js
+++ b/lib/cartodb/backends/pg_connection.js
@@ -31,7 +31,7 @@ PgConnection.prototype.setDBAuth = function(username, params, apikeyType, callba
             return callback();
         });
     } else if (apikeyType === 'regular') {
-        this.metadataBackend.getApikey(username, params.apikeyToken, (err, apikey) => {
+        this.metadataBackend.getApikey(username, params.api_key, (err, apikey) => {
             if (err) {
                 return callback(err);
             }
diff --git a/lib/cartodb/middleware/context/apikey-token.js b/lib/cartodb/middleware/context/apikey-token.js
index f18cf60a..db43d843 100644
--- a/lib/cartodb/middleware/context/apikey-token.js
+++ b/lib/cartodb/middleware/context/apikey-token.js
@@ -3,7 +3,6 @@
 const getApikeyTokenFromRequest = require('../lib/get_api_key_token_from_request');
 
 module.exports = () => function apikeyTokenMiddleware(req, res, next) {
-    res.locals.apikeyToken = getApikeyTokenFromRequest(req);
-
+    res.locals.api_key = getApikeyTokenFromRequest(req);
     return next();
 };