KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error where user is not signed in if server crashes and comes up again

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-04-06 16:04:02 +02:00
parent bf6a90050c
commit 9e22d5f68d
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

17
static/js/crypt.js
View File

@@ -1,6 +1,6 @@
var Crypt = { var Crypt = {
conf_arr: {}, conf_pass: undefined,
init: function(){ init: function(){
@@ -12,9 +12,9 @@ var Crypt = {
conf_arr = Crypt.decrypt(Crypt.create_cookie("_opt"), "_opt"); conf_arr = Crypt.decrypt(Crypt.create_cookie("_opt"), "_opt");
} }
try{ try{
conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase()); Crypt.conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase());
}catch(err){ }catch(err){
conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase()); Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase());
} }
Hostcontroller.change_enabled(conf_arr.remote); Hostcontroller.change_enabled(conf_arr.remote);
if(conf_arr["width"] != 100) Player.set_width(conf_arr["width"]); if(conf_arr["width"] != 100) Player.set_width(conf_arr["width"]);
@@ -113,13 +113,13 @@ var Crypt = {
}, },
set_pass: function(chan, pass){ set_pass: function(chan, pass){
conf_pass.passwords[chan] = pass; Crypt.conf_pass.passwords[chan] = pass;
Crypt.encrypt(conf_pass, chan); Crypt.encrypt(Crypt.conf_pass, chan);
}, },
remove_pass:function(chan){ remove_pass:function(chan){
delete conf_pass.passwords[chan]; delete Crypt.conf_pass.passwords[chan];
Crypt.encrypt(conf_pass, chan.toLowerCase()); Crypt.encrypt(Crypt.conf_pass, chan.toLowerCase());
}, },
set_name:function(name){ set_name:function(name){
@@ -133,7 +133,8 @@ var Crypt = {
}, },
get_pass: function(chan){ get_pass: function(chan){
return conf_pass.passwords[chan]; if(Crypt.conf_pass != undefined) return Crypt.conf_pass.passwords[chan];
return undefined;
}, },
set_remote: function(val){ set_remote: function(val){

6
static/js/listeners.js
View File

@@ -123,8 +123,10 @@ function init(){
socket.on("get_list", function(){ socket.on("get_list", function(){
//setTimeout(function(){ //setTimeout(function(){
socket.emit('list', chan.toLowerCase()) socket.emit('list', chan.toLowerCase());
//},1000); if(Crypt.get_pass(chan.toLowerCase()) != undefined){
socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
}
}); });
socket.on("suggested", function(params){ socket.on("suggested", function(params){