fix tests namespace definition

[bookstack] / app / App / Providers / AuthServiceProvider.php

diff --git a/app/App/Providers/AuthServiceProvider.php b/app/App/Providers/AuthServiceProvider.php
index dc482ce33062725ba05ca2e353273ec5851c9e4f..23c3390796575c5a4b6af2de18197d2e7072c757 100644 (file)
--- a/app/App/Providers/AuthServiceProvider.php
+++ b/app/App/Providers/AuthServiceProvider.php
@@ -9,6 +9,7 @@ use BookStack\Access\LdapService;
 use BookStack\Access\LoginService;
 use BookStack\Access\RegistrationService;
 use BookStack\Api\ApiTokenGuard;
 use BookStack\Access\LoginService;
 use BookStack\Access\RegistrationService;
 use BookStack\Api\ApiTokenGuard;

+use BookStack\Users\Models\User;

 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\Rules\Password;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\Rules\Password;


@@ -17,10 +18,8 @@ class AuthServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap the application services.
 {
     /**
      * Bootstrap the application services.

-     *
-     * @return void

      */
      */

-    public function boot()
+    public function boot(): void

     {
         // Password Configuration
         // Changes here must be reflected in ApiDocsGenerate@getValidationAsString.
     {
         // Password Configuration
         // Changes here must be reflected in ApiDocsGenerate@getValidationAsString.


@@ -57,13 +56,17 @@ class AuthServiceProvider extends ServiceProvider
 
     /**
      * Register the application services.
 
     /**
      * Register the application services.

-     *
-     * @return void

      */
      */

-    public function register()
+    public function register(): void

     {
         Auth::provider('external-users', function ($app, array $config) {
             return new ExternalBaseUserProvider($config['model']);
         });
     {
         Auth::provider('external-users', function ($app, array $config) {
             return new ExternalBaseUserProvider($config['model']);
         });

+
+        // Bind and provide the default system user as a singleton to the app instance when needed.
+        // This effectively "caches" fetching the user at an app-instance level.
+        $this->app->singleton('users.default', function () {
+            return User::query()->where('system_name', '=', 'public')->first();
+        });

     }
 }
     }
 }