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 issue with login-in

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-13 17:55:56 +01:00
parent eb69e1e67b
commit ed38c213ac
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/handlers/io.js
View File

@@ -45,7 +45,7 @@ module.exports = function() {
}); });
socket.on("logout", function() { socket.on("logout", function() {
Functions.removeSessionAdminPass(Functions.getSession(socket), "", coll, function() {}) Functions.removeSessionAdminPass(Functions.getSession(socket), coll, function() {})
}); });
socket.on('chromecast', function(msg) { socket.on('chromecast', function(msg) {

2
server/handlers/list_settings.js
View File

@@ -42,7 +42,7 @@ function password(inp, coll, guid, offline, socket) {
{ {
Functions.setSessionAdminPass(sessionId, inp.password, coll, function() { Functions.setSessionAdminPass(sessionId, inp.password, coll, function() {
db.collection(coll + "_settings").update({ id: "config" }, {$set:{adminpass:Functions.hash_pass(pw)}}, function(err, docs){ db.collection(coll + "_settings").update({ id: "config" }, {$set:{adminpass:Functions.hash_pass(pw)}}, function(err, docs){
if(adminpass != pw) { if(adminpass != pw && adminpass != "") {
socket.emit("toast", "changedpass"); socket.emit("toast", "changedpass");
} else { } else {
socket.emit("toast", "correctpass"); socket.emit("toast", "correctpass");

3
server/public/assets/js/admin.js
View File

@@ -83,13 +83,14 @@ var Admin = {
/*if(Crypt.get_pass(chan.toLowerCase())) {*/ /*if(Crypt.get_pass(chan.toLowerCase())) {*/
//Crypt.remove_pass(chan.toLowerCase()); //Crypt.remove_pass(chan.toLowerCase());
Admin.display_logged_out(); Admin.display_logged_out();
console.log(Admin.logged_in);
if(Admin.logged_in) { if(Admin.logged_in) {
socket.emit("logout"); socket.emit("logout");
Materialize.toast("Logged out", 4000); Materialize.toast("Logged out", 4000);
} else { } else {
Materialize.toast("Not logged in", 4000); Materialize.toast("Not logged in", 4000);
} }
Admin.logged_in = false;
}, },
display_logged_out: function() { display_logged_out: function() {