zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better check if logged in

Browse Source
This commit is contained in:
zefie
2022-12-04 15:03:52 -05:00
parent abb01f4ce0
commit 8cd5148b04
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js
View File

@@ -51,7 +51,7 @@ wtv-visit: client:hangupphone`
if (request_headers.query.skip_splash) gourl += "&skip_splash=true"; if (request_headers.query.skip_splash) gourl += "&skip_splash=true";
} }
if (user_id != null && !request_headers.query.initial_login && !request_headers.query.user_login && !request_headers.query.relogin) { if (user_id != null && !request_headers.query.initial_login && !request_headers.query.user_login && !request_headers.query.relogin && !request_headers.query.reconnect) {
if (request_headers.query.password == "") { if (request_headers.query.password == "") {
headers = `403 Please enter your password and try again headers = `403 Please enter your password and try again
minisrv-no-mail-count: true minisrv-no-mail-count: true
@@ -72,7 +72,7 @@ minisrv-no-mail-count: true
if (session_data.baddisk === true) { if (session_data.baddisk === true) {
gourl = "wtv-head-waiter:/bad-disk?" gourl = "wtv-head-waiter:/bad-disk?"
} }
else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && (request_headers.query.initial_login || request_headers.query.relogin)) { else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && (!session_data.isUserLoggedIn() || request_headers.query.initial_login || request_headers.query.relogin) ) {
gourl = "wtv-head-waiter:/choose-user?" gourl = "wtv-head-waiter:/choose-user?"
} else { } else {
if (!session_data.getUserPasswordEnabled() && request_headers.query.user_login) session_data.setUserLoggedIn(true); if (!session_data.getUserPasswordEnabled() && request_headers.query.user_login) session_data.setUserLoggedIn(true);

2
zefie_wtvp_minisrv/includes/classes/WTVClientSessionData.js
View File

@@ -478,7 +478,7 @@ class WTVClientSessionData {
} }
isUserLoggedIn() { isUserLoggedIn() {
var password_valid = this.get("password_valid"); var password_valid = this.get("password_valid") || false;
return (password_valid); return (password_valid);
} }

1
zefie_wtvp_minisrv/includes/config.json
View File

@@ -179,6 +179,7 @@
"port": 1615, "port": 1615,
"connections": 1, "connections": 1,
"flags": "0x00000001", "flags": "0x00000001",
"privileged": true,
"send_tellyscripts": true // Best left untouched "send_tellyscripts": true // Best left untouched
}, },
"wtv-flashrom": { "wtv-flashrom": {