summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bucky/util/middleware.js1
-rw-r--r--public/assets/js/lib/sdk/auth.js7
2 files changed, 8 insertions, 0 deletions
diff --git a/bucky/util/middleware.js b/bucky/util/middleware.js
index a744c89..72d43b9 100644
--- a/bucky/util/middleware.js
+++ b/bucky/util/middleware.js
@@ -1,6 +1,7 @@
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/public/assets/js/lib/sdk/auth.js b/public/assets/js/lib/sdk/auth.js
index c720292..983cc99 100644
--- a/public/assets/js/lib/sdk/auth.js
+++ b/public/assets/js/lib/sdk/auth.js
@@ -11,23 +11,29 @@ var auth = (function(){
auth.init = function(fn){
// if we're on an authentication page, ignore the current user
+ console.log('auth')
if (window.location.pathname === '/login' || window.location.pathname === '/signup') {
+ console.log('authenticating..')
fn && fn( false )
return
}
+ console.log('loading user..')
auth.load_user(function(user){
var logged_in = auth.logged_in()
+ console.log('logged in?', logged_in)
if (logged_in) {
fn && fn()
return
}
auth.checkin({
success: function(user){
+ console.log('check in :)', user)
if (user) {
auth.set_user(user, fn)
}
},
error: function(){
+ console.log('no check in :(', user)
window.location.href = "/login"
}
})
@@ -44,6 +50,7 @@ var auth = (function(){
auth.load_user = function(cb){
var user
var user_str = localStorage.getItem("bucky.user")
+ console.log("check localStorage", user_str)
if (user_str && user_str.length) {
try {
user = JSON.parse(user_str)