From e26369f133cb93beb417d33821d25f0ac705befb Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Fri, 1 Sep 2023 09:40:06 +0200 Subject: [PATCH] payment gateway settings now fully working --- src/server/admin/api/postHandler.js | 2 +- src/server/backend/plugins/manager.js | 1 + src/server/config/settings.config.json | 2 +- .../main/src/views/admin/SettingsView.vue | 22 +++++++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/server/admin/api/postHandler.js b/src/server/admin/api/postHandler.js index aabc602..c6bb645 100644 --- a/src/server/admin/api/postHandler.js +++ b/src/server/admin/api/postHandler.js @@ -113,7 +113,7 @@ class POSTHandler { reject( { 'code': 500, 'error': error } ); } ); } else if ( call === 'createAdminAccount' ) { - // TODO: Finish + db.writeDataSimple( 'admin', 'email', data.email ) } else if ( call === 'updateAdminAccount' ) { // TODO: Finish } else if ( call === 'deleteAdminAccount' ) { diff --git a/src/server/backend/plugins/manager.js b/src/server/backend/plugins/manager.js index fbe4ffa..fa57b18 100644 --- a/src/server/backend/plugins/manager.js +++ b/src/server/backend/plugins/manager.js @@ -32,6 +32,7 @@ class PluginManager { loadPaymentGatewaySettings () { return new Promise( ( resolve, reject ) => { + this.paymentGateway = JSON.parse( fs.readFileSync( path.join( __dirname + '/../../config/settings.config.json' ) ) ).payments; fs.readFile( path.join( __dirname + '/payments/' + this.paymentGateway + '/configOptions.json' ), ( err, optionsBuffer ) => { if ( err ) reject( err ); fs.readFile( path.join( __dirname + '/payments/' + this.paymentGateway + '/config.payments.json' ), ( err, configBuffer ) => { diff --git a/src/server/config/settings.config.json b/src/server/config/settings.config.json index 31587c6..871a7ad 100644 --- a/src/server/config/settings.config.json +++ b/src/server/config/settings.config.json @@ -12,5 +12,5 @@ "currency":"CHF", "gcInterval":300, "ticketTimeout":900, - "startPage": "default" + "startPage":"default" } \ No newline at end of file diff --git a/src/webapp/main/src/views/admin/SettingsView.vue b/src/webapp/main/src/views/admin/SettingsView.vue index cc2d5f5..d1a7400 100644 --- a/src/webapp/main/src/views/admin/SettingsView.vue +++ b/src/webapp/main/src/views/admin/SettingsView.vue @@ -252,6 +252,27 @@ 'value': '', 'type': 'password', }, + 'twoFA': { + 'display': 'Two Factor Authentication', + 'id': 'twoFA', + 'tooltip':'With this setting you may change the 2FA Authentication should work for this user. Enhanced requires the user to enter a code, simple solely to click a link', + 'value': 'enhanced', + 'type': 'select', + 'restrictions': { + 'enhanced': { + 'value': 'enhanced', + 'displayName': 'Enhanced' + }, + 'eventManager': { + 'value': 'simple', + 'displayName': 'Simple' + }, + 'disabled': { + 'value': 'disabled', + 'displayName': 'Disabled' + } + } + }, } , 'settings' ); }, @@ -272,6 +293,7 @@ console.log( this.currentPopup ); if ( this.currentPopup === 'account' ) { console.log( 'settings processing' ) + // TODO: Call to server to create account, also add to admin accounts here } else if ( this.currentPopup === 'payments' ) { for ( let setting in data.data ) { if ( !data.data[ setting ] ) {