feat(server): pass cors config to apollo server

src/app.js

@@ -20,6 +20,7 @@ const api = require('pubsweet-server/src/routes/api')
 const index = require('pubsweet-server/src/routes/index')
 
 const healthcheck = require('./healthcheck')
+const createCORSConfig = require('./corsConfig')
 
 const configureApp = app => {
   const models = require('@pubsweet/models')
@@ -61,16 +62,8 @@ const configureApp = app => {
   }
 
   // Allow CORS from client if host / port is different
-  if (config.has('pubsweet-client.url')) {
-    const clientUrl = config.has('clientUrl') && config.get('clientUrl')
-
-    app.use(
-      cors({
-        origin: clientUrl,
-        credentials: true,
-      }),
-    )
-  }
+  const CORSConfig = createCORSConfig()
+  app.use(cors(CORSConfig))
 
   // Register passport authentication strategies
   app.use(passport.initialize())

src/corsConfig.js

+const config = require('config')
+
+const createCORSConfig = () => {
+  if (!config.has('pubsweet-client.url')) return null
+
+  const clientUrl = config.has('clientUrl') && config.get('clientUrl')
+
+  return {
+    origin: clientUrl,
+    credentials: true,
+  }
+}
+
+module.exports = createCORSConfig

src/graphqlApi.js

 const { graphqlUploadExpress } = require('graphql-upload')
 
 const createGraphQLServer = require('./graphqlServer')
+const createCORSConfig = require('./corsConfig')
 
 const api = app => {
   app.use(
@@ -13,7 +14,9 @@ const api = app => {
   app.use(graphqlUploadExpress())
 
   const server = createGraphQLServer()
-  server.applyMiddleware({ app })
+  const CORSConfig = createCORSConfig()
+
+  server.applyMiddleware({ app, cors: CORSConfig })
 }
 
 module.exports = api