Add userId in GraphQL context after authentication

cofacts · Apr 4, 2020 · 97b491d · 97b491d
1 parent 5295edb
commit 97b491d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/graphql/__tests__/context.js b/src/graphql/__tests__/context.js
@@ -34,6 +34,7 @@ it('Returns user context', async () => {
   `(
     {},
     {
+      userId: 'U12345678',
       userContext: {
         state: 'CHOOSING_ARTICLE',
         issuedAt: 1586013070089,

diff --git a/src/graphql/__tests__/index.js b/src/graphql/__tests__/index.js
@@ -14,6 +14,7 @@ describe('getContext', () => {
     expect(context).toMatchInlineSnapshot(`
       Object {
         "userContext": null,
+        "userId": "",
       }
     `);
   });
@@ -38,6 +39,7 @@ describe('getContext', () => {
     expect(context).toMatchInlineSnapshot(`
       Object {
         "userContext": null,
+        "userId": "user1",
       }
     `);
   });
@@ -66,6 +68,7 @@ describe('getContext', () => {
           "foo": "bar",
           "nonce": "correctpass",
         },
+        "userId": "user1",
       }
     `);
   });

diff --git a/src/graphql/directives/auth.js b/src/graphql/directives/auth.js
@@ -11,7 +11,7 @@ class AuthDirective extends SchemaDirectiveVisitor {
     field.resolve = (...args) => {
       const [, , context] = args;
 
-      if (!context.userContext) {
+      if (!context.userId || !context.userContext) {
         throw new AuthenticationError('Invalid authentication header');
       }
 

diff --git a/src/graphql/index.js b/src/graphql/index.js
@@ -46,6 +46,7 @@ export async function getContext({ ctx: { req } }) {
   }
 
   return {
+    userId,
     userContext,
   };
 }