Merge pull request #54 from AdvancedAlgos/develop

Server: add module auth with Master API

api/src/ApolloServer.js

@@ -1,6 +1,7 @@
 import http from 'http'
 import { ApolloServer, makeExecutableSchema } from 'apollo-server-express'
 import { applyMiddleware as applyGraphQLMiddleware } from 'graphql-middleware'
+import { moduleAuth } from './middleware'
 import { logger } from './logger'
 
 /**
@@ -110,6 +111,7 @@ export default function createApolloServer(
 
   // Express middleware
   server.applyMiddleware({
+    moduleAuth,
     app,
     cors,
     path: graphqlEndpoint,

api/src/graphql/resolvers/Mutation/index.js

@@ -78,7 +78,9 @@ export const resolvers = {
 
       logger.info('createPlatformTeam')
       logger.info(await createPlatformTeam)
+      logger.info('createPlatformTeam Error')
       logger.error(await createPlatformTeam.error)
+      logger.info('createPlatformTeam Code')
       logger.error(await createPlatformTeam.code)
 
       // if (await createPlatformTeam.error && await createPlatformTeam.code === 404) throw new ApolloError(await createPlatformTeam.error, 404)
@@ -110,7 +112,7 @@ export const resolvers = {
           })
       }
 
-      // sendTeamCreateConfirmation(email, name, botName)
+      sendTeamCreateConfirmation(email, name, botName)
 
       return createTeam
     },

api/src/middleware/getMember.js

@@ -46,10 +46,10 @@ export const getUser = authId => {
         .catch(err => {
           logger.info('getUser err')
           logger.info(err)
-          reject(new DatabaseError(err))
+          reject(err)
         })
     } catch (error) {
-      reject(new DatabaseError(error))
+      reject(error)
     }
   })
 }

api/src/middleware/index.js

@@ -0,0 +1,3 @@
+import moduleAuth from './moduleAuth'
+
+export { moduleAuth }

api/src/middleware/moduleAuth.js

@@ -0,0 +1,13 @@
+import { logger } from '../logger'
+
+export const moduleAuth = async (req, res, next, db) => {
+  if (req.headers.preshared === process.env.PRESHARED_GATEWAY_KEY) {
+    logger.info('Module authenticated')
+    next();
+  } else {
+    logger.error('Module authentication error')
+    res.send(wrongPreshared);
+  }
+}
+
+export default moduleAuth