diff options
| -rw-r--r-- | bucky/app/index.js | 6 | ||||
| -rw-r--r-- | bucky/util/middleware.js | 1 | ||||
| -rw-r--r-- | bucky/util/upload.js | 9 | ||||
| -rw-r--r-- | public/assets/js/lib/router.js | 7 |
4 files changed, 12 insertions, 11 deletions
diff --git a/bucky/app/index.js b/bucky/app/index.js index c445536..248679a 100644 --- a/bucky/app/index.js +++ b/bucky/app/index.js @@ -54,11 +54,7 @@ site.init = function(){ console.log('Bucky listening at http://' + process.env.HOST_NAME + ':%s', server.address().port) }) - upload.init({ - key: process.env.S3_KEY, - secret: process.env.S3_SECRET, - bucket: process.env.S3_BUCKET, - }) + upload.init() site.route(app) diff --git a/bucky/util/middleware.js b/bucky/util/middleware.js index 72d43b9..a744c89 100644 --- a/bucky/util/middleware.js +++ b/bucky/util/middleware.js @@ -1,7 +1,6 @@ var middleware = module.exports = { ensureAuthenticated: function (req, res, next) { - console.log(req.user) if (! req.isAuthenticated()) { req.session.returnTo = req.path return res.redirect('/login') diff --git a/bucky/util/upload.js b/bucky/util/upload.js index a1810a4..d7bf822 100644 --- a/bucky/util/upload.js +++ b/bucky/util/upload.js @@ -13,12 +13,11 @@ var acceptableuploadTypes = { module.exports = {} -module.exports.init = function (opt){ - options = opt +module.exports.init = function (){ s3 = knox.createClient({ - key: opt.key, - secret: opt.secret, - bucket: opt.bucket, + key: process.env.S3_KEY, + secret: process.env.S3_SECRET, + bucket: process.env.S3_BUCKET, }) } diff --git a/public/assets/js/lib/router.js b/public/assets/js/lib/router.js index 388bdac..7b0fbb6 100644 --- a/public/assets/js/lib/router.js +++ b/public/assets/js/lib/router.js @@ -7,6 +7,7 @@ var SiteRouter = Router.extend({ "/index/:keyword": 'index', "/index": 'index', "/login": 'login', + "/logout": 'logout', "/signup": 'signup', "/details/:id": 'details', "/details/:id/settings": 'threadSettings', @@ -25,6 +26,7 @@ var SiteRouter = Router.extend({ }, initialize: function(){ + $("#logout").click(() => this.logout()) }, index: function(keyword){ @@ -36,6 +38,11 @@ var SiteRouter = Router.extend({ app.view = new LoginView () }, + logout: function(){ + auth.log_out() + window.location.href = "/logout" + }, + signup: function(){ app.view = new SignupView () }, |