mirrors/mStream
3
0
Fork 0
mirror of https://github.com/IrosTheBeggar/mStream.git synced 2025-10-27 07:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

electron cleanup

Browse Source
This commit is contained in:
Paul Sori 2019-10-16 22:04:28 -07:00
parent 9b78e0e2a9
commit 02c15e12ef
2 changed files with 7 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
electron/index3.html
View File

@ -150,10 +150,6 @@
loadJson.federation = {};
}
if(typeof loadJson.federation.disableInvites !== 'boolean') {
loadJson.federation.disableInvites = false;
}
if(!loadJson.secret) {
loadJson.secret = crypto.randomBytes(Math.ceil(128/2)).toString('base64').slice(0,128);
}
@ -702,7 +698,7 @@
<div class="section-header">Federation</div>\
<div class="row row-mod">\
<div class="col s12">\
Federation allows you to sync files between mStream servers. To sync your files to another server, you can create a Federation Token through the Web UI. Federation Tokens allow the other server to download files without an account.\
Federation allows you to sync files between mStream servers. To sync your files to another server, you can create a Invite Token through the Web UI\
</div>\
</div>\
</div>\
@ -712,45 +708,22 @@
</div>\
<div class="row row-mod">\
<div class="col s12">\
Federated directories will be downloaded here. Federation is disabled until this value is set\
Federated directories will be downloaded here\
</div>\
<div class="col s12 port-form-container">\
<div class="input-field">\
<input v-on:click="selectSyncPath($event)" v-model="lJson.federation.folder" @blur="updateConfig()" type="text" placeholder="Click to select directory" required />\
<span class="helper-text">Federation is disabled until this value is set</span>\
</div>\
</div>\
</div>\
<div class="row row-mod clearfix">\
<a class="reset-defaults-link" href="#!" v-on:click="resetStorageValues" >Clear</a>\
</div>\
</div>\
<div class="card">\
<div class="row row-mod">\
<div class="section-header">Access Controls</div>\
</div>\
<div class="row row-mod">\
<div class="col s12">\
<b>Secret Key:</b> {{secretKey}}\
</div>\
<div class="col s12 port-form-container">\
<label class="input-field">\
<input v-model="lJson.federation.disableInvites" v-on:blur="updateConfig" type="checkbox"/>\
<span>Disable Invite Token Creation</span>\
</label>\
</div>\
</div>\
<div class="row row-mod clearfix">\
<a class="reset-defaults-link" href="#!" v-on:click="resetSecurityKey" >Reset Security Key (Permanently disables all active tokens)</a>\
<a class="reset-defaults-link" href="#!" v-on:click="resetStorageValues">Clear (Disables Federation)</a>\
</div>\
</div>\
</div>\
</div>\
</div>',
computed: {
secretKey: function() {
return `*****************${this.lJson.secret.slice(-6, -2)}`;
}
},
methods: {
updateConfig: function() {
fs.writeFileSync(configFile, JSON.stringify(loadJson), 'utf8');
@ -759,29 +732,6 @@
loadJson.federation.folder = null;
fs.writeFileSync(configFile, JSON.stringify(loadJson), 'utf8');
},
resetSecurityKey: function(e) {
iziToast.question({
timeout: 20000,
close: false,
overlayClose: true,
overlay: true,
displayMode: 'once',
id: 'question',
zindex: 99999,
title: "Reset Secret Key?",
position: 'center',
buttons: [
['<button><b>Reset</b></button>', (instance, toast) => {
loadJson.secret = crypto.randomBytes(Math.ceil(256/2)).toString('base64').slice(0,256);
fs.writeFileSync(configFile, JSON.stringify(loadJson), 'utf8');
instance.hide({ transitionOut: 'fadeOut' }, toast, 'button');
}, true],
['<button>Go Back</button>', (instance, toast) => {
instance.hide({ transitionOut: 'fadeOut' }, toast, 'button');
}],
]
});
},
selectSyncPath: function(el) {
dialog.showOpenDialog({properties: ['openDirectory']}, (selectedFile) => {
if(selectedFile.length === 0){

4
modules/defaults.js
View File

@ -21,6 +21,7 @@ exports.setup = function (program) {
});
const schema = Joi.object({
autoboot: Joi.boolean().optional(),
port: Joi.number().default(3000),
scanOptions: scanOptions.default(scanOptions.validate({}).value),
noUpload: Joi.boolean().optional(),
@ -30,7 +31,8 @@ exports.setup = function (program) {
ddns: Joi.object({
iniFile: Joi.string().default(path.join(__dirname, `../frp/frps.ini`)),
email: Joi.string().optional(),
password: Joi.string().optional()
password: Joi.string().optional(),
tested: Joi.boolean().optional()
}),
secret: Joi.string().optional(),
folders: Joi.object().pattern(