Guest create page: name field autofocus

[bookstack] / app / Providers / AuthServiceProvider.php

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index fe52df1686cec7ac00bcd82ba14a1c74b0b5f3dd..5e16179ab27c60ff878451f35868a75d9013c662 100644 (file)
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,15 +2,16 @@
 
 namespace BookStack\Providers;
 
 
 namespace BookStack\Providers;
 

-use Auth;

 use BookStack\Api\ApiTokenGuard;
 use BookStack\Auth\Access\ExternalBaseUserProvider;
 use BookStack\Api\ApiTokenGuard;
 use BookStack\Auth\Access\ExternalBaseUserProvider;

+use BookStack\Auth\Access\Guards\AsyncExternalBaseSessionGuard;

 use BookStack\Auth\Access\Guards\LdapSessionGuard;
 use BookStack\Auth\Access\Guards\LdapSessionGuard;

-use BookStack\Auth\Access\Guards\Saml2SessionGuard;

 use BookStack\Auth\Access\LdapService;
 use BookStack\Auth\Access\LdapService;

+use BookStack\Auth\Access\LoginService;

 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\RegistrationService;

-use BookStack\Auth\UserRepo;
+use Illuminate\Support\Facades\Auth;

 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\ServiceProvider;

+use Illuminate\Validation\Rules\Password;

 
 class AuthServiceProvider extends ServiceProvider
 {
 
 class AuthServiceProvider extends ServiceProvider
 {


@@ -21,27 +22,34 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
      */
     public function boot()
     {

+        // Password Configuration
+        // Changes here must be reflected in ApiDocsGenerate@getValidationAsString.
+        Password::defaults(fn () => Password::min(8));
+
+        // Custom guards

         Auth::extend('api-token', function ($app, $name, array $config) {
         Auth::extend('api-token', function ($app, $name, array $config) {

-            return new ApiTokenGuard($app['request']);
+            return new ApiTokenGuard($app['request'], $app->make(LoginService::class));

         });
 
         Auth::extend('ldap-session', function ($app, $name, array $config) {
             $provider = Auth::createUserProvider($config['provider']);
         });
 
         Auth::extend('ldap-session', function ($app, $name, array $config) {
             $provider = Auth::createUserProvider($config['provider']);

+

             return new LdapSessionGuard(
                 $name,
                 $provider,
             return new LdapSessionGuard(
                 $name,
                 $provider,

-                $this->app['session.store'],
+                $app['session.store'],

                 $app[LdapService::class],
                 $app[RegistrationService::class]
             );
         });
 
                 $app[LdapService::class],
                 $app[RegistrationService::class]
             );
         });
 

-        Auth::extend('saml2-session', function ($app, $name, array $config) {
+        Auth::extend('async-external-session', function ($app, $name, array $config) {

             $provider = Auth::createUserProvider($config['provider']);
             $provider = Auth::createUserProvider($config['provider']);

-            return new Saml2SessionGuard(
+
+            return new AsyncExternalBaseSessionGuard(

                 $name,
                 $provider,
                 $name,
                 $provider,

-                $this->app['session.store'],
+                $app['session.store'],

                 $app[RegistrationService::class]
             );
         });
                 $app[RegistrationService::class]
             );
         });