Fixed incorrect AuthToken encoding, Query Operation not performing on…

… correct database
BennyKJohnson · Nov 29, 2016 · fc551be · fc551be
1 parent e66c92b
commit fc551be
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Sources/CKContainerInfo.swift b/Sources/CKContainerInfo.swift
@@ -14,8 +14,8 @@ struct CKContainerInfo {
 
     let containerID: String
 
-    var publicCloudDBURL: URL {
-        let baseURL = "\(CKServerInfo.path)/database/\(CKServerInfo.version)/\(containerID)/\(environment)/public"
+    func publicCloudDBURL(databaseScope: CKDatabaseScope) ->  URL {
+        let baseURL = "\(CKServerInfo.path)/database/\(CKServerInfo.version)/\(containerID)/\(environment)/\(databaseScope)"
         return URL(string: baseURL)!
     }
 

diff --git a/Sources/CKQueryOperation.swift b/Sources/CKQueryOperation.swift
@@ -50,7 +50,8 @@ public class CKQueryOperation: CKDatabaseOperation {
 
         let queryOperationURLRequest = CKQueryURLRequest(query: query!, cursor: cursor?.data.bridge(), limit: resultsLimit, requestedFields: desiredKeys, zoneID: zoneID)
         queryOperationURLRequest.accountInfoProvider = CloudKit.shared.defaultAccount
-
+        queryOperationURLRequest.databaseScope = database?.scope ?? .public
+
         queryOperationURLRequest.completionBlock = { (result) in
 
             switch result {

diff --git a/Sources/CKURLRequest.swift b/Sources/CKURLRequest.swift
@@ -106,7 +106,7 @@ class CKURLRequest: NSObject {
         get {
             let accountInfo = accountInfoProvider ?? CloudKit.shared.defaultAccount!
 
-            let baseURL =  accountInfo.containerInfo.publicCloudDBURL.appendingPathComponent("\(operationType)/\(path)")
+            let baseURL =  accountInfo.containerInfo.publicCloudDBURL(databaseScope: databaseScope).appendingPathComponent("\(operationType)/\(path)")
 
             var urlComponents = URLComponents(url: baseURL, resolvingAgainstBaseURL: false)!
             switch accountInfo.accountType {
@@ -128,7 +128,9 @@ class CKURLRequest: NSObject {
 
 
             }
-                     //}
+
+            // Perform Encoding
+            urlComponents.percentEncodedQuery = urlComponents.percentEncodedQuery?.replacingOccurrences(of:"+", with: "%2B")
             CloudKit.debugPrint(urlComponents.url!)
             return urlComponents.url!
         }