getMe as middleware

rwieruch · Apr 16, 2020 · c9adeaa · c9adeaa
1 parent 6503542
commit c9adeaa
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/pages/api/graphql.ts b/pages/api/graphql.ts
@@ -1,7 +1,9 @@
 import { ApolloServer } from 'apollo-server-micro';
-import cors from 'micro-cors';
 import { buildSchema } from 'type-graphql';
 import { applyMiddleware } from 'graphql-middleware';
+
+import cors from 'micro-cors';
+
 import 'reflect-metadata';
 
 import getConnection from '@models/index';
@@ -13,8 +15,9 @@ import { ServerRequest, ServerResponse } from '@typeDefs/server';
 import { ResolverContext } from '@typeDefs/resolver';
 
 import resolvers from '@api/resolvers';
-import getMe from '@api/middleware/me';
+import meMiddleware from '@api/middleware/me';
 import sentryMiddleware from '@api/middleware/sentry';
+
 import firebaseAdmin from '@services/firebase/admin';
 
 if (process.env.FIREBASE_ADMIN_UID) {
@@ -52,11 +55,9 @@ export default async (req: ServerRequest, res: ServerResponse) => {
   });
 
   const server = new ApolloServer({
-    schema: applyMiddleware(schema, sentryMiddleware),
+    schema: applyMiddleware(schema, sentryMiddleware, meMiddleware),
 
     context: async ({ req, res }): Promise<ResolverContext> => {
-      const me = await getMe(req, res);
-
       const adminConnector = new AdminConnector();
       const partnerConnector = new PartnerConnector(connection!);
       const courseConnector = new CourseConnector(connection!);
@@ -65,7 +66,6 @@ export default async (req: ServerRequest, res: ServerResponse) => {
       return {
         req,
         res,
-        me,
         adminConnector,
         courseConnector,
         partnerConnector,
@@ -78,7 +78,5 @@ export default async (req: ServerRequest, res: ServerResponse) => {
     server.createHandler({ path: '/api/graphql' })
   );
 
-  // await connection.close();
-
   return handler(req, res);
 };
diff --git a/src/api/middleware/me.ts b/src/api/middleware/me.ts
@@ -3,19 +3,24 @@ import { AuthenticationError } from 'apollo-server-micro';
 import firebaseAdmin from '@services/firebase/admin';
 
 import { ResolverContext } from '@typeDefs/resolver';
-import { ServerResponse, ServerRequest } from '@typeDefs/server';
 import { User } from '@typeDefs/user';
 
-export default async (req: ServerRequest, res: ServerResponse) => {
-  const { session } = req.cookies;
+export default async (
+  resolve: Function,
+  root: any,
+  args: any,
+  context: ResolverContext,
+  info: any
+) => {
+  const { session } = context.req.cookies;
 
   if (!session) {
     return undefined;
   }
 
   const CHECK_REVOKED = true;
 
-  return await firebaseAdmin
+  const me = await firebaseAdmin
     .auth()
     .verifySessionCookie(session, CHECK_REVOKED)
     .then(async claims => {
@@ -24,4 +29,8 @@ export default async (req: ServerRequest, res: ServerResponse) => {
     .catch(error => {
       throw new AuthenticationError(error.message);
     });
+
+  context.me = me;
+
+  return await resolve(root, args, context, info);
 };
diff --git a/src/api/resolvers/course/index.ts b/src/api/resolvers/course/index.ts
@@ -233,7 +233,7 @@ export default class CourseResolver {
   async unlockedCourse(
     @Arg('courseId') courseId: string,
     @Ctx() ctx: ResolverContext
-  ) {
+  ): Promise<UnlockedCourse | null> {
     if (!ctx.me) {
       return null;
     }
@@ -257,7 +257,7 @@ export default class CourseResolver {
     @Arg('courseId') courseId: string,
     @Arg('bundleId') bundleId: string,
     @Ctx() ctx: ResolverContext
-  ) {
+  ): Promise<boolean> {
     if (!ctx.me) {
       return false;
     }
@@ -292,7 +292,7 @@ export default class CourseResolver {
     @Arg('bundleId') bundleId: string,
     @Arg('uid') uid: string,
     @Ctx() ctx: ResolverContext
-  ) {
+  ): Promise<boolean> {
     await ctx.courseConnector.createCourse({
       userId: uid,
       courseId: courseId as COURSE,

diff --git a/src/api/resolvers/index.ts b/src/api/resolvers/index.ts
@@ -1,3 +1,5 @@
+import { NonEmptyArray } from 'type-graphql';
+
 import MigrationResolvers from './migration';
 import SessionResolver from './session';
 import UserResolvers from './user';
@@ -24,4 +26,4 @@ export default [
   CouponResolver,
   PartnerResolver,
   CommunityResolvers,
-];
+] as NonEmptyArray<Function>;
diff --git a/src/models/index.ts b/src/models/index.ts
@@ -13,9 +13,7 @@ export default async function() {
     if (connection.isConnected) {
       await connection.close();
     }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch (error) {}
 
   try {
     connection = await createConnection({
@@ -38,9 +36,7 @@ export default async function() {
         },
       }),
     });
-  } catch (error) {
-    console.log(error);
-  }
+  } catch (error) {}
 
   return connection;
 }