Fixing serviceInfo - bug file upload

Author: Perki

Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
-  - Alamofire (5.2.1)
-  - Mocker (2.2.0)
-  - PromisesObjC (1.2.9)
-  - PromisesSwift (1.2.9):
-    - PromisesObjC (= 1.2.9)
+  - Alamofire (5.10.2)
+  - Mocker (2.5.5)
+  - PromisesObjC (2.4.0)
+  - PromisesSwift (2.4.0):
+    - PromisesObjC (= 2.4.0)
   - Socket.IO-Client-Swift (15.2.0):
     - Starscream (~> 3.1)
   - Starscream (3.1.1)
@@ -24,13 +24,13 @@ SPEC REPOS:
     - Starscream
 
 SPEC CHECKSUMS:
-  Alamofire: e911732990610fe89af59ac0077f923d72dc3dfd
-  Mocker: d0ceb340eddd5c28539a691ce67d068674cef9a0
-  PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
-  PromisesSwift: 991ad88e9851c45410d6697d1fe5df88fd3deb08
+  Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
+  Mocker: 8c731a8104962f246cadf2b02556218e9edc1390
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   Socket.IO-Client-Swift: 1e3e3a1f09f3312a167f0d781eb2f383d477357c
   Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
 
 PODFILE CHECKSUM: d6dc12204b40b69e26fe720e542ae7850f7739af
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.16.2

PryvSwiftKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'PryvSwiftKit'
-  s.version          = '2.1.0'
+  s.version          = '2.1.1'
   s.summary          = 'Pryv Swift library for iOS'
 
   s.description      = <<-DESC

PryvSwiftKit/Service.swift

@@ -34,7 +34,7 @@ public class Service: Equatable {
     private var session: Session!
     private var pryvServiceInfoUrl: String
     private var serviceCustomization: Json?
-    private var pryvServiceInfo: Promise<PryvServiceInfo>?
+    private var pryvServiceInfo: PryvServiceInfo?
     private var pollingInfo: (poll: String, poll_ms: Double, callback: (AuthResult) -> ())? {
         didSet {
             var currentState: AuthState? = nil
@@ -81,21 +81,25 @@ public class Service: Equatable {
     /// - Returns: promise to service info object, customized if needed
     public func info(forceFetch: Bool = false) -> Promise<PryvServiceInfo> {
         if forceFetch || pryvServiceInfo == nil {
-            pryvServiceInfo = Promise<PryvServiceInfo>(on: .global(qos: .background), { (fullfill, reject) in
+            var pryvServiceInfoPromise = Promise<PryvServiceInfo>(on: .global(qos: .background), { (fullfill, reject) in
                 self.session.request(URL(string: self.pryvServiceInfoUrl)!).responseDecodable(of: PryvServiceInfo.self) { response in
                     switch response.result {
                     case .success(var serviceInfo):
-                        serviceInfo = self.customize(serviceInfo: serviceInfo, with: self.serviceCustomization)
-                        fullfill(serviceInfo)
+                        self.pryvServiceInfo = self.customize(serviceInfo: serviceInfo, with: self.serviceCustomization)
+                
+                        fullfill(self.pryvServiceInfo!)
                     case .failure(let error):
                         let servError = PryvError.requestError(error.localizedDescription)
                         reject(servError)
                     }
                 }
             })
+            return pryvServiceInfoPromise
         }
 
-        return pryvServiceInfo!
+        return Promise<PryvServiceInfo>(on: .global(qos: .background), { (fullfill, reject) in
+            fullfill(self.pryvServiceInfo!)
+        })
     }
 
     /// Return service info parameters
@@ -106,7 +110,7 @@ public class Service: Equatable {
         if pryvServiceInfo == nil {
             return nil
         }
-        return try? await(pryvServiceInfo!)
+        return self.pryvServiceInfo!
     }
 
     /// Return an API Endpoint from a username and token and a PryvServiceInfo
@@ -127,7 +131,7 @@ public class Service: Equatable {
     ///   - token (optional)
     /// - Returns: API Endpoint from a username and token and the PryvServiceInfo
     public func apiEndpointFor(username: String, token: String? = nil) -> Promise<String> {
-        let serviceInfoPromise = pryvServiceInfo ?? info()
+        let serviceInfoPromise = info()
 
         return serviceInfoPromise.then { serviceInfo in
             return self.buildApiEndpoint(serviceInfo: serviceInfo, username: username, token: token)
@@ -184,7 +188,7 @@ public class Service: Equatable {
     ///    }
     ///    ```
     public func setUpAuth(authSettings: Json, stateChangedCallback: @escaping (AuthResult) -> ()) -> Promise<String> {
-        let serviceInfoPromise = pryvServiceInfo ?? info()
+        let serviceInfoPromise = info()
         return serviceInfoPromise.then { serviceInfo in
             let string = serviceInfo.register.hasSuffix("/") ? serviceInfo.register + "access" : serviceInfo.register + "/access"
             var request = URLRequest(url: URL(string: string)!)

PryvSwiftKitTests/ConnectionTests.swift

@@ -18,6 +18,13 @@ class ConnectionTests: XCTestCase {
     private let testuser = "testuser"
     private let service = Service(pryvServiceInfoUrl: "https://reg.pryv.me/service/info")
     private let callBatches: [APICall] = [
+        [
+            "method": "streams.create",
+            "params": [
+                "id": "position",
+                "name": "Position"
+            ]
+        ],
         [
             "method": "events.create",
             "params": [
@@ -72,7 +79,6 @@ class ConnectionTests: XCTestCase {
         var events = [Event]()
         var a = 0
         let results = connection?.api(APICalls: callBatches, handleResults: [0: { result in a = 2 }])
-        
         XCTAssert(waitForPromises(timeout: timeout))
         XCTAssertNil(results?.error)
         XCTAssertNotNil(results?.value)

PryvSwiftKitTests/ConnectionWebSocketTests.swift

@@ -12,8 +12,8 @@ import XCTest
 @testable import PryvSwiftKit
 
 class ConnectionWebSocketTests: XCTestCase {
-    private let url = "https://testuser.pryv.me/testuser?auth=ckclwj7m504fo1od3fkt6ptqb"
-    private let apiEndpoint = "https://ckclwj7m504fo1od3fkt6ptqb@testuser.pryv.me/"
+    private let url = "https://testuser.pryv.me/testuser?auth=cm5wjb0fp003o1vpce4bc7rxj"
+    private let apiEndpoint = "https://cm5wjb0fp003o1vpce4bc7rxj@testuser.pryv.me/"
     private let streamId = "lib-swift-test"
 
     private var connectionWebSocket: ConnectionWebSocket!

PryvSwiftKitTests/ServiceTests.swift

@@ -51,9 +51,7 @@ class ServiceTests: XCTestCase {
         XCTAssertEqual(serviceInfo?.api, "https://{username}.pryv.me/")
         XCTAssertEqual(serviceInfo?.name, "Pryv Lab")
         XCTAssertEqual(serviceInfo?.home, "https://sw.pryv.me")
-        XCTAssertEqual(serviceInfo?.support, "https://pryv.com/helpdesk")
-        XCTAssertEqual(serviceInfo?.terms, "https://pryv.com/terms-of-use/")
-        XCTAssertEqual(serviceInfo?.eventTypes, "https://api.pryv.com/event-types/flat.json")
+        XCTAssertEqual(serviceInfo?.eventTypes, "https://pryv.github.io/event-types/flat.json")
     }
 
     func testInfoCustomized() {