Use getChildren() in discovery

and remove no longer needed findAddressbooks() from Account.
mstilkerich · Aug 4, 2020 · 7fd23ee · 7fd23ee
1 parent 4f12894
commit 7fd23ee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 41 deletions.
diff --git a/doc/Classes.drawio b/doc/Classes.drawio
@@ -1 +1 @@
-<mxfile host="Electron" modified="2020-08-03T16:45:35.244Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.5.7 Chrome/83.0.4103.122 Electron/9.1.2 Safari/537.36" etag="ymICywsOFp1MQma-mNPo" version="13.5.7" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>
+<mxfile host="Electron" modified="2020-08-04T14:02:59.431Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.5.7 Chrome/83.0.4103.122 Electron/9.1.2 Safari/537.36" etag="p--f10xwnU4nYMwv8Z2Q" version="13.5.7" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>
diff --git a/doc/Classes.svg b/doc/Classes.svg
diff --git a/src/Account.php b/src/Account.php
@@ -210,34 +210,6 @@ public function findAddressbookHome(string $principalUri): ?string
 
         return $addressbookHomeUri;
     }
-
-    /**
-     * Finds the addressbooks in an addressbook-home location.
-     *
-     * @param string $addressbookHomeUri The/An addressbook home URI of the principal.
-     * @return string[] An array of URIs of the found addressbooks.
-     */
-    public function findAddressbooks(string $addressbookHomeUri): array
-    {
-        try {
-            $client = $this->getClient();
-            $abooks = $client->findProperties($addressbookHomeUri, [ XmlEN::RESTYPE ], "1");
-
-            $abooksResult = [];
-            foreach ($abooks as $abook) {
-                // RFC6352: An address book collection MUST report the DAV:collection and CARDDAV:addressbook XML
-                // elements in the value of the DAV:resourcetype property.
-                if (in_array(XmlEN::RESTYPE_ABOOK, $abook["props"][XmlEN::RESTYPE])) {
-                    $abooksResult[] = $abook["uri"];
-                }
-            }
-        } catch (\Exception $e) {
-            Config::$logger->info("Exception while querying addressbooks: " . $e->getMessage());
-            $abooksResult = [];
-        }
-
-        return $abooksResult;
-    }
 }
 
 // vim: ts=4:sw=4:expandtab:fenc=utf8:ff=unix:tw=120
diff --git a/src/Services/Discovery.php b/src/Services/Discovery.php
@@ -25,7 +25,7 @@
 
 namespace MStilkerich\CardDavClient\Services;
 
-use MStilkerich\CardDavClient\{Account, AddressbookCollection, CardDavClient, Config};
+use MStilkerich\CardDavClient\{Account, AddressbookCollection, CardDavClient, Config, WebDavCollection};
 
 /**
  * Class Discovery - Provides a service to discovery the addressbooks for a CardDAV account.
@@ -92,7 +92,7 @@ public function discoverAddressbooks(Account $account): array
         // as a fallback, we will last try what the user provided
         $servers[] = [ "host" => $host, "port" => $port, "scheme" => $protocol, "userinput" => true ];
 
-        $addressbooks = array();
+        $addressbooks = [];
 
         // (2) Discover the "initial context path" for each servers (until first success)
         foreach ($servers as $server) {
@@ -114,13 +114,21 @@ public function discoverAddressbooks(Account $account): array
                     // (4) Attempt a PROPFIND asking for the addressbook home of the user on the principal URI
                     $addressbookHomeUri = $account->findAddressbookHome($principalUri);
                     if (isset($addressbookHomeUri)) {
-                        // (5) Attempt PROPFIND (Depth 1) to discover all addressbooks of the user
-                        foreach ($account->findAddressbooks($addressbookHomeUri) as $davAbookUri) {
-                            $addressbooks[] = new AddressbookCollection($davAbookUri, $account);
-                        }
-
-                        if (count($addressbooks) > 0) {
-                            break 2;
+                        try {
+                            // (5) Attempt PROPFIND (Depth 1) to discover all addressbooks of the user
+                            $addressbookHome = new WebDavCollection($addressbookHomeUri, $account);
+
+                            foreach ($addressbookHome->getChildren() as $abookCandidate) {
+                                if ($abookCandidate instanceof AddressbookCollection) {
+                                    $addressbooks[] = $abookCandidate;
+                                }
+                            }
+
+                            if (count($addressbooks) > 0) {
+                                break 2;
+                            }
+                        } catch (\Exception $e) {
+                            Config::$logger->info("Exception while querying addressbooks: " . $e->getMessage());
                         }
                     }
                 }
@@ -144,7 +152,7 @@ public function discoverAddressbooks(Account $account): array
      */
     private function discoverServers(string $host, bool $force_ssl): array
     {
-        $servers = array();
+        $servers = [];
 
         $rrnamesAndSchemes = [ ["_carddavs._tcp.$host", 'https'] ];
         if ($force_ssl === false) {
@@ -206,7 +214,7 @@ private function discoverServers(string $host, bool $force_ssl): array
      */
     private function discoverContextPath(array $server): array
     {
-        $contextpaths = array();
+        $contextpaths = [];
 
         if (key_exists("dnsrr", $server)) {
             $dnsresults = dns_get_record($server["dnsrr"], DNS_TXT);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<mxfile host="Electron" modified="2020-08-03T16:45:35.244Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.5.7 Chrome/83.0.4103.122 Electron/9.1.2 Safari/537.36" etag="ymICywsOFp1MQma-mNPo" version="13.5.7" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>
		<mxfile host="Electron" modified="2020-08-04T14:02:59.431Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.5.7 Chrome/83.0.4103.122 Electron/9.1.2 Safari/537.36" etag="p--f10xwnU4nYMwv8Z2Q" version="13.5.7" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>