fix: fix vcard company import (#5616)

monicahq · Oct 17, 2021 · 0dd4b23 · 0dd4b23
1 parent 8eed44e
commit 0dd4b23
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 1 deletion.
diff --git a/app/Services/VCard/ImportVCard.php b/app/Services/VCard/ImportVCard.php
@@ -866,7 +866,10 @@ private function importWorkInformation(Contact $contact, VCard $entry): void
         ];
 
         if ($entry->ORG) {
-            $request['company'] = $this->formatValue($entry->ORG);
+            $parts = $entry->ORG->getParts();
+            if ($company = Arr::get($parts, '0')) {
+                $request['company'] = $this->formatValue($company);
+            }
         }
 
         if ($entry->ROLE) {

diff --git a/database/migrations/2021_10_14_212144_v_card_company.php b/database/migrations/2021_10_14_212144_v_card_company.php
@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Migrations\Migration;
+
+class VCardCompany extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('contacts')
+            ->where('company', ';')
+            ->update(['company' => null]);
+    }
+}
diff --git a/tests/Unit/Services/VCard/ImportVCardTest.php b/tests/Unit/Services/VCard/ImportVCardTest.php
@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use Tests\TestCase;
 use App\Models\User\User;
+use Sabre\VObject\Reader;
 use App\Models\Contact\Tag;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
@@ -49,6 +50,41 @@ public function it_can_not_import_because_no_firstname_in_vcard()
         $this->assertFalse($this->invokePrivateMethod($importVCard, 'canImportCurrentEntry', [$vcard]));
     }
 
+    /** @test */
+    public function it_can_not_import_because_empty_firstname_in_vcard()
+    {
+        $account = factory(Account::class)->create([]);
+        $importVCard = new ImportVCard;
+
+        $vcard = new VCard([
+            'N'   => ';;;;',
+        ]);
+
+        $this->assertFalse($this->invokePrivateMethod($importVCard, 'canImportCurrentEntry', [$vcard]));
+    }
+
+    /** @test */
+    public function it_can_not_import_vcard()
+    {
+        $account = factory(Account::class)->create([]);
+        $importVCard = new ImportVCard;
+
+        $vcard = Reader::read('
+BEGIN:VCARD
+VERSION:3.0
+N:;;;;
+FN:
+ORG:;
+EMAIL;TYPE=home;TYPE=pref:mail@example.org
+NOTE:
+NICKNAME:
+TITLE:
+REV:20210900T000102Z
+END:VCARD', Reader::OPTION_FORGIVING + Reader::OPTION_IGNORE_INVALID_LINES);
+
+        $this->assertFalse($this->invokePrivateMethod($importVCard, 'canImportCurrentEntry', [$vcard]));
+    }
+
     /** @test */
     public function it_can_not_import_because_empty_nickname_in_vcard()
     {