[Surrey] Don’t fetch & upload photos from media_url

Photos should only be uploaded if the photo content was POSTed from FMS.
mysociety · Sep 17, 2024 · d8cfef2 · d8cfef2
1 parent 39cd0e1
commit d8cfef2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/perllib/Open311/Endpoint/Integration/Boomi.pm b/perllib/Open311/Endpoint/Integration/Boomi.pm
@@ -308,19 +308,11 @@ sub _add_attachments {
 
     my @attachments;
 
-    my $ua = LWP::UserAgent->new(agent => "FixMyStreet/open311-adapter");
-
     for my $photo (@{ $args->{media_url} }) {
-        my $photo_response = $ua->get($photo);
-        unless ( $photo_response->is_success) {
-            $self->logger->error("Failed to retrieve photo from $photo\n");
-            die "Failed to retrieve photo from $photo";
-        }
-
+        my $filename = (URI->new($photo)->path_segments)[-1];
         push @attachments, {
-            fileName => $photo_response->filename,
             url => $photo,
-            base64 => encode_base64($photo_response->content),
+            fileName => $filename,
         };
     }
 

diff --git a/t/open311/endpoint/surrey_boomi.t b/t/open311/endpoint/surrey_boomi.t
@@ -33,8 +33,7 @@ $lwp->mock(request => sub {
                     "attachments" => [
                         {
                             "url" => "http://localhost/photo/one.jpeg",
-                            "fileName" => "1.jpeg",
-                            "base64" => "/9j/4AAQSkZJRgABAQAAAAAAAAD/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkI\nCQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/wAALCAABAAEBAREA/8QAFAABAAAAAAAA\nAAAAAAAAAAAACf/EABQQAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQEAAD8AKp//2Q==\n",
+                            "fileName" => "one.jpeg",
                         },
                     ]
                 };
@@ -133,8 +132,7 @@ $lwp->mock(request => sub {
                 "attachments" => [
                     {
                         "url" => "http://localhost/photo/one.jpeg",
-                        "fileName" => "1.jpeg",
-                        "base64" => "/9j/4AAQSkZJRgABAQAAAAAAAAD/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkI\nCQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/wAALCAABAAEBAREA/8QAFAABAAAAAAAA\nAAAAAAAAAAAACf/EABQQAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQEAAD8AKp//2Q==\n",
+                        "fileName" => "one.jpeg",
                     },
                 ]
             };