extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-06-25 06:24:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Push to Error view when ProtectDB option fail

Browse Source
This commit is contained in:
Bubka 2020-11-06 17:49:28 +01:00
parent d1d4734031
commit 289a208847
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/Settings/OptionController.php
View File

@ -33,19 +33,22 @@ class OptionController extends Controller
// The useEncryption option impacts the [existing] content of the database. // The useEncryption option impacts the [existing] content of the database.
// Encryption/Decryption of the data is done only if the user change the value of the option // Encryption/Decryption of the data is done only if the user change the value of the option
// to prevent successive encryption // to prevent successive encryption
if( $request->useEncryption && !Options::get('useEncryption') ) {
// user enabled the encryption if( isset($request->useEncryption))
if( !DbProtection::enable() ) { {
return response()->json(['message' => __('errors.error_during_encryption'), 'settings' => Options::get()], 422); if( $request->useEncryption && !Options::get('useEncryption') ) {
// user enabled the encryption
if( !DbProtection::enable() ) {
return response()->json(['message' => __('errors.error_during_encryption'), 'settings' => Options::get()], 400);
}
} }
} else if( !$request->useEncryption && Options::get('useEncryption') ) {
else if( !$request->useEncryption && Options::get('useEncryption') ) {
// user disabled the encryption // user disabled the encryption
if( !DbProtection::disable() ) { if( !DbProtection::disable() ) {
return response()->json(['message' => __('errors.error_during_decryption'), 'settings' => Options::get()], 422); return response()->json(['message' => __('errors.error_during_decryption'), 'settings' => Options::get()], 400);
}
} }
} }

6
resources/js/views/settings/Options.vue
View File

@ -80,7 +80,7 @@
handleSubmit(e) { handleSubmit(e) {
e.preventDefault() e.preventDefault()
this.form.post('/api/settings/options', {returnError: true}) this.form.post('/api/settings/options', {returnError: false})
.then(response => { .then(response => {
this.$notify({ type: 'is-success', text: response.data.message }) this.$notify({ type: 'is-success', text: response.data.message })
@ -91,10 +91,6 @@
else { else {
this.$root.appSettings = response.data.settings this.$root.appSettings = response.data.settings
} }
})
.catch(error => {
this.$notify({ type: 'is-danger', text: error.response.data.message })
}); });
}, },

4
resources/lang/en/errors.php
View File

@ -25,7 +25,7 @@ return [
'Unable_to_decrypt_uri' => 'Unable to decrypt uri', 'Unable_to_decrypt_uri' => 'Unable to decrypt uri',
'not_a_supported_otp_type' => 'This OTP format is not currently supported', 'not_a_supported_otp_type' => 'This OTP format is not currently supported',
'wrong_current_password' => 'Wrong current password, nothing has changed', 'wrong_current_password' => 'Wrong current password, nothing has changed',
'error_during_encryption' => 'Encryption failed, your database remains unprotected', 'error_during_encryption' => 'Encryption failed, your database remains unprotected.',
'error_during_decryption' => 'Decryption failed, your database is still protected', 'error_during_decryption' => 'Decryption failed, your database is still protected. This is mainly caused by an integrity issue of encrypted data for one or more accounts.',
]; ];