Prevent unnecessary receipt posts #323
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,17 +8,32 @@ | |
|
|
||
| import Foundation | ||
|
|
||
| @objc(RCReceiptParser) public class ReceiptParser: NSObject { | ||
| private let objectIdentifierBuilder: ASN1ObjectIdentifierBuilder | ||
| private let containerBuilder: ASN1ContainerBuilder | ||
| private let receiptBuilder: AppleReceiptBuilder | ||
|
|
||
| @objc public convenience override init() { | ||
| self.init(objectIdentifierBuilder: ASN1ObjectIdentifierBuilder(), | ||
| containerBuilder: ASN1ContainerBuilder(), | ||
| receiptBuilder: AppleReceiptBuilder()) | ||
| } | ||
|
|
||
| init(objectIdentifierBuilder: ASN1ObjectIdentifierBuilder, | ||
| containerBuilder: ASN1ContainerBuilder, | ||
| receiptBuilder: AppleReceiptBuilder) { | ||
| self.objectIdentifierBuilder = objectIdentifierBuilder | ||
| self.containerBuilder = containerBuilder | ||
| self.receiptBuilder = receiptBuilder | ||
| super.init() | ||
| } | ||
|
|
||
| @objc public func receiptHasTransactions(receiptData: Data) -> Bool { | ||
| if let receipt = try? parse(from: receiptData) { | ||
| return receipt.inAppPurchases.count > 0 | ||
| } | ||
| // if the receipt can't be parsed, conservatively return true | ||
| return true | ||
|
Comment on lines
+31
to
+36
There was a problem hiding this comment. I'm not a huge fan of returning a
However, this isn't trivial to do in swift-objc interoperability:
They're not bad, but they did feel too complicated for what we're doing here. More info: https://stackoverflow.com/a/36673027/5074358 There was a problem hiding this comment. if you're curious about what this would look like, I have a stash that I can upload into a branch for perspective |
||
| } | ||
|
|
||
| func parse(from receiptData: Data) throws -> AppleReceipt { | ||
|
|
@@ -40,7 +55,7 @@ private extension ReceiptParser { | |
| if container.encodingType == .constructed { | ||
| for (index, internalContainer) in container.internalContainers.enumerated() { | ||
| if internalContainer.containerIdentifier == .objectIdentifier { | ||
| let objectIdentifier = objectIdentifierBuilder.build(fromPayload: internalContainer.internalPayload) | ||
|
Comment on lines
-43
to
+58
|
||
| if objectIdentifier == objectId && index < container.internalContainers.count - 1 { | ||
| // the container that holds the data comes right after the one with the object identifier | ||
| return container.internalContainers[index + 1] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // | ||
| // Created by Andrés Boedo on 8/27/20. | ||
| // Copyright (c) 2020 Purchases. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| @testable import PurchasesCoreSwift | ||
|
|
||
| class MockReceiptParser: ReceiptParser { | ||
|
|
||
| init() { | ||
| super.init(objectIdentifierBuilder: ASN1ObjectIdentifierBuilder(), | ||
| containerBuilder: ASN1ContainerBuilder(), | ||
| receiptBuilder: AppleReceiptBuilder()) | ||
| } | ||
|
|
||
| var invokedReceiptHasTransactions = false | ||
| var invokedReceiptHasTransactionsCount = 0 | ||
| var invokedReceiptHasTransactionsParameters: (receiptData: Data, Void)? | ||
| var invokedReceiptHasTransactionsParametersList = [(receiptData: Data, Void)]() | ||
| var stubbedReceiptHasTransactionsResult: Bool! = false | ||
|
|
||
| override func receiptHasTransactions(receiptData: Data) -> Bool { | ||
| invokedReceiptHasTransactions = true | ||
| invokedReceiptHasTransactionsCount += 1 | ||
| invokedReceiptHasTransactionsParameters = (receiptData, ()) | ||
| invokedReceiptHasTransactionsParametersList.append((receiptData, ())) | ||
| return stubbedReceiptHasTransactionsResult | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we'll move a lot of stuff out of this class eventually, but it's out-of-scope for this PR