@didomi/react-native 1.5.0 → 1.8.0

package/android/build.gradle

@@ -132,5 +132,5 @@ dependencies {
     api "com.facebook.react:react-native:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation "io.didomi.sdk:android:1.55.0"
+    implementation "io.didomi.sdk:android:1.64.0"
 }

package/android/gradle.properties

@@ -1,4 +1,4 @@
-Didomi_kotlinVersion=1.4.32
+Didomi_kotlinVersion=1.5.31
 Didomi_compileSdkVersion=29
 Didomi_buildToolsVersion=29.0.2
 Didomi_targetSdkVersion=29

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

@@ -12,7 +12,8 @@ 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) {
 
@@ -170,6 +171,21 @@ 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)
+
+        /**
+         * Language updated
+         */
+        override fun languageUpdated(event: LanguageUpdatedEvent) = prepareEvent(EventTypes.LANGUAGE_UPDATED.event, event.languageCode)
+
+        /**
+         * Language update failed
+         */
+        override fun languageUpdateFailed(event: LanguageUpdateFailedEvent) = prepareEvent(EventTypes.LANGUAGE_UPDATE_FAILED.event, event.reason)
     }
 
     override fun getName() = "Didomi"
@@ -227,7 +243,13 @@ 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
     }
 
@@ -258,7 +280,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                 noticeId
             )
 
-            Didomi.getInstance().initialize(currentActivity?.application, parameters)
+            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) }
@@ -266,7 +289,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
             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)
         }
     }
@@ -275,7 +298,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) {
@@ -519,7 +542,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)
         }
@@ -584,7 +607,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)
         }
@@ -593,7 +616,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)
         }
@@ -609,6 +632,12 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         promise.resolve(Didomi.getInstance().isReady)
     }
 
+    @ReactMethod
+    fun clearUser(promise: Promise) {
+        Didomi.getInstance().clearUser()
+        promise.resolve(0)
+    }
+
     @ReactMethod
     fun setUser(organizationUserId: String,
                 organizationUserIdAuthAlgorithm: String?,
@@ -619,7 +648,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         if (organizationUserIdAuthAlgorithm != null
                 && organizationUserIdAuthSid != null
                 && organizationUserIdAuthSalt != null
-                && organizationUserIdAuthDigest != null)
+                && organizationUserIdAuthDigest != null) {
             Didomi.getInstance().setUser(
                     organizationUserId,
                     organizationUserIdAuthAlgorithm,
@@ -627,9 +656,172 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                     organizationUserIdAuthSalt,
                     organizationUserIdAuthDigest
             )
-        else
+        } else {
             Didomi.getInstance().setUser(organizationUserId)
+        }
+
+        promise.resolve(0)
+    }
+
+    @ReactMethod
+    fun setUserAndSetupUI(organizationUserId: String, promise: Promise) {
+        Didomi.getInstance().setUser(organizationUserId, currentActivity as? FragmentActivity)
+        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 setUserWithHashAuthAndSetupUI(organizationUserId: String,
+                algorithm: String,
+                secretId: String,
+                digest: String,
+                salt: String?,
+                promise: Promise) {
+        Didomi.getInstance().setUser(
+            UserAuthWithHashParams(
+                organizationUserId,
+                algorithm,
+                secretId,
+                digest,
+                salt
+            ),
+            currentActivity as? FragmentActivity
+        )
+        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 setUserWithHashAuthWithExpirationAndSetupUI(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()
+            ),
+            currentActivity as? FragmentActivity
+        )
+        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 setUserWithEncryptionAuthAndSetupUI(organizationUserId: String,
+                            algorithm: String,
+                            secretId: String,
+                            initializationVector: String,
+                            promise: Promise) {
+        Didomi.getInstance().setUser(
+            UserAuthWithEncryptionParams(
+                organizationUserId,
+                algorithm,
+                secretId,
+                initializationVector
+            ),
+            currentActivity as? FragmentActivity
+        )
+        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 setUserWithEncryptionAuthWithExpirationAndSetupUI(organizationUserId: String,
+                            algorithm: String,
+                            secretId: String,
+                            initializationVector: String,
+                            expiration: Int,
+                            promise: Promise) {
+        Didomi.getInstance().setUser(
+            UserAuthWithEncryptionParams(
+                organizationUserId,
+                algorithm,
+                secretId,
+                initializationVector,
+                expiration.toLong()
+            ),
+            currentActivity as? FragmentActivity
+        )
         promise.resolve(0)
     }
 
@@ -637,7 +829,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     fun showNotice(promise: Promise) {
         try {
             runOnUiThread {
-                Didomi.getInstance().showNotice(currentActivity as FragmentActivity)
+                Didomi.getInstance().showNotice(currentActivity as? FragmentActivity)
             }
             promise.resolve(0)
         } catch (e: Exception) {
@@ -651,8 +843,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,8 @@ 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"),
+    LANGUAGE_UPDATED("on_language_updated"),
+    LANGUAGE_UPDATE_FAILED("on_language_update_failed");
+}

package/ios/Didomi.m

@@ -3,10 +3,6 @@
 
 @interface RCT_EXTERN_MODULE(Didomi, RCTEventEmitter)
 
-RCT_EXTERN_METHOD(multiply:(float)a withB:(float)b
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject)
-
 RCT_EXTERN_METHOD(initialize:(NSString *)userAgentName
                   userAgentVersion:(NSString *)userAgentVersion
                   apiKey:(NSString *)apiKey
@@ -15,7 +11,9 @@ RCT_EXTERN_METHOD(initialize:(NSString *)userAgentName
                   providerId:(nullable NSString *)providerId
                   disableDidomiRemoteConfig:(BOOL)disableDidomiRemoteConfig
                   languageCode:(nullable NSString *)languageCode
-                  noticeId:(nullable NSString *)noticeId)
+                  noticeId:(nullable NSString *)noticeId
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(onReady)
 
@@ -102,7 +100,8 @@ RCT_EXTERN_METHOD(setUserDisagreeToAll:(RCTPromiseResolveBlock)resolve
 //        Didomi.shared.onError(callback: callback)
 //    }
 
-RCT_EXTERN_METHOD(reset)
+RCT_EXTERN_METHOD(reset:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getRequiredPurposeIds:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
@@ -157,7 +156,9 @@ RCT_EXTERN_METHOD(getJavaScriptForWebView:(NSString *)extra
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(updateSelectedLanguage:(NSString *)languageCode)
+RCT_EXTERN_METHOD(updateSelectedLanguage:(NSString *)languageCode
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 
 // MARK: ViewProviderDelegate
@@ -172,13 +173,17 @@ RCT_EXTERN_METHOD(getPreferencesViewController:(RCTPromiseResolveBlock)resolve
 
 // MARK: Didomi extension
 
-RCT_EXTERN_METHOD(setupUI)
+RCT_EXTERN_METHOD(setupUI:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(forceShowNotice)
+RCT_EXTERN_METHOD(forceShowNotice:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(showNotice)
+RCT_EXTERN_METHOD(showNotice:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(hideNotice)
+RCT_EXTERN_METHOD(hideNotice:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(isNoticeVisible:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
@@ -186,9 +191,12 @@ RCT_EXTERN_METHOD(isNoticeVisible:(RCTPromiseResolveBlock)resolve
 RCT_EXTERN_METHOD(shouldConsentBeCollected:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(showPreferences:(nullable NSString *)view)
+RCT_EXTERN_METHOD(showPreferences:(nullable NSString *)view
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(hidePreferences)
+RCT_EXTERN_METHOD(hidePreferences:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(isPreferencesVisible:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
@@ -201,15 +209,88 @@ RCT_EXTERN_METHOD(getText:(NSString *)key
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(setLogLevel:(int)minLevel)
+RCT_EXTERN_METHOD(setLogLevel:(int)minLevel
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(clearUser:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUser:(NSString *)id
+                  algorithm:(nullable NSString *)algorithm
+                  secretId:(nullable NSString *)secretId
+                  salt:(nullable NSString *)salt
+                  digest:(nullable NSString *)digest
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserAndSetupUI:(NSString *)id
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(setUser:(NSString *)id)
+RCT_EXTERN_METHOD(setUserWithHashAuth:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  digest:(NSString *)digest
+                  salt:(nullable NSString *)salt
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(setUse:(NSString *)id
+RCT_EXTERN_METHOD(setUserWithHashAuthAndSetupUI:(NSString *)id
                   algorithm:(NSString *)algorithm
                   secretId:(NSString *)secretId
+                  digest:(NSString *)digest
                   salt:(nullable NSString *)salt
-                  digest:(NSString *)digest)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserWithHashAuthWithExpiration:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  digest:(NSString *)digest
+                  salt:(nullable NSString *)salt
+                  expiration: (double)expiration
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserWithHashAuthWithExpirationAndSetupUI:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  digest:(NSString *)digest
+                  salt:(nullable NSString *)salt
+                  expiration: (double)expiration
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserWithEncryptionAuth:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  initializationVector:(NSString *)initializationVector
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserWithEncryptionAuthAndSetupUI:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  initializationVector:(NSString *)initializationVector
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserWithEncryptionAuthWithExpiration:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  initializationVector:(NSString *)initializationVector
+                  expiration: (double)expiration
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setUserWithEncryptionAuthWithExpirationAndSetupUI:(NSString *)id
+                  algorithm:(NSString *)algorithm
+                  secretId:(NSString *)secretId
+                  initializationVector:(NSString *)initializationVector
+                  expiration: (double)expiration
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(supportedEvents)