fix: fix davclient options call (#5584)

monicahq · Oct 9, 2021 · 9c276aa · 9c276aa
1 parent 3e813c2
commit 9c276aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/app/Services/DavClient/Utils/AddressBookGetter.php b/app/Services/DavClient/Utils/AddressBookGetter.php
@@ -116,12 +116,6 @@ private function getAddressBookBaseUri(): string
     private function checkOptions()
     {
         $options = $this->client->options();
-        if (! empty($options)) {
-            $options = array_map(function ($option) {
-                return explode(', ', $option);
-            }, $options);
-            $options = Arr::flatten($options);
-        }
 
         if (! in_array('1', $options) || ! in_array('3', $options) || ! in_array('addressbook', $options)) {
             throw new DavServerNotCompliantException('server is not compliant with rfc2518 section 15.1, or rfc6352 section 6.1');

diff --git a/app/Services/DavClient/Utils/Dav/DavClient.php b/app/Services/DavClient/Utils/Dav/DavClient.php
@@ -483,16 +483,15 @@ public function options(): array
     {
         $response = $this->request('OPTIONS');
 
-        $dav = Arr::get($response->headers(), 'Dav');
-        if (! $dav) {
+        $dav = $response->header('Dav');
+        if (empty($dav)) {
             return [];
         }
+        $davs = explode(', ', $dav);
 
-        foreach ($dav as &$v) {
-            $v = trim($v);
-        }
-
-        return $dav;
+        return array_map(function ($header) {
+            return trim($header);
+        }, $davs);
     }
 
     /**