Skip to content

Option to Enter authorization code is added for 2FA #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Option to Enter authorization code is added for 2FA #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion resources/views/setup.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,19 @@
<div class="form-group text-center">
@if(! $user->is_two_factor_enabled)
<p>Please scan this barcode using <strong>Google Authenticator</strong> or <strong>Authy</strong> client Application and Click Enable Button</p>
<img src="{{ $barcode }}" />
<img id="barcode" src="{{ $barcode }}" />
<div>
<input type="number" id='pass_code' name="pass_code" autocomplete="off" class="form-control" placeholder="Enter Authy Code" required>
@if ($errors->any())
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
</div>
@endif
</div>
<div class="form-group text-center">
Expand Down
1 change: 0 additions & 1 deletion src/AuthenticatesUsersWith2FA.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public function verifyToken(Request $request)
// Impllicitly adding an validation rule to check if token is valid or not.
Validator::extendImplicit('valid_token', function ($attribute, $value) {
$totp = Factory::loadFromProvisioningUri($this->user->two_factor_provisioned_uri);

return $totp->verify($value);
});

Expand Down
34 changes: 21 additions & 13 deletions src/Http/Controllers/TwoFactorAuthenticationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Thecodework\TwoFactorAuthentication\Contracts\TwoFactorAuthenticationInterface;
use Thecodework\TwoFactorAuthentication\Exceptions\TwoFactorAuthenticationExceptions;
use Thecodework\TwoFactorAuthentication\TwoFactorAuthenticationServiceProvider;
use Session;

class TwoFactorAuthenticationController extends Controller implements TwoFactorAuthenticationInterface
{
Expand Down Expand Up @@ -55,6 +56,7 @@ public function setupTwoFactorAuthentication(Request $request)
config('2fa-config.digest_algorithm'),
config('2fa-config.number_of_digits')
);
session(['totp' => $totp]);
$totp->setLabel(config('2fa-config.account_name'));
$this->updateUserWithProvisionedUri($totp->getProvisioningUri());

Expand All @@ -77,20 +79,26 @@ public function setupTwoFactorAuthentication(Request $request)
*/
public function enableTwoFactorAuthentication(Request $request)
{
$user = $this->getUser();
$user->is_two_factor_enabled = 1;
$user->update();

if ($request->ajax()) {
return [
'data' => [
'message' => 'success',
'description' => '2FA Enabled',
],
];
$GOTP = $request->session()->get('totp');
$UOTP = $request->input('pass_code');

if (isset($GOTP) && $GOTP->verify($UOTP)) {
$user = $this->getUser();
$user->is_two_factor_enabled = 1;
$user->update();

if ($request->ajax()) {
return [
'data' => [
'message' => 'success',
'description' => '2FA Enabled',
],
];
}
return redirect(config('2fa-config.redirect_to'));
}else{
return redirect('setup-2fa');
}

return redirect(config('2fa-config.redirect_to'));
}

/**
Expand Down