瀏覽代碼

fix: 🐛 Recaptcha credentials must not be null even if disabled

IceToast 2 年之前
父節點
當前提交
935bc05880
共有 6 個文件被更改,包括 187 次插入179 次删除
  1. 5 0
      app/Providers/AppServiceProvider.php
  2. 4 2
      composer.json
  3. 173 174
      composer.lock
  4. 1 2
      config/app.php
  5. 2 1
      resources/views/auth/login.blade.php
  6. 2 0
      resources/views/auth/register.blade.php

+ 5 - 0
app/Providers/AppServiceProvider.php

@@ -90,6 +90,11 @@ class AppServiceProvider extends ServiceProvider
 
 
             // Set Recaptcha API Config
+            // Load recaptcha package if recaptcha is enabled
+            if(config('SETTINGS::RECAPTCHA:ENABLED') == 'true') {
+                $this->app->register(\Biscolab\ReCaptcha\ReCaptchaServiceProvider::class);
+            }
+
             //only update config if recaptcha settings have changed in DB
             if (
                 config('recaptcha.api_site_key') != config('SETTINGS::RECAPTCHA:SITE_KEY') ||

+ 4 - 2
composer.json

@@ -10,7 +10,7 @@
     "require": {
         "php": "^8.0|^7.4",
         "ext-intl": "*",
-        "biscolab/laravel-recaptcha": "^5.0",
+        "biscolab/laravel-recaptcha": "^5.4",
         "doctrine/dbal": "^3.1",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
@@ -47,7 +47,9 @@
     },
     "extra": {
         "laravel": {
-            "dont-discover": []
+            "dont-discover": [
+                "biscolab/laravel-recaptcha"
+            ]
         }
     },
     "autoload": {

File diff suppressed because it is too large
+ 173 - 174
composer.lock


+ 1 - 2
config/app.php

@@ -180,7 +180,7 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
-        Biscolab\ReCaptcha\ReCaptchaServiceProvider::class,
+
 
         /*
          * Package Service Providers...
@@ -250,7 +250,6 @@ return [
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
-        'ReCaptcha' => Biscolab\ReCaptcha\Facades\ReCaptcha::class,
         'DataTables' => Yajra\DataTables\Facades\DataTables::class,
 
     ],

+ 2 - 1
resources/views/auth/login.blade.php

@@ -63,7 +63,7 @@
                             </span>
                         @enderror
                     </div>
-
+                    @if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true')
                     <div class="input-group mb-3">
                         {!! htmlFormSnippet() !!}
                         @error('g-recaptcha-response')
@@ -72,6 +72,7 @@
                             </span>
                         @enderror
                     </div>
+                    @endif
 
                     <div class="row">
                         <div class="col-8">

+ 2 - 0
resources/views/auth/register.blade.php

@@ -101,6 +101,7 @@
                             </div>
                         </div>
                     @endif
+                    @if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true')
                     <div class="input-group mb-3">
                         {!! htmlFormSnippet() !!}
                         @error('g-recaptcha-response')
@@ -109,6 +110,7 @@
                             </span>
                         @enderror
                     </div>
+                    @endif
 
                     <div class="row">
                         <div class="col-8">

Some files were not shown because too many files changed in this diff