From 016f03c7482664ca4c5277edc81062f16e29e1f8 Mon Sep 17 00:00:00 2001 From: Raphael Straub Date: Wed, 24 Apr 2024 13:48:37 +0000 Subject: [PATCH] Bug 36503: (follow-up) Move the plugin hook to include the domain This allows the plugin to read/change the domain. Sponsored-by: Karlsruhe Institute of Technology (KIT) Signed-off-by: Martin Renvoize --- Koha/Auth/Client.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Koha/Auth/Client.pm b/Koha/Auth/Client.pm index 7e9d69e6406..d51f400bba0 100644 --- a/Koha/Auth/Client.pm +++ b/Koha/Auth/Client.pm @@ -64,6 +64,10 @@ sub get_user { my ( $mapped_data, $patron ) = $self->_get_data_and_patron({ provider => $provider, data => $data, config => $config }); + $mapped_data //= {}; + + my $domain = $self->has_valid_domain_config({ provider => $provider, email => $mapped_data->{email}, interface => $interface}); + # Call the plugin hook "auth_client_get_user" of all plugins in # ascending priority. if ( C4::Context->config('enable_plugins') ) { @@ -79,18 +83,16 @@ sub get_user { config => $config, mapped_data => $mapped_data, patron => $patron, + domain => $domain, }; foreach my $plugin (@plugins) { $plugin->auth_client_get_user($args); } $mapped_data = $args->{'mapped_data'}; $patron = $args->{'patron'}; + $domain = $args->{'domain'}; } - $mapped_data //= {}; - - my $domain = $self->has_valid_domain_config({ provider => $provider, email => $mapped_data->{email}, interface => $interface}); - $patron->set($mapped_data)->store if $patron && $domain->update_on_auth; $mapped_data->{categorycode} = $domain->default_category_id; -- 2.45.0