Merge branch 'release-1.0.5'

.gitignore

@@ -8,4 +8,5 @@ xcuserdata
 .svn
 .swiftpm
 .dependencies
-.derivedData
+.derivedData
+package.resolved

.travis.yml

@@ -1,9 +1,9 @@
 ---
-language: objective-c
-osx_image: xcode9
+language: swift
+osx_image: xcode12
 
 script: 
- - xcodebuild -project Kvitto.xcodeproj -scheme "Kvitto" -sdk iphonesimulator  -destination 'platform=iOS Simulator,name=iPhone 6 Plus' build test
+ - xcodebuild -project Kvitto.xcodeproj -scheme "Kvitto (iOS)" -sdk iphonesimulator  -destination 'platform=iOS Simulator,name=iPhone SE (2nd generation)' build test
 
 after_success:
  - bash <(curl -s https://codecov.io/bash)

Core/Source/Functions.swift

@@ -88,19 +88,22 @@ internal func _dateFromRFC3339String(_ string: String) -> Date?
     rfc3339DateFormatter.locale = Locale(identifier: "en_US_POSIX")
     rfc3339DateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
 
-	if string.count == 24  // e.g. 2020-09-27T12:07:19.686Z
+	if string.hasSuffix("Z")
 	{
-		/// with fractional seconds
-		rfc3339DateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
-	}
-	else if string.count == 20  // e.g. 2020-09-27T12:07:19Z
-	{
-		/// no fractional seconds
-		rfc3339DateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
+		if string.count == 24  // e.g. 2020-09-27T12:07:19.686Z
+		{
+			/// with fractional seconds
+			rfc3339DateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
+		}
+		else if string.count == 20  // e.g. 2020-09-27T12:07:19Z
+		{
+			/// no fractional seconds
+			rfc3339DateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
+		}
 	}
 	else
 	{
-		return nil
+		rfc3339DateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
 	}
 
     return rfc3339DateFormatter.date(from: string)

Core/Source/PKCS7Container.swift

@@ -58,13 +58,26 @@ import DTFoundation
     func unwrapSignedDataSequence(_ sequence: [AnyObject]) -> Data?
     {
         guard sequence.count==2,
-            let OID = sequence[0] as? String, OID == "1.2.840.113549.1.7.1",
-            let dataSequence = sequence[1] as? [Data], dataSequence.count == 1
+            let OID = sequence[0] as? String,
+			OID == "1.2.840.113549.1.7.1"
             else
         {
             return nil
         }
-
-        return dataSequence[0]
+
+		if let dataSequence = sequence[1] as? [Data],
+			dataSequence.count == 1
+		{
+			return dataSequence[0]
+		}
+
+		if let array = sequence[1] as? [[Data]],
+		   let dataSequence = array.first,
+		   dataSequence.count == 1
+		{
+			return dataSequence[0]
+		}
+
+		return nil
     }
 }

Core/Source/Receipt.swift

@@ -124,7 +124,7 @@ An iTunes store sales receipt.
 
     fileprivate func parseData(_ data: Data) throws -> Bool
     {
-        guard let rootArray = DTASN1Serialization.object(with: data) as? [[AnyObject]]
+        guard let rootArray = DTASN1Serialization.object(with: data) as? [[Any]]
             else
         {
             throw ReceiptParsingError.invalidRootObject
@@ -150,6 +150,8 @@ An iTunes store sales receipt.
 
     fileprivate func processItem(_ type: Int, data: Data) throws
     {
+		do {
+
         switch(type)
         {
             case 0:
@@ -201,5 +203,10 @@ An iTunes store sales receipt.
                 // all other types are private
                 break;
         }
+		}
+		catch let error
+		{
+			print(error.localizedDescription)
+		}
     }
 }

Kvitto.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'Kvitto'
-  spec.version      = '1.0.4'
+  spec.version      = '1.0.5'
   spec.summary      = "Parse and validate iTunes App Store receipts"
   spec.homepage     = "https://github.com/Cocoanetics/Kvitto"
   spec.author       = { "Oliver Drobnik" => "oliver@cocoanetics.com" }

Kvitto.xcodeproj/xcshareddata/xcschemes/Kvitto Framework.xcscheme → Kvitto.xcodeproj/xcshareddata/xcschemes/Kvitto (iOS).xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "A795445B1BC3FC1600EC73B1"
-               BuildableName = "Kvitto.framework"
-               BlueprintName = "Kvitto"
+               BuildableName = "Kvitto_iOS.framework"
+               BlueprintName = "Kvitto (iOS)"
                ReferencedContainer = "container:Kvitto.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -32,8 +32,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A795445B1BC3FC1600EC73B1"
-            BuildableName = "Kvitto.framework"
-            BlueprintName = "Kvitto"
+            BuildableName = "Kvitto_iOS.framework"
+            BlueprintName = "Kvitto (iOS)"
             ReferencedContainer = "container:Kvitto.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -64,8 +64,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A795445B1BC3FC1600EC73B1"
-            BuildableName = "Kvitto.framework"
-            BlueprintName = "Kvitto"
+            BuildableName = "Kvitto_iOS.framework"
+            BlueprintName = "Kvitto (iOS)"
             ReferencedContainer = "container:Kvitto.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -80,8 +80,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A795445B1BC3FC1600EC73B1"
-            BuildableName = "Kvitto.framework"
-            BlueprintName = "Kvitto"
+            BuildableName = "Kvitto_iOS.framework"
+            BlueprintName = "Kvitto (iOS)"
             ReferencedContainer = "container:Kvitto.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Kvitto.xcodeproj/xcshareddata/xcschemes/Kvitto Unit Tests.xcscheme

@@ -5,6 +5,22 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A79544641BC3FC1600EC73B1"
+               BuildableName = "Unit Tests.xctest"
+               BlueprintName = "Unit Tests"
+               ReferencedContainer = "container:Kvitto.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"

Package.swift

@@ -1,5 +1,4 @@
 // swift-tools-version:5.3
-// The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
@@ -16,20 +15,23 @@ let package = Package(
             targets: ["Kvitto"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/Cocoanetics/DTFoundation.git", from: "1.7.15"),
+        .package(url: "https://github.com/Cocoanetics/DTFoundation.git", 
+		from: "1.7.16"),
     ],
     targets: [
         .target(
             name: "Kvitto",
             dependencies: [
-                .product(name: "DTFoundation", package: "DTFoundation"),
+                .product(name: "DTFoundation", 
+				package: "DTFoundation"),
             ],
-            path: "Core/Source"),
+            path: "Core",
+            exclude: ["Info.plist"]),
         .testTarget(
             name: "KvittoTests",
             dependencies: ["Kvitto"],
-            path: "Test/Source",
-            resources: [.copy("receipt"),
-                        .copy("sandboxReceipt")]),
+            path: "Test",
+            exclude: ["Info.plist"],
+            resources: [.copy("Resources")]),
     ]
 )

Test/Source/KvittoTests.swift

@@ -9,7 +9,7 @@
 import XCTest
 import DTFoundation
 
-@testable import Kvitto
+import Kvitto
 
 class DTReceiptTests: XCTestCase
 {
@@ -105,24 +105,95 @@ class DTReceiptTests: XCTestCase
         XCTAssertNil(iap.cancellationDate)
         // XCTAssertEqual(iap.webOrderLineItemIdentifier, 1000000029801037)
     }
+
+	func testDecodeStoreKitTestReceipt()
+	{
+		guard let receipt = receiptFromTestResource("storeKitTestReceipt", ofType: nil)
+		else
+		{
+			XCTFail("Error parsing receipt")
+			return
+		}
+
+		XCTAssertEqual(receipt.bundleIdentifier, "com.rd.eehelper")
+		XCTAssertEqual(receipt.appVersion, "2020.10.02.1149")
+		XCTAssertEqual(receipt.originalAppVersion, nil)
+		XCTAssertEqual(receipt.opaqueValue?.count, 8)
+		XCTAssertEqual(receipt.SHA1Hash?.count, 20)
+		XCTAssertEqual(receipt.receiptExpirationDate, Date.distantFuture)
+		XCTAssertNotNil(receipt.receiptCreationDate)
+		XCTAssertNil(receipt.ageRating)
+		XCTAssertEqual(receipt.receiptType, "Xcode")
+
+		guard let iap = receipt.inAppPurchaseReceipts?.first
+			else
+		{
+			XCTFail("No IAP decoded")
+			return
+		}
+
+		XCTAssertEqual(iap.productIdentifier, "com.rd.eehelper.pro_subscription")
+		XCTAssertEqual(iap.transactionIdentifier, "0")
+		XCTAssertNil(iap.originalTransactionIdentifier)
+		XCTAssertNotNil(iap.subscriptionExpirationDate)
+		XCTAssertNil(iap.webOrderLineItemIdentifier)
+		XCTAssertNotNil(iap.purchaseDate)
+		XCTAssertNil(iap.cancellationDate)
+		// XCTAssertEqual(iap.webOrderLineItemIdentifier, 1000000029801037)
+	}
 
     // MARK: - Helper
 
-    func dataForTestResource(_ name: String?, ofType ext: String?) -> Data?
+	func urlForTestResource(name: String, ofType ext: String?) -> URL?
+	{
+		let bundle = Bundle(for: type(of: self))
+
+		#if SWIFT_PACKAGE
+
+		// there is a bug where Bundle.module points to the path of xcrun inside the Xcode.app bundle, instead of the test bundle
+		// that aborts unit tests with message:
+		//   Fatal error: could not load resource bundle: /Applications/Xcode.app/Contents/Developer/usr/bin/Kvitto_KvittoTests.bundle: file KvittoTests/resource_bundle_accessor.swift, line 7
+
+		// workaround: try to find the resource bundle at the build path
+		let buildPathURL = bundle.bundleURL.deletingLastPathComponent()
+
+		guard let resourceBundle = Bundle(url: buildPathURL.appendingPathComponent("Kvitto_KvittoTests.bundle")),
+		   let path = resourceBundle.path(forResource: name, ofType: ext) else
+		{
+			return nil
+		}
+
+		return URL(fileURLWithPath: path)
+
+		#else
+
+		guard let path = bundle.path(forResource: name, ofType: ext) else
+		{
+			return nil
+		}
+
+		return URL(fileURLWithPath: path)
+
+		#endif
+	}
+
+    func dataForTestResource(_ name: String, ofType ext: String?) -> Data?
     {
-        let bundle = Bundle(for: type(of: self))
-
-        guard let path = bundle.path(forResource: name, ofType: ext) else { return nil }
+		guard let url = urlForTestResource(name: name, ofType: ext) else
+		{
+			return nil
+		}
 
-        return (try? Data(contentsOf: URL(fileURLWithPath: path)))
+		return (try? Data(contentsOf: url))
     }
 
-    func receiptFromTestResource(_ name: String?, ofType ext: String?) -> Receipt?
+    func receiptFromTestResource(_ name: String, ofType ext: String?) -> Receipt?
     {
-        let bundle = Bundle(for: type(of: self))
-
-        guard let URL = bundle.url(forResource: name, withExtension: ext) else { return nil }
-
-        return Receipt(contentsOfURL: URL)
+		guard let url = urlForTestResource(name: name, ofType: ext) else
+		{
+			return nil
+		}
+
+        return Receipt(contentsOfURL: url)
     }
 }