From d918794ef080ec5c08e49306b217a962a8f21b3a Mon Sep 17 00:00:00 2001
From: ragu <ragu@gnu-systems.net>
Date: Fri, 10 Jun 2022 14:18:17 +0200
Subject: [PATCH] sig minor changes2

---
 copri4/main/src/Mod/APIshareeio.pm  | 12 ++++++++----
 copri4/main/src/Mod/APIsigclient.pm |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/copri4/main/src/Mod/APIshareeio.pm b/copri4/main/src/Mod/APIshareeio.pm
index ae37124..e2993a5 100644
--- a/copri4/main/src/Mod/APIshareeio.pm
+++ b/copri4/main/src/Mod/APIshareeio.pm
@@ -64,7 +64,8 @@ sub handler {
 
 
  my $response = { 
-	response_state => "OK, nothing todo",
+	event => "",
+	response_state => "Event doesn't match",
  };
 
  my $http_sharee_api_key = $headers{HTTP_SHAREE_API_KEY} || $R::HTTP_SHAREE_API_KEY || "";
@@ -122,6 +123,7 @@ sub sig_booking_update {
   my $response_in = {};
   $response_in = decode_json($POSTDATA) if($POSTDATA);
 
+  $response->{event} = "$response_in->{event}";
   if($response_in->{event} && $response_in->{event} eq "RENTAL_END"){
 
    my $rentalId = $q->escapeHTML($response_in->{data}->{rentalId}) || "";
@@ -160,11 +162,12 @@ sub sig_booking_update {
       	($rows, $booking_values) = $apif->booking_update($q,\%varenv,$authraw,$aowner,$sig_book) if($authraw->{c_id});
 
 	#response is for sig json after rental-end
-	delete $booking_values->{geo_distance};
-	delete $booking_values->{response_state};
-	delete $booking_values->{response_text};
 	$booking_values->{bikeId} = $sig_book->{bikeId};
 	$booking_values->{rentalId} = $sig_book->{rentalId};
+	delete $booking_values->{geo_distance};
+	delete $booking_values->{co2saving};
+	delete $booking_values->{bike};
+	delete $booking_values->{response_text};
       	$response = {%$response, %$booking_values};
       }else{
       	$response->{response_state} = "Failure: there is no rental with rentalID=$rentalId";
@@ -180,6 +183,7 @@ sub sig_booking_update {
   print FILE "failure! can not decode POST json, POSTDATA:\n" . Dumper($q->param('POSTDATA')) . "\n" if($debug);
   #warn $@;
   print FILE "warn:" . $@ . "\n" if($debug);
+  $response->{response_state} = "Failure: can not decode POST json";
  }
 
 }#end sig json booking_update
diff --git a/copri4/main/src/Mod/APIsigclient.pm b/copri4/main/src/Mod/APIsigclient.pm
index cea1f69..d3dcf5a 100755
--- a/copri4/main/src/Mod/APIsigclient.pm
+++ b/copri4/main/src/Mod/APIsigclient.pm
@@ -311,7 +311,6 @@ sub sig_booking {
  elsif($todo eq "rental"){
    $endpoint .= "rental";
    my $sig_bikeId = $ctpos->{txt22} || $ct_bike->{txt22};
-   #my $sig_bikeId = "380116b5-0522-43da-ab66-477744a731a3";
    %json = (
 	bikeId => "$sig_bikeId",
 	email => "$ctadr->{txt08}"