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

more fixes

Browse Source
This commit is contained in:
zefie
2022-02-10 01:18:00 -05:00
parent af34d66488
commit 4d8bc314b4
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js
View File

@@ -86,7 +86,7 @@ wtv-ssl-timeout: 240
wtv-login-timeout: 7200 wtv-login-timeout: 7200
`; `;
if (!limitedLogin) { if (!limitedLogin) {
ssid_sessions[socket.ssid].assignMailstore();
headers += getServiceString('all', { "exceptions": ["wtv-register"] }); headers += getServiceString('all', { "exceptions": ["wtv-register"] });
if (offline_user_list) headers += "wtv-offline-user-list: " + offline_user_list + "\n"; if (offline_user_list) headers += "wtv-offline-user-list: " + offline_user_list + "\n";
headers += `wtv-messenger-authorized: ${messenger_authorized} headers += `wtv-messenger-authorized: ${messenger_authorized}

8
zefie_wtvp_minisrv/WTVClientSessionData.js
View File

@@ -47,18 +47,16 @@ class WTVClientSessionData {
]; ];
this.lockdownWhitelist.push(minisrv_config.config.unauthorized_url); this.lockdownWhitelist.push(minisrv_config.config.unauthorized_url);
this.lockdownWhitelist.push(minisrv_config.config.service_logo); this.lockdownWhitelist.push(minisrv_config.config.service_logo);
this.mailstore = new WTVMail(this.minisrv_config, this)
this.loginWhitelist = Object.assign([], this.lockdownWhitelist); // clone lockdown whitelist into login whitelist this.loginWhitelist = Object.assign([], this.lockdownWhitelist); // clone lockdown whitelist into login whitelist
this.loginWhitelist.push("wtv-head-waiter:/choose-user"); this.loginWhitelist.push("wtv-head-waiter:/choose-user");
this.loginWhitelist.push("wtv-head-waiter:/password"); this.loginWhitelist.push("wtv-head-waiter:/password");
this.mailstore = new WTVMail(minisrv_config, this);
} }
switchUserID(user_id, update_mail = true, update_ticket = true) { switchUserID(user_id, update_mail = true, update_ticket = true) {
this.user_id = user_id; this.user_id = user_id;
this.loadSessionData(); this.loadSessionData();
this.mailstore = new WTVMail(this.minisrv_config, this.ssid, this) this.mailstore = new WTVMail(this.minisrv_config, this)
if (this.data_store.wtvsec_login && update_ticket) this.setTicketData('user_id', user_id); if (this.data_store.wtvsec_login && update_ticket) this.setTicketData('user_id', user_id);
} }

8
zefie_wtvp_minisrv/WTVMail.js
View File

@@ -15,9 +15,7 @@ class WTVMail {
wtvclient = null; wtvclient = null;
WTVClientSessionData = null; WTVClientSessionData = null;
mailstore_dir = null; mailstore_dir = null;
is_guest = null;
mailboxes = null; mailboxes = null;
msgFileExt = ".zmsg"; msgFileExt = ".zmsg";
trashMailboxName = "Trash"; trashMailboxName = "Trash";
@@ -25,14 +23,12 @@ class WTVMail {
if (!minisrv_config) throw ("minisrv_config required"); if (!minisrv_config) throw ("minisrv_config required");
var WTVShared = require('./WTVShared.js')['WTVShared']; var WTVShared = require('./WTVShared.js')['WTVShared'];
var WTVMime = require('./WTVMime.js'); var WTVMime = require('./WTVMime.js');
var WTVClientSessionData = require('./WTVClientSessionData.js'); this.WTVClientSessionData = require('./WTVClientSessionData.js');
this.minisrv_config = minisrv_config; this.minisrv_config = minisrv_config;
this.wtvshared = new WTVShared(minisrv_config); this.wtvshared = new WTVShared(minisrv_config);
this.wtvmime = new WTVMime(minisrv_config); this.wtvmime = new WTVMime(minisrv_config);
this.wtvclient = wtvclient; this.wtvclient = wtvclient;
this.is_guest = !this.wtvclient.isRegistered(); this.ssid = this.wtvclient.ssid;
this.ssid = wtvclient.ssid;
console.log(this.ssid);
this.unread_mail = this.wtvclient.getSessionData("subscriber_unread_mail") ? this.wtvclient.getSessionData("subscriber_unread_mail") : 0; this.unread_mail = this.wtvclient.getSessionData("subscriber_unread_mail") ? this.wtvclient.getSessionData("subscriber_unread_mail") : 0;
this.mailboxes = [ this.mailboxes = [
// referenced by id, so order is important! // referenced by id, so order is important!