chop off charset from mimetype for external content header (#131)

closes Islandora/documentation#1918
Islandora · Oct 22, 2021 · 09a62a4 · 09a62a4
1 parent ee9ea25
commit 09a62a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Milliner/src/Service/MillinerService.php b/Milliner/src/Service/MillinerService.php
@@ -93,7 +93,7 @@ public function saveNode(
         $fedora_url  = "$islandora_fedora_endpoint/$path";
 
         $response = $this->fedora->getResourceHeaders($fedora_url);
-        if ($response->getStatusCode() == "404") {
+        if ($response->getStatusCode() == 404) {
             $this->log->debug("GOT A 404");
             return $this->createNode(
                 $jsonld_url,
@@ -324,7 +324,7 @@ function (array $elem) use ($subject_url) {
         // Put in an fedora url for the resource.
         $resource[0]['@id'] = $fedora_url;
 
-    
+
         $this->log->debug("AFTER: " . json_encode($resource));
         return $resource;
     }
@@ -481,6 +481,9 @@ public function saveExternal(
             );
         }
         $mimetype = $drupal_response->getHeader('Content-Type')[0];
+        if (preg_match("/^([^;]+);/", $mimetype, $matches)) {
+            $mimetype = $matches[1];
+        }
 
         // Save it in Fedora as external content.
         $external_rel = "http://fedora.info/definitions/fcrepo#ExternalContent";
@@ -556,6 +559,7 @@ public function createMediaVersion(
         $urls = $this->getMediaUrls($source_field, $json_url, $islandora_fedora_endpoint, $token);
         $fedora_url = $urls['fedora'];
 
+        $headers = empty($token) ? [] : ['Authorization' => $token];
         $date = new DateTime();
         $timestamp = $date->format("D, d M Y H:i:s O");
         // create version in Fedora.

diff --git a/Milliner/tests/Islandora/Milliner/Tests/MillinerControllerTest.php b/Milliner/tests/Islandora/Milliner/Tests/MillinerControllerTest.php
@@ -43,7 +43,8 @@ protected function setUp(): void
      * @covers ::saveNode
      * @covers ::saveMedia
      * @covers ::deleteNode
-     * @covers ::createVersion
+     * @covers ::createNodeVersion
+     * @covers ::createMediaVersion
      */
     public function testMethodsReturnMillinerErrors()
     {