refactor: simplify cache directives

example/routes/express.js

@@ -39,8 +39,7 @@ module.exports = (app, provider) => {
   });
 
   function setNoCache(req, res, next) {
-    res.set('Pragma', 'no-cache');
-    res.set('Cache-Control', 'no-cache, no-store');
+    res.set('cache-control', 'no-store');
     next();
   }
 

example/routes/koa.js

@@ -26,8 +26,7 @@ module.exports = (provider) => {
   const { constructor: { errors: { SessionNotFound } } } = provider;
 
   router.use(async (ctx, next) => {
-    ctx.set('Pragma', 'no-cache');
-    ctx.set('Cache-Control', 'no-cache, no-store');
+    ctx.set('cache-control', 'no-store');
     try {
       await next();
     } catch (err) {

lib/shared/no_cache.js

@@ -1,5 +1,4 @@
 module.exports = async function noCache(ctx, next) {
-  ctx.set('Pragma', 'no-cache');
-  ctx.set('Cache-Control', 'no-cache, no-store');
+  ctx.set('cache-control', 'no-store');
   await next();
 };

test/authorization_code/code.grant.test.js

@@ -117,8 +117,7 @@ describe('grant_type=authorization_code', () => {
           grant_type: 'authorization_code',
           redirect_uri: 'https://client.example.com/cb',
         })
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store');
+        .expect('cache-control', 'no-store');
     });
 
     context('', () => {
@@ -431,8 +430,7 @@ describe('grant_type=authorization_code', () => {
           code: this.ac,
           grant_type: 'authorization_code',
         })
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store');
+        .expect('cache-control', 'no-store');
     });
 
     context('', () => {

test/dynamic_registration/dynamic_registration.test.js

@@ -251,8 +251,7 @@ describe('registration features', () => {
         .send({
           redirect_uris: ['https://client.example.com/cb'],
         })
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store');
+        .expect('cache-control', 'no-store');
     });
 
     it('stores the client and emits an event', function () {
@@ -522,8 +521,7 @@ describe('registration features', () => {
     it('returns token-endpoint-like cache headers', function () {
       return this.agent.get(`/reg/${this.clientId}`)
         .auth(this.token, { type: 'bearer' })
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store');
+        .expect('cache-control', 'no-store');
     });
 
     it('validates client is a valid client', function () {
@@ -567,8 +565,7 @@ describe('registration features', () => {
 
       return this.agent.get('/reg/foobar')
         .auth(this.token, { type: 'bearer' })
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store')
+        .expect('cache-control', 'no-store')
         .expect(this.failWith(401, 'invalid_token', 'invalid token provided'))
         .expect(() => {
           expect(spy.calledOnce).to.be.true;

test/introspection/introspection.test.js

@@ -301,8 +301,7 @@ describe('introspection features', () => {
         .auth('client', 'secret')
         .send({})
         .type('form')
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store');
+        .expect('cache-control', 'no-store');
     });
 
     it('validates token param presence', function () {

test/registration_management/registration_management.test.js

@@ -44,8 +44,7 @@ describe('OAuth 2.0 Dynamic Client Registration Management Protocol', () => {
         }))
         .expect(200)
         .expect('content-type', /application\/json/)
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store')
+        .expect('cache-control', 'no-store')
         .expect((res) => {
           expect(res.body).to.have.property('registration_access_token', client.registration_access_token);
           expect(res.body).to.have.property('registration_client_uri', client.registration_client_uri);
@@ -273,8 +272,7 @@ describe('OAuth 2.0 Dynamic Client Registration Management Protocol', () => {
       const client = await setup.call(this, {});
       await this.agent.del(`/reg/${client.client_id}`)
         .auth(client.registration_access_token, { type: 'bearer' })
-        .expect('pragma', 'no-cache')
-        .expect('cache-control', 'no-cache, no-store')
+        .expect('cache-control', 'no-store')
         .expect('') // empty body
         .expect(204);
 

test/web_message/web_message.test.js

@@ -43,8 +43,7 @@ describe('configuration features.webMessageResponseMode', () => {
 
         await this.wrap({ route, auth, verb: 'get' })
           .expect(200)
-          .expect('pragma', 'no-cache')
-          .expect('cache-control', 'no-cache, no-store')
+          .expect('cache-control', 'no-store')
           .expect('content-type', 'text/html; charset=utf-8')
           .expect((response) => {
             expect(response.headers['x-frame-options']).not.to.be.ok;
@@ -76,8 +75,7 @@ describe('configuration features.webMessageResponseMode', () => {
 
         await this.wrap({ route, auth, verb: 'get' })
           .expect(200)
-          .expect('pragma', 'no-cache')
-          .expect('cache-control', 'no-cache, no-store')
+          .expect('cache-control', 'no-store')
           .expect('content-type', 'text/html; charset=utf-8')
           .expect((response) => {
             expect(response.headers['x-frame-options']).not.to.be.ok;
@@ -107,8 +105,7 @@ describe('configuration features.webMessageResponseMode', () => {
 
         await this.wrap({ route, auth, verb: 'get' })
           .expect(200)
-          .expect('pragma', 'no-cache')
-          .expect('cache-control', 'no-cache, no-store')
+          .expect('cache-control', 'no-store')
           .expect('content-type', 'text/html; charset=utf-8')
           .expect((response) => {
             expect(response.headers['x-frame-options']).not.to.be.ok;
@@ -136,8 +133,7 @@ describe('configuration features.webMessageResponseMode', () => {
 
         await this.wrap({ route, auth, verb: 'get' })
           .expect(200)
-          .expect('pragma', 'no-cache')
-          .expect('cache-control', 'no-cache, no-store')
+          .expect('cache-control', 'no-store')
           .expect('content-type', 'text/html; charset=utf-8')
           .expect((response) => {
             expect(response.headers['x-frame-options']).not.to.be.ok;
@@ -269,8 +265,7 @@ describe('configuration features.webMessageResponseMode', () => {
 
         await this.wrap({ route, auth, verb: 'get' })
           .expect(400)
-          .expect('pragma', 'no-cache')
-          .expect('cache-control', 'no-cache, no-store')
+          .expect('cache-control', 'no-store')
           .expect('content-type', 'text/html; charset=utf-8')
           .expect((response) => {
             expect(response.headers['x-frame-options']).not.to.be.ok;