From 4142974e4bed9abe37de551b0b2532db465a838a Mon Sep 17 00:00:00 2001 From: uerceg Date: Wed, 10 Jul 2024 00:10:46 +0200 Subject: [PATCH] refac: remove receipt from pv in v5 --- Adjust/ADJAppStorePurchase.h | 5 +---- Adjust/ADJAppStorePurchase.m | 5 +---- Adjust/ADJEvent.h | 12 ------------ Adjust/ADJEvent.m | 7 ------- Adjust/Internal/ADJPackageBuilder.m | 16 ---------------- .../AdjustTestApp/ATAAdjustCommandExecutor.m | 14 +------------- 6 files changed, 3 insertions(+), 56 deletions(-) diff --git a/Adjust/ADJAppStorePurchase.h b/Adjust/ADJAppStorePurchase.h index 0b8d7f2d2..8ff12322f 100644 --- a/Adjust/ADJAppStorePurchase.h +++ b/Adjust/ADJAppStorePurchase.h @@ -14,13 +14,10 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy, readonly, nonnull) NSString *transactionId; -@property (nonatomic, copy, readonly, nonnull) NSData *receipt; - @property (nonatomic, copy, readonly, nonnull) NSString *productId; - (nullable id)initWithTransactionId:(nonnull NSString *)transactionId - productId:(nonnull NSString *)productId - receipt:(nonnull NSData *)receipt; + productId:(nonnull NSString *)productId; @end diff --git a/Adjust/ADJAppStorePurchase.m b/Adjust/ADJAppStorePurchase.m index 2c37cf621..136823180 100644 --- a/Adjust/ADJAppStorePurchase.m +++ b/Adjust/ADJAppStorePurchase.m @@ -11,8 +11,7 @@ @implementation ADJAppStorePurchase - (nullable id)initWithTransactionId:(NSString *)transactionId - productId:(NSString *)productId - receipt:(NSData *)receipt { + productId:(NSString *)productId { self = [super init]; if (self == nil) { return nil; @@ -20,7 +19,6 @@ - (nullable id)initWithTransactionId:(NSString *)transactionId _transactionId = [transactionId copy]; _productId = [productId copy]; - _receipt = [receipt copy]; return self; } @@ -30,7 +28,6 @@ - (id)copyWithZone:(NSZone *)zone { if (copy) { copy->_transactionId = [self.transactionId copyWithZone:zone]; - copy->_receipt = [self.receipt copyWithZone:zone]; copy->_productId = [self.productId copyWithZone:zone]; } diff --git a/Adjust/ADJEvent.h b/Adjust/ADJEvent.h index 5b746053a..b64027cac 100644 --- a/Adjust/ADJEvent.h +++ b/Adjust/ADJEvent.h @@ -48,11 +48,6 @@ */ @property (nonatomic, copy, readonly, nonnull) NSString *productId; -/** - * @brief IAP receipt. - */ -@property (nonatomic, copy, readonly, nonnull) NSData *receipt; - /** * @brief List of partner parameters. */ @@ -143,11 +138,4 @@ */ - (void)setProductId:(NSString * _Nonnull)productId; -/** - * @brief Set the receipt of an In-App Purchases to perform IAP verification. - * - * @param receipt The receipt obtained after successful IAP. - */ -- (void)setReceipt:(NSData * _Nonnull)receipt; - @end diff --git a/Adjust/ADJEvent.m b/Adjust/ADJEvent.m index 1d2fc0a99..86a2311b4 100644 --- a/Adjust/ADJEvent.m +++ b/Adjust/ADJEvent.m @@ -139,12 +139,6 @@ - (void)setProductId:(NSString *)productId { } } -- (void)setReceipt:(NSData *)receipt { - @synchronized (self) { - _receipt = [receipt copy]; - } -} - - (BOOL)checkEventToken:(NSString *)eventToken { if ([ADJUtil isNull:eventToken]) { [self.logger error:@"Missing Event Token"]; @@ -197,7 +191,6 @@ - (id)copyWithZone:(NSZone *)zone { copy.partnerMutableParameters = [self.partnerMutableParameters copyWithZone:zone]; copy->_transactionId = [self.transactionId copyWithZone:zone]; copy->_deduplicationId = [self.deduplicationId copyWithZone:zone]; - copy->_receipt = [self.receipt copyWithZone:zone]; copy->_productId = [self.productId copyWithZone:zone]; } diff --git a/Adjust/Internal/ADJPackageBuilder.m b/Adjust/Internal/ADJPackageBuilder.m index d5c1bb59b..244212dd4 100644 --- a/Adjust/Internal/ADJPackageBuilder.m +++ b/Adjust/Internal/ADJPackageBuilder.m @@ -250,13 +250,6 @@ - (ADJActivityPackage *)buildClickPackage:(NSString *)clickSource - (ADJActivityPackage * _Nullable)buildPurchaseVerificationPackageWithPurchase:(ADJAppStorePurchase * _Nullable)purchase { NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; - if (purchase.receipt != nil) { - // NSString *receiptBase64 = [purchase.receipt adjEncodeBase64]; - NSString *receiptBase64 = [ADJAdditions adjEncodeBase64:purchase.receipt]; - [ADJPackageBuilder parameters:parameters - setString:receiptBase64 - forKey:@"receipt"]; - } if (purchase.transactionId != nil) { [ADJPackageBuilder parameters:parameters setString:purchase.transactionId @@ -274,13 +267,6 @@ - (ADJActivityPackage * _Nullable)buildPurchaseVerificationPackageWithPurchase:( - (ADJActivityPackage * _Nullable)buildPurchaseVerificationPackageWithEvent:(ADJEvent *)event { NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; - if (event.receipt != nil) { - // NSString *receiptBase64 = [event.receipt adjEncodeBase64]; - NSString *receiptBase64 = [ADJAdditions adjEncodeBase64:event.receipt]; - [ADJPackageBuilder parameters:parameters - setString:receiptBase64 - forKey:@"receipt"]; - } if (event.transactionId != nil) { [ADJPackageBuilder parameters:parameters setString:event.transactionId @@ -414,8 +400,6 @@ - (NSMutableDictionary *)getEventParameters:(ADJEvent *)event { [ADJPackageBuilder parameters:parameters setString:event.transactionId forKey:@"transaction_id"]; [ADJPackageBuilder parameters:parameters setString:event.deduplicationId forKey:@"deduplication_id"]; [ADJPackageBuilder parameters:parameters setString:event.productId forKey:@"product_id"]; - // [ADJPackageBuilder parameters:parameters setString:[event.receipt adjEncodeBase64] forKey:@"receipt"]; - [ADJPackageBuilder parameters:parameters setString:[ADJAdditions adjEncodeBase64:event.receipt] forKey:@"receipt"]; if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m b/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m index 09dcc8f09..0c51b8aa8 100644 --- a/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m +++ b/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m @@ -486,12 +486,6 @@ - (void)event:(NSDictionary *)parameters { } [adjustEvent setDeduplicationId:deduplicationId]; } - - if ([parameters objectForKey:@"receipt"]) { - NSString *receiptString = [parameters objectForKey:@"receipt"][0]; - NSData *receipt = [receiptString dataUsingEncoding:NSUTF8StringEncoding]; - [adjustEvent setReceipt:receipt]; - } } - (void)trackEvent:(NSDictionary *)parameters { @@ -758,14 +752,9 @@ - (void)getLastDeeplink:(NSDictionary *)parameters { } - (void)verifyPurchase:(NSDictionary *)parameters { - NSData *receipt; NSString *transactionId; NSString *productId; - if ([parameters objectForKey:@"receipt"]) { - NSString *receiptString = [parameters objectForKey:@"receipt"][0]; - receipt = [receiptString dataUsingEncoding:NSUTF8StringEncoding]; - } if ([parameters objectForKey:@"transactionId"]) { transactionId = [parameters objectForKey:@"transactionId"][0]; } @@ -774,8 +763,7 @@ - (void)verifyPurchase:(NSDictionary *)parameters { } ADJAppStorePurchase *purchase = [[ADJAppStorePurchase alloc] initWithTransactionId:transactionId - productId:productId - receipt:receipt]; + productId:productId]; [Adjust verifyAppStorePurchase:purchase withCompletionHandler:^(ADJPurchaseVerificationResult * _Nonnull verificationResult) { [self.testLibrary addInfoToSend:@"verification_status" value:verificationResult.verificationStatus];