Merge pull request #310 from contentful/feature/fix-syncing-concrete-…

…type Send only SyncSpace parameters when accessing next page of data to be synced
contentful · Jul 7, 2020 · 16afcd2 · 16afcd2
2 parents 1e25cdc + db95770
commit 16afcd2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.env b/.env
@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=5.1.0
+CONTENTFUL_SDK_VERSION=5.1.1
diff --git a/Config.xcconfig b/Config.xcconfig
@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=5.1.0
+CONTENTFUL_SDK_VERSION=5.1.1
diff --git a/Sources/Contentful/Client.swift b/Sources/Contentful/Client.swift
@@ -580,8 +580,15 @@ extension Client {
             completion(.failure(SDKError.previewAPIDoesNotSupportSync))
             return nil
         }
-
-        let parameters = syncableTypes.parameters + syncSpace.parameters
+
+        // Send only sync space parameters when accessing another page.
+        let parameters: [String: String]
+        if syncSpace.hasMorePages {
+            parameters = syncSpace.parameters
+        } else {
+            parameters = syncableTypes.parameters + syncSpace.parameters
+        }
+
         return fetch(url: url(endpoint: .sync, parameters: parameters)) { (result: Result<SyncSpace, Error>) in
             switch result {
             case .success(let newSyncSpace):

diff --git a/Sources/Contentful/SyncSpace.swift b/Sources/Contentful/SyncSpace.swift
@@ -179,6 +179,7 @@ public final class SyncSpace: Decodable {
         }
 
         syncToken = syncSpace.syncToken
+        hasMorePages = syncSpace.hasMorePages
     }
 
     internal func cache(resources: [Resource]) {