From 8cd5148b040645200fdb59a06a9a7b08b5b72bce Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Sun, 4 Dec 2022 15:03:52 -0500
Subject: [PATCH] better check if logged in

---
 .../includes/ServiceVault/wtv-head-waiter/ValidateLogin.js    | 4 ++--
 zefie_wtvp_minisrv/includes/classes/WTVClientSessionData.js   | 2 +-
 zefie_wtvp_minisrv/includes/config.json                       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js
index 4cfc138b..f5eef53c 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js
@@ -51,7 +51,7 @@ wtv-visit: client:hangupphone`
 		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 == "") {
 			headers = `403 Please enter your password and try again
 minisrv-no-mail-count: true
@@ -72,7 +72,7 @@ minisrv-no-mail-count: true
 		if (session_data.baddisk === true) {
 			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?"
 		} else {
 			if (!session_data.getUserPasswordEnabled() && request_headers.query.user_login) session_data.setUserLoggedIn(true);
diff --git a/zefie_wtvp_minisrv/includes/classes/WTVClientSessionData.js b/zefie_wtvp_minisrv/includes/classes/WTVClientSessionData.js
index 6da31aab..48d9f128 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVClientSessionData.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVClientSessionData.js
@@ -478,7 +478,7 @@ class WTVClientSessionData {
     }
 
     isUserLoggedIn() {
-        var password_valid = this.get("password_valid");
+        var password_valid = this.get("password_valid") || false;
         return (password_valid);
     }
 
diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json
index 18c7e8cd..483a5082 100644
--- a/zefie_wtvp_minisrv/includes/config.json
+++ b/zefie_wtvp_minisrv/includes/config.json
@@ -179,6 +179,7 @@
       "port": 1615,
       "connections": 1,
       "flags": "0x00000001",
+      "privileged": true,
       "send_tellyscripts": true // Best left untouched
     },
     "wtv-flashrom": {