server: remove cache specific headers when response is not cached

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8637
Co-authored-by: Daniele Cammareri <5709409+dancamma@users.noreply.github.com>
GitOrigin-RevId: 0af8adbb638394fb65926165b09ff237d060ce85

server/src-lib/Hasura/GraphQL/Transport/HTTP.hs

@@ -206,9 +206,8 @@ buildResponseFromParts ::
   (MonadError QErr m) =>
   Telem.QueryType ->
   Either (Either GQExecError QErr) (RootFieldMap AnnotatedResponsePart) ->
-  HTTP.ResponseHeaders ->
   m AnnotatedResponse
-buildResponseFromParts telemType partsErr cacheHeaders =
+buildResponseFromParts telemType partsErr =
   buildResponse telemType partsErr \parts ->
     let responseData = Right $ encJToLBS $ encodeAnnotatedResponseParts parts
      in AnnotatedResponse
@@ -218,7 +217,7 @@ buildResponseFromParts telemType partsErr cacheHeaders =
             arResponse =
               HttpResponse
                 (Just responseData, encodeGQResp responseData)
-                (cacheHeaders <> foldMap arpHeaders parts)
+                (foldMap arpHeaders parts)
           }
 
 buildResponse ::
@@ -427,14 +426,14 @@ runGQ env sqlGenCtx sc scVer enableAL readOnlyMode prometheusMetrics logger agen
             -- TODO: can this be a `catch` rather than a `runExceptT`?
             conclusion <- runExceptT $ forWithKey queryPlans executeQueryStep
             -- 2. Construct an 'AnnotatedResponse' from the results of all steps in the 'ExecutionPlan'.
-            result <- buildResponseFromParts Telem.Query conclusion cachingHeaders
+            result <- buildResponseFromParts Telem.Query conclusion
             let response@(HttpResponse responseData _) = arResponse result
             -- 3. Cache the 'AnnotatedResponse'.
             cacheStoreRes <- keyedStore (snd responseData)
             let headers = case cacheStoreRes of
                   -- Note: Warning header format: "Warning: <warn-code> <warn-agent> <warn-text> [warn-date]"
                   -- See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Warning
-                  Right _ -> []
+                  Right _ -> cachingHeaders
                   (Left CacheStoreLimitReached) -> [("warning", "199 - cache-store-size-limit-exceeded")]
                   (Left CacheStoreNotEnoughCapacity) -> [("warning", "199 - cache-store-capacity-exceeded")]
                   (Left (CacheStoreBackendError _)) -> [("warning", "199 - cache-store-error")]
@@ -473,7 +472,7 @@ runGQ env sqlGenCtx sc scVer enableAL readOnlyMode prometheusMetrics logger agen
           Nothing -> do
             -- TODO: can this be a `catch` rather than a `runExceptT`?
             conclusion <- runExceptT $ forWithKey mutationPlans executeMutationStep
-            buildResponseFromParts Telem.Mutation conclusion []
+            buildResponseFromParts Telem.Mutation conclusion
       E.SubscriptionExecutionPlan _sub ->
         throw400 UnexpectedPayload "subscriptions are not supported over HTTP, use websockets instead"
 

server/src-lib/Hasura/Server/Middleware.hs

@@ -62,8 +62,14 @@ corsMiddleware getPolicy app req sendResp = do
         ("Access-Control-Allow-Credentials", "true"),
         ( "Access-Control-Allow-Methods",
           B.intercalate "," $ TE.encodeUtf8 <$> cpMethods policy
+        ),
+        -- console requires this header to access the cache headers as HGE and console
+        -- are hosted on different domains in production
+        ( "Access-Control-Expose-Headers",
+          B.intercalate "," $ TE.encodeUtf8 <$> cacheExposedHeaders
         )
       ]
 
+    cacheExposedHeaders = ["X-Hasura-Query-Cache-Key", "X-Hasura-Query-Family-Cache-Key", "Warning"]
     setHeaders hdrs = mapResponseHeaders (\h -> mkRespHdrs hdrs ++ h)
     mkRespHdrs = map (\(k, v) -> (CI.mk k, v))