Fixes for CodeStyle vol.2

[bookstack] / app / Providers / AuthServiceProvider.php

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index fe52df1686cec7ac00bcd82ba14a1c74b0b5f3dd..71b7ab016200bb085c5383584463313c673c1eb6 100644 (file)
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -8,8 +8,8 @@ use BookStack\Auth\Access\ExternalBaseUserProvider;
 use BookStack\Auth\Access\Guards\LdapSessionGuard;
 use BookStack\Auth\Access\Guards\Saml2SessionGuard;
 use BookStack\Auth\Access\LdapService;
 use BookStack\Auth\Access\Guards\LdapSessionGuard;
 use BookStack\Auth\Access\Guards\Saml2SessionGuard;
 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\ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider
 use Illuminate\Support\ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider


@@ -22,15 +22,16 @@ class AuthServiceProvider extends ServiceProvider
     public function boot()
     {
         Auth::extend('api-token', function ($app, $name, array $config) {
     public function boot()
     {
         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]
             );


@@ -38,10 +39,11 @@ class AuthServiceProvider extends ServiceProvider
 
         Auth::extend('saml2-session', function ($app, $name, array $config) {
             $provider = Auth::createUserProvider($config['provider']);
 
         Auth::extend('saml2-session', function ($app, $name, array $config) {
             $provider = Auth::createUserProvider($config['provider']);

+

             return new Saml2SessionGuard(
                 $name,
                 $provider,
             return new Saml2SessionGuard(
                 $name,
                 $provider,

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

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