Merge pull request #215 from Kinvey/feature/MLIBZ-1908-custom-request…

…-properties MLIBZ-1908: x-kinvey-custom-request-properties header
Kinvey · Jul 17, 2017 · d994f97 · d994f97
2 parents bb5fbc2 + ba3a80d
commit d994f97
Show file tree

Hide file tree

Showing 32 changed files with 3,228 additions and 560 deletions.
diff --git a/Kinvey/Kinvey/AggregateOperation.swift b/Kinvey/Kinvey/AggregateOperation.swift
@@ -13,10 +13,20 @@ class AggregateOperation<T: Persistable>: ReadOperation<T, [JsonDictionary], Swi
     let aggregation: Aggregation
     let predicate: NSPredicate?
 
-    init(aggregation: Aggregation, condition predicate: NSPredicate? = nil, readPolicy: ReadPolicy, cache: AnyCache<T>?, client: Client) {
+    init(
+        aggregation: Aggregation,
+        condition predicate: NSPredicate? = nil,
+        readPolicy: ReadPolicy,
+        cache: AnyCache<T>?,
+        options: Options?
+    ) {
         self.aggregation = aggregation
         self.predicate = predicate
-        super.init(readPolicy: readPolicy, cache: cache, client: client)
+        super.init(
+            readPolicy: readPolicy,
+            cache: cache,
+            options: options
+        )
     }
 
     func executeLocal(_ completionHandler: CompletionHandler? = nil) -> Request {
@@ -32,7 +42,14 @@ class AggregateOperation<T: Persistable>: ReadOperation<T, [JsonDictionary], Swi
     }
 
     func executeNetwork(_ completionHandler: CompletionHandler? = nil) -> Request {
-        let request = client.networkRequestFactory.buildAppDataGroup(collectionName: T.collectionName(), keys: aggregation.keys, initialObject: aggregation.initialObject, reduceJSFunction: aggregation.reduceJSFunction, condition: predicate)
+        let request = client.networkRequestFactory.buildAppDataGroup(
+            collectionName: T.collectionName(),
+            keys: aggregation.keys,
+            initialObject: aggregation.initialObject,
+            reduceJSFunction: aggregation.reduceJSFunction,
+            condition: predicate,
+            options: options
+        )
         request.execute() { data, response, error in
             if let response = response, response.isOK,
                 let data = data,

diff --git a/Kinvey/Kinvey/Client.swift b/Kinvey/Kinvey/Client.swift
@@ -92,11 +92,10 @@ open class Client: Credential {
     /// Timeout interval for this client instance.
     open var timeoutInterval: TimeInterval = 60
 
-    /// App version for this client instance.
-    open var clientAppVersion: String?
-
-    /// Custom request properties for this client instance.
-    open var customRequestProperties: [String : String] = [:]
+    /**
+     Hold default optional values for all calls made by this `Client` instance
+     */
+    open var options: Options?
 
     /// The default value for `apiHostName` variable.
     open static let defaultApiHostName = URL(string: "https://baas.kinvey.com/")!
@@ -356,7 +355,7 @@ open class Client: Credential {
             }
             return LocalRequest()
         }
-        let request = networkRequestFactory.buildAppDataPing()
+        let request = networkRequestFactory.buildAppDataPing(options: options)
         Promise<EnvironmentInfo> { fulfill, reject in
             request.execute() { data, response, error in
                 if let response = response,

diff --git a/Kinvey/Kinvey/CountOperation.swift b/Kinvey/Kinvey/CountOperation.swift
@@ -12,9 +12,18 @@ class CountOperation<T: Persistable>: ReadOperation<T, Int, Swift.Error>, ReadOp
 
     let query: Query?
 
-    init(query: Query? = nil, readPolicy: ReadPolicy, cache: AnyCache<T>?, client: Client) {
+    init(
+        query: Query? = nil,
+        readPolicy: ReadPolicy,
+        cache: AnyCache<T>?,
+        options: Options?
+    ) {
         self.query = query
-        super.init(readPolicy: readPolicy, cache: cache, client: client)
+        super.init(
+            readPolicy: readPolicy,
+            cache: cache,
+            options: options
+        )
     }
 
     func executeLocal(_ completionHandler: CompletionHandler? = nil) -> Request {
@@ -31,7 +40,11 @@ class CountOperation<T: Persistable>: ReadOperation<T, Int, Swift.Error>, ReadOp
     }
 
     func executeNetwork(_ completionHandler: CompletionHandler? = nil) -> Request {
-        let request = client.networkRequestFactory.buildAppDataCountByQuery(collectionName: T.collectionName(), query: query)
+        let request = client.networkRequestFactory.buildAppDataCountByQuery(
+            collectionName: T.collectionName(),
+            query: query,
+            options: options
+        )
         request.execute() { data, response, error in
             if let response = response, response.isOK,
                 let data = data,