Nick Clemens
46d3d63e46
This patch modifies the checkout_download_url routine in WebSerivce::ILS::OverDrive::Patron We now directly hit the fulfillment endpoint with redirects disabled and fetch the URL The overdrive.js is modified to use a single 'Get item' button for all checked out items and to refer to the fulfillment page To test: 1 - Enable all OverDrive system preferences 2 - Search on opac and confirm OD results returned 3 - Checkout an item 4 - Confirm you have the new 'Get item' button on 'OverDrive account' tab on opac-user.pl 5 - Confirm the 'Get item' button works NOTE: Most items will also show the 'Get item' button in results, however, magazines may not as each checkout has a unique 'reserve id' and the 'parent' id is not checked in our current code Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
162 lines
5.8 KiB
Perl
Executable file
162 lines
5.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# script to action OverDrive API calls
|
|
|
|
# Copyright 2015 Catalyst IT
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use JSON qw(encode_json);
|
|
use C4::Auth qw( checkauth );
|
|
use C4::Output qw( output_with_http_headers );
|
|
use Koha::Logger;
|
|
use Koha::Patrons;
|
|
use Koha::Library::OverDriveInfos;
|
|
use Koha::ExternalContent::OverDrive;
|
|
|
|
my $logger = Koha::Logger->get({ interface => 'opac' });
|
|
our $cgi = CGI->new;
|
|
my $page_url = $cgi->referer();
|
|
|
|
my ( $user, $cookie, $sessionID, $flags ) = checkauth( $cgi, 1, {}, 'opac' );
|
|
$user && $sessionID or response_bad_request("User not logged in");
|
|
|
|
my $action = $cgi->param('action') or response_bad_request("No 'action' specified");
|
|
|
|
my $od = Koha::ExternalContent::OverDrive->new({ koha_session_id => $sessionID });
|
|
my %data = (
|
|
is_logged_in => JSON::false,
|
|
);
|
|
local $@;
|
|
eval {
|
|
{
|
|
$action eq 'login' && do {
|
|
my $password = $cgi->param("password") // q{} ;
|
|
my $patron = Koha::Patrons->find({ userid => $user });
|
|
my $branch_info = $patron ? Koha::Library::OverDriveInfos->find( $patron->branchcode ) : undef;
|
|
my $od_username;
|
|
if ( C4::Context->preference('OverDriveUsername') eq 'cardnumber' ){
|
|
$od_username = $patron ? $patron->cardnumber : undef;
|
|
} else {
|
|
$od_username = $user;
|
|
}
|
|
my $branch_authname = $branch_info ? $branch_info->authname : undef;
|
|
my $authname = $branch_authname || C4::Context->preference('OverDriveAuthname');
|
|
$od->auth_by_userid($od_username, $password,C4::Context->preference('OverDriveWebsiteID'),$authname);
|
|
$data{login_success} = 1;
|
|
last;
|
|
};
|
|
|
|
if ($od->is_logged_in) {
|
|
$data{is_logged_in} = JSON::true;
|
|
|
|
$action eq 'logout' && do {
|
|
$od->forget();
|
|
$data{login_url} = $od->auth_url($page_url);
|
|
$data{is_logged_in} = JSON::false;
|
|
last;
|
|
};
|
|
|
|
$action eq 'account' && do {
|
|
$data{account} = $od->patron;
|
|
$data{checkouts} = $od->checkouts;
|
|
$data{holds} = $od->holds;
|
|
last;
|
|
};
|
|
|
|
$action eq 'checkout' && do {
|
|
my $id = $cgi->param('id')
|
|
or response_bad_request("No 'id' specified");
|
|
my $format = $cgi->param('format');
|
|
$data{action} = $od->checkout($id, $format);
|
|
$data{checkouts} = $od->checkouts;
|
|
$data{holds} = $od->holds;
|
|
last;
|
|
};
|
|
|
|
$action eq 'checkout-format' && do {
|
|
my $id = $cgi->param('id')
|
|
or response_bad_request("No 'id' specified");
|
|
my $format = $cgi->param('format')
|
|
or response_bad_request("No 'format' specified");
|
|
$data{action} = $od->lock_format($id, $format);
|
|
$data{checkouts} = $od->checkouts;
|
|
last;
|
|
};
|
|
|
|
$action eq 'download-url' && do {
|
|
my $id = $cgi->param('id')
|
|
or response_bad_request("No 'id' specified");
|
|
$data{action} = $od->checkout_download_url($id);
|
|
last;
|
|
};
|
|
|
|
$action eq 'return' && do {
|
|
my $id = $cgi->param('id')
|
|
or response_bad_request("No 'id' specified");
|
|
local $@;
|
|
$data{action} = eval { $od->return($id) };
|
|
$data{action} = $@ if $@;
|
|
$data{checkouts} = $od->checkouts;
|
|
last;
|
|
};
|
|
|
|
$action eq 'place-hold' && do {
|
|
my $id = $cgi->param('id')
|
|
or response_bad_request("No 'id' specified");
|
|
$data{action} = $od->place_hold($id);
|
|
$data{holds} = $od->holds;
|
|
last;
|
|
};
|
|
|
|
$action eq 'remove-hold' && do {
|
|
my $id = $cgi->param('id')
|
|
or response_bad_request("No 'id' specified");
|
|
local $@;
|
|
$data{action} = eval { $od->remove_hold($id) };
|
|
$data{action} = $@ if $@;
|
|
$data{holds} = $od->holds;
|
|
last;
|
|
};
|
|
|
|
response_bad_request("Invalid 'action': $action");
|
|
}
|
|
}
|
|
};
|
|
if ($@) {
|
|
if ($od->is_not_authenticated_error("$@")) {
|
|
$logger->debug("OverDrive session timeout");
|
|
$data{is_logged_in} = JSON::false;
|
|
} else {
|
|
$logger->error($@);
|
|
$data{error} = $od->error_message("$@");
|
|
}
|
|
}
|
|
|
|
response(\%data);
|
|
|
|
|
|
sub response_bad_request {
|
|
my ($error) = @_;
|
|
response({error => $error}, "400 $error");
|
|
}
|
|
sub response {
|
|
my ($data, $status_line) = @_;
|
|
$status_line ||= "200 OK";
|
|
output_with_http_headers $cgi, undef, encode_json($data), 'json', $status_line;
|
|
exit;
|
|
}
|