From 5e3c83707f28dd6e0e9a975e9d94456225065e9b Mon Sep 17 00:00:00 2001 From: Georg Reisinger Date: Fri, 26 Oct 2018 14:34:34 +0200 Subject: [PATCH] GoogleOauth2.0 Working MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GoogleOauth2.0 Funktioniert. Beim Aufrufen von http://localhost:7000/ wird direkt die Google Login Seite geöffnet. Es wird dann von der callback route '/auth/google/callback' die route '/dash' geöffnet. Auf der Route '/dash' wird unsere index Seite der app entwickelt --- express-server/routes/index.js | 19 +++++++++---------- express-server/views/index.ejs | 1 + express-server/views/login.ejs | 33 --------------------------------- 3 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 express-server/views/login.ejs diff --git a/express-server/routes/index.js b/express-server/routes/index.js index e9364422..ba4502c7 100644 --- a/express-server/routes/index.js +++ b/express-server/routes/index.js @@ -1,5 +1,6 @@ var express = require('express'); var router = express.Router(); +var session; // GoogleOauth2.0 passport = require('passport'), @@ -18,11 +19,11 @@ router.use(cookieSession({ router.use(cookieParser()); router.get('/', (req, res) => { - if (req.session.token) { - res.redirect('/dash'); - } else { + // if (req.session.passport.user.token) { + // res.redirect('/dash'); + // } else { res.redirect('/auth/google'); - } + // } }); router.get('/auth/google', passport.authenticate('google', { scope: ['https://www.googleapis.com/auth/userinfo.profile'] @@ -30,7 +31,7 @@ router.get('/auth/google', passport.authenticate('google', { router.get('/auth/google/callback', passport.authenticate('google', {failureRedirect:'/'}), (req, res) => { - req.session.token = req.user.token; + req.session.passport.user.token = req.user.token; res.redirect('/dash'); } ); @@ -41,12 +42,10 @@ router.get('/logout', (req, res) => { res.redirect('/'); }); - - -/* GET home page. */ router.get('/dash', function(req, res, next) { - if (req.session.token) { - res.render(index); + console.log("Session: ", req.session.passport.user.token); + if (req.session.passport.user.token) { + res.render('index'); } else { res.redirect('/auth/google'); } diff --git a/express-server/views/index.ejs b/express-server/views/index.ejs index bb579e94..2d4dc11e 100644 --- a/express-server/views/index.ejs +++ b/express-server/views/index.ejs @@ -7,5 +7,6 @@

Welcome to

+ Logout diff --git a/express-server/views/login.ejs b/express-server/views/login.ejs deleted file mode 100644 index d36498ff..00000000 --- a/express-server/views/login.ejs +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - SmartShopper - - - - - - -
-
-

Welcome

-
-
- Bitte Loggen sie sich ein um ihre Einkaufsliste zu sehen -
-
- - Login - -
-
- -
-
- - \ No newline at end of file