Rename middleware

2018-02-28 19:20:51 +01:00
parent 62deda6470
commit 42deb7abbe
4 changed files with 21 additions and 21 deletions
@@ -10,7 +10,7 @@ var TemplateMaps = require('../../../lib/cartodb/backends/template_maps');
 const cleanUpQueryParamsMiddleware = require('../../../lib/cartodb/middleware/context/clean-up-query-params');
 const authorizeMiddleware = require('../../../lib/cartodb/middleware/context/authorize');
 const dbConnSetupMiddleware = require('../../../lib/cartodb/middleware/context/db-conn-setup');
-const apikeyCredentialsMiddleware = require('../../../lib/cartodb/middleware/context/apikey-credentials');
+const credentialsMiddleware = require('../../../lib/cartodb/middleware/context/credentials');
 const localsMiddleware =  require('../../../lib/cartodb/middleware/context/locals');

 var windshaft = require('windshaft');
@@ -24,7 +24,7 @@ describe('prepare-context', function() {
    let cleanUpQueryParams;
    let dbConnSetup;
    let authorize;
-    let setApikeyCredentials;
+    let setCredentials;

    before(function() {
        var redisPool = new RedisPool(global.environment.redis);
@@ -37,7 +37,7 @@ describe('prepare-context', function() {
        cleanUpQueryParams = cleanUpQueryParamsMiddleware();
        authorize = authorizeMiddleware(authApi);
        dbConnSetup = dbConnSetupMiddleware(pgConnection);
-        setApikeyCredentials = apikeyCredentialsMiddleware();
+        setCredentials = credentialsMiddleware();
    });


@@ -74,7 +74,7 @@ describe('prepare-context', function() {
            done();
        });
    });
-    
+
    it('cleans up request', function(done){
      var req = {headers: { host:'localhost' }, query: {dbuser:'hacker',dbname:'secret'}};
      var res = {};
@@ -106,18 +106,18 @@ describe('prepare-context', function() {
    });

    it('sets also dbuser for authenticated requests', function(done){
-        var req = { 
-            headers: { 
-                host: 'localhost' 
-            }, 
+        var req = {
+            headers: {
+                host: 'localhost'
+            },
            query: {
                api_key: '1234'
            }
        };
-        var res = { 
+        var res = {
            set: function () {},
            locals: {
-                api_key: '1234' 
+                api_key: '1234'
            }
        };

@@ -169,7 +169,7 @@ describe('prepare-context', function() {
            }
        };
        var res = {};
-        
+
        cleanUpQueryParams(prepareRequest(req), prepareResponse(res), function (err) {
            if ( err ) {
                return done(err);
@@ -194,12 +194,12 @@ describe('prepare-context', function() {
                }
            };
            var res = {};
-            setApikeyCredentials(prepareRequest(req), prepareResponse(res), function (err) {
+            setCredentials(prepareRequest(req), prepareResponse(res), function (err) {
                if (err) {
                    return done(err);
                }
                var query = res.locals;
-                
+
                assert.equal('1234', query.api_key);
                done();
            });
@@ -215,7 +215,7 @@ describe('prepare-context', function() {
                }
            };
            var res = {};
-            setApikeyCredentials(prepareRequest(req), prepareResponse(res), function (err) {
+            setCredentials(prepareRequest(req), prepareResponse(res), function (err) {
                if (err) {
                    return done(err);
                }
@@ -234,7 +234,7 @@ describe('prepare-context', function() {
                }
            };
            var res = {};
-            setApikeyCredentials(prepareRequest(req), prepareResponse(res), function (err) {
+            setCredentials(prepareRequest(req), prepareResponse(res), function (err) {
                if (err) {
                    return done(err);
                }