Merge pull request #4 from AvdLee/master

Add additional certficate types (AvdLee#105)

AppStoreConnect-Swift-SDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AppStoreConnect-Swift-SDK'
-  s.version          = '1.1.1'
+  s.version          = '1.1.2'
   s.summary          = 'The Swift SDK to work with the App Store Connect API from Apple.'
 
   s.description      = <<-DESC

Changelog.md

@@ -1,3 +1,10 @@
+### 1.1.2
+- Return Response instead of Void for "Sales and Finance Reports" endpoints ([#100](https://github.com/AvdLee/appstoreconnect-swift-sdk/issues/100)) via [@DechengMa](https://github.com/DechengMa)
+- Add public init to CapabilitySetting and CapabilityOption ([#106](https://github.com/AvdLee/appstoreconnect-swift-sdk/pull/106)) via [@DechengMa](https://github.com/DechengMa)
+- Add paging to listProfiles endpoint ([#107](https://github.com/AvdLee/appstoreconnect-swift-sdk/pull/107)) via [@DechengMa](https://github.com/DechengMa)
+- List/Read Certificates fails to parse response. ([#104](https://github.com/AvdLee/appstoreconnect-swift-sdk/issues/104)) via [@orj](https://github.com/orj)
+- Merge release 1.1.1 into master ([#99](https://github.com/AvdLee/appstoreconnect-swift-sdk/pull/99)) via [@SwiftLeeBot](https://github.com/SwiftLeeBot)
+
 ### 1.1.1
 - Fix Prerelease Versions filter ([#98](https://github.com/AvdLee/appstoreconnect-swift-sdk/pull/98)) via [@orj](https://github.com/orj)
 - Merge release 1.1.0 into master ([#97](https://github.com/AvdLee/appstoreconnect-swift-sdk/pull/97)) via [@SwiftLeeBot](https://github.com/SwiftLeeBot)

Sources/APIProvider.swift

@@ -163,6 +163,10 @@ private extension APIProvider {
                 return .failure(Error.requestFailure(response.statusCode, response.data))
             }
 
+            if let data = data as? T {
+                return .success(data)
+            }
+
             do {
                 let decodedValue = try Self.jsonDecoder.decode(T.self, from: data)
                 return .success(decodedValue)

Sources/Endpoints/Provisioning/Profiles/ListDownloadProfiles.swift

@@ -15,14 +15,16 @@ extension APIEndpoint where T == ProfilesResponse {
         filter: [Profiles.Filter]? = nil,
         include: [Profiles.Include]? = nil,
         sort: [Profiles.Sort]? = nil,
-        limit: [Profiles.Limit]? = nil) -> APIEndpoint {
+        limit: [Profiles.Limit]? = nil,
+        next: PagedDocumentLinks? = nil) -> APIEndpoint {
 
         var parameters = [String: Any]()
         if let fields = fields { parameters.add(fields) }
         if let filter = filter { parameters.add(filter) }
         if let include = include { parameters.add(include) }
         if let sort = sort { parameters.add(sort) }
         if let limit = limit { parameters.add(limit) }
+        if let nextCursor = next?.nextCursor { parameters["cursor"] = nextCursor }
 
         return APIEndpoint(
             path: "profiles",

Sources/Endpoints/Sales and Finance Reports/DownloadFinanceReports.swift

@@ -5,7 +5,9 @@
 //  Created by Pascal Edmond on 30/11/2018.
 //
 
-extension APIEndpoint where T == Void {
+import Foundation
+
+extension APIEndpoint where T == Data {
 
     /// Download finance reports filtered by your specified criteria.
     ///

Sources/Endpoints/Sales and Finance Reports/DownloadSalesAndTrendsReports.swift

@@ -5,7 +5,9 @@
 //  Created by Pascal Edmond on 30/11/2018.
 //
 
-extension APIEndpoint where T == Void {
+import Foundation
+
+extension APIEndpoint where T == Data {
 
     /// Download sales and trends reports filtered by your specified criteria.
     ///

Sources/Models/CapabilityOption.swift

@@ -15,4 +15,20 @@ public struct CapabilityOption: Codable {
     public let key: CapabilityOptionKey?
     public let name: String?
     public let supportsWildcard: Bool?
+
+    public init(
+        description: String? = nil,
+        enabled: Bool? = nil,
+        enabledByDefault: Bool? = nil,
+        key: CapabilityOptionKey? = nil,
+        name: String? = nil,
+        supportsWildcard: Bool? = nil
+    ) {
+        self.description = description
+        self.enabled = enabled
+        self.enabledByDefault = enabledByDefault
+        self.key = key
+        self.name = name
+        self.supportsWildcard = supportsWildcard
+    }
 }

Sources/Models/CapabilitySetting.swift

@@ -17,4 +17,24 @@ public struct CapabilitySetting: Codable {
     public let options: [CapabilityOption]?
     public let visible: Bool?
     public let minInstances: Int?
+
+    public init(
+        allowedInstances: CapabilitySettingAllowedInstances? = nil,
+        description: String? = nil,
+        enabledByDefault: Bool? = nil,
+        key: CapabilitySettingKey? = nil,
+        name: String? = nil,
+        options: [CapabilityOption]? = nil,
+        visible: Bool? = nil,
+        minInstances: Int? = nil
+    ) {
+        self.allowedInstances = allowedInstances
+        self.description = description
+        self.enabledByDefault = enabledByDefault
+        self.key = key
+        self.name = name
+        self.options = options
+        self.visible = visible
+        self.minInstances = minInstances
+    }
 }

Sources/Models/CertificateType.swift

@@ -6,6 +6,8 @@
 //
 
 public enum CertificateType: String, Codable {
+    case development = "DEVELOPMENT" // undocumented
+    case distribution = "DISTRIBUTION" // undocumented
     case iOSDevelopment = "IOS_DEVELOPMENT"
     case iOSDistribution = "IOS_DISTRIBUTION"
     case macAppDistribution = "MAC_APP_DISTRIBUTION"

Tests/APIProviderTests.swift

@@ -159,4 +159,18 @@ final class APIProviderTests: XCTestCase {
             XCTAssertTrue(result.isFailure)
         }
     }
+
+    func testRequestWithDataResultSuccess() {
+        let response = Response(statusCode: 200, data: Data(base64Encoded: ""))
+        let mockRequestExecutor = MockRequestExecutor(expectedResponse: Result.success(response))
+
+        let apiProvider = APIProvider(configuration: configuration, requestExecutor: mockRequestExecutor)
+        let resourceLink = ResourceLinks<Data>(self: URL(string: "https://api.appstoreconnect.com?cursor=FIRST")!)
+        apiProvider.request(resourceLink) { result in
+            // using the mock request executor the block is called sync
+            XCTAssertTrue(result.isSuccess)
+            XCTAssertEqual(result.value!, Data(base64Encoded: ""))
+            XCTAssertNotEqual(result.value!, Data(base64Encoded: "foo"))
+        }
+    }
 }