log in and out

2 files changed, 8 insertions, 13 deletions

diff --git a/bucky/app/index.js b/bucky/app/index.js
index e2fcd48..0da18c7 100644
--- a/bucky/app/index.js
+++ b/bucky/app/index.js
@@ -21,13 +21,8 @@ var site = module.exports = {}
 site.init = function(){
   app = express()
   app.set('port', 5000)
-  app.set('view engine', 'ejs')
-  app.set('views', path.join(__dirname, '../../views'))
-  app.use(express.static(path.join(__dirname, '../../public')))
-  
   app.use(favicon(__dirname + '../../../public/favicon.ico'))
   app.use(bodyParser.json())
-  app.use(bodyParser.urlencoded({ extended: false }))
   
   app.use(session({
     key: 'bucky.sid',
@@ -45,6 +40,7 @@ site.init = function(){
     saveUninitialized: false,
   }))
   app.use(csurf({ cookie: false }))
+  app.disable('x-powered-by')
 
   app.use(express.query())
 	app.use(passport.initialize())
@@ -61,6 +57,10 @@ site.init = function(){
   })
 
   site.route(app)
+
+  app.set('view engine', 'ejs')
+  app.set('views', path.join(__dirname, '../../views'))
+  app.use(express.static(path.join(__dirname, '../../public')))
 }
 
 site.route = require('./router')
diff --git a/bucky/app/router.js b/bucky/app/router.js
index 007ff6b..eada09b 100644
--- a/bucky/app/router.js
+++ b/bucky/app/router.js
@@ -15,11 +15,6 @@ module.exports = function(app){
   app.get("/", middleware.ensureAuthenticated, function(req, res){
     res.redirect('/index')
   })
-  app.get("/login", function(req, res){
-    res.render("pages/login", {
-      title: "login"
-    })
-  })
   app.get("/index", middleware.ensureAuthenticated, function(req, res){
     res.render("pages/index", {
       title: fortune("titles"),
@@ -49,7 +44,6 @@ module.exports = function(app){
     }
   )
 
-  app.post("/api/login", auth.loggedInLocal)
   app.get("/api/index",
     bucky.ensureLastlog,
     middleware.ensureAuthenticated,
@@ -66,10 +60,10 @@ module.exports = function(app){
       })
     }
   )
+
   app.get("/api/keyword/:keyword",
     bucky.ensureLastlog,
     middleware.ensureAuthenticated,
-    bucky.keyword,
     bucky.ensureThreadsForKeyword,
     bucky.ensureCommentCountsForThreads,
     bucky.ensureFileCountsForThreads,
@@ -223,5 +217,6 @@ module.exports = function(app){
       // send new mail
     }
   )
-
+  
+  auth.route(app)
 }