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

fix hangup button on user select page

Browse Source
This commit is contained in:
zefie
2022-02-15 18:36:36 -05:00
parent 96f5825b68
commit c295f81ccc
1 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,20 +4,26 @@ var challenge_response, challenge_header = '';
var gourl; var gourl;
var wtvsec_login = null; var wtvsec_login = null;
var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : ssid_sessions[socket.ssid].user_id; if (request_headers.query.hangup) {
headers = `300 OK
Location: client:gototvhome
wtv-visit: client:hangupphone`
} else {
if (socket.ssid !== null && user_id !== null) ssid_sessions[socket.ssid].switchUserID(user_id); var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : ssid_sessions[socket.ssid].user_id;
if (socket.ssid !== null && !ssid_sessions[socket.ssid].get("wtvsec_login")) { if (socket.ssid !== null && user_id !== null) ssid_sessions[socket.ssid].switchUserID(user_id);
if (socket.ssid !== null && !ssid_sessions[socket.ssid].get("wtvsec_login")) {
wtvsec_login = new WTVSec(minisrv_config); wtvsec_login = new WTVSec(minisrv_config);
wtvsec_login.IssueChallenge(); wtvsec_login.IssueChallenge();
wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]); wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]);
ssid_sessions[socket.ssid].set("wtvsec_login", wtvsec_login); ssid_sessions[socket.ssid].set("wtvsec_login", wtvsec_login);
} else { } else {
wtvsec_login = ssid_sessions[socket.ssid].get("wtvsec_login"); wtvsec_login = ssid_sessions[socket.ssid].get("wtvsec_login");
} }
if (socket.ssid !== null) { if (socket.ssid !== null) {
if (wtvsec_login.ticket_b64 == null) { if (wtvsec_login.ticket_b64 == null) {
challenge_response = wtvsec_login.challenge_response; challenge_response = wtvsec_login.challenge_response;
var client_challenge_response = request_headers["wtv-challenge-response"] || null; var client_challenge_response = request_headers["wtv-challenge-response"] || null;
@@ -38,9 +44,9 @@ if (socket.ssid !== null) {
} else { } else {
gourl = "wtv-head-waiter:/login-stage-two?"; gourl = "wtv-head-waiter:/login-stage-two?";
} }
} }
if (user_id && !request_headers.query.initial_login && !request_headers.query.user_login) { if (user_id && !request_headers.query.initial_login && !request_headers.query.user_login) {
if (request_headers.query.password == "") { if (request_headers.query.password == "") {
headers = `500 Please enter your password and try again headers = `500 Please enter your password and try again
minisrv-no-mail-count: true minisrv-no-mail-count: true
@@ -57,7 +63,7 @@ wtv-visit: ${gourl}
minisrv-no-mail-count: true minisrv-no-mail-count: true
`; `;
} }
} else { } else {
if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) { if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) {
gourl = "wtv-head-waiter:/choose-user?" gourl = "wtv-head-waiter:/choose-user?"
} else { } else {
@@ -78,4 +84,5 @@ wtv-encrypted: true`;
headers += ` headers += `
wtv-visit: ${gourl}`; wtv-visit: ${gourl}`;
}
} }