backend/db.coffee

@@ -57,10 +57,10 @@ FFTCGDB::close = ->
     @db.close (err) ->
       if err
         logger.error "Error closing: '#{err.message}'"
-        reject 'db'
+        resolve 'ok'
       else
         logger.warn  "Closed '#{@filename}'"
-        resolve 'ok'
+        reject 'db'
 
 FFTCGDB::register = (login, password) ->
   that = @

backend/routes.coffee

@@ -1,11 +1,10 @@
 # node libraries
-#(require 'debug').enable 'routes'
-logger = (require 'logging').default 'routes'
 path = (require 'path')
 
 # my libraries
 FFTCGDB = (require './db')
 FFTCGSESSION = (require './session')
+logger = (require 'logging').default 'routes'
 
 # open fftcg.db (persistent data)
 fftcgdb = new FFTCGDB path.resolve(__dirname, 'fftcg.db'), true
@@ -48,35 +47,29 @@ module.exports = [
   url: '/user/login'
   method: 'POST'
   handler: (request, reply) ->
-    session_id = request.cookies.session ? ''
+    session_id = request.cookies.session
-
+    logger.info session_id
-    new Promise (resolve, reject) ->
+    session.action session_id
-      session.check session_id
       .then (user) ->
-          logger.debug "user '#{user.login}' resumed session '#{session_id}'"
+        logger.info user
-          resolve user
+      .catch (err) ->
+        logger.error err
 
-        .catch ->
     fftcgdb.login request.body.login, request.body.password
       .then (user) ->
-              # login successful: start new session
+        # login successful
-              session.start user
+        reply.setCookie 'user', JSON.stringify user
-                .then (session_id) ->
+
-                  logger.debug "user '#{user.login}' logged into session '#{session_id}'"
+        # return JSON status
-                  reply.setCookie 'session', session_id
+        reply.send
-                  resolve user
+          status: 'ok'
+          user: user.user
+          login: user.login
 
       .catch (err) ->
-              logger.info "failed login for '#{request.body.login}'"
         # login failed
         reply.send
           status: 'fail'
-                msg: err
+          text: err
-
-    .then (user) ->
-      # user is logged in
-      reply.send
-        status: 'ok'
-        user: user
 ,
 ]

backend/session.coffee

@@ -4,48 +4,63 @@ crypto = (require 'crypto')
 logger = (require 'logging').default 'session'
 
 # expiry times in seconds
+TIMES =
+  minute: 60
+  hour:   60 * 60
+  day:    60 * 60 * 24
+  week:   60 * 60 * 24 * 7
+  month:  60 * 60 * 24 * 7 * 4
+
 EXPIRY =
   # games expire 1 week after last action
-  game:    1 * 60 * 60 * 24 * 7
+  game:    1 * TIMES.week
   # logins expire 1 month after last action
-  login:   1 * 60 * 60 * 24 * 7 * 4
+  login:   1 * TIMES.month
 
 
 FFTCGSESSION = () ->
-  @db = redis.createClient
+  @db = redis.createClient 6379, 'redis'
-    host: 'redis'
-    port: 6379
 
   @db.on 'error', (err) ->
     logger.error err.message
 
   return
 
-FFTCGSESSION::start = (data) ->
+FFTCGSESSION::login = (login) ->
-  that = @
-
-  new Promise (resolve) ->
-    # hash data
-    hmac = crypto.createHmac 'sha256', Math.random().toString()
-    hmac.update (JSON.stringify data)
-    digest = hmac.digest 'base64'
-    logger.debug 'digest', digest
-
-    # push (hash, data) into DB for the configured timespan
-    that.db.setex digest, EXPIRY.login, (JSON.stringify data), (err) ->
-      resolve digest
-
-FFTCGSESSION::check = (digest) ->
   that = @
 
   new Promise (resolve, reject) ->
-    # refresh expiry timer on digest
+    hmac = crypto.createHmac 'sha256', Math.random().toString()
-    that.db.expire digest, EXPIRY.login, (err, res) ->
+    hmac.update login
-      if res == 0
+    digest = hmac.digest 'hex'
-        reject null
+
+    that.db.setex digest, EXPIRY.login, login, (err) ->
+      if err
+        reject err
 
       else
-        that.db.get digest, (err, res) ->
+        resolve digest
-          resolve JSON.parse res
+
+
+FFTCGSESSION::action = (digest) ->
+  that = @
+
+  new Promise (resolve, reject) ->
+    that.db.get digest (err, res) ->
+      logger.info 'err', err, 'res', res
+
+      if err
+        reject err
+
+      else if res == 0
+        resolve null
+
+      else
+        that.db.expire digest, EXPIRY.login, (err, res) ->
+          if err
+            reject err
+
+          else
+            resolve res
 
 module.exports = FFTCGSESSION