albertcito
diff --git a/‎src/init/graphql/server.ts
Copy file name to clipboard
+2-10Lines changed: 2 additions & 10 deletions b/‎src/init/graphql/server.ts
Copy file name to clipboard
+2-10Lines changed: 2 additions & 10 deletions
diff --git a/‎src/init/server.ts
Copy file name to clipboardExpand all lines: src/init/server.ts
+9-2Lines changed: 9 additions & 2 deletions b/‎src/init/server.ts
Copy file name to clipboardExpand all lines: src/init/server.ts
+9-2Lines changed: 9 additions & 2 deletions
@@ -1,35 +1,27 @@
 import 'reflect-metadata';
-import { Express } from 'express';
 import { join } from 'path';
 import { BuildSchemaOptions, buildSchema } from 'type-graphql';
 import { ApolloServer } from 'apollo-server-express';
 
-import { cors } from 'src/config';
 import formatError from './formatError';
 import ErrorHandlePlugin from './errorHandlePlugin';
 
 export const path = '/graphql';
-const server = async (app: Express) => {
+const server = async () => {
   const privatePath = join(__dirname, '../../graphql/resolvers/**/*{.ts,.js}');
   const apolloSchemeOptions: BuildSchemaOptions = {
     resolvers: [privatePath],
     validate: false,
   };
   const apolloSchema = await buildSchema(apolloSchemeOptions);
-  const apolloServer = new ApolloServer({
+  return new ApolloServer({
     schema: apolloSchema,
     formatError,
     plugins: [ErrorHandlePlugin],
     playground: true,
     introspection: true,
     uploads: false,
   });
-  apolloServer.applyMiddleware({
-    cors,
-    app,
-    path,
-    bodyParserConfig: true,
-  });
 };
 
 export default server;
@@ -10,8 +10,9 @@ import './i18n/index';
 import './bugsnag';
 import '../util/validatorjs/rules';
 import handleErrors from './handleErrors';
-import apolloServer from './graphql/server';
+import ApolloServer, { path } from './graphql/server';
 import useControllersApi from './controllers';
+import { cors } from 'src/config';
 
 const getApp = async (): Promise<Express> => {
   dotenv.config();
@@ -27,7 +28,13 @@ const getApp = async (): Promise<Express> => {
   // use multi languages
   app.use(i18n.init);
   // Apollo graphQL
-  await apolloServer(app);
+  const apolloServer = await ApolloServer();
+  apolloServer.applyMiddleware({
+    cors,
+    app,
+    path,
+    bodyParserConfig: true,
+  });
   app.use(graphqlUploadExpress({ maxFileSize: 10000, maxFiles: 10 }));
   // Api
   useControllersApi(app);