Fix support for Apollo Server 2.0

Volst · Jul 26, 2018 · b285e8f · b285e8f
1 parent 16f8097
commit b285e8f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/graphql-authentication/src/utils.ts b/packages/graphql-authentication/src/utils.ts
@@ -4,11 +4,13 @@ import { ID } from './Adapter';
 
 export interface Context {
   graphqlAuthentication: IGraphqlAuthenticationConfig;
-  request: any;
+  request?: any;
+  req?: any;
 }
 
 function _getUserId(ctx: Context): string {
-  const Authorization = ctx.request.get('Authorization');
+  // For Apollo Server 2.0+ it is ctx.req and for GraphQL Yoga ctx.request. Maybe there is a better way...
+  const Authorization = (ctx.req || ctx.request).get('Authorization');
   if (Authorization) {
     const token = Authorization.replace('Bearer ', '');
     const { userId } = jwt.verify(token, ctx.graphqlAuthentication.secret) as {