Add safety guards around setting cache control headers in query (#2169)

keystonejs · Dec 30, 2019 · 05d07ad · 05d07ad
1 parent 1d7f2e6
commit 05d07ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/giant-wasps-call.md b/.changeset/giant-wasps-call.md
@@ -0,0 +1,5 @@
+---
+'@keystonejs/keystone': patch
+---
+
+Ensure executeQuery() does not throw when a queried field has cache hint setttings
diff --git a/packages/keystone/lib/List/index.js b/packages/keystone/lib/List/index.js
@@ -568,7 +568,7 @@ module.exports = class List {
       }
 
       // Only static cache hints are supported at the field level until a use-case makes it clear what parameters a dynamic hint would take
-      if (field.config.cacheHint) {
+      if (field.config.cacheHint && info && info.cacheControl) {
         info.cacheControl.setCacheHint(field.config.cacheHint);
       }
 
@@ -1048,7 +1048,7 @@ module.exports = class List {
   }
 
   authenticatedQuery(context, info) {
-    if (info) {
+    if (info && info.cacheControl) {
       info.cacheControl.setCacheHint({ scope: 'PRIVATE' });
     }