Merge branch 'master' into origin-develop

src/server/api.coffee

@@ -3,6 +3,7 @@ router = new express.Router()
 
 scoring = require '../app/scoring'
 _ = require 'underscore'
+{ tnl } = require '../app/algos'
 validator = require 'derby-auth/node_modules/validator'
 check = validator.check
 sanitize = validator.sanitize
@@ -41,6 +42,9 @@ auth = (req, res, next) ->
 router.get '/user', auth, (req, res) ->
   user = req.userObj
 
+  user.stats.tnl = tnl user.stats.lvl
+  user.stats.maxHealth = 50
+
   delete user.apiToken
 
   res.json user

test/api.mocha.coffee

@@ -100,6 +100,9 @@ describe 'API', ->
           expect(res.body.id).not.to.be.empty()
           self = _.clone(currentUser)
           delete self.apiToken
+          # To next level should be 100
+          self.stats.tnl = 100
+          self.stats.maxHealth = 50
 
           expect(res.body).to.eql self
           done()