Skip to content

Dev #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbarzin merged 4 commits into from
Dec 17, 2025
Merged

Dev #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12e1b5c
add redirect route for Mercator dev
dbarzin Oct 31, 2025
450bc79
fix solicalite
dbarzin Dec 17, 2025
028221e
somes fixes
dbarzin Dec 17, 2025
29c8f7e
update libraries
dbarzin Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/SocialiteController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
10 changes: 9 additions & 1 deletion app/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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);
Expand Down
Loading
⚡