diff --git a/www/install/appconfigscreen.js b/www/install/appconfigscreen.js index 620d50e04..ac801b861 100644 --- a/www/install/appconfigscreen.js +++ b/www/install/appconfigscreen.js @@ -27,70 +27,7 @@ define([ const blocks = Sidebar.blocks; - AppConfigScreen.mfaRegistrationScreen = function(sendAdminDecree) { - console.log('mreao1') - - - - var restrict = blocks.activeCheckbox({ - key: 'registration', - getState: function () { - return false - }, - query: function (val, setState) { - // sendAdminDecree('RESTRICT_REGISTRATION', [val], function (e, response) { - - // if (e || response.error) { - // UI.warn(Messages.error); - // $input.val(''); - // console.error(e, response); - // done(false); - // return; - // } - // // flushCache(); - // done(true); - // UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); - - // }) - }, - }); - - var forceMFA = blocks.activeCheckbox({ - key: 'forcemfa', - getState: function () { - return false - }, - query: function (val, setState) { - - // sendAdminDecree('ENFORCE_MFA', [val], function (e, response) { - - // if (e || response.error) { - // UI.warn(Messages.error); - // $input.val(''); - // console.error(e, response); - // done(false); - // return; - // } - // // flushCache(); - // done(true); - // UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); - - // }) - }, - }); - - var button = blocks.activeButton('primary', '', Messages.settings_save, function (done) { - // document.location.href = '/drive/'; - return; - }) - - var form = blocks.form([restrict, forceMFA], [button]) - return form - - - } - - AppConfigScreen.titleConfig = function (sendAdminDecree) { + AppConfigScreen.titleConfig = function (sendAdminDecree) { const blocks = Sidebar.blocks; @@ -145,7 +82,6 @@ define([ let reader = new FileReader(); reader.onloadend = function () { - console.log('belp') let dataURL = this.result; sendAdminDecree('UPLOAD_LOGO', {dataURL}, function (e, response) { $button.removeAttr('disabled'); @@ -268,37 +204,36 @@ define([ // ], blocks.nav([btn, remove, btn.spinner])); var button = blocks.activeButton('primary', '', Messages.settings_save, function (done) { - console.log('mreao') - // sendAdminDecree('SET_INSTANCE_NAME', [$input.val().trim()], function (e, response) { + sendAdminDecree('SET_INSTANCE_NAME', [$input.val().trim()], function (e, response) { - // if (e || response.error) { - // UI.warn(Messages.error); - // $input.val(''); - // console.error(e, response); - // done(false); - // return; - // } - // // flushCache(); - // done(true); - // UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); + if (e || response.error) { + UI.warn(Messages.error); + $input.val(''); + console.error(e, response); + done(false); + return; + } + // flushCache(); + done(true); + UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); - // }) - // sendAdminDecree('SET_INSTANCE_DESCRIPTION', [$description.val().trim()], function (e, response) { + }) + sendAdminDecree('SET_INSTANCE_DESCRIPTION', [$description.val().trim()], function (e, response) { - // if (e || response.error) { - // UI.warn(Messages.error); - // $input.val(''); - // console.error(e, response); - // done(false); - // return; - // } - // // flushCache(); - // done(true); - // UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); + if (e || response.error) { + UI.warn(Messages.error); + $input.val(''); + console.error(e, response); + done(false); + return; + } + // flushCache(); + done(true); + UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); - // }) - var nextPageForm = AppConfigScreen.appConfig() + }) + var nextPageForm = AppConfigScreen.appConfig(sendAdminDecree) var elem = document.createElement('div'); elem.setAttribute('id', 'cp-loading'); let frame = h('div.configscreen', {style: 'width: 70%; height: 75%; background-color: white'}, nextPageForm) @@ -324,6 +259,67 @@ define([ } + AppConfigScreen.mfaRegistrationScreen = function(sendAdminDecree) { + + var restrict = blocks.activeCheckbox({ + key: 'registration', + getState: function () { + return false + }, + query: function (val, setState) { + sendAdminDecree('RESTRICT_REGISTRATION', [val], function (e, response) { + + if (e || response.error) { + UI.warn(Messages.error); + $input.val(''); + console.error(e, response); + done(false); + return; + } + // flushCache(); + done(true); + UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); + + }) + }, + }); + + var forceMFA = blocks.activeCheckbox({ + key: 'forcemfa', + getState: function () { + return false + }, + query: function (val, setState) { + + sendAdminDecree('ENFORCE_MFA', [val], function (e, response) { + + if (e || response.error) { + UI.warn(Messages.error); + $input.val(''); + console.error(e, response); + done(false); + return; + } + // flushCache(); + done(true); + UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); + + }) + }, + }); + + var button = blocks.activeButton('primary', '', Messages.settings_save, function (done) { + document.location.href = '/drive/'; + return; + }) + + var form = blocks.form([restrict, forceMFA], [button]) + return form + + + } + + AppConfigScreen.appConfig = function (sendAdminDecree) { const blocks = Sidebar.blocks; @@ -353,23 +349,22 @@ define([ }); var save = blocks.activeButton('primary', '', Messages.settings_save, function (done) { - // sendAdminDecree('DISABLE_APPS', availableApps, function (e, response) { + sendAdminDecree('DISABLE_APPS', availableApps, function (e, response) { - // if (e || response.error) { - // UI.warn(Messages.error); - // $input.val(''); - // console.error(e, response); - // done(false); - // return; - // } - // // flushCache(); - // done(true); - // UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); - // window.location.href = '/drive/'; + if (e || response.error) { + UI.warn(Messages.error); + $input.val(''); + console.error(e, response); + done(false); + return; + } + // flushCache(); + done(true); + UI.log(Messages._getKey('ui_saved', [Messages.admin_appSelection])); - // }) + }) UI.log('Messages._getKey(, [Messages.admin_appSelection])'); - var nextPageForm = AppConfigScreen.mfaRegistrationScreen() + var nextPageForm = AppConfigScreen.mfaRegistrationScreen(sendAdminDecree) var elem = document.createElement('div'); elem.setAttribute('id', 'cp-loading'); let frame = h('div.configscreen', {style: 'width: 70%; height: 75%; background-color: white'}, nextPageForm) diff --git a/www/install/main.js b/www/install/main.js index f6822db65..2ea706af0 100644 --- a/www/install/main.js +++ b/www/install/main.js @@ -148,138 +148,140 @@ define([ } var registerClick = function () { - showTitleScreen() - document.location.href = '/drive/'; + // showTitleScreen() + // document.location.href = '/drive/'; -// var uname = $uname.val().trim(); -// // trim whitespace surrounding the username since it is otherwise included in key derivation -// // most people won't realize that its presence is significant -// $uname.val(uname); + var uname = $uname.val().trim(); + // trim whitespace surrounding the username since it is otherwise included in key derivation + // most people won't realize that its presence is significant + $uname.val(uname); -// var passwd = $passwd.val(); -// var confirmPassword = $confirm.val(); + var passwd = $passwd.val(); + var confirmPassword = $confirm.val(); -// if (!token) { token = $token.val().trim(); } + if (!token) { token = $token.val().trim(); } -// var shouldImport = false; -// var doesAccept; -// try { -// // if this throws there's either a horrible bug (which someone will report) -// // or the instance admins did not configure a terms page. -// doesAccept = true; -// } catch (err) { -// console.error(err); -// } + var shouldImport = false; + var doesAccept; + try { + // if this throws there's either a horrible bug (which someone will report) + // or the instance admins did not configure a terms page. + doesAccept = true; + } catch (err) { + console.error(err); + } -// if (Cred.isEmail(uname) && !I_REALLY_WANT_TO_USE_MY_EMAIL_FOR_MY_USERNAME) { -// var emailWarning = [ -// Messages.register_emailWarning0, -// br(), br(), -// Messages.register_emailWarning1, -// br(), br(), -// Messages.register_emailWarning2, -// br(), br(), -// Messages.register_emailWarning3, -// ]; + if (Cred.isEmail(uname) && !I_REALLY_WANT_TO_USE_MY_EMAIL_FOR_MY_USERNAME) { + var emailWarning = [ + Messages.register_emailWarning0, + br(), br(), + Messages.register_emailWarning1, + br(), br(), + Messages.register_emailWarning2, + br(), br(), + Messages.register_emailWarning3, + ]; -// Feedback.send("EMAIL_USERNAME_WARNING", true); + Feedback.send("EMAIL_USERNAME_WARNING", true); -// return void UI.confirm(emailWarning, function (yes) { -// if (!yes) { return; } -// I_REALLY_WANT_TO_USE_MY_EMAIL_FOR_MY_USERNAME = true; -// registerClick(); -// }); -// } + return void UI.confirm(emailWarning, function (yes) { + if (!yes) { return; } + I_REALLY_WANT_TO_USE_MY_EMAIL_FOR_MY_USERNAME = true; + registerClick(); + }); + } -// /* basic validation */ -// if (!Cred.isLongEnoughPassword(passwd)) { -// var warning = Messages._getKey('register_passwordTooShort', [ -// Cred.MINIMUM_PASSWORD_LENGTH -// ]); -// return void UI.alert(warning); -// } + /* basic validation */ + if (!Cred.isLongEnoughPassword(passwd)) { + var warning = Messages._getKey('register_passwordTooShort', [ + Cred.MINIMUM_PASSWORD_LENGTH + ]); + return void UI.alert(warning); + } -// if (passwd !== confirmPassword) { // do their passwords match? -// return void UI.alert(Messages.register_passwordsDontMatch); -// } + if (passwd !== confirmPassword) { // do their passwords match? + return void UI.alert(Messages.register_passwordsDontMatch); + } -// if (Pages.customURLs.terms && !doesAccept) { // do they accept the terms of service? (if they exist) -// return void UI.alert(Messages.register_mustAcceptTerms); -// } + if (Pages.customURLs.terms && !doesAccept) { // do they accept the terms of service? (if they exist) + return void UI.alert(Messages.register_mustAcceptTerms); + } -// let startOnboarding = function (network, proxy) { -// Rpc.create(network, proxy.edPrivate, proxy.edPublic, function (e, rpc) { -// if (e) { -// // TODO: handle error -// return; -// } + let startOnboarding = function (network, proxy) { + Rpc.create(network, proxy.edPrivate, proxy.edPublic, function (e, rpc) { + if (e) { + // TODO: handle error + return; + } -// let sendAdminDecree = function (command, data, callback) { -// var params = ['ADMIN_DECREE', [command, data]]; -// rpc.send('ADMIN', params, callback) -// }; + let sendAdminDecree = function (command, data, callback) { + var params = ['ADMIN_DECREE', [command, data]]; + rpc.send('ADMIN', params, callback) + }; -// showAppScreen(sendAdminDecree) + showTitleScreen(sendAdminDecree) + + // showAppScreen(sendAdminDecree) -// }); + }); -// }; + }; -// setTimeout(function () { -// var span = h('span', [ -// h('h2', [ -// h('i.fa.fa-warning'), -// ' ', -// Messages.register_warning, -// ]), -// Messages.register_warning_note -// ]); + setTimeout(function () { + var span = h('span', [ + h('h2', [ + h('i.fa.fa-warning'), + ' ', + Messages.register_warning, + ]), + Messages.register_warning_note + ]); -// UI.confirm(span, -// function (yes) { -// if (!yes) { return; } + UI.confirm(span, + function (yes) { + if (!yes) { return; } -// Login.loginOrRegisterUI({ -// uname, -// passwd, -// isRegister: true, -// onOTP: UI.getOTPScreen, -// shouldImport, -// cb: function (data) { -// var proxy = data.proxy; -// if (!proxy || !proxy.edPublic) { UI.alert(Messages.error); return true; } + Login.loginOrRegisterUI({ + uname, + passwd, + isRegister: true, + onOTP: UI.getOTPScreen, + shouldImport, + cb: function (data) { + var proxy = data.proxy; + if (!proxy || !proxy.edPublic) { UI.alert(Messages.error); return true; } -// Rpc.createAnonymous(data.network, function (e, call) { -// if (e) { UI.alert(Messages.error); return console.error(e); } -// var anon_rpc = call; + Rpc.createAnonymous(data.network, function (e, call) { + if (e) { UI.alert(Messages.error); return console.error(e); } + var anon_rpc = call; -// anon_rpc.send('ADD_FIRST_ADMIN', { -// token: token, -// edPublic: proxy.edPublic -// }, function (e) { -// if (e) { UI.alert(Messages.error); return console.error(e); } -// startOnboarding(data.network, proxy); -// }); -// }); + anon_rpc.send('ADD_FIRST_ADMIN', { + token: token, + edPublic: proxy.edPublic + }, function (e) { + if (e) { UI.alert(Messages.error); return console.error(e); } + startOnboarding(data.network, proxy); + }); + }); -// return true; -// } -// }); -// }, { -// ok: Messages.register_writtenPassword, -// cancel: Messages.register_cancel, -// /* If we're certain that we aren't using these "*Class" APIs -// anywhere else then we can deprecate them and make this a -// custom modal in common-interface (or here). */ -// cancelClass: 'btn.btn-cancel.btn-register', -// okClass: 'btn.btn-danger.btn-register', -// reverseOrder: true, -// done: function ($dialog) { -// $dialog.find('> div').addClass('half'); -// }, -// }); -// }, 150); + return true; + } + }); + }, { + ok: Messages.register_writtenPassword, + cancel: Messages.register_cancel, +/* If we're certain that we aren't using these "*Class" APIs + anywhere else then we can deprecate them and make this a + custom modal in common-interface (or here). */ + cancelClass: 'btn.btn-cancel.btn-register', + okClass: 'btn.btn-danger.btn-register', + reverseOrder: true, + done: function ($dialog) { + $dialog.find('> div').addClass('half'); + }, + }); + }, 150); }; $register.click(registerClick);