From 8b41158cc8dbfdd7c609a856ef618e36ea321a89 Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Sun, 21 May 2017 23:54:44 +0900
Subject: [PATCH] move passport

---
 webui/server/index.js          | 43 ++++------------------------------
 webui/server/passport/index.js | 32 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100644 webui/server/passport/index.js

diff --git a/webui/server/index.js b/webui/server/index.js
index ba4c2cce3..a52d1cff8 100644
--- a/webui/server/index.js
+++ b/webui/server/index.js
@@ -9,8 +9,9 @@ const bodyParser = require('body-parser');
 const session = require('express-session');
 const SequelizeStore = require('connect-session-sequelize')(session.Store);
 const passport = require('passport');
-const LocalStrategy = require('passport-local').Strategy;
+require('./passport');
 const csrf = require('lusca').csrf();
+const secret = process.env.SECRET_KEY || 'change-me';
 
 const models = require('./models');
 const api = require('./routes');
@@ -22,6 +23,7 @@ app.prepare()
 .then(() => {
   const server = express();
 
+  // FIXME : we need to implement landing page for adding admin account
   models.UserRole.count().then(c => {
     if (c == 0) {
       models.UserRole.create({
@@ -40,14 +42,14 @@ app.prepare()
   server.use(bodyParser.urlencoded({ extended: true }));
 
   server.use(session({
-    secret: 'change-me',
+    secret: secret,
     store: new SequelizeStore({ db: models.sequelize, table: 'Session' }),
     resave: false,
     rolling: true,
     saveUninitialized: true,
     httpOnly: true,
     cookie: {
-      maxAge: 60000 * 60 * 24 * 7 * 4  // 4 weeks
+      maxAge: 1000 * 60 * 60 * 24 * 7 * 2  // 2 weeks
     }
   }));
 
@@ -55,34 +57,6 @@ app.prepare()
     csrf(req, res, next);
   })
 
-  passport.use(new LocalStrategy((username, password, done) => {
-    models.User.findOne({ where: {username: username} }).then(user => {
-      if (!user) { 
-        return done(null, false, { message: 'Incorrect username' }); 
-      }
-      if (user.password != password) {
-        return done(null, false, { message: 'Incorrect password' });
-      }
-      return done(null, user);
-    });
-  }));
-
-  passport.serializeUser((user, done) => {
-    done(null, user.id);
-  })
-
-  passport.deserializeUser((id, done) => {
-    models.User.findOne({
-      where: { id: id },
-      include: [{ model: models.UserRole }]
-    }).then(user => {
-      done(null, {
-        username: user.username,
-        role: user.UserRole.role
-      });
-    })
-  });
-
   server.use(passport.initialize());
   server.use(passport.session());
 
@@ -92,13 +66,6 @@ app.prepare()
     return handle(req, res);
   });
 
-  // Set vary header (good practice)
-  // Note: This overrides any existing 'Vary' header but is okay in this app
-  server.use(function (req, res, next) {
-    res.setHeader('Vary', 'Accept-Encoding')
-    next()
-  });
-
   server.listen(3000, err => {
     if (err) throw err;
     console.log('> Ready on http://localhost:3000');
diff --git a/webui/server/passport/index.js b/webui/server/passport/index.js
new file mode 100644
index 000000000..c5e2c3fb7
--- /dev/null
+++ b/webui/server/passport/index.js
@@ -0,0 +1,32 @@
+const passport = require('passport');
+const LocalStrategy = require('passport-local').Strategy;
+
+const models = require('../models');
+
+passport.use(new LocalStrategy((username, password, done) => {
+    models.User.findOne({ where: {username: username} }).then(user => {
+      if (!user) { 
+        return done(null, false, { message: 'Incorrect username' }); 
+      }
+      if (user.password != password) {
+        return done(null, false, { message: 'Incorrect password' });
+      }
+      return done(null, user);
+    });
+  }));
+
+passport.serializeUser((user, done) => {
+  done(null, user.id);
+})
+
+passport.deserializeUser((id, done) => {
+  models.User.findOne({
+    where: { id: id },
+    include: [{ model: models.UserRole }]
+  }).then(user => {
+    done(null, {
+      username: user.username,
+      role: user.UserRole.role
+    });
+  })
+});