From 6d0fdf8ca2a3e65aab61447d97784a9a46c11606 Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Fri, 22 Apr 2022 16:13:17 +1200
Subject: [PATCH] Bug 30444: (follow-up) WIP:

Don't re-direct infinite loop if SelfCheckoutByLogin not equal to 'shibboleth'

Test plan:
1. On a Koha setup to do Shibboleth set the following sysprefs:
- OPACShibOnly = "Don't allow"
- AutoSelfCheckAllowed = Allow
- AutoSelfCheckID and AutoSelfCheckPass = The username and password of a
patron with 'self_checkout_module' sub-permission enabled
- SelfCheckoutByLogin = 'cardnumber'
2. Visit the self checkout page, confirm it does not indefinitely loop
3. Change SelfCheckoutbyLogin = 'username and password'
4. Repeat step 2 and confirm the same results
5. Change SelfCheckoutByLogin = 'shibboleth'
6. Repeat step 2 and confirm the same results

Sponsored-by: Catalyst IT
---
 C4/Auth.pm                                               | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 6d33f08aed..e74d6f202a 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -1137,7 +1137,7 @@ sub checkauth {
                     (
                         ( $type eq 'opac' )
                         && C4::Context->preference('OPACShibOnly')
-			&& C4::Context->preference('SelfCheckoutByLogin') ne 'shibboleth'
+                        && !$query->param('sco_user_login')
                     )
                     || ( ( $type ne 'opac' )
                         && C4::Context->preference('staffShibOnly') )
@@ -1457,7 +1457,7 @@ sub checkauth {
 
     if ($shib) {
         #If shibOnly is enabled just go ahead and redirect directly
-        if ( (($type eq 'opac') && C4::Context->preference('OPACShibOnly')) || (($type ne 'opac') && C4::Context->preference('staffShibOnly')) ) {
+        if ( (($type eq 'opac') && C4::Context->preference('OPACShibOnly') && !$query->param('sco_user_login') ) || (($type ne 'opac') && C4::Context->preference('staffShibOnly')) ) {
             my $redirect_url = login_shib_url( $query );
             print $query->redirect( -uri => "$redirect_url", -status => 303 );
             safe_exit;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index b435b29501..1b5ae2393d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -404,7 +404,7 @@
                             <div class="sco_entry" >
                                 <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post">
                                     <fieldset>
-                                        [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]
+                                        [% IF ( Koha.Preference('SelfCheckoutByLogin') == 'username' ) %]
                                             <legend>Log in to your account</legend>
                                             <label for="patronlogin">Login:</label>
                                             <input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/>
@@ -413,7 +413,7 @@
                                             <fieldset class="action">
                                                 <button type="submit" class="btn btn-primary">Log in</button>
                                             </fieldset>
-                                        [% ELSE %]
+                                        [% ELSIF ( Koha.Preference('SelfCheckoutByLogin') == 'cardnumber' )  %]
                                             <div class="form-row">
                                                 <div class="col-auto">
                                                     <label for="patronid">Please enter your card number:</label>
-- 
2.20.1