From 79a5f17a2ca7de242c2c75507cfd4fa939d1bc2e Mon Sep 17 00:00:00 2001
From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com>
Date: Tue, 20 Nov 2018 20:59:19 +0100
Subject: [PATCH] Login&Logout fix

/Dash ist jetzt sicher gegen unangemeldete user.
/logout funktioniert jetzt auch
---
 express-server/routes/index.js  | 12 ++++++++++--
 express-server/views/index1.ejs |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/express-server/routes/index.js b/express-server/routes/index.js
index f8049d05..c4afbd72 100644
--- a/express-server/routes/index.js
+++ b/express-server/routes/index.js
@@ -21,6 +21,14 @@ router.use(cookieSession({
 
 router.use(cookieParser());
 
+function isLoggedIn(req, res, next) {
+  console.log("Auth: ", req.session.passport.user.profile.id);
+  if (req.session.passport.user.profile.id) {
+    return next();
+  }
+  res.redirect('/')
+}
+
 router.get('/', (req, res) => {
     // if (req.session.passport.user.token) {
     //   res.redirect('/dash');
@@ -40,12 +48,12 @@ router.get('/auth/google/callback',
 );
 
 router.get('/logout', (req, res) => {
+  req.session.passport.user.profile.id = null;
   req.logout();
-  req.session = null;
   res.redirect('/');
 });
 
-router.get('/dash', function(req, res, next) {
+router.get('/dash', isLoggedIn, function(req, res, next) {
   // console.log("Session: ", req.session.passport.user.token);
   // console.log("User ID: " + req.session.passport.user.profile.id);
   // if (req.session.passport.user.token) {
diff --git a/express-server/views/index1.ejs b/express-server/views/index1.ejs
index 2982a508..1a7d89b6 100644
--- a/express-server/views/index1.ejs
+++ b/express-server/views/index1.ejs
@@ -13,7 +13,11 @@
 
   <div class="container">
       <p>Logged in as: testuser1</p>
-      <br><br>
+      <br>
+      <div class="col s6">
+        <a href="/logout" class="waves-effect waves-light btn">Logout</a>
+    </div>
+      <br>
     <div class="row">
         <div class="input-field col s6">
           <input id="name" type="text" class="validate name">