Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 22:07:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5936 from turbo124/v5-develop

Browse Source 
Add specific route for disabling 2FA
This commit is contained in:
David Bomba 2021-06-06 19:23:01 +10:00 committed by GitHub
commit 408cdac3ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/TwoFactorController.php
View File

@ -71,4 +71,12 @@ class TwoFactorController extends BaseController
} }
public function disableTwoFactor()
{
$user = auth()->user();
$user->google_2fa_secret = null;
$user->save();
return $this->itemResponse($user);
}
} }

2
app/Models/User.php
View File

@ -81,7 +81,7 @@ class User extends Authenticatable implements MustVerifyEmail
'custom_value3', 'custom_value3',
'custom_value4', 'custom_value4',
'is_deleted', 'is_deleted',
'google_2fa_secret', // 'google_2fa_secret',
]; ];
/** /**

1
app/Utils/HtmlEngine.php
View File

@ -252,6 +252,7 @@ class HtmlEngine
$data['$client.address2'] = &$data['$address2']; $data['$client.address2'] = &$data['$address2'];
$data['$client_address'] = ['value' => $this->client->present()->address() ?: ' ', 'label' => ctrans('texts.address')]; $data['$client_address'] = ['value' => $this->client->present()->address() ?: ' ', 'label' => ctrans('texts.address')];
$data['$client.address'] = &$data['$client_address']; $data['$client.address'] = &$data['$client_address'];
$data['$client.postal_code'] = $this->client->postal_code;
$data['$client.id_number'] = &$data['$id_number']; $data['$client.id_number'] = &$data['$id_number'];
$data['$client.vat_number'] = &$data['$vat_number']; $data['$client.vat_number'] = &$data['$vat_number'];
$data['$client.website'] = &$data['$website']; $data['$client.website'] = &$data['$website'];

1
routes/api.php
View File

@ -163,6 +163,7 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a
Route::get('settings/enable_two_factor', 'TwoFactorController@setupTwoFactor'); Route::get('settings/enable_two_factor', 'TwoFactorController@setupTwoFactor');
Route::post('settings/enable_two_factor', 'TwoFactorController@enableTwoFactor'); Route::post('settings/enable_two_factor', 'TwoFactorController@enableTwoFactor');
Route::post('settings/disable_two_factor', 'TwoFactorController@disableTwoFactor');
Route::resource('vendors', 'VendorController'); // name = (vendors. index / create / show / update / destroy / edit Route::resource('vendors', 'VendorController'); // name = (vendors. index / create / show / update / destroy / edit
Route::post('vendors/bulk', 'VendorController@bulk')->name('vendors.bulk'); Route::post('vendors/bulk', 'VendorController@bulk')->name('vendors.bulk');