deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-08 00:32:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #437 from williamboman/fix/save-token

Browse source 
src/client: fix storing updated token, ensure client config is always an object
This commit is contained in:
Jérémie Astori 2016-07-01 02:12:42 -04:00 committed by GitHub
parent 0de9f61e8d 32b46bb32d
commit 1cc02221a3
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/client.js
View file

@ -55,6 +55,9 @@ var inputs = [
}, {});
function Client(manager, name, config) {
if (typeof config !== "object") {
config = {};
}
_.merge(this, {
activeChannel: -1,
config: config,
@ -67,22 +70,22 @@ function Client(manager, name, config) {
var client = this;
if (config) {
if (!config.token) {
client.updateToken(function() {
client.manager.updateUser(client.name, {token: config.token});
});
}
var delay = 0;
(config.networks || []).forEach(function(n) {
setTimeout(function() {
client.connect(n);
}, delay);
delay += 1000;
if (client.name && !client.config.token) {
client.updateToken(function(token) {
client.manager.updateUser(client.name, {token: token});
});
}
log.info("User '" + name + "' loaded");
var delay = 0;
(client.config.networks || []).forEach(function(n) {
setTimeout(function() {
client.connect(n);
}, delay);
delay += 1000;
});
if (client.name) {
log.info("User '" + client.name + "' loaded");
}
}
@ -90,8 +93,7 @@ Client.prototype.emit = function(event, data) {
if (this.sockets !== null) {
this.sockets.in(this.id).emit(event, data);
}
var config = this.config || {};
if (config.log === true) {
if (this.config.log === true) {
if (event === "msg") {
var target = this.find(data.chan);
if (target) {
@ -245,17 +247,16 @@ Client.prototype.updateToken = function(callback) {
var client = this;
crypto.randomBytes(48, function(err, buf) {
client.config.token = buf.toString("hex");
callback();
callback(client.config.token = buf.toString("hex"));
});
};
Client.prototype.setPassword = function(hash, callback) {
var client = this;
client.updateToken(function() {
client.updateToken(function(token) {
client.manager.updateUser(client.name, {
token: client.config.token,
token: token,
password: hash
});

2
src/server.js
View file

@ -196,7 +196,7 @@ function init(socket, client) {
socket.emit("init", {
active: client.activeChannel,
networks: client.networks,
token: client.config ? client.config.token : null
token: client.config.token || null
});
}
}