CUYAHOGA - Bug 36665: (follow-up) Allow choosing a branch with no IP …

…when using AutoLocation Signed-off-by: Jonathan Druart <[email protected]>
bywatersolutions · May 22, 2024 · 3d17fbe · 3d17fbe
1 parent 8927269
commit 3d17fbe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/C4/Auth.pm b/C4/Auth.pm
@@ -1215,11 +1215,17 @@ sub checkauth {
                         }
 
                         if (
+                            # If StaffLoginBranchBasedOnIP is enabled we will try to find a branch
+                            # matching your ip, regardless of the choice you have passed in
                             (
                                   !C4::Context->preference('AutoLocation')
                                 && C4::Context->preference('StaffLoginBranchBasedOnIP')
                             )
-                            || ( C4::Context->preference('AutoLocation') && $auth_state ne 'failed' )
+                            # When AutoLocation is enabled we will not choose a branch matching IP
+                            # if your selected branch has no IP set
+                            || (   C4::Context->preference('AutoLocation')
+                                && $auth_state ne 'failed'
+                                && $branches->{$branchcode}->{'branchip'} )
                             )
                         {
                             foreach my $br ( uniq( $branchcode, keys %$branches ) ) {

diff --git a/t/db_dependent/Auth.t b/t/db_dependent/Auth.t
@@ -1346,7 +1346,7 @@ subtest 'StaffLoginBranchBasedOnIP' => sub {
 
 subtest 'AutoLocation' => sub {
 
-    plan tests => 7;
+    plan tests => 8;
 
     $schema->storage->txn_begin;
 
@@ -1398,6 +1398,13 @@ subtest 'AutoLocation' => sub {
     my $session = C4::Auth::get_session($sessionID);
     is( $session->param('branch'), $patron->branchcode );
 
+    my $noip_library = $builder->build_object( { class => 'Koha::Libraries', value => { branchip => '' } } );
+    $cgi->param( 'branch', $noip_library->branchcode );
+    ( $userid, $cookie, $sessionID, $flags, $template ) =
+        C4::Auth::checkauth( $cgi, 0, { catalogue => 1 }, 'intranet' );
+    $session = C4::Auth::get_session($sessionID);
+    is( $session->param('branch'), $noip_library->branchcode );
+
     $schema->storage->txn_rollback;
 
 };