From be28f6a2be16813233a2ffd79a824883e9546838 Mon Sep 17 00:00:00 2001 From: zefie Date: Sun, 8 Aug 2021 13:16:37 -0400 Subject: [PATCH] guest mode: only skip splash on first transistion --- zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js | 1 + .../ServiceVault/wtv-head-waiter/login-stage-two.js | 3 ++- zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js | 1 + zefie_wtvp_minisrv/ServiceVault/wtv-register/BeMyGuest.js | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js index 35c8f6a1..49ae3d46 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js @@ -124,6 +124,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { if (request_headers.query.guest_login) { send_tellyscript = false; gourl += "&guest_login=true" + if (request_headers.query.skip_splash) gourl += "&skip_splash=true"; } headers = "200 OK\n" diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js index 8c0a72ac..531fceeb 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js @@ -59,7 +59,8 @@ else { var userid = '1' + Math.floor(Math.random() * 1000000000000000000); var messenger_enabled = 0; var messenger_authorized = 0; - var home_url = "wtv-home:/home?"; + if (request_headers.query.skip_splash) var home_url = "wtv-home:/home?"; + else var home_url = "wtv-home:/splash?"; } else if (!ssid_sessions[socket.ssid].getSessionData("registered")) { var errpage = doErrorPage(400); headers = errpage[0]; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js index 6d770d36..ae847962 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js @@ -7,6 +7,7 @@ else if (request_headers.query.reconnect) gourl += "reconnect=true"; if (request_headers.query.guest_login) { if (request_headers.query.relogin || request_headers.query.reconnect) gourl += "&"; gourl += "guest_login=true"; + if (request_headers.query.skip_splash) gourl += "&skip_splash=true"; } var send_to_relogin = true; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-register/BeMyGuest.js b/zefie_wtvp_minisrv/ServiceVault/wtv-register/BeMyGuest.js index 8c0382cc..dffe9ebf 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-register/BeMyGuest.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-register/BeMyGuest.js @@ -15,7 +15,7 @@ wtv-expire-all: wtv-`; headers += ` wtv-service: reset ${getServiceString('wtv-1800')} -wtv-relogin-url: wtv-1800:/preregister?guest_login=true +wtv-relogin-url: wtv-1800:/preregister?guest_login=true&skip_splash=true wtv-reconnect-url: wtv-1800:/preregister?guest_login=true&reconnect=true wtv-boot-url: wtv-1800:/preregister?guest_login=true Location: client:relogin`;