Adding SK2 option

Author: al-af

android/src/main/includeConnector/com/appsflyer/reactnative/PCAppsFlyerModule.java

@@ -51,6 +51,12 @@ public void create(ReadableMap config) {
             boolean logInApps = config.getBoolean("logInApps");
             boolean sandbox = config.getBoolean("sandbox");
 
+            // Optional: Log that storeKitVersion is ignored on Android (for debugging purposes)
+            if (config.hasKey("storeKitVersion")) {
+                String storeKitVersion = config.getString("storeKitVersion");
+                Log.d(TAG, "storeKitVersion (" + storeKitVersion + ") is ignored on Android.");
+            }
+
             MappedValidationResultListener arsListener = this.arsListener;
             MappedValidationResultListener viapListener = this.viapListener;
 

index.d.ts

@@ -166,10 +166,16 @@ declare module "react-native-appsflyer" {
   /**
    * PurchaseConnector
    */
+  export const StoreKitVersion = {
+    SK1: "SK1",
+    SK2: "SK2",
+  };
+
   export interface PurchaseConnectorConfig {
     logSubscriptions: boolean;
     logInApps: boolean;
     sandbox: boolean;
+    storeKitVersion?: keyof typeof StoreKitVersion; // Optional property
   }
 
   export const AppsFlyerPurchaseConnectorConfig: {
@@ -180,6 +186,7 @@ declare module "react-native-appsflyer" {
     create(config: PurchaseConnectorConfig): void;
     startObservingTransactions(): void;
     stopObservingTransactions(): void;
+    logConsumableTransaction(transactionId: string): void;
     onSubscriptionValidationResultSuccess(
       callback: (data:OnResponse<SubscriptionValidationResult>) => any
     ): () => void;

index.js

@@ -15,6 +15,11 @@ const AppsFlyerPurchaseConnector = {};
 const pcEventsMap = {};
 const purchaseConnectorEventEmitter = new NativeEventEmitter(PCAppsFlyer);
 
+export const StoreKitVersion = {
+  SK1: "SK1",
+  SK2: "SK2",
+};
+
 function startObservingTransactions() {
   PCAppsFlyer.startObservingTransactions();
 }
@@ -197,12 +202,19 @@ AppsFlyerPurchaseConnector.OnReceivePurchaseRevenueValidationInfo = (
   };
 };
 
+function logConsumableTransaction(transactionId){
+  PCAppsFlyer.logConsumableTransaction(transactionId);
+};
+
+AppsFlyerPurchaseConnector.logConsumableTransaction = logConsumableTransaction;
+
 const AppsFlyerPurchaseConnectorConfig = {
-  setConfig: ({ logSubscriptions, logInApps, sandbox }) => {
+  setConfig: ({ logSubscriptions, logInApps, sandbox, storeKitVersion }) => {
     return {
       logSubscriptions,
       logInApps,
       sandbox,
+      storeKitVersion: storeKitVersion || StoreKitVersion.SK1, // Default to SK1 if not provided
     };
   },
 };

ios/PCAppsFlyer.m

@@ -14,6 +14,7 @@ @implementation PCAppsFlyer
 static NSString *const logSubscriptionsKey = @"logSubscriptions";
 static NSString *const logInAppsKey = @"logInApps";
 static NSString *const sandboxKey = @"sandbox";
+static NSString *const storeKitKey = @"storeKitVersion";
 static NSString *const connectorAlreadyConfiguredMessage = @"Connector already configured";
 static NSString *const connectorNotConfiguredMessage = @"Connector not configured, did you call `create` first?";
 
@@ -41,8 +42,18 @@ @implementation PCAppsFlyer
     BOOL logSubscriptions = [config[logSubscriptionsKey] boolValue];
     BOOL logInApps = [config[logInAppsKey] boolValue];
     BOOL sandbox = [config[sandboxKey] boolValue];
-  
+    NSString *storeKitVersion = config[storeKitKey]; 
+
     [connector setIsSandbox:sandbox];
+
+    // Set the StoreKitVersion (default to SK1 if not provided or invalid)
+    if ([storeKitVersion isEqualToString:@"SK2"]) {
+        [connector setStoreKitVersion:AFSDKStoreKitVersionSK2];
+        NSLog(@"%@Configure PurchaseConnector with StoreKit2 Version", TAG);
+    } else {
+        [connector setStoreKitVersion:AFSDKStoreKitVersionSK1];
+        NSLog(@"%@Configure PurchaseConnector with StoreKit1 Version", TAG);
+    }
 
     if (logSubscriptions && logInApps) {
     [connector setAutoLogPurchaseRevenue:AFSDKAutoLogPurchaseRevenueOptionsAutoRenewableSubscriptions | AFSDKAutoLogPurchaseRevenueOptionsInAppPurchases];
@@ -58,6 +69,35 @@ @implementation PCAppsFlyer
     resolve(nil);
 }
 
+RCT_EXPORT_METHOD(logConsumableTransaction:(NSString *)transactionId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    NSLog(@"%@Logging consumable transaction with ID: %@", TAG, transactionId);
+    
+    if (connector == nil) {
+        reject(connectorNotConfiguredMessage, connectorNotConfiguredMessage, nil);
+        return;
+    }
+
+    // Call the Swift method via the TransactionFetcher class
+    /*
+    [TransactionFetcher fetchTransactionWithId:transactionId completion:^(AFSDKTransactionSK2 * _Nullable afTransaction) {
+        if (afTransaction) {
+            // Use the fetched transaction
+            [connector logConsumableTransaction:afTransaction];
+            NSLog(@"Logged transaction: %@", transactionId);
+            resolve(nil);
+        } else {
+            // Handle the case where the transaction was not found
+            NSError *error = [NSError errorWithDomain:@"PCAppsFlyer"
+                                                 code:404
+                                             userInfo:@{NSLocalizedDescriptionKey: @"Transaction not found"}];
+            reject(@"transaction_not_found", @"Transaction not found", error);
+        }
+    }];
+    */
+}
+
 RCT_EXPORT_METHOD(startObservingTransactions:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     NSLog(@"%@Starting to observe transactions.", TAG);