From 87f2321055636be7dbcf55a8eb814fd0fe955c26 Mon Sep 17 00:00:00 2001
From: ManifoldFR <wilson.jallet@gmail.com>
Date: Wed, 28 Feb 2018 15:45:39 +0100
Subject: [PATCH] Small fixes
---
src/graphql/schema.js | 2 +-
src/index.js | 4 +---
src/server.js | 4 ----
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/graphql/schema.js b/src/graphql/schema.js
index 4313cee..a9316b4 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 6529c16..2d73129 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 ed02067..40816aa 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}));
--
GitLab