[graphql] rename context to userContext and add non-null output

cofacts · May 1, 2020 · 3905997 · 3905997
1 parent 97b491d
commit 3905997
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/graphql/__tests__/context.js → src/graphql/__tests__/userContext.js b/src/graphql/__tests__/context.js → src/graphql/__tests__/userContext.js
@@ -3,15 +3,15 @@ import { gql } from '../testUtils';
 it('context rejects anonymous users', async () => {
   const result = await gql`
     {
-      context {
+      userContext {
         state
       }
     }
   `();
   expect(result).toMatchInlineSnapshot(`
     Object {
       "data": Object {
-        "context": null,
+        "userContext": null,
       },
       "errors": Array [
         [GraphQLError: Invalid authentication header],
@@ -23,9 +23,8 @@ it('context rejects anonymous users', async () => {
 it('Returns user context', async () => {
   const result = await gql`
     {
-      context {
+      userContext {
         state
-        issuedAt
         data {
           searchedText
         }
@@ -47,11 +46,10 @@ it('Returns user context', async () => {
   expect(result).toMatchInlineSnapshot(`
     Object {
       "data": Object {
-        "context": Object {
+        "userContext": Object {
           "data": Object {
             "searchedText": "Foo",
           },
-          "issuedAt": 1586013070089,
           "state": "CHOOSING_ARTICLE",
         },
       },

diff --git a/src/graphql/resolvers/Query.js b/src/graphql/resolvers/Query.js
@@ -4,7 +4,7 @@ export default {
     return {};
   },
 
-  context(root, args, context) {
+  userContext(root, args, context) {
     return context.userContext;
   },
 };
diff --git a/src/graphql/typeDefs.graphql b/src/graphql/typeDefs.graphql
@@ -4,7 +4,7 @@ type Query {
   insights: MessagingAPIInsight
 
   # Current user's chatbot context
-  context: UserContext @auth
+  userContext: UserContext @auth
 }
 
 type MessagingAPIInsight {
@@ -130,9 +130,8 @@ enum MessagingAPIInsightStatus {
 }
 
 type UserContext {
-  state: String
-  issuedAt: Float
-  data: StateData
+  state: String!
+  data: StateData!
 }
 
 type StateData {