logging i

1 files changed, 6 insertions, 5 deletions

diff --git a/app/server/util/auth.js b/app/server/util/auth.js
index b2faf2a..0d7dbd8 100644
--- a/app/server/util/auth.js
+++ b/app/server/util/auth.js
@@ -92,7 +92,7 @@ export function login(req, res) {
     return res.json({
       status: "OK",
       user: sanitizeUser(req.user),
-      returnTo: returnTo || "/index",
+      returnTo: returnTo || "/",
     })
   }
   res.json({
@@ -105,9 +105,9 @@ export function serializeUser(user, done) {
 }
 
 export function deserializeUser(id, done) {
-  db.getUser(id).then(function(user){
-    done(! user, user)
-  })
+  userModel.show(id).then(user => {
+    done(!user, user)
+  }).catch(done)
 }
 
 export function makePassword(password) {
@@ -143,7 +143,7 @@ export function verifyLocalUser(username, password, done) {
     console.log(user)
     // if (err) { return done(err) }
     if (! user) { return done("no user") }
-    if (! user || ! validPassword(user, password)) {
+    if (! user || !validPassword(user, password)) {
       return done(null, false, { error: { message: 'Bad username/password.' } })
     }
     return done(null, user)
@@ -151,6 +151,7 @@ export function verifyLocalUser(username, password, done) {
 }
 
 export function checkin(req, res) {
+  console.log(req.user)
   res.json({ user: sanitizeUser(req.user) })
 }