fix: add cache-control, remove cache for error responses (#114)

hirosystems · Feb 9, 2023 · e03caf8 · e03caf8
1 parent 85ce86c
commit e03caf8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/api/util/cache.ts b/src/api/util/cache.ts
@@ -17,11 +17,16 @@ export async function handleTokenCache(request: FastifyRequest, reply: FastifyRe
     if (ifNoneMatch && ifNoneMatch.includes(etag)) {
       await reply.header('Cache-Control', CACHE_CONTROL_MUST_REVALIDATE).code(304).send();
     } else {
-      void reply.header('ETag', `"${etag}"`);
+      void reply.headers({ 'Cache-Control': CACHE_CONTROL_MUST_REVALIDATE, ETag: `"${etag}"` });
     }
   }
 }
 
+export function setReplyNonCacheable(reply: FastifyReply) {
+  reply.removeHeader('Cache-Control');
+  reply.removeHeader('Etag');
+}
+
 /**
  * Retrieve the token's last modified date as a UNIX epoch so we can use it as the response ETag.
  * @returns Etag string

diff --git a/src/api/util/errors.ts b/src/api/util/errors.ts
@@ -11,13 +11,15 @@ import {
   TokenNotFoundError,
   TokenNotProcessedError,
 } from '../../pg/errors';
+import { setReplyNonCacheable } from './cache';
 
 export const TokenErrorResponseSchema = {
   404: TokenNotFoundResponse,
   422: Type.Union([TokenNotProcessedResponse, TokenLocaleNotFoundResponse]),
 };
 
 export async function generateTokenErrorResponse(error: any, reply: FastifyReply) {
+  setReplyNonCacheable(reply);
   if (error instanceof TokenNotFoundError) {
     await reply.code(404).send(Value.Create(TokenNotFoundResponse));
   } else if (error instanceof TokenNotProcessedError) {