From c0ade4578b3583da99209970ebf5498299b296e4 Mon Sep 17 00:00:00 2001
From: ManifoldFR <wilson.jallet@gmail.com>
Date: Wed, 28 Feb 2018 20:52:42 +0100
Subject: [PATCH] Commiting small changes

---
 package-lock.json     | 9 +++++++++
 package.json          | 1 +
 src/ldap/ldap_data.js | 4 ++--
 src/server.js         | 3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a357345..f4d683a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1181,6 +1181,15 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cors": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz",
+      "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=",
+      "requires": {
+        "object-assign": "4.1.1",
+        "vary": "1.1.2"
+      }
+    },
     "crc": {
       "version": "3.4.4",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
diff --git a/package.json b/package.json
index 84aedce..2227f83 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "colors": "^1.1.2",
     "connect-ensure-login": "^0.1.1",
     "connect-flash": "^0.1.1",
+    "cors": "^2.8.4",
     "express": "^4.16.2",
     "express-session": "^1.15.6",
     "fs": "0.0.1-security",
diff --git a/src/ldap/ldap_data.js b/src/ldap/ldap_data.js
index 9a93f2d..5e8e5e8 100644
--- a/src/ldap/ldap_data.js
+++ b/src/ldap/ldap_data.js
@@ -16,7 +16,7 @@ var ldapEscape = require('ldap-escape');
 var ensureLoggedin =  require('connect-ensure-login').ensureLoggedIn;
 
 // Point central ; tous les champs de la BDD sont 'cachés' dans config.json et pas visibles directement
-let config = JSON.parse(fs.readFileSync('../../config.json', 'utf8'));
+let config = JSON.parse(fs.readFileSync('./config.json', 'utf8'));
 
 // Connection au serveur LDAP avec des temps de timeout arbitraires
 var client = ldap.createClient({ url: config.ldap.server, timeout: 10000, idleTimeout: 10000});
@@ -121,4 +121,4 @@ TOL("","","","","","","faerix","","","","","","").then((meList) => { console.log
 /* Partage pour le reste du monde ; même remarque synthaxe  
 export { listGroups, listMembers, TOL }; */
 
-module.exports ={ listGroups, listMembers, TOL };
\ No newline at end of file
+module.exports = { listGroups, listMembers, TOL };
\ No newline at end of file
diff --git a/src/server.js b/src/server.js
index 87f08ae..eda3adc 100644
--- a/src/server.js
+++ b/src/server.js
@@ -6,6 +6,7 @@ import bodyParser from 'body-parser';
 import favicon from 'serve-favicon';
 import morgan from 'morgan';
 import path from 'path';
+import cors from 'cors';
 import schema from './graphql/schema';
 import { graphqlExpress, graphiqlExpress } from 'graphql-server-express';
 import flash from 'connect-flash';
@@ -31,7 +32,7 @@ server.use(favicon(path.resolve('./','assets','favicon.ico')));
 server.use(morgan('dev'));
 
 // Charge le middleware express pour GraphQL
-server.use('/graphql', bodyParser.json(), graphqlExpress({schema}));
+server.use('/graphql', cors(), bodyParser.json(), graphqlExpress({schema}));
 
 // GraphiQL est une console interactive pour faire des requêtes au schéma GraphQL
 server.use('/graphiql', graphiqlExpress({ endpointURL: '/graphql'}));
-- 
GitLab