fix: fix carddav sync-collection reporting wrong syncToken

.github/workflows/cypress.yml

@@ -95,6 +95,7 @@ jobs:
         parallel: true
         group: Azure DevOps CI
         config: baseUrl=http://localhost:8000
+        wait-on: http://localhost:8000
       env:
         CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -10,7 +10,8 @@
 
 ### Fixes:
 
-*
+* Fix carddav sync-collection reporting wrong syncToken
+
 
 # RELEASED VERSIONS:
 

app/Http/Controllers/DAV/Backend/SyncDAVBackend.php

@@ -167,7 +167,6 @@ public function getChanges($syncToken)
 
             $timestamp = $token->timestamp;
         } else {
-            $token = $this->createSyncTokenNow();
             $timestamp = null;
         }
 
@@ -184,7 +183,7 @@ public function getChanges($syncToken)
         });
 
         return [
-            'syncToken' => $token->id,
+            'syncToken' => $this->getCurrentSyncToken()->id,
             'added' => $added->map(function ($obj) {
                 return $this->encodeUri($obj);
             })->toArray(),

tests/Api/DAV/CalDAVBirthdaysTest.php

@@ -223,6 +223,14 @@ public function test_caldav_birthdays_sync_collection_with_token()
 
         $response->assertStatus(207);
 
+        $token = SyncToken::where([
+            'account_id' => $user->account_id,
+            'user_id' => $user->id,
+            'name' => 'birthdays',
+        ])
+            ->orderBy('created_at')
+            ->get()
+            ->last();
         $response->assertSee("<d:multistatus xmlns:d=\"DAV:\" xmlns:s=\"http://sabredav.org/ns\" xmlns:card=\"urn:ietf:params:xml:ns:carddav\" xmlns:cal=\"urn:ietf:params:xml:ns:caldav\" xmlns:cs=\"http://calendarserver.org/ns/\">
  <d:response>
   <d:href>/dav/calendars/{$user->email}/birthdays/{$specialDate->uuid}.ics</d:href>

tests/Api/DAV/CalDAVTasksTest.php

@@ -229,6 +229,14 @@ public function test_caldav_tasks_sync_collection_with_token()
         );
         $response->assertStatus(207);
 
+        $token = SyncToken::where([
+            'account_id' => $user->account_id,
+            'user_id' => $user->id,
+            'name' => 'tasks',
+        ])
+            ->orderBy('created_at')
+            ->get()
+            ->last();
         $response->assertSee("<d:multistatus xmlns:d=\"DAV:\" xmlns:s=\"http://sabredav.org/ns\" xmlns:card=\"urn:ietf:params:xml:ns:carddav\" xmlns:cal=\"urn:ietf:params:xml:ns:caldav\" xmlns:cs=\"http://calendarserver.org/ns/\">
  <d:response>
   <d:href>/dav/calendars/{$user->email}/tasks/{$task->uuid}.ics</d:href>

tests/Api/DAV/CardDAVTest.php

@@ -331,6 +331,15 @@ public function test_carddav_sync_collection_with_token()
 
         $response->assertStatus(207);
 
+        $token = SyncToken::where([
+            'account_id' => $user->account_id,
+            'user_id' => $user->id,
+            'name' => 'contacts',
+        ])
+            ->orderBy('created_at')
+            ->get()
+            ->last();
+
         $response->assertSee("<d:multistatus xmlns:d=\"DAV:\" xmlns:s=\"http://sabredav.org/ns\" xmlns:card=\"urn:ietf:params:xml:ns:carddav\" xmlns:cal=\"urn:ietf:params:xml:ns:caldav\" xmlns:cs=\"http://calendarserver.org/ns/\">
  <d:response>
   <d:href>/dav/addressbooks/{$user->email}/contacts/{$contact->uuid}.vcf</d:href>