mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-04 01:04:36 -04:00
Do no force self hosters to enter a phone number to enable 2FA
This commit is contained in:
parent
ea9632c72e
commit
60030c4e9a
@ -11,10 +11,11 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
use App\Http\Requests\TwoFactor\EnableTwoFactorRequest;
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Transformers\UserTransformer;
|
use App\Utils\Ninja;
|
||||||
use PragmaRX\Google2FA\Google2FA;
|
use PragmaRX\Google2FA\Google2FA;
|
||||||
|
use App\Transformers\UserTransformer;
|
||||||
|
use App\Http\Requests\TwoFactor\EnableTwoFactorRequest;
|
||||||
|
|
||||||
class TwoFactorController extends BaseController
|
class TwoFactorController extends BaseController
|
||||||
{
|
{
|
||||||
@ -24,11 +25,15 @@ class TwoFactorController extends BaseController
|
|||||||
|
|
||||||
public function setupTwoFactor()
|
public function setupTwoFactor()
|
||||||
{
|
{
|
||||||
|
/** @var \App\Models\User $user */
|
||||||
$user = auth()->user();
|
$user = auth()->user();
|
||||||
|
|
||||||
if ($user->google_2fa_secret) {
|
if ($user->google_2fa_secret) {
|
||||||
return response()->json(['message' => '2FA already enabled'], 400);
|
return response()->json(['message' => '2FA already enabled'], 400);
|
||||||
} elseif (! $user->phone) {
|
} elseif(Ninja::isSelfHost()){
|
||||||
|
|
||||||
|
}
|
||||||
|
elseif (! $user->phone) {
|
||||||
return response()->json(['message' => ctrans('texts.set_phone_for_two_factor')], 400);
|
return response()->json(['message' => ctrans('texts.set_phone_for_two_factor')], 400);
|
||||||
} elseif (! $user->isVerified()) {
|
} elseif (! $user->isVerified()) {
|
||||||
return response()->json(['message' => 'Please confirm your account first'], 400);
|
return response()->json(['message' => 'Please confirm your account first'], 400);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user