core: fix sha import and fix persisted query cache test

apollographql · Jun 11, 2018 · ae8ef9a · ae8ef9a
1 parent 3ef3e47
commit ae8ef9a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/packages/apollo-server-core/src/ApolloServer.test.ts b/packages/apollo-server-core/src/ApolloServer.test.ts
@@ -905,14 +905,16 @@ describe('ApolloServerBase', () => {
       server = new ApolloServerBase({
         schema,
         introspection: false,
+        persistedQueries: {
+          cache: new Map<string, string>() as any,
+        },
       });
 
       const httpServer = createHttpServer(server);
 
       server.use({
         getHttp: () => httpServer,
         path: '/graphql',
-        cache: new Map<string, string>() as any,
       });
       uri = (await server.listen()).url;
     });

diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts
@@ -1,5 +1,5 @@
 import { ExecutionResult } from 'graphql';
-import * as sha256 from 'hash.js/lib/hash/sha/256';
+import sha256 from 'hash.js/lib/hash/sha/256';
 
 import { runQuery, QueryOptions } from './runQuery';
 import {
@@ -198,21 +198,22 @@ export async function runHttpQuery(
           }
 
           //Do the store completely asynchronously
-          Promise.resolve().then(() => {
-            //We do not wait on the cache storage to complete
-            optionsObject.persistedQueries.cache
-              .set(sha, queryString)
-              .catch(error => {
-                if (optionsObject.logFunction) {
-                  optionsObject.logFunction({
-                    action: LogAction.setup,
-                    step: LogStep.status,
-                    key: 'error',
-                    data: error,
-                  });
-                }
-              });
-          });
+          Promise.resolve()
+            .then(() => {
+              //We do not wait on the cache storage to complete
+              return optionsObject.persistedQueries.cache.set(sha, queryString);
+            })
+            .catch(error => {
+              console.log(error);
+              if (optionsObject.logFunction) {
+                optionsObject.logFunction({
+                  action: LogAction.setup,
+                  step: LogStep.status,
+                  key: 'error',
+                  data: error,
+                });
+              }
+            });
         }
       }