From 937345f0e065baf4aec12348f5e3920949e0341d Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Thu, 5 Sep 2013 12:45:48 +0200 Subject: [PATCH] Minor fix. --- package.json | 1 + src/collection.js | 1 - src/main.js | 3 +++ src/xo.js | 13 +++++++------ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 68c8e12..6787b13 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "js-yaml": ">=2.1.0", "q": ">=0.9.6", "sync": ">=0.2.2", + "then-redis": ">=0.3.8", "underscore": ">=1.4.4", "validator": ">=1.2.1", "ws": ">=0.4.27", diff --git a/src/collection.js b/src/collection.js index 1a7b14a..323c6b3 100644 --- a/src/collection.js +++ b/src/collection.js @@ -3,7 +3,6 @@ var Q = require('q'); ////////////////////////////////////////////////////////////////////// -// @todo Add events. function Collection(models) { // Parent constructor. diff --git a/src/main.js b/src/main.js index c705fe6..41a68f1 100644 --- a/src/main.js +++ b/src/main.js @@ -355,5 +355,8 @@ Q.ninvoke(require('fs'), 'readFile', __dirname +'/../config/local.yaml', {'encod console.log('XO-Server Web server is listening on port '+ port +'.'); }); + var redis = require('then-redis').createClient('tcp://localhost:6379'); + + xo.start(cfg); }).done(); diff --git a/src/xo.js b/src/xo.js index f983791..d1b662d 100644 --- a/src/xo.js +++ b/src/xo.js @@ -61,7 +61,7 @@ var Token = Model.extend({ return Q.ninvoke(crypto, 'randomBytes', 32).then(function (buf) { return new Token({ 'id': buf.toString('base64'), - 'user_id': user_id, + 'user_id': +user_id, }); }); }, @@ -548,7 +548,13 @@ function Xo() }); xo.users.on('remove', function (user_ids) { _.each(user_ids, function (user_id) { + user_id = +user_id; xo.emit('user.revoked:'+ user_id); + + // All associated tokens must be destroyed too. + xo.tokens.get({'user_id': user_id}).then(function (tokens) { + return xo.tokens.remove(_.pluck(tokens, 'id')); + }).done(); }); }); @@ -573,11 +579,6 @@ function Xo() // ------------------------------------- // Temporary data for testing purposes. - //xo.servers.add([{ - // 'host': '192.168.1.116', - // 'username': 'root', - // 'password': 'qwerty', - //}]).done(); xo.users.add([{ 'email': 'bob@gmail.com', 'pw_hash': '$2a$10$PsSOXflmnNMEOd0I5ohJQ.cLty0R29koYydD0FBKO9Rb7.jvCelZq',