review 1

Author: Amit kremer

Docs/RN_API.md

@@ -37,7 +37,6 @@ The list of available methods for this plugin is described below.
     - [disableAdvertisingIdentifier](#disableAdvertisingIdentifier)
     - [enableTCFDataCollection](#enableTCFDataCollection)
     - [setConsentData](#setConsentData)
-    - [setNonGDPRUser](#setNonGDPRUser)
 - [Android Only APIs](#android-only-apis)
     - [setCollectAndroidID](#setcollectandroidid)
     - [setCollectIMEI](#setcollectimei)
@@ -772,40 +771,30 @@ appsFlyer.enableTCFDataCollection(true);
 
 ---
 ### setConsentData
-`setConsentData(consentData): void`
+`setConsentData(consentObject): void`
 
 When GDPR applies to the user and your app does not use a CMP compatible with TCF v2.2, use this API to provide the consent data directly to the SDK.<br>
-The consent object has 2 properties:
+The AppsFlyerConsent object has 2 methods:
+
+1. `AppsFlyerConsent.forNonGDPRUser`: Indicates that GDPR doesn’t apply to the user and generates nonGDPR consent object. This method doesn’t accept any parameters.
+2. `AppsFlyerConsent.forGDPRUser`: create an AppsFlyerConsent object with 2 parameters:
 
-1. `hasConsentForDataUsage`: Indicates whether the user has consented to use their data for advertising purposes.
-2. `hasConsentForAdsPersonalization`: ndicates whether the user has consented to use their data for personalized advertising.
 
 | parameter       | type     | description                      |
 | ----------      |----------|------------------                |
-| consentData  | object  | Consent object of the user       |
+| hasConsentForDataUsage  | boolean  | Indicates whether the user has consented to use their data for advertising purposes       |
+| hasConsentForAdsPersonalization  | boolean  | Indicates whether the user has consented to use their data for personalized advertising       |
 
 *Example:*
 
 ```javascript
-let consentData = {
-      hasConsentForDataUsage: true,
-      hasConsentForAdsPersonalization: false
-    }
-
-appsFlyer.setConsentData(consentData);
-```
-
----
-
-### setNonGDPRUser
-`setNonGDPRUser(): void`
+import appsFlyer, {AppsFlyerConsent} from 'react-native-appsflyer';
 
-Use this API if GDPR doesn’t apply to the user.<br>
+let nonGDPRUser = AppsFlyerConsent.forNonGDPRUser();
+// OR
+let GDPRUser = AppsFlyerConsent.forGDPRUser(true, false);
 
-*Example:*
-
-```javascript
-appsFlyer.setNonGDPRUser();
+appsFlyer.setConsentData(nonGDPRUser /**or**/ GDPRUser);
 ```
 
 ## Android Only APIs

android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerModule.java

@@ -824,18 +824,18 @@ public void enableTCFDataCollection(Boolean enabled) {
     @ReactMethod
     public void setConsentData(ReadableMap consentData) {
         JSONObject JSONConsentData = RNUtil.readableMapToJson(consentData);
+        boolean isUserSubjectToGDPR = JSONConsentData.optBoolean("isUserSubjectToGDPR");
         boolean hasConsentForDataUsage = JSONConsentData.optBoolean("hasConsentForDataUsage");
         boolean hasConsentForAdsPersonalization = JSONConsentData.optBoolean("hasConsentForAdsPersonalization");
-        AppsFlyerConsent consentObject = AppsFlyerConsent.forGDPRUser(hasConsentForDataUsage, hasConsentForAdsPersonalization);
+        AppsFlyerConsent consentObject;
+        if (isUserSubjectToGDPR) {
+            consentObject = AppsFlyerConsent.forGDPRUser(hasConsentForDataUsage, hasConsentForAdsPersonalization);
+        } else {
+            consentObject = AppsFlyerConsent.forNonGDPRUser();
+        }
         AppsFlyerLib.getInstance().setConsentData(consentObject);
     }
 
-    @ReactMethod
-    public void setNonGDPRUser() {
-        AppsFlyerConsent consentData = AppsFlyerConsent.forNonGDPRUser();
-        AppsFlyerLib.getInstance().setConsentData(consentData);
-    }
-
     @ReactMethod
     public void addListener(String eventName) {
       // Keep: Required for RN built in Event Emitter Calls.

index.d.ts

@@ -114,6 +114,13 @@ declare module "react-native-appsflyer" {
         brandDomain?: string;
     }
 
+    export const AppsFlyerConsent: {
+        forGDPRUser: (hasConsentForDataUsage: boolean, hasConsentForAdsPersonalization: boolean) => void;
+        forNonGDPRUser: () => void;
+    }
+
+    export type AppsFlyerConsentType = typeof AppsFlyerConsent;
+
     const appsFlyer: {
         onInstallConversionData(callback: (data: ConversionData) => any): () => void;
         onInstallConversionFailure(callback: (data: ConversionData) => any): () => void;
@@ -152,8 +159,7 @@ declare module "react-native-appsflyer" {
         appendParametersToDeepLinkingURL(contains: string, parameters: object): void
         startSdk(): void
         enableTCFDataCollection(enabled: boolean): void
-        setConsentData(consentData: object): void
-        setNonGDPRUser(): void
+        setConsentData(consentData: AppsFlyerConsentType): void
 
         /**
          * For iOS Only

index.js

@@ -635,20 +635,38 @@ appsFlyer.enableTCFDataCollection= (enabled) => {
 
 /**
  * If your app does not use a CMP compatible with TCF v2.2, use the SDK API detailed below to provide the consent data directly to the SDK.
- * @param  consentData: object with 2 properties: hasConsentForDataUsage and hasConsentForAdsPersonalization.
+ * @param  consentData: AppsFlyerConsent object.
  */
 appsFlyer.setConsentData = (consentData) => {
 	return RNAppsFlyer.setConsentData(consentData);
 }
 
-appsFlyer.setNonGDPRUser = () => {
-	return RNAppsFlyer.setNonGDPRUser();
-}
-
 function AFParseJSONException(_message, _data) {
 	this.message = _message;
 	this.data = _data;
 	this.name = 'AFParseJSONException';
 }
 
-export default appsFlyer;
+// Consent object
+export const AppsFlyerConsent = (function () {
+    // Private constructor
+    function AppsFlyerConsent(isUserSubjectToGDPR, hasConsentForDataUsage, hasConsentForAdsPersonalization) {
+        this.isUserSubjectToGDPR = isUserSubjectToGDPR;
+        this.hasConsentForDataUsage = hasConsentForDataUsage;
+        this.hasConsentForAdsPersonalization = hasConsentForAdsPersonalization;
+    }
+
+    return {
+        // Factory method for GDPR user
+        forGDPRUser: function(hasConsentForDataUsage, hasConsentForAdsPersonalization) {
+            return new AppsFlyerConsent(true, hasConsentForDataUsage, hasConsentForAdsPersonalization);
+        },
+
+        // Factory method for non GDPR user
+        forNonGDPRUser: function() {
+            return new AppsFlyerConsent(false, null, null);
+        }
+    };
+})();
+
+export default appsFlyer;

ios/RNAppsFlyer.m

@@ -569,18 +569,21 @@ - (BOOL)isExpoApp {
     [[AppsFlyerLib shared] enableTCFDataCollection:enabled];
 }
 
-RCT_EXPORT_METHOD(setConsentData:(NSDictionary *)consentData) {
-    if (![consentData isKindOfClass:[NSNull null]]) {
-        BOOL hasConsentForDataUsage = consentData[@"hasConsentForDataUsage"];
-        BOOL hasConsentForAdsPersonalization = consentData[@"hasConsentForAdsPersonalization"];
-        AppsFlyerConsent *consentData = [[AppsFlyerConsent alloc] initForGDPRUserWithHasConsentForDataUsage:hasConsentForDataUsage hasConsentForAdsPersonalization:hasConsentForAdsPersonalization];
+RCT_EXPORT_METHOD(setConsentData:(NSDictionary *)consentDictionary) {
+    if (![consentDictionary isKindOfClass:[NSNull null]]) {
+        BOOL isUserSubjectToGDPR = [consentDictionary[@"isUserSubjectToGDPR"] boolValue];
+        
+        AppsFlyerConsent *consentData;
+        if (isUserSubjectToGDPR){
+            BOOL hasConsentForDataUsage = [consentDictionary[@"hasConsentForDataUsage"] boolValue];
+            BOOL hasConsentForAdsPersonalization = [consentDictionary[@"hasConsentForAdsPersonalization"] boolValue];
+            consentData = [[AppsFlyerConsent alloc] initForGDPRUserWithHasConsentForDataUsage:hasConsentForDataUsage hasConsentForAdsPersonalization:hasConsentForAdsPersonalization];
+        } else {
+            consentData = [[AppsFlyerConsent alloc] initNonGDPRUser];
+        }
+         
         [[AppsFlyerLib shared] setConsentData:consentData];
     }
 }
 
-RCT_EXPORT_METHOD(setNonGDPRUser) {
-    AppsFlyerConsent *consentData = [[AppsFlyerConsent alloc] initNonGDPRUser];
-    [[AppsFlyerLib shared] setConsentData:consentData];
-}
-
 @end