Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 00:04:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check user is confirmed for 2FA

Browse Source
This commit is contained in:
Hillel Coren 2017-11-05 11:54:32 +02:00
parent c39f57fcb5
commit 5083d44b0a
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ class TwoFactorController extends Controller
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->google_2fa_secret || ! $user->phone) { if ($user->google_2fa_secret || ! $user->phone || ! $user->confirmed) {
return redirect('/settings/user_details'); return redirect('/settings/user_details');
} }
@ -39,7 +39,7 @@ class TwoFactorController extends Controller
$user = auth()->user(); $user = auth()->user();
$secret = session()->pull('2fa:secret'); $secret = session()->pull('2fa:secret');
if ($secret && ! $user->google_2fa_secret && $user->phone) { if ($secret && ! $user->google_2fa_secret && $user->phone && $user->confirmed) {
$user->google_2fa_secret = Crypt::encrypt($secret); $user->google_2fa_secret = Crypt::encrypt($secret);
$user->save(); $user->save();

27
resources/views/accounts/user_details.blade.php
View File

@ -50,21 +50,22 @@
!!} !!}
@endif @endif
@if ($user->google_2fa_secret) @if ($user->confirmed)
{!! Former::checkbox('enable_two_factor') @if ($user->google_2fa_secret)
->help(trans('texts.enable_two_factor_help')) {!! Former::checkbox('enable_two_factor')
->text(trans('texts.enable')) ->help(trans('texts.enable_two_factor_help'))
->value(1) !!} ->text(trans('texts.enable'))
@elseif ($user->phone) ->value(1) !!}
{!! Former::plaintext('enable_two_factor')->value( @elseif ($user->phone)
Button::primary(trans('texts.enable'))->asLinkTo(url('settings/enable_two_factor'))->small() {!! Former::plaintext('enable_two_factor')->value(
)->help('enable_two_factor_help') !!} Button::primary(trans('texts.enable'))->asLinkTo(url('settings/enable_two_factor'))->small()
@else )->help('enable_two_factor_help') !!}
{!! Former::plaintext('enable_two_factor') @else
->value('<span class="text-muted">' . trans('texts.set_phone_for_two_factor') . '</span>') !!} {!! Former::plaintext('enable_two_factor')
->value('<span class="text-muted">' . trans('texts.set_phone_for_two_factor') . '</span>') !!}
@endif
@endif @endif
{!! Former::checkbox('dark_mode') {!! Former::checkbox('dark_mode')
->help(trans('texts.dark_mode_help')) ->help(trans('texts.dark_mode_help'))
->text(trans('texts.enable')) ->text(trans('texts.enable'))