Merge pull request #106 from apigee/b132970272

Cache no-control for OAuth
apigee · May 17, 2019 · 54488d2 · 54488d2
2 parents 4761b68 + 77530a3
commit 54488d2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/apikeys/index.js b/apikeys/index.js
@@ -66,7 +66,7 @@ module.exports.init = function(config, logger, stats) {
     }
 
     var exchangeApiKeyForToken = function(req, res, next, config, logger, stats, middleware, apiKey) {
-        var cacheControl = req.headers["cache-control"] || 'no-control';
+        var cacheControl = req.headers["cache-control"] || 'no-cache';
         if (cacheKey || (cacheControl && cacheControl.indexOf("no-cache") < 0)) { // caching is allowed
             cache.read(apiKey, function(err, value) {
                 if (value) {
@@ -193,7 +193,7 @@ module.exports.init = function(config, logger, stats) {
             req.headers["x-authorization-claims"] = new Buffer(JSON.stringify(authClaims)).toString("base64");
 
             if (apiKey) {
-                var cacheControl = req.headers["cache-control"];
+                var cacheControl = req.headers["cache-control"] || "no-cache";
                 if (cacheKey || (cacheControl && cacheControl.indexOf("no-cache") < 0)) { // caching is toFixed
                     // default to now (in seconds) + 30m if not set
                     decodedToken.exp = decodedToken.exp || +(((Date.now() / 1000) + 1800).toFixed(0));

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/oauth/index.js b/oauth/index.js
@@ -283,7 +283,7 @@ module.exports.init = function(config, logger, stats) {
             req.headers['x-authorization-claims'] = new Buffer(JSON.stringify(authClaims)).toString('base64');
 
             if (apiKey) {
-                var cacheControl = req.headers['cache-control'];
+                var cacheControl = req.headers['cache-control'] || 'no-cache';
                 if (cacheKey || (!cacheControl || (cacheControl && cacheControl.indexOf('no-cache') < 0))) { // caching is allowed
                     // default to now (in seconds) + 30m if not set
                     decodedToken.exp = decodedToken.exp || +(((Date.now() / 1000) + 1800).toFixed(0));

diff --git a/oauthv2/index.js b/oauthv2/index.js
@@ -330,4 +330,4 @@ function sendError(req, res, next, logger, stats, code, message) {
     stats.incrementStatusCount(res.statusCode);
     next(code, message);
     return code;
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "microgateway-plugins",
-  "version": "2.5.35",
+  "version": "2.5.36",
   "description": "Plugins for Apige Edge Microgateway",
   "main": "index.js",
   "scripts": {