@didomi/react-native 2.3.0 → 2.5.0

package/android/build.gradle

@@ -124,5 +124,5 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation "io.didomi.sdk:android:2.6.0"
+    implementation "io.didomi.sdk:android:2.9.0"
 }

package/android/src/main/java/com/reactnativedidomi/DidomiModule.kt

@@ -15,8 +15,12 @@ import io.didomi.sdk.DidomiInitializeParameters
 import io.didomi.sdk.events.*
 import io.didomi.sdk.exceptions.DidomiNotReadyException
 import io.didomi.sdk.models.CurrentUserStatus
+import io.didomi.sdk.user.UserAuthParams
 import io.didomi.sdk.user.UserAuthWithEncryptionParams
 import io.didomi.sdk.user.UserAuthWithHashParams
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
 
 class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
@@ -231,6 +235,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
          */
         override fun languageUpdateFailed(event: LanguageUpdateFailedEvent) = prepareEvent(EventTypes.LANGUAGE_UPDATE_FAILED.event, event.reason)
     }
+
     private val vendorStatusListeners: MutableSet<String> = mutableSetOf()
     private val syncAcknowledgedCallbacks: MutableMap<Int, () -> Boolean> = mutableMapOf()
     private var syncAcknowledgedCallbackIndex = 0
@@ -261,7 +266,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         val set = mutableSetOf<String>()
 
         for (i in 0 until size()) {
-            set.add(getString(i).orEmpty())
+            set.add(getString(i))
         }
 
         return set
@@ -304,6 +309,9 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                         map.putArray(entry.key, Arguments.makeNativeArray(listValues))
                     }
                 }
+                is Boolean -> map.putBoolean(entry.key, value)
+                is Int -> map.putInt(entry.key, value)
+                is Double -> map.putDouble(entry.key, value)
                 else -> map.putString(entry.key, value.toString())
             }
         }
@@ -323,6 +331,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         noticeId: String?,
         androidTvNoticeId: String?,
         androidTvEnabled: Boolean,
+        countryCode: String?,
+        regionCode: String?,
         promise: Promise
     ) {
         try {
@@ -339,7 +349,9 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                 languageCode,
                 noticeId,
                 androidTvNoticeId,
-                androidTvEnabled
+                androidTvEnabled,
+                countryCode,
+                regionCode
             )
 
             val application = currentActivity?.application ?: throw IllegalStateException("No activity present")
@@ -615,6 +627,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParams instead", replaceWith = ReplaceWith("setUserWithAuthParams()"))
     fun setUserWithHashAuth(
         organizationUserId: String,
         algorithm: String,
@@ -636,6 +649,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParamsAndSetupUI instead", replaceWith = ReplaceWith("setUserWithAuthParamsAndSetupUI()"))
     fun setUserWithHashAuthAndSetupUI(
         organizationUserId: String,
         algorithm: String,
@@ -658,6 +672,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParams instead", replaceWith = ReplaceWith("setUserWithAuthParams()"))
     fun setUserWithHashAuthWithExpiration(
         organizationUserId: String,
         algorithm: String,
@@ -681,6 +696,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParamsAndSetupUI instead", replaceWith = ReplaceWith("setUserWithAuthParamsAndSetupUI()"))
     fun setUserWithHashAuthWithExpirationAndSetupUI(
         organizationUserId: String,
         algorithm: String,
@@ -705,6 +721,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParams instead", replaceWith = ReplaceWith("setUserWithAuthParams()"))
     fun setUserWithEncryptionAuth(
         organizationUserId: String,
         algorithm: String,
@@ -724,6 +741,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParamsAndSetupUI instead", replaceWith = ReplaceWith("setUserWithAuthParamsAndSetupUI()"))
     fun setUserWithEncryptionAuthAndSetupUI(
         organizationUserId: String,
         algorithm: String,
@@ -744,6 +762,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParams instead", replaceWith = ReplaceWith("setUserWithAuthParams()"))
     fun setUserWithEncryptionAuthWithExpiration(
         organizationUserId: String,
         algorithm: String,
@@ -765,6 +784,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
+    @Deprecated("Use setUserWithAuthParamsAndSetupUI instead", replaceWith = ReplaceWith("setUserWithAuthParamsAndSetupUI()"))
     fun setUserWithEncryptionAuthWithExpirationAndSetupUI(
         organizationUserId: String,
         algorithm: String,
@@ -786,6 +806,61 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         promise.resolve(0)
     }
 
+    @ReactMethod
+    fun setUserWithAuthParams(
+        jsonUserAuthParams: String,
+        jsonSynchronizedUsers: String?,
+        promise: Promise
+    ) {
+        try {
+            val userAuthParams = buildUserAuthParams(JSONObject(jsonUserAuthParams))
+
+            val synchronizedUsers = jsonSynchronizedUsers?.let {
+                JSONArray(it).run {
+                    List(length()) { i -> buildUserAuthParams(getJSONObject(i)) }
+                }
+            } ?: emptyList()
+
+            Didomi.getInstance().setUser(
+                userAuthParams = userAuthParams,
+                synchronizedUsers = synchronizedUsers,
+            )
+
+            promise.resolve(0)
+        } catch (e: JSONException) {
+            Log.e("setUserWithAuthParams", "Error while parsing user with auth params", e)
+            promise.reject(e)
+        }
+    }
+
+    @ReactMethod
+    fun setUserWithAuthParamsAndSetupUI(
+        jsonUserAuthParams: String,
+        jsonSynchronizedUsers: String?,
+        promise: Promise
+    ) {
+        try {
+            val userAuthParams = buildUserAuthParams(JSONObject(jsonUserAuthParams))
+
+            val synchronizedUsers = jsonSynchronizedUsers?.let {
+                JSONArray(it).run {
+                    List(length()) { i -> buildUserAuthParams(getJSONObject(i)) }
+                }
+            } ?: emptyList()
+
+            Didomi.getInstance().setUser(
+                userAuthParams = userAuthParams,
+                synchronizedUsers = synchronizedUsers,
+                activity = currentActivity as? FragmentActivity,
+            )
+
+            promise.resolve(0)
+        } catch (e: JSONException) {
+            Log.e("setUserWithAuthParams", "Error while parsing user with auth params", e)
+            promise.reject(e)
+        }
+    }
+
     @ReactMethod
     fun showNotice(promise: Promise) {
         try {
@@ -1018,4 +1093,35 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     private fun readableArrayToStringArray(readableArray: ReadableArray): Array<String> {
         return Array(readableArray.size()) { i -> readableArray.getString(i) }
     }
+
+    private fun buildUserAuthParams(jsonParameters: JSONObject): UserAuthParams {
+
+        val id = jsonParameters.getString("id")
+        val algorithm = jsonParameters.getString("algorithm")
+        val secretId = jsonParameters.getString("secretId")
+
+        return if (jsonParameters.has("initializationVector")) {
+            val expiration = if (jsonParameters.has("expiration")) jsonParameters.getLong("expiration") else null
+            val initializationVector = jsonParameters.getString("initializationVector")
+            UserAuthWithEncryptionParams(
+                id = id,
+                algorithm = algorithm,
+                secretId = secretId,
+                initializationVector = initializationVector,
+                expiration = expiration
+            )
+        } else {
+            val expiration = if (jsonParameters.has("expiration")) jsonParameters.getLong("expiration") else null
+            val digest = jsonParameters.getString("digest")
+            val salt = if (jsonParameters.has("salt")) jsonParameters.getString("salt") else null
+            UserAuthWithHashParams(
+                id = id,
+                algorithm = algorithm,
+                secretId = secretId,
+                digest = digest,
+                salt = salt,
+                expiration = expiration
+            )
+        }
+    }
 }

package/ios/Didomi.m

@@ -14,6 +14,8 @@ RCT_EXTERN_METHOD(initialize:(NSString *)userAgentName
                   noticeId:(nullable NSString *)noticeId
                   androidTvNoticeId:(nullable NSString *)androidTvNoticeId
                   androidTvEnabled:(BOOL)androidTvEnabled
+                  countryCode:(nullable NSString *)countryCode
+                  regionCode:(nullable NSString *)regionCode
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
@@ -79,16 +81,6 @@ RCT_EXTERN_METHOD(setUserAgreeToAll:(RCTPromiseResolveBlock)resolve
 RCT_EXTERN_METHOD(setUserDisagreeToAll:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-//    @objc(onReady:)
-//    func onReady(callback: @escaping RCTResponseSenderBlock) {
-//        Didomi.shared.onReady(callback: callback)
-//    }
-
-//    @objc(onError:)
-//    func onError(callback: @escaping (Didomi.DidomiErrorEvent)) {
-//        Didomi.shared.onError(callback: callback)
-//    }
-
 RCT_EXTERN_METHOD(reset:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
@@ -242,6 +234,16 @@ RCT_EXTERN_METHOD(setUserWithEncryptionAuthWithExpirationAndSetupUI:(NSString *)
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(setUserWithAuthParams:(NSString *)jsonUserAuthParams
+                  jsonSynchronizedUsers:(NSString)jsonSynchronizedUsers
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserWithAuthParamsAndSetupUI:(NSString *)jsonUserAuthParams
+                  jsonSynchronizedUsers:(NSString)jsonSynchronizedUsers
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(listenToVendorStatus:(NSString *)vendorId
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)

package/ios/RNDidomi.swift

@@ -1,6 +1,7 @@
 import Didomi
 import AdSupport
 import AppTrackingTransparency
+import Foundation
 
 @objc(Didomi)
 class RNDidomi: RCTEventEmitter {
@@ -20,8 +21,8 @@ class RNDidomi: RCTEventEmitter {
         return true
     }
 
-    @objc(initialize:userAgentVersion:apiKey:localConfigurationPath:remoteConfigurationURL:providerId:disableDidomiRemoteConfig:languageCode:noticeId:androidTvNoticeId:androidTvEnabled:resolve:reject:)
-    func initialize(userAgentName: String, userAgentVersion: String, apiKey: String, localConfigurationPath: String?, remoteConfigurationURL: String?, providerId: String?, disableDidomiRemoteConfig: Bool = false, languageCode: String? = nil, noticeId: String? = nil, androidTvNoticeId: String? = nil, androidTvEnabled: Bool = false, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+    @objc(initialize:userAgentVersion:apiKey:localConfigurationPath:remoteConfigurationURL:providerId:disableDidomiRemoteConfig:languageCode:noticeId:androidTvNoticeId:androidTvEnabled:countryCode:regionCode:resolve:reject:)
+    func initialize(userAgentName: String, userAgentVersion: String, apiKey: String, localConfigurationPath: String?, remoteConfigurationURL: String?, providerId: String?, disableDidomiRemoteConfig: Bool = false, languageCode: String? = nil, noticeId: String? = nil, androidTvNoticeId: String? = nil, androidTvEnabled: Bool = false, countryCode: String? = nil, regionCode: String? = nil, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         Didomi.shared.setUserAgent(name: userAgentName, version: userAgentVersion)
         
         Didomi.shared.initialize(DidomiInitializeParameters(
@@ -31,7 +32,9 @@ class RNDidomi: RCTEventEmitter {
             providerID: providerId,
             disableDidomiRemoteConfig: disableDidomiRemoteConfig,
             languageCode: languageCode ?? Locale.current.languageCode ?? "",
-            noticeID: noticeId
+            noticeID: noticeId,
+            countryCode: countryCode,
+            regionCode: regionCode
         ))
 
         resolve(0)
@@ -477,6 +480,48 @@ class RNDidomi: RCTEventEmitter {
         }
         resolve(0)
     }
+
+    @objc(setUserWithAuthParams:jsonSynchronizedUsers:resolve:reject:)
+    dynamic func setUserWithAuthParams(jsonUserAuthParams: String, jsonSynchronizedUsers: String?, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        do {
+            let userAuthParams = try buildUserAuthParams(from: jsonUserAuthParams)
+            let synchronizedUsers = try jsonSynchronizedUsers.flatMap { try buildUserAuthParamsArray(from: $0) } ?? []
+            
+            Didomi.shared.setUser(
+                userAuthParams: userAuthParams,
+                synchronizedUsers: synchronizedUsers
+            )
+            resolve(0)
+        } catch {
+            reject("Error", "Error while setting user with auth params", error)
+        }
+    }
+
+    @objc(setUserWithAuthParamsAndSetupUI:jsonSynchronizedUsers:resolve:reject:)
+    dynamic func setUserWithAuthParamsAndSetupUI(jsonUserAuthParams: String, jsonSynchronizedUsers: String?, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        do {
+            let userAuthParams = try buildUserAuthParams(from: jsonUserAuthParams)
+            let synchronizedUsers = try jsonSynchronizedUsers.flatMap { try buildUserAuthParamsArray(from: $0) } ?? []
+            
+            DispatchQueue.main.async {
+                if let containerController = RCTPresentedViewController() {
+                    Didomi.shared.setUser(
+                        userAuthParams: userAuthParams,
+                        synchronizedUsers: synchronizedUsers,
+                        containerController: containerController
+                    )
+                } else {
+                    Didomi.shared.setUser(
+                        userAuthParams: userAuthParams,
+                        synchronizedUsers: synchronizedUsers
+                    )
+                }
+            }
+            resolve(0)
+        } catch {
+            reject("Error", "Error while setting user with auth params", error)
+        }
+    }
     
     @objc(listenToVendorStatus:resolve:reject:)
     dynamic func listenToVendorStatus(vendorId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
@@ -811,6 +856,75 @@ extension RNDidomi {
             Didomi.shared.removeEventListener(listener: didomiEventListener)
         }
     }
+    
+    /// Build the user auth params from the JSON parameters
+    private func buildUserAuthParams(from jsonString: String) throws -> UserAuthParams {
+        let data = jsonString.data(using: .utf8)!
+        let json = try JSONSerialization.jsonObject(with: data, options: []) as! [String: Any]
+        
+        guard let id = json["id"] as? String,
+              let algorithm = json["algorithm"] as? String,
+              let secretID = json["secretId"] as? String else {
+            fatalError("Missing required parameters")
+        }
+        
+        let expiration = json["expiration"] as? CLong
+        let initializationVector = json["initializationVector"] as? String
+        let digest = json["digest"] as? String
+        let salt = json["salt"] as? String
+        
+        if let initializationVector = initializationVector {
+            if let expiration = expiration {
+                return UserAuthWithEncryptionParams(
+                    id: id,
+                    algorithm: algorithm,
+                    secretID: secretID,
+                    initializationVector: initializationVector,
+                    legacyExpiration: Double(expiration)
+                )
+            } else {
+                return UserAuthWithEncryptionParams(
+                    id: id,
+                    algorithm: algorithm,
+                    secretID: secretID,
+                    initializationVector: initializationVector
+                )
+            }
+        } else {
+            guard let digest = digest else {
+                fatalError("Missing required digest parameter")
+            }
+            if let expiration = expiration {
+                return UserAuthWithHashParams(
+                    id: id,
+                    algorithm: algorithm,
+                    secretID: secretID,
+                    digest: digest,
+                    salt: salt,
+                    legacyExpiration: Double(expiration)
+                )
+            } else {
+                return UserAuthWithHashParams(
+                    id: id,
+                    algorithm: algorithm,
+                    secretID: secretID,
+                    digest: digest,
+                    salt: salt
+                )
+            }
+        }
+    }
+    
+    /// Build the user auth params list from the JSON parameters
+    private func buildUserAuthParamsArray(from jsonString: String) throws -> [UserAuthParams] {
+        let jsonData = jsonString.data(using: .utf8)!
+        let jsonArray = try JSONSerialization.jsonObject(with: jsonData, options: []) as! [[String: Any]]
+        return try jsonArray.map { dictionary in
+            let jsonData = try JSONSerialization.data(withJSONObject: dictionary, options: [])
+            let jsonString = String(data: jsonData, encoding: .utf8)!
+            return try buildUserAuthParams(from: jsonString)
+        }
+    }
 }
 
 extension Int {

package/lib/commonjs/Constants.js

@@ -7,5 +7,5 @@ exports.DIDOMI_VERSION = exports.DIDOMI_USER_AGENT_NAME = void 0;
 // User agent name
 const DIDOMI_USER_AGENT_NAME = exports.DIDOMI_USER_AGENT_NAME = "Didomi React-Native SDK";
 // User agent version
-const DIDOMI_VERSION = exports.DIDOMI_VERSION = "2.3.0";
+const DIDOMI_VERSION = exports.DIDOMI_VERSION = "2.5.0";
 //# sourceMappingURL=Constants.js.map

package/lib/commonjs/Constants.js.map

@@ -1 +1 @@
-{"version":3,"names":["DIDOMI_USER_AGENT_NAME","exports","DIDOMI_VERSION"],"sources":["Constants.ts"],"sourcesContent":["// User agent name\nexport const DIDOMI_USER_AGENT_NAME = \"Didomi React-Native SDK\"\n// User agent version\nexport const DIDOMI_VERSION = \"2.3.0\"\n"],"mappings":";;;;;;AAAA;AACO,MAAMA,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,yBAAyB;AAC/D;AACO,MAAME,cAAc,GAAAD,OAAA,CAAAC,cAAA,GAAG,OAAO","ignoreList":[]}
+{"version":3,"names":["DIDOMI_USER_AGENT_NAME","exports","DIDOMI_VERSION"],"sources":["Constants.ts"],"sourcesContent":["// User agent name\nexport const DIDOMI_USER_AGENT_NAME = \"Didomi React-Native SDK\"\n// User agent version\nexport const DIDOMI_VERSION = \"2.5.0\"\n"],"mappings":";;;;;;AAAA;AACO,MAAMA,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,yBAAyB;AAC/D;AACO,MAAME,cAAc,GAAAD,OAAA,CAAAC,cAAA,GAAG,OAAO","ignoreList":[]}