Merge pull request thelounge#553 from thelounge/astorije/fix-auth-token

Fix token persistency across server refresh
matburnham · Aug 11, 2016 · 5684a92 · 5684a92
2 parents e1daddb + 22cf600
commit 5684a92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/clientManager.js b/src/clientManager.js
@@ -17,7 +17,7 @@ function ClientManager() {
 ClientManager.prototype.findClient = function(name, token) {
 	for (var i in this.clients) {
 		var client = this.clients[i];
-		if (client.name === name || (token && token === client.token)) {
+		if (client.name === name || (token && token === client.config.token)) {
 			return client;
 		}
 	}

diff --git a/src/server.js b/src/server.js
@@ -282,11 +282,11 @@ function auth(data) {
 		}
 	} else {
 		client = manager.findClient(data.user, data.token);
-		var signedIn = data.token && client && client.token === data.token;
+		var signedIn = data.token && data.token === client.config.token;
 		var token;
 
 		if (data.remember || data.token) {
-			token = client.token;
+			token = client.config.token;
 		}
 
 		var authCallback = function(success) {