From 208b9b5ba7c36dd7bd5839c517f9525cf9da10bc Mon Sep 17 00:00:00 2001
From: Agustin Moyano <agustinmoyano@theke.io>
Date: Tue, 23 Aug 2022 12:00:10 -0300
Subject: [PATCH] Bug 31378: Add the API-based auth mechanism to
 C4::Auth::check_api_auth

Signed-off-by: Lukasz Koszyk <lukasz.koszyk@kit.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 C4/Auth.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 8bd13e88e1..ac73f2d018 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -259,9 +259,12 @@ sub get_template_and_user {
                 -sameSite => 'Lax',
             ));
 
+            my $auth_error = $in->{query}->param('auth_error');
+
             $template->param(
                 loginprompt => 1,
                 script_name => get_script_name(),
+                auth_error  => $auth_error,
             );
 
             print $in->{query}->header(
@@ -1336,6 +1339,7 @@ sub checkauth {
     $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
 
     my $auth_template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt';
+    my $auth_error = $query->param('auth_error');
     my $template = C4::Templates::gettemplate( $auth_template_name, $type, $query );
     $template->param(
         login                                 => 1,
@@ -1373,6 +1377,7 @@ sub checkauth {
         opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
         too_many_login_attempts               => ( $patron and $patron->account_locked ),
         password_has_expired                  => ( $patron and $patron->password_expired ),
+        auth_error                            => $auth_error,
     );
 
     $template->param( SCO_login => 1 ) if ( $query->param('sco_user_login') );
@@ -1556,6 +1561,7 @@ sub check_api_auth {
         # new login
         my $userid   = $query->param('userid');
         my $password = $query->param('password');
+        my $auth_client_login = $query->param('auth_client_login');
         my ( $return, $cardnumber, $cas_ticket );
 
         # Proxy CAS auth
@@ -1565,6 +1571,9 @@ sub check_api_auth {
             # In case of a CAS authentication, we use the ticket instead of the password
             my $PT = $query->param('PT');
             ( $return, $cardnumber, $userid, $cas_ticket ) = check_api_auth_cas( $PT, $query );    # EXTERNAL AUTH
+        } elsif ( $auth_client_login && ( $userid || $query->param('cardnumber') ) ) {
+            $cardnumber = $query->param('cardnumber');
+            $return = 1;
         } else {
 
             # User / password auth
@@ -1769,7 +1778,8 @@ sub check_cookie_auth {
         } elsif ( $userid ) {
             $session->param( 'lasttime', time() );
             my $patron = Koha::Patrons->find({ userid => $userid });
-            $patron = Koha::Patron->find({ cardnumber => $userid }) unless $patron;
+            $patron = Koha::Patrons->find({ cardnumber => $userid })
+              unless $patron;
             return ("password_expired", undef ) if $patron->password_expired;
             my $flags = defined($flagsrequired) ? haspermission( $userid, $flagsrequired ) : 1;
             if ($flags) {
-- 
2.39.5