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

Remove invalid calls to the Settings facade

Browse Source
This commit is contained in:
Bubka 2023-03-15 16:26:32 +01:00
parent 4d8180a8c1
commit 82717077be
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Auth/WebAuthnManageController.php
View File

@ -2,7 +2,6 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Facades\Settings;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\WebauthnRenameRequest; use App\Http\Requests\WebauthnRenameRequest;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -58,8 +57,9 @@ class WebAuthnManageController extends Controller
// no more registered device exists. // no more registered device exists.
// See #110 // See #110
if (blank($user->webAuthnCredentials()->WhereEnabled()->get())) { if (blank($user->webAuthnCredentials()->WhereEnabled()->get())) {
Settings::delete('useWebauthnOnly');
Log::notice('No Webauthn credential enabled, Webauthn settings reset to default'); Log::notice('No Webauthn credential enabled, Webauthn settings reset to default');
$request->user()->preferences['useWebauthnOnly'] = false;
$request->user()->save();
} }
Log::info('Security device deleted'); Log::info('Security device deleted');

4
app/Http/Controllers/Auth/WebAuthnRecoveryController.php
View File

@ -3,7 +3,6 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Extensions\WebauthnCredentialBroker; use App\Extensions\WebauthnCredentialBroker;
use App\Facades\Settings;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\WebauthnRecoveryRequest; use App\Http\Requests\WebauthnRecoveryRequest;
use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\AuthenticationException;
@ -52,7 +51,8 @@ class WebAuthnRecoveryController extends Controller
if ($this->shouldRevokeAllCredentials($request)) { if ($this->shouldRevokeAllCredentials($request)) {
$user->flushCredentials(); $user->flushCredentials();
} }
Settings::delete('useWebauthnOnly'); $user->preferences['useWebauthnOnly'] = false;
$user->save();
} else { } else {
throw new AuthenticationException(); throw new AuthenticationException();
} }

15
tests/Feature/Http/Auth/UserControllerTest.php
View File

@ -68,7 +68,10 @@ class UserControllerTest extends FeatureTestCase
*/ */
public function test_update_user_in_demo_mode_returns_unchanged_user() public function test_update_user_in_demo_mode_returns_unchanged_user()
{ {
Settings::set('isDemoApp', true); Config::set('2fauth.config.isDemoApp', true);
$name = $this->user->name;
$email = $this->user->email;
$response = $this->actingAs($this->user, 'web-guard') $response = $this->actingAs($this->user, 'web-guard')
->json('PUT', '/user', [ ->json('PUT', '/user', [
@ -78,17 +81,16 @@ class UserControllerTest extends FeatureTestCase
]) ])
->assertOk() ->assertOk()
->assertExactJson([ ->assertExactJson([
'name' => $this->user->name, 'name' => $name,
'id' => $this->user->id, 'id' => $this->user->id,
'email' => $this->user->email, 'email' => $email,
'is_admin' => $this->user->is_admin, 'is_admin' => $this->user->is_admin,
]); ]);
$this->assertDatabaseHas('users', [ $this->assertDatabaseHas('users', [
'name' => $this->user->name, 'name' => $name,
'id' => $this->user->id, 'id' => $this->user->id,
'email' => $this->user->email, 'email' => $email,
'is_admin' => $this->user->is_admin,
]); ]);
} }
@ -170,7 +172,6 @@ class UserControllerTest extends FeatureTestCase
public function test_delete_user_in_demo_mode_returns_unauthorized() public function test_delete_user_in_demo_mode_returns_unauthorized()
{ {
Config::set('2fauth.config.isDemoApp', true); Config::set('2fauth.config.isDemoApp', true);
Settings::set('isDemoApp', true);
$response = $this->actingAs($this->user, 'web-guard') $response = $this->actingAs($this->user, 'web-guard')
->json('DELETE', '/user', [ ->json('DELETE', '/user', [