Merge pull request #546 from dbarzin/dev

Dev

Author: dbarzin

app/Http/Controllers/SocialiteController.php

@@ -68,8 +68,8 @@ public function callback(Request $_request, string $provider)
         $allow_createUser = false;
         $allow_updateUser = false;
         if (config($config_name)) {
-            $allow_createUser = config($config_name.'.allow_createUser', $allow_createUser);
-            $allow_updateUser = config($config_name.'.allow_updateUser', $allow_updateUser);
+            $allow_createUser = config($config_name.'.allow_create_User', $allow_createUser);
+            $allow_updateUser = config($config_name.'.allow_update_User', $allow_updateUser);
         }
         Log::debug('CONFIG: allow_createUser='.($allow_createUser ? 'true' : 'false'));
         Log::debug('CONFIG: allow_updateUser='.($allow_updateUser ? 'true' : 'false'));

app/Providers/AppServiceProvider.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
+use LdapRecord\Container;
 use Log;
 
 class AppServiceProvider extends ServiceProvider
@@ -36,7 +37,7 @@ public function boot()
             URL::forceScheme('https');
         }
 
-        if (Config::get('app.debug')) {
+        if (config('app.debug')) {
             DB::listen(function ($query) {
                 Log::info(
                     $query->sql,
@@ -45,6 +46,13 @@ public function boot()
             });
         }
 
+        // Si le logging LDAP est activé, on force l’utilisation du channel "ldap"
+        if (config('ldap.logging.enabled')) {
+            Container::setLogger(
+                Log::channel('ldap')
+            );
+        }
+
         if (in_array('keycloak', Config::get('services.socialite_controller.providers'))) {
             Event::listen(function (\SocialiteProviders\Manager\SocialiteWasCalled $event) {
                 $event->extendSocialite('keycloak', \SocialiteProviders\Keycloak\Provider::class);