Attachment 166459 Details for Bug 36503 – Bug 36503: (follow-up) Move the plugin hook to include the domain

[patch] Bug 36503: (follow-up) Move the plugin hook to include the domain

Bug-36503-follow-up-Move-the-plugin-hook-to-includ.patch (text/plain), 1.84 KB, created by Martin Renvoize (ashimema) on 2024-05-09 13:57:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-05-09 13:57:33 UTC

Size: 1.84 KB

patch

obsolete

>From 016f03c7482664ca4c5277edc81062f16e29e1f8 Mon Sep 17 00:00:00 2001
>From: Raphael Straub <raphael.straub@kit.edu>
>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 <martin.renvoize@ptfs-europe.com>
>---
> 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

Actions: View | Diff | Splinter Review

Attachments on bug 36503: 164379 | 164628 | 164893 | 164894 | 165466 | 166050 | 166111 | 166112 | 166113 | 166114 | 166115 | 166116 | 166458 | 166459 | 166460 | 166461 | 166462 | 166531 | 166532