@didomi/react-native 1.4.0 → 1.7.0

package/android/build.gradle

@@ -25,6 +25,8 @@ def getExtOrIntegerDefault(name) {
     return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Didomi_" + name]).toInteger()
 }
 
+def parsedPackage = new groovy.json.JsonSlurper().parseText(file("../package.json").text)
+
 android {
     compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
     buildToolsVersion getExtOrDefault("buildToolsVersion")
@@ -32,7 +34,7 @@ android {
         minSdkVersion 16
         targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
         versionCode 1
-        versionName "1.0"
+        versionName "${parsedPackage.version}"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true
@@ -130,5 +132,5 @@ dependencies {
     api "com.facebook.react:react-native:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation "io.didomi.sdk:android:1.54.0"
+    implementation "io.didomi.sdk:android:1.59.1"
 }

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativedidomi">
-
-</manifest>
+          package="com.reactnativedidomi"/>

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

@@ -9,9 +9,11 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import io.didomi.sdk.Didomi
+import io.didomi.sdk.DidomiInitializeParameters
 import io.didomi.sdk.events.*
 import io.didomi.sdk.exceptions.DidomiNotReadyException
-
+import io.didomi.sdk.user.UserAuthWithEncryptionParams
+import io.didomi.sdk.user.UserAuthWithHashParams
 
 class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
@@ -169,6 +171,11 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
          * Sync finished
          */
         override fun syncDone(event: SyncDoneEvent) = prepareEvent(EventTypes.SYNC_DONE.event, event.organizationUserId)
+
+        /**
+         * Sync error
+         */
+        override fun syncError(event: SyncErrorEvent) = prepareEvent(EventTypes.SYNC_ERROR.event, event.error)
     }
 
     override fun getName() = "Didomi"
@@ -226,40 +233,53 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
 
     private fun objectToWritableMap(obj: Any?): WritableMap {
         val map = WritableNativeMap()
-        obj?.serializeToMap()?.entries?.forEach { entry -> map.putString(entry.key, entry.value.toString()) }
+        obj?.serializeToMap()?.entries?.forEach { entry ->
+            when (val value = entry.value) {
+                is Map<*,*> -> map.putMap(entry.key, objectToWritableMap(value))
+                is List<*> -> map.putArray(entry.key, Arguments.fromList(value))
+                else -> map.putString(entry.key, value.toString())
+            }
+        }
         return map
     }
 
     @ReactMethod
-    fun initialize(apiKey: String,
-                   localConfigurationPath: String?,
-                   remoteConfigurationUrl: String?,
-                   providerId: String?,
-                   disableDidomiRemoteConfig: Boolean,
-                   languageCode: String?,
-                   noticeId: String?,
-                   promise: Promise) {
+    fun initialize(
+        userAgentName: String,
+        userAgentVersion: String,
+        apiKey: String,
+        localConfigurationPath: String?,
+        remoteConfigurationUrl: String?,
+        providerId: String?,
+        disableDidomiRemoteConfig: Boolean,
+        languageCode: String?,
+        noticeId: String?,
+        promise: Promise) {
         try {
             Didomi.getInstance().addEventListener(eventListener)
 
-            Didomi.getInstance().initialize(
-                    currentActivity?.application,
-                    apiKey,
-                    if (localConfigurationPath.isNullOrEmpty()) null else localConfigurationPath,
-                    if (remoteConfigurationUrl.isNullOrEmpty()) null else remoteConfigurationUrl,
-                    if (providerId.isNullOrEmpty()) null else providerId,
-                    disableDidomiRemoteConfig,
-                    languageCode,
-                    noticeId
+            Didomi.getInstance().setUserAgent(userAgentName, userAgentVersion)
+
+            val parameters = DidomiInitializeParameters(
+                apiKey,
+                localConfigurationPath,
+                remoteConfigurationUrl,
+                providerId,
+                disableDidomiRemoteConfig,
+                languageCode,
+                noticeId
             )
 
+            val application = currentActivity?.application ?: throw IllegalStateException("No activity present")
+            Didomi.getInstance().initialize(application, parameters)
+
             Didomi.getInstance().onReady { prepareEvent(EventTypes.READY_CALLBACK.event, null) }
             Didomi.getInstance().onError { prepareEvent(EventTypes.ERROR_CALLBACK.event, null) }
 
             promise.resolve(0)
 
         } catch (e: Exception) {
-            Log.e("initialize", "Error while initializing the Didomi SDK", e);
+            Log.e("initialize", "Error while initializing the Didomi SDK", e)
             promise.reject(e)
         }
     }
@@ -268,7 +288,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     fun setupUI(promise: Promise) {
         try {
             runOnUiThread {
-                Didomi.getInstance().setupUI(currentActivity as FragmentActivity)
+                Didomi.getInstance().setupUI(currentActivity as? FragmentActivity)
             }
             promise.resolve(0)
         } catch (e: Exception) {
@@ -512,7 +532,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserStatus(promise: Promise) {
         try {
-            promise.resolve(objectToWritableMap(Didomi.getInstance().getUserStatus()))
+            promise.resolve(objectToWritableMap(Didomi.getInstance().userStatus))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -577,7 +597,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun isNoticeVisible(promise: Promise) {
         try {
-            promise.resolve(Didomi.getInstance().isNoticeVisible)
+            promise.resolve(Didomi.getInstance().isNoticeVisible())
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -586,7 +606,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun isPreferencesVisible(promise: Promise) {
         try {
-            promise.resolve(Didomi.getInstance().isPreferencesVisible)
+            promise.resolve(Didomi.getInstance().isPreferencesVisible())
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -612,7 +632,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         if (organizationUserIdAuthAlgorithm != null
                 && organizationUserIdAuthSid != null
                 && organizationUserIdAuthSalt != null
-                && organizationUserIdAuthDigest != null)
+                && organizationUserIdAuthDigest != null) {
             Didomi.getInstance().setUser(
                     organizationUserId,
                     organizationUserIdAuthAlgorithm,
@@ -620,17 +640,86 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                     organizationUserIdAuthSalt,
                     organizationUserIdAuthDigest
             )
-        else
+        } else {
             Didomi.getInstance().setUser(organizationUserId)
+        }
 
         promise.resolve(0)
     }
 
+    @ReactMethod
+    fun setUserWithHashAuth(organizationUserId: String,
+                algorithm: String,
+                secretId: String,
+                digest: String,
+                salt: String?,
+                promise: Promise) {
+        Didomi.getInstance().setUser(UserAuthWithHashParams(
+            organizationUserId,
+            algorithm,
+            secretId,
+            digest,
+            salt
+        ))
+        promise.resolve(0)
+    }
+
+    @ReactMethod
+    fun setUserWithHashAuthWithExpiration(organizationUserId: String,
+                algorithm: String,
+                secretId: String,
+                digest: String,
+                salt: String?,
+                expiration: Int,
+                promise: Promise) {
+        Didomi.getInstance().setUser(UserAuthWithHashParams(
+            organizationUserId,
+            algorithm,
+            secretId,
+            digest,
+            salt,
+            expiration.toLong()
+        ))
+        promise.resolve(0)
+    }
+
+    @ReactMethod
+    fun setUserWithEncryptionAuth(organizationUserId: String,
+                            algorithm: String,
+                            secretId: String,
+                            initializationVector: String,
+                            promise: Promise) {
+        Didomi.getInstance().setUser(UserAuthWithEncryptionParams(
+            organizationUserId,
+            algorithm,
+            secretId,
+            initializationVector
+        ))
+        promise.resolve(0)
+    }
+
+    @ReactMethod
+    fun setUserWithEncryptionAuthWithExpiration(organizationUserId: String,
+                            algorithm: String,
+                            secretId: String,
+                            initializationVector: String,
+                            expiration: Int,
+                            promise: Promise) {
+        Didomi.getInstance().setUser(UserAuthWithEncryptionParams(
+            organizationUserId,
+            algorithm,
+            secretId,
+            initializationVector,
+            expiration.toLong()
+        ))
+        promise.resolve(0)
+    }
+
     @ReactMethod
     fun showNotice(promise: Promise) {
         try {
             runOnUiThread {
-                Didomi.getInstance().showNotice(currentActivity as FragmentActivity)
+                Didomi.getInstance().showNotice(currentActivity as? FragmentActivity)
             }
             promise.resolve(0)
         } catch (e: Exception) {
@@ -644,8 +733,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         try {
             runOnUiThread {
                 view?.also {
-                    Didomi.getInstance().showPreferences(currentActivity as FragmentActivity, view)
-                } ?: Didomi.getInstance().showPreferences(currentActivity as FragmentActivity)
+                    Didomi.getInstance().showPreferences(currentActivity as? FragmentActivity, view)
+                } ?: Didomi.getInstance().showPreferences(currentActivity as? FragmentActivity)
             }
             promise.resolve(0)
         } catch (e: Exception) {

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

@@ -32,5 +32,6 @@ enum class EventTypes(val event: String) {
     PREFERENCES_CLICK_AGREE_TO_ALL_PURPOSES("on_preferences_click_agree_to_all_purposes"),
     PREFERENCES_CLICK_DISAGREE_TO_ALL_PURPOSES("on_preferences_click_disagree_to_all_purposes"),
     PREFERENCES_CLICK_RESET_ALL_PURPOSES("on_preferences_click_reset_all_purposes"),
-    SYNC_DONE("on_sync_done");
-}
+    SYNC_DONE("on_sync_done"),
+    SYNC_ERROR("on_sync_error");
+}

package/ios/Didomi.m

@@ -4,16 +4,12 @@
 @interface RCT_EXTERN_MODULE(Didomi, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(multiply:(float)a withB:(float)b
-                 withResolver:(RCTPromiseResolveBlock)resolve
+                  withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
-//RCT_EXTERN_METHOD(initialize:(NSString *)apikey
-//                  localConfigurationPath:(nullable NSString *)localConfigurationPath
-//                  remoteConfigurationURL:(nullable NSString *)remoteConfigurationURL
-//                  providerId:(nullable NSString *)providerId
-//                  disableDidomiRemoteConfig:(BOOL)disableDidomiRemoteConfig)
-
-RCT_EXTERN_METHOD(initialize:(NSString *)apikey
+RCT_EXTERN_METHOD(initialize:(NSString *)userAgentName
+                  userAgentVersion:(NSString *)userAgentVersion
+                  apiKey:(NSString *)apiKey
                   localConfigurationPath:(nullable NSString *)localConfigurationPath
                   remoteConfigurationURL:(nullable NSString *)remoteConfigurationURL
                   providerId:(nullable NSString *)providerId
@@ -28,9 +24,6 @@ RCT_EXTERN_METHOD(onError)
 RCT_EXTERN_METHOD(getQueryStringForWebView:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(setUserAgent:(NSString *)name
-                  version:(NSString *)version)
-
 RCT_EXTERN_METHOD(setUserConsentStatus:(NSArray<NSString *> *)enabledPurposeIds
                   disabledPurposeIds:(NSArray<NSString *> *)disabledPurposeIds
                   enabledVendorIds:(NSArray<NSString *> *)enabledVendorIds
@@ -210,13 +203,35 @@ RCT_EXTERN_METHOD(getText:(NSString *)key
 
 RCT_EXTERN_METHOD(setLogLevel:(int)minLevel)
 
-RCT_EXTERN_METHOD(setUser:(NSString *)id)
+RCT_EXTERN_METHOD(setUser:(NSString *)id
+                  algorithm:(nullable NSString *)algorithm
+                  secretId:(nullable NSString *)secretId
+                  salt:(nullable NSString *)salt
+                  digest:(nullable NSString *)digest)
+
+RCT_EXTERN_METHOD(setUserWithHashAuth:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  digest:(NSString *)digest
+                  salt:(nullable NSString *)salt)
 
-RCT_EXTERN_METHOD(setUse:(NSString *)id
+RCT_EXTERN_METHOD(setUserWithHashAuthWithExpiration:(NSString *)id
                   algorithm:(NSString *)algorithm
                   secretId:(NSString *)secretId
+                  digest:(NSString *)digest
                   salt:(nullable NSString *)salt
-                  digest:(NSString *)digest)
+                  expiration: (double)expiration)
+
+RCT_EXTERN_METHOD(setUserWithEncryptionAuth:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  initializationVector:(NSString *)initializationVector)
+
+RCT_EXTERN_METHOD(setUserWithEncryptionAuthWithExpiration:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  initializationVector:(NSString *)initializationVector
+                  expiration: (double)expiration)
 
 RCT_EXTERN_METHOD(supportedEvents)