Added CKAccount

Sources/CKAccount.swift

@@ -0,0 +1,47 @@
+//
+//  CKAccount.swift
+//  OpenCloudKit
+//
+//  Created by Ben Johnson on 27/07/2016.
+//
+//
+
+import Foundation
+
+public enum CKAccountType {
+    case primary
+    case anoymous
+    case server
+}
+
+public struct CKAccount: CKAccountInfoProvider {
+
+    let accountType: CKAccountType
+
+    var isAnonymousAccount: Bool {
+        return accountType == .anoymous
+    }
+
+    var isServerAccount: Bool {
+        return accountType == .server
+    }
+
+    var containerInfo: CKContainerInfo
+
+    var iCloudAuthToken: String?
+
+    let cloudKitAuthToken: String
+
+    init(type: CKAccountType, containerInfo: CKContainerInfo, cloudKitAuthToken: String) {
+        self.accountType = type
+        self.containerInfo = containerInfo
+        self.cloudKitAuthToken = cloudKitAuthToken
+    }
+
+    init(containerInfo: CKContainerInfo,cloudKitAuthToken: String, iCloudAuthToken: String) {
+        self.accountType = .primary
+        self.containerInfo = containerInfo
+        self.iCloudAuthToken = iCloudAuthToken
+    }
+
+}

Sources/CKContainerConfig.swift

@@ -125,6 +125,12 @@ public struct CKContainerConfig {
     }
 }
 
+extension CKContainerConfig {
+    var containerInfo: CKContainerInfo {
+        return CKContainerInfo(containerID: containerIdentifier, environment: environment)
+    }
+}
+
 public struct CKServerToServerKeyAuth {
     // A unique identifier for the key generated using CloudKit Dashboard. To create this key, read
     public let keyID: String

Sources/CKModifyRecordsURLRequest.swift

@@ -0,0 +1,36 @@
+//
+//  CKModifyRecordsURLRequest.swift
+//  OpenCloudKit
+//
+//  Created by Ben Johnson on 27/07/2016.
+//
+//
+
+import Foundation
+
+class CKModifyRecordsURLRequest: CKURLRequest {
+
+    var recordsToSave: [CKRecord]?
+
+    var recordIDsToDelete: [CKRecordID]?
+
+    var recordsByRecordIDs: [CKRecordID: CKRecord] = [:]
+
+    var atomic: Bool = true
+
+    var sendAllFields: Bool
+
+    init(recordsToSave: [CKRecord], recordIDsToDelete: [CKRecordID], sendAllFields: Bool) {
+
+        self.recordsToSave = recordsToSave
+        self.recordIDsToDelete = recordIDsToDelete
+        self.sendAllFields = sendAllFields
+
+    }
+
+
+
+
+
+
+}

Sources/CKPredicateReader.swift

@@ -104,7 +104,7 @@ struct CKPredicateReader {
 
     func consumeWhitespace(_ input: Index) -> Index? {
         var index = input
-        while let (char, nextIndex) = source.takeCharacter(index) , char == " " {
+        while let (char, nextIndex) = source.takeCharacter(index)  where char == " " {
             index = nextIndex
         }
         return index

Sources/CKQueryOperation.swift

@@ -49,7 +49,7 @@ public class CKQueryOperation: CKDatabaseOperation {
 
 
         let queryOperationURLRequest = CKQueryURLRequest(query: query!, cursor: cursor?.data as? Data, limit: resultsLimit, requestedFields: desiredKeys, zoneID: zoneID)
-
+        queryOperationURLRequest.accountInfoProvider = CloudKit.shared.defaultAccount
 
         queryOperationURLRequest.completionBlock = { (result) in
 

Sources/CKQueryURLRequest.swift

@@ -41,7 +41,7 @@ class CKQueryURLRequest: CKURLRequest {
         var parameters: [String: AnyObject] = [:]
 
         let isZoneWide = false
-        if  let zoneID = zoneID , zoneID.zoneName != CKRecordZoneDefaultName {
+        if  let zoneID = zoneID where zoneID.zoneName != CKRecordZoneDefaultName {
             // Add ZoneID Dictionary to parameters
 
         }

Sources/CKRecordZone.swift

@@ -65,7 +65,7 @@ extension CKRecordZone {
 
         self.init(zoneID: zoneID)
 
-        if let isAtomic = dictionary["atomic"] as? Bool , isAtomic {
+        if let isAtomic = dictionary["atomic"] as? Bool where isAtomic {
             capabilities = CKRecordZoneCapabilities.atomic
         }
     }

Sources/OpenCloudKit.swift

@@ -16,6 +16,8 @@ public class CloudKit {
 
     public var environment: CKEnvironment = .development
 
+    public var defaultAccount: CKAccount!
+
     public private(set) var containers: [CKContainerConfig] = []
 
     public static let shared = CloudKit()
@@ -24,6 +26,18 @@ public class CloudKit {
 
     public func configure(with configuration: CKConfig) {
         self.containers = configuration.containers
+
+        // Setup DefaultAccount
+        let container = self.containers.first!
+        if serverAuth = container.serverToServerKeyAuth {
+            // Setup Server Account
+
+            defaultAccount = CKAccount(type: .Server, containerInfo: container.containerInfo, cloudKitAuthToken: container.serverToServerKeyAuth?.keyID)
+
+        } else if let apiTokenAuth = container.apiTokenAuth {
+            // Setup Anoymous Account
+            defaultAccount = CKAccount(type: .Anoymous, containerInfo: container.containerInfo, cloudKitAuthToken: apiTokenAuth)
+        }
     }
 
     func containerConfig(forContainer container: CKContainer) -> CKContainerConfig? {