Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for google 2fa reset strlen

This commit is contained in:
David Bomba 2025-08-29 11:47:37 +10:00
parent eeb0022342
commit a5562edd36
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -139,7 +139,7 @@ class LoginController extends BaseController
->header('X-App-Version', config('ninja.app_version')) ->header('X-App-Version', config('ninja.app_version'))
->header('X-Api-Version', config('ninja.minimum_client_version')); ->header('X-Api-Version', config('ninja.minimum_client_version'));
} }
} elseif ($user->google_2fa_secret && !$request->has('one_time_password')) { } elseif (strlen($user->google_2fa_secret ?? '') > 2 && !$request->has('one_time_password')) {
return response() return response()
->json(['message' => ctrans('texts.invalid_one_time_password')], 401) ->json(['message' => ctrans('texts.invalid_one_time_password')], 401)
->header('X-App-Version', config('ninja.app_version')) ->header('X-App-Version', config('ninja.app_version'))

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

@ -29,7 +29,7 @@ class TwoFactorController extends BaseController
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
if ($user->google_2fa_secret) { if (strlen($user->google_2fa_secret ?? '') > 2) {
return response()->json(['message' => '2FA already enabled'], 400); return response()->json(['message' => '2FA already enabled'], 400);
} elseif (Ninja::isSelfHost()) { } elseif (Ninja::isSelfHost()) {