Bug 32426: (follow-up) Fix api/v1/patrons.t

[srvgit] / C4 / InstallAuth.pm

diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm
index 7ed980b..56dd8e3 100644 (file)
--- a/C4/InstallAuth.pm
+++ b/C4/InstallAuth.pm
@@ -18,24 +18,23 @@ package C4::InstallAuth;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use Digest::MD5 qw(md5_base64);
 use CGI::Session;
 use File::Spec;
 
 require Exporter;
 
 use C4::Context;
-use C4::Output;
+use C4::Output qw( output_html_with_http_headers );
 use C4::Templates;
-use C4::Koha;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-@ISA    = qw(Exporter);
-@EXPORT = qw(
-  &checkauth
-  &get_template_and_user
-);
+our (@ISA, @EXPORT_OK);
+BEGIN {
+    @ISA    = qw(Exporter);
+    @EXPORT_OK = qw(
+      checkauth
+      get_template_and_user
+    );
+}
 
 =head1 NAME
 
@@ -143,6 +142,7 @@ sub get_template_and_user {
             $template->param( CAN_user_serials          => 1 );
             $template->param( CAN_user_reports          => 1 );
             $template->param( CAN_user_problem_reports   => 1 );
+            $template->param( CAN_user_recalls          => 1 );
         }
 
         my $minPasswordLength = C4::Context->preference('minPasswordLength');
@@ -243,7 +243,7 @@ sub checkauth {
     if ( $sessionID = $query->cookie("CGISESSID") ) {
         C4::Context->_new_userenv($sessionID);
         my $session =
-          CGI::Session->new( "driver:File;serializer:yaml", $sessionID,
+          CGI::Session->new( "driver:File", $sessionID,
             { Directory => $sessdir } );
         if ( $session->param('cardnumber') ) {
             C4::Context->set_userenv(
@@ -262,6 +262,7 @@ sub checkauth {
                 -value    => $session->id,
                 -HttpOnly => 1,
                 -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
+                -sameSite => 'Lax'
             );
             $loggedin = 1;
             $userid   = $session->param('cardnumber');
@@ -283,7 +284,7 @@ sub checkauth {
     }
     unless ($userid) {
         my $session =
-          CGI::Session->new( "driver:File;serializer:yaml", undef, { Directory => $sessdir } );
+          CGI::Session->new( "driver:File", undef, { Directory => $sessdir } );
         $sessionID = $session->id;
         $userid    = $query->param('userid');
         C4::Context->_new_userenv($sessionID);
@@ -302,6 +303,7 @@ sub checkauth {
                 -value    => $sessionID,
                 -HttpOnly => 1,
                 -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
+                -sameSite => 'Lax'
             );
             if ( $return == 2 ) {
 
@@ -349,6 +351,7 @@ sub checkauth {
                 -HttpOnly => 1,
                 -expires => '',
                 -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
+                -sameSite => 'Lax'
             );
         }
         if ($envcookie) {
@@ -392,6 +395,7 @@ sub checkauth {
         -HttpOnly => 1,
         -expires => '',
         -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
+        -sameSite => 'Lax'
     );
     print $query->header(
         -type    => 'text/html; charset=utf-8',