🐛修复对chillerlan\QRCode\QRCode包的兼容

asundust · Nov 8, 2023 · e54166f · e54166f
1 parent 7432682
commit e54166f
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/Http/Controllers/DcatAuthGoogle2FaAuthController.php b/src/Http/Controllers/DcatAuthGoogle2FaAuthController.php
@@ -155,8 +155,20 @@ protected function settingForm()
                 $url = $google2fa->getQRCodeInline(config('admin.name'), $user->username, $googleTwoFaSecret);
                 $form->display('google_2fa_qrcode', DcatAuthGoogle2FaServiceProvider::trans('dcat-auth-google-2fa.google_2fa_qrcode'))
                     ->help(DcatAuthGoogle2FaServiceProvider::trans('dcat-auth-google-2fa.google_2fa_qrcode_help'))
-                    ->with(function () use ($url) {
-                        return $url;
+                    ->width(2)
+                    ->with(function () use ($url, $google2fa) {
+                        if (
+                            class_exists('BaconQrCode\Writer') &&
+                            class_exists('BaconQrCode\Renderer\ImageRenderer')
+                        ) {
+                            return $url;
+                        } elseif (class_exists('chillerlan\QRCode\QRCode')) {
+                            return '<img src="' . $url . '" />';
+                        } else {
+                            throw new MissingQrCodeServiceException(
+                                DcatAuthGoogle2FaServiceProvider::trans('dcat-auth-google-2fa.qrcode_service_tips')
+                            );
+                        }
                     });
                 $form->text('google_2fa_code', DcatAuthGoogle2FaServiceProvider::trans('dcat-auth-google-2fa.google_2fa_code'))
                     ->help(DcatAuthGoogle2FaServiceProvider::trans('dcat-auth-google-2fa.google_2fa_code_enable_help'));