diff --git a/src/graphql/schema.js b/src/graphql/schema.js index 4313cee559267ccab32af55fa118d67e7bd126ef..a9316b455239aeff5044a5c4811b3f9d105df6db 100644 --- a/src/graphql/schema.js +++ b/src/graphql/schema.js @@ -3,7 +3,7 @@ import { makeExecutableSchema } from 'graphql-tools'; const typeDefs = ` type Query { - groups: [Group] + groups: [Group]! } type Group { diff --git a/src/index.js b/src/index.js index 6529c167e3009cf051fe99f7ae313d45351a4591..2d73129e95d8905dfc5e645a33f556be6a6c84b1 100644 --- a/src/index.js +++ b/src/index.js @@ -3,9 +3,7 @@ */ import server from './server'; import colors from 'colors'; -import { graphqlExpress, graphiqlExpress } from 'graphql-server-express'; -import makeExecutableSchema from 'graphql-tools'; -import setupLdapAuth from './ldap_auth/ldap_auth'; +import setupLdapAuth from './ldap/ldap_auth.js'; import router from './admin_view/admin_router'; // setting up ldap authentication diff --git a/src/server.js b/src/server.js index ed02067bf9729d7ce98788aa614e9ad9b6db366f..40816aa04c735c5c806390a8c1a66abf9ffdef23 100644 --- a/src/server.js +++ b/src/server.js @@ -6,7 +6,6 @@ import bodyParser from 'body-parser'; import favicon from 'serve-favicon'; import morgan from 'morgan'; import path from 'path'; -import ldap_auth from './ldap_auth/ldap_auth'; import schema from './graphql/schema'; import { graphqlExpress, graphiqlExpress } from 'graphql-server-express'; @@ -30,9 +29,6 @@ server.use(favicon(path.resolve('./','assets','favicon.ico'))); // Morgan is middleware for logging requests server.use(morgan('dev')); -// setting up ldap authentication -ldap_auth(server); - // Charge le middleware express pour GraphQL server.use('/graphql', bodyParser.json(), graphqlExpress({schema}));