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

tweat adding users

Browse Source
This commit is contained in:
zefie
2022-02-18 23:08:25 -05:00
parent 0a00e34537
commit aa2fbfbbb3
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ minisrv-no-mail-count: true
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 {
var limitedLogin = (!ssid_sessions[socket.ssid].lockdown && (!ssid_sessions[socket.ssid].getSessionData('password_valid') && ssid_sessions[socket.ssid].getUserPasswordEnabled())); var limitedLogin = (!ssid_sessions[socket.ssid].lockdown && (!ssid_sessions[socket.ssid].get('password_valid') && ssid_sessions[socket.ssid].getUserPasswordEnabled()));
var limitedLoginRegistered = (limitedLogin && ssid_sessions[socket.ssid].isRegistered()); var limitedLoginRegistered = (limitedLogin && ssid_sessions[socket.ssid].isRegistered());
} }
headers = `200 OK headers = `200 OK

16
zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user-done.js
View File

@@ -33,15 +33,16 @@ if (errpage) {
userSession.setSessionData("subscriber_username", request_headers.query.user_name); userSession.setSessionData("subscriber_username", request_headers.query.user_name);
userSession.setSessionData("registered", true); userSession.setSessionData("registered", true);
var mailstore_exists = userSession.mailstore.mailstoreExists(); var mailstore_exists = userSession.mailstore.mailstoreExists();
var mailbox_exists = false;
if (!mailstore_exists) mailstore_exists = userSession.mailstore.createMailstore(); if (!mailstore_exists) mailstore_exists = userSession.mailstore.createMailstore();
if (mailstore_exists) { if (mailstore_exists) {
if (!userSession.mailstore.mailboxExists(0)) { if (!userSession.mailstore.mailboxExists(0)) {
// mailbox does not yet exist, create it // mailbox does not yet exist, create it
var mailbox_exists = userSession.mailstore.createMailbox(0); mailbox_exists = userSession.mailstore.createMailbox(0);
if (mailbox_exists) { }
// Just created Inbox for the first time, so create the welcome message if (mailbox_exists) {
userSession.mailstore.createWelcomeMessage(); // Just created Inbox for the first time, so create the welcome message
} userSession.mailstore.createWelcomeMessage();
} }
} }
if (!userSession.saveSessionData(true)) { if (!userSession.saveSessionData(true)) {
@@ -49,8 +50,11 @@ if (errpage) {
headers = errpage[0]; headers = errpage[0];
data = errpage[1]; data = errpage[1];
} else { } else {
if (request_headers.query.user_password) if (request_headers.query.user_password) {
userSession.setUserPassword(request_headers.query.user_password); userSession.setUserPassword(request_headers.query.user_password);
userSession.set('password_valid', true);
}
headers = `300 OK headers = `300 OK
Content-type: text/html Content-type: text/html