Merge pull request #632 from biigle/utf8-bug

Resolve Utf8 bug
biigle · Aug 9, 2023 · 772f9f7 · 772f9f7
2 parents 67c3424 + 375da03
commit 772f9f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/app/Http/Requests/StoreVolumeMetadata.php b/app/Http/Requests/StoreVolumeMetadata.php
@@ -40,6 +40,7 @@ public function rules()
     {
         return [
             'metadata_csv' => [
+                'bail',
                 'required_without_all:metadata_text,ifdo_file',
                 'file',
                 'mimetypes:text/plain,text/csv,application/csv',

diff --git a/app/Rules/Utf8.php b/app/Rules/Utf8.php
@@ -15,7 +15,8 @@ class Utf8 implements Rule
      */
     public function passes($attribute, $value)
     {
-        return mb_detect_encoding($value->get(), 'UTF-8', true) !== false;
+        $value = is_string($value) ? $value : $value->get();
+        return mb_detect_encoding($value, 'UTF-8', true) !== false;
     }
 
     /**

diff --git a/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php b/tests/php/Http/Controllers/Api/Volumes/MetadataControllerTest.php
@@ -76,6 +76,16 @@ public function testStoreImageMetadata()
         $this->assertEmpty($png->metadata);
     }
 
+    public function testStoreStringMetadata()
+    {
+        $id = $this->volume()->id;
+
+        $this->beAdmin();
+
+        $this->postJson("/api/v1/volumes/{$id}/metadata", ['metadata_csv' => "metadata_string"])
+            ->assertStatus(422);
+    }
+
     public function testStoreDeprecatedFileAttribute()
     {
         $id = $this->volume()->id;