From d6307cb1c3e8101caeb4602e3b46c5aba7c266d5 Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Sat, 22 Jan 2022 19:06:38 -0300 Subject: [PATCH 01/13] Bump to Google2fa Laravel 1.0.0 --- composer.json | 6 +++--- src/Google2fa.php | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 6fca6f0..93f6214 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,10 @@ ], "license": "MIT", "require": { - "php": ">=7.1.0", + "php": ">=7.1.0|>=8.0.0", "bacon/bacon-qr-code": "^2.0", - "pragmarx/recovery": "^0.1.0", - "pragmarx/google2fa-laravel": "^0.2.0" + "pragmarx/recovery": "^0.2.0", + "pragmarx/google2fa-laravel": "^1.0.0" }, "autoload": { "psr-4": { diff --git a/src/Google2fa.php b/src/Google2fa.php index f2b6ba2..4484732 100644 --- a/src/Google2fa.php +++ b/src/Google2fa.php @@ -32,9 +32,8 @@ public function confirm() } $google2fa = new G2fa(); - $google2fa->setAllowInsecureCallToGoogleApis(true); - $google2fa_url = $google2fa->getQRCodeGoogleUrl( + $google2fa_url = $google2fa->getQRCodeUrl( config('app.name'), auth()->user()->email, auth()->user()->user2fa->google2fa_secret @@ -53,9 +52,8 @@ public function confirm() public function register() { $google2fa = new G2fa(); - $google2fa->setAllowInsecureCallToGoogleApis(true); - $google2fa_url = $google2fa->getQRCodeGoogleUrl( + $google2fa_url = $google2fa->getQRCodeUrl( config('app.name'), auth()->user()->email, auth()->user()->user2fa->google2fa_secret From 22aeb3087309c10c48c45863e298fee033051c5d Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Sat, 22 Jan 2022 20:36:35 -0300 Subject: [PATCH 02/13] Bump to use google2fa-laravel ^2.0.1 and generate QR code using google2fa-qrcode ^3.0 --- composer.json | 8 ++++---- resources/views/authenticate.blade.php | 2 +- resources/views/register.blade.php | 2 +- src/Google2fa.php | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 93f6214..004780d 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,10 @@ ], "license": "MIT", "require": { - "php": ">=7.1.0|>=8.0.0", - "bacon/bacon-qr-code": "^2.0", - "pragmarx/recovery": "^0.2.0", - "pragmarx/google2fa-laravel": "^1.0.0" + "php": ">=8.0.0", + "pragmarx/google2fa-laravel": "^2.0.1", + "pragmarx/google2fa-qrcode": "^3.0", + "pragmarx/recovery": "^0.2.0" }, "autoload": { "psr-4": { diff --git a/resources/views/authenticate.blade.php b/resources/views/authenticate.blade.php index b93f525..7ca9ecf 100644 --- a/resources/views/authenticate.blade.php +++ b/resources/views/authenticate.blade.php @@ -69,7 +69,7 @@ class="w-1/4 btn btn-default btn-primary hover:bg-primary-dark" type="button">
+ name="{{ config('google2fa.otp_input') }}" value="" onkeyup="checkAutoSubmit(this)" autofocus="">

@endif +
- +
+ - +
+ + + +
diff --git a/resources/views/recovery.blade.php b/resources/views/recovery.blade.php index 40f9e33..f1d54dd 100644 --- a/resources/views/recovery.blade.php +++ b/resources/views/recovery.blade.php @@ -9,25 +9,6 @@ - -
diff --git a/resources/views/register.blade.php b/resources/views/register.blade.php index f5bbd94..0200970 100644 --- a/resources/views/register.blade.php +++ b/resources/views/register.blade.php @@ -10,17 +10,6 @@ - @@ -65,13 +85,7 @@