From 4ad1b8dd2fde1de972928cdb74cb21c6d7e31f42 Mon Sep 17 00:00:00 2001 From: ManifoldFR <wilson.jallet@gmail.com> Date: Tue, 1 May 2018 18:48:25 +0200 Subject: [PATCH] moved adminview back to root --- src/index.js | 2 +- src/server.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 8753dd4..207338d 100644 --- a/src/index.js +++ b/src/index.js @@ -8,7 +8,7 @@ import router from './routing/admin_router'; import passport from 'passport'; // setting up l'interface admin des BDD -server.use('/adminview',router); // catches and resolves HTTP requests to paths '/adminview/*' +server.use('/',router); // catches and resolves HTTP requests to paths '/adminview/*' // gere les requetes de login du front server.post('/login', diff --git a/src/server.js b/src/server.js index dba035f..0675393 100644 --- a/src/server.js +++ b/src/server.js @@ -11,8 +11,8 @@ import { express as graphqlVoyager } from 'graphql-voyager/middleware'; import graphqlHTTP from 'express-graphql'; // new name of 'graphql-server-express'. cf npmjs.com import flash from 'connect-flash'; import { ensureLoggedIn } from 'connect-ensure-login'; -import './auth'; import passport from 'passport'; +import './auth'; import session from 'express-session'; import bodyParser from 'body-parser'; import favicon from 'serve-favicon'; @@ -80,6 +80,8 @@ server.use('/graphql', let uid; let password; + console.log(`User authenticated: ${req.isAuthenticated()}`); + if(req.isAuthenticated()) { try { uid = req.user.uid; -- GitLab