@didomi/react-native 1.6.0 → 1.10.0

package/ios/RNDidomi.swift

@@ -6,14 +6,20 @@ import AppTrackingTransparency
 class RNDidomi: RCTEventEmitter {
     
     public static var initialized = false
-    let didomiEventListener = EventListener()
-    
+    var didomiEventListener: EventListener
+
+    override init() {
+        didomiEventListener = EventListener()
+        super.init()
+        initEventListener()
+    }
+
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
-    
-    @objc(initialize:userAgentVersion:apiKey:localConfigurationPath:remoteConfigurationURL:providerId:disableDidomiRemoteConfig:languageCode:noticeId:)
-    func initialize(userAgentName: String, userAgentVersion: String, apiKey: String, localConfigurationPath: String?, remoteConfigurationURL: String?, providerId: String?, disableDidomiRemoteConfig: Bool = false, languageCode: String? = nil, noticeId: String? = nil) {
+
+    @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) {
         onReady()
         onError()
         if !RNDidomi.initialized {
@@ -32,281 +38,288 @@ class RNDidomi: RCTEventEmitter {
             ))
         }
         RNDidomi.initialized = true
+        resolve(0)
     }
     
     private func onReady() {
         Didomi.shared.onReady {
-            self.sendEvent(withName: "on_ready_callback", body: nil)
+            self.dispatchEvent(withName: "on_ready_callback", body: nil)
         }
     }
     
     private func onError() {
         Didomi.shared.onError { error in
-            self.sendEvent(withName: "on_error_callback", body: error.descriptionText)
+            self.dispatchEvent(withName: "on_error_callback", body: error.descriptionText)
         }
     }
     
     @objc(getQueryStringForWebView:reject:)
-    func getQueryStringForWebView(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getQueryStringForWebView(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.getQueryStringForWebView())
     }
     
     @objc(setUserConsentStatus:disabledPurposeIds:enabledVendorIds:disabledVendorIds:resolve:reject:)
-    func setUserConsentStatus(enabledPurposeIds: Set<String>, disabledPurposeIds: Set<String>, enabledVendorIds: Set<String>, disabledVendorIds: Set<String>, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func setUserConsentStatus(enabledPurposeIds: Set<String>, disabledPurposeIds: Set<String>, enabledVendorIds: Set<String>, disabledVendorIds: Set<String>, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.setUserConsentStatus(enabledPurposeIds: Set(enabledPurposeIds), disabledPurposeIds: Set(disabledPurposeIds), enabledVendorIds: Set(enabledVendorIds), disabledVendorIds: Set(disabledVendorIds)))
     }
     
     @objc(isConsentRequired:reject:)
-    func isConsentRequired(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func isConsentRequired(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.isConsentRequired())
     }
     
     @objc(isUserConsentStatusPartial:reject:)
-    func isUserConsentStatusPartial(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func isUserConsentStatusPartial(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.isUserConsentStatusPartial())
     }
     
     @objc(isUserLegitimateInterestStatusPartial:reject:)
-    func isUserLegitimateInterestStatusPartial(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func isUserLegitimateInterestStatusPartial(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.isUserLegitimateInterestStatusPartial())
     }
     
     @objc(getUserConsentStatusForPurpose:resolve:reject:)
-    func getUserConsentStatusForPurpose(purposeId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserConsentStatusForPurpose(purposeId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let consentStatus = Didomi.shared.getUserConsentStatusForPurpose(purposeId: purposeId)
         resolve(consentStatus.rawValue.consentStatusBool)
     }
     
     @objc(getUserLegitimateInterestStatusForPurpose:resolve:reject:)
-    func getUserLegitimateInterestStatusForPurpose(purposeId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserLegitimateInterestStatusForPurpose(purposeId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let consentStatus = Didomi.shared.getUserLegitimateInterestStatusForPurpose(purposeId: purposeId)
         resolve(consentStatus.rawValue.consentStatusBool)
     }
     
     @objc(getUserStatus:reject:)
-    func getUserStatus(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserStatus(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let userStatus = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getUserStatus())) as? [String: Any]
         resolve(userStatus)
     }
     
     @objc(getUserStatusForVendor:resolve:reject:)
-    func getUserStatusForVendor(vendorId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserStatusForVendor(vendorId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let userStatus = Didomi.shared.getUserStatusForVendor(vendorId: vendorId)
         resolve(userStatus.rawValue.consentStatusBool)
     }
     
     @objc(getUserConsentStatusForVendor:resolve:reject:)
-    func getUserConsentStatusForVendor(vendorId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserConsentStatusForVendor(vendorId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let consentStatus = Didomi.shared.getUserConsentStatusForVendor(vendorId: vendorId)
         resolve(consentStatus.rawValue.consentStatusBool)
     }
     
     @objc(getUserLegitimateInterestStatusForVendor:resolve:reject:)
-    func getUserLegitimateInterestStatusForPurpose(vendorId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserLegitimateInterestStatusForPurpose(vendorId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let consentStatus = Didomi.shared.getUserLegitimateInterestStatusForVendor(vendorId: vendorId)
         resolve(consentStatus.rawValue.consentStatusBool)
     }
     
     @objc(getUserConsentStatusForVendorAndRequiredPurposes:resolve:reject:)
-    func getUserConsentStatusForVendorAndRequiredPurposes(vendorId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserConsentStatusForVendorAndRequiredPurposes(vendorId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let consentStatus = Didomi.shared.getUserConsentStatusForVendorAndRequiredPurposes(vendorId: vendorId)
         resolve(consentStatus.rawValue.consentStatusBool)
     }
     
     @objc(getUserLegitimateInterestStatusForVendorAndRequiredPurposes:resolve:reject:)
-    func getUserLegitimateInterestStatusForVendorAndRequiredPurposes(vendorId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getUserLegitimateInterestStatusForVendorAndRequiredPurposes(vendorId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let consentStatus = Didomi.shared.getUserLegitimateInterestStatusForVendorAndRequiredPurposes(vendorId: vendorId)
         resolve(consentStatus.rawValue.consentStatusBool)
     }
     
     @objc(setUserStatus:purposesLIStatus:vendorsConsentStatus:vendorsLIStatus:resolve:reject:)
-    func setUserStatus(purposesConsentStatus: Bool, purposesLIStatus: Bool, vendorsConsentStatus: Bool, vendorsLIStatus: Bool, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func setUserStatus(purposesConsentStatus: Bool, purposesLIStatus: Bool, vendorsConsentStatus: Bool, vendorsLIStatus: Bool, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.setUserStatus(purposesConsentStatus: purposesConsentStatus, purposesLIStatus: purposesLIStatus, vendorsConsentStatus: vendorsConsentStatus, vendorsLIStatus: vendorsLIStatus))
     }
     
     @objc(setUserStatusSets:disabledConsentPurposeIds:enabledLIPurposeIds:disabledLIPurposeIds:enabledConsentVendorIds:disabledConsentVendorIds:enabledLIVendorIds:disabledLIVendorIds:resolve:reject:)
-    func setUserStatusSets(enabledConsentPurposeIds: Set<String>, disabledConsentPurposeIds: Set<String>, enabledLIPurposeIds: Set<String>, disabledLIPurposeIds: Set<String>, enabledConsentVendorIds: Set<String>, disabledConsentVendorIds: Set<String>, enabledLIVendorIds: Set<String>, disabledLIVendorIds: Set<String>, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func setUserStatusSets(enabledConsentPurposeIds: Set<String>, disabledConsentPurposeIds: Set<String>, enabledLIPurposeIds: Set<String>, disabledLIPurposeIds: Set<String>, enabledConsentVendorIds: Set<String>, disabledConsentVendorIds: Set<String>, enabledLIVendorIds: Set<String>, disabledLIVendorIds: Set<String>, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.setUserStatus(enabledConsentPurposeIds: Set(enabledConsentPurposeIds), disabledConsentPurposeIds: Set(disabledConsentPurposeIds), enabledLIPurposeIds: Set(enabledLIPurposeIds), disabledLIPurposeIds: Set(disabledLIPurposeIds), enabledConsentVendorIds: Set(enabledConsentVendorIds), disabledConsentVendorIds: Set(disabledConsentVendorIds), enabledLIVendorIds: Set(enabledLIVendorIds), disabledLIVendorIds: Set(disabledLIVendorIds)))
     }
     
     @objc(setUserAgreeToAll:reject:)
-    func setUserAgreeToAll(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func setUserAgreeToAll(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.setUserAgreeToAll())
     }
-    
+
     @objc(setUserDisagreeToAll:reject:)
-    func setUserDisagreeToAll(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func setUserDisagreeToAll(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.setUserDisagreeToAll())
     }
-    
-    @objc(reset)
-    func reset() {
+
+    @objc(reset:reject:)
+    func reset(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         Didomi.shared.reset()
+        resolve(0)
     }
-    
+
     @objc(getRequiredPurposeIds:reject:)
-    func getRequiredPurposeIds(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getRequiredPurposeIds(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Array(Didomi.shared.getRequiredPurposeIds()))
     }
-    
+
     @objc(getRequiredVendorIds:reject:)
-    func getRequiredVendorIds(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getRequiredVendorIds(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Array(Didomi.shared.getRequiredVendorIds()))
     }
-    
+
     @objc(isReady:reject:)
-    func isReady(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func isReady(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.isReady())
     }
-    
+
     @objc(getRequiredPurposes:reject:)
-    func getRequiredPurposes(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getRequiredPurposes(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let purposes = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getRequiredPurposes())) as? [[String: Any]]
         resolve(purposes)
     }
-    
+
     @objc(getRequiredVendors:reject:)
-    func getRequiredVendors(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getRequiredVendors(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let vendors = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getRequiredVendors())) as? [[String: Any]]
         resolve(vendors)
     }
     
     @objc(getEnabledPurposes:reject:)
-    func getEnabledPurposes(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getEnabledPurposes(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let purposes = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getEnabledPurposes())) as? [[String: Any]]
         resolve(purposes)
     }
     
     @objc(getEnabledPurposeIds:reject:)
-    func getEnabledPurposeIds(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getEnabledPurposeIds(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Array(Didomi.shared.getEnabledPurposeIds()))
     }
     
     @objc(getDisabledPurposes:reject:)
-    func getDisabledPurposes(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getDisabledPurposes(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let purposes = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getDisabledPurposes())) as? [[String: Any]]
         resolve(purposes)
     }
     
     @objc(getDisabledPurposeIds:reject:)
-    func getDisabledPurposeIds(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getDisabledPurposeIds(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Array(Didomi.shared.getDisabledPurposeIds()))
     }
     
     @objc(getEnabledVendors:reject:)
-    func getEnabledVendors(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getEnabledVendors(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let vendors = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getEnabledVendors())) as? [[String: Any]]
         resolve(vendors)
     }
     
     @objc(getEnabledVendorIds:reject:)
-    func getEnabledVendorIds(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getEnabledVendorIds(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Array(Didomi.shared.getEnabledVendorIds()))
     }
     
     @objc(getDisabledVendors:reject:)
-    func getDisabledVendors(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getDisabledVendors(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let vendors = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getDisabledVendors())) as? [[String: Any]]
         resolve(vendors)
     }
     
     @objc(getDisabledVendorIds:reject:)
-    func getDisabledVendorIds(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getDisabledVendorIds(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Array(Didomi.shared.getDisabledVendorIds()))
     }
     
     @objc(getPurpose:resolve:reject:)
-    func getPurpose(purposeId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getPurpose(purposeId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let purposes = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getPurpose(purposeId: purposeId))) as? [String: Any]
         resolve(purposes)
     }
     
     @objc(getVendor:resolve:reject:)
-    func getVendor(vendorId: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getVendor(vendorId: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let encoder = JSONEncoder()
         let vendors = try? JSONSerialization.jsonObject(with: encoder.encode(Didomi.shared.getVendor(vendorId: vendorId))) as? [String: Any]
         resolve(vendors)
     }
     
     @objc(getJavaScriptForWebView:resolve:reject:)
-    func getJavaScriptForWebView(_ extra: String? = "", resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    func getJavaScriptForWebView(_ extra: String? = "", resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         if let extra = extra {
             resolve(Didomi.shared.getJavaScriptForWebView(extra: extra))
         } else {
             resolve(Didomi.shared.getJavaScriptForWebView())
         }
     }
-    
-    @objc(updateSelectedLanguage:)
-    func updateSelectedLanguage(languageCode: String) {
+
+    @objc(updateSelectedLanguage:resolve:reject:)
+    func updateSelectedLanguage(languageCode: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         Didomi.shared.updateSelectedLanguage(languageCode: languageCode)
+        resolve(0)
     }
     
     // MARK: ViewProviderDelegate
     
     @objc(getNoticeViewController:resolve:reject:)
-    dynamic func getNoticeViewController(position: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    dynamic func getNoticeViewController(position: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.getNoticeViewController(position: position))
     }
     
     @objc(getPreferencesViewController:reject:)
-    dynamic func getPreferencesViewController(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    dynamic func getPreferencesViewController(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.getPreferencesViewController())
     }
     
     // MARK: Didomi extension
-    
-    @objc(setupUI)
-    dynamic func setupUI() {
-        
+
+    @objc(setupUI:reject:)
+    dynamic func setupUI(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+
         DispatchQueue.main.async {
             if let containerController = RCTPresentedViewController() {
                 Didomi.shared.setupUI(containerController: containerController)
             }
         }
+        resolve(0)
     }
-    
-    @objc(forceShowNotice)
-    dynamic func forceShowNotice() {
+
+    @objc(forceShowNotice:reject:)
+    dynamic func forceShowNotice(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         DispatchQueue.main.async {
             Didomi.shared.forceShowNotice()
         }
+        resolve(0)
     }
-    
-    @objc(showNotice)
-    dynamic func showNotice() {
+
+    @objc(showNotice:reject:)
+    dynamic func showNotice(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         DispatchQueue.main.async {
             Didomi.shared.showNotice()
         }
+        resolve(0)
     }
-    
-    @objc(hideNotice)
-    dynamic func hideNotice() {
+
+    @objc(hideNotice:reject:)
+    dynamic func hideNotice(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         DispatchQueue.main.async {
             Didomi.shared.hideNotice()
         }
+        resolve(0)
     }
     
     @objc(isNoticeVisible:reject:)
-    dynamic func isNoticeVisible(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    dynamic func isNoticeVisible(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.isNoticeVisible())
     }
     
     @objc(shouldConsentBeCollected:reject:)
-    dynamic func shouldConsentBeCollected(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    dynamic func shouldConsentBeCollected(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.shouldConsentBeCollected())
     }
-    
-    @objc(showPreferences:)
-    dynamic func showPreferences(view: String?) {
+
+    @objc(showPreferences:resolve:reject:)
+    dynamic func showPreferences(view: String?, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         if let containerController = RCTPresentedViewController(){
             if view?.lowercased() == "vendors"{
                 DispatchQueue.main.async {
@@ -319,33 +332,35 @@ class RNDidomi: RCTEventEmitter {
                 }
             }
         }
+        resolve(0)
     }
-    
-    @objc(hidePreferences)
-    dynamic func hidePreferences() {
+
+    @objc(hidePreferences:reject:)
+    dynamic func hidePreferences(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         DispatchQueue.main.async {
             Didomi.shared.hidePreferences()
         }
+        resolve(0)
     }
     
     @objc(isPreferencesVisible:reject:)
-    dynamic func isPreferencesVisible(resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    dynamic func isPreferencesVisible(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.isPreferencesVisible())
     }
     
     @objc(getTranslatedText:resolve:reject:)
-    dynamic func getTranslatedText(key: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    dynamic func getTranslatedText(key: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         resolve(Didomi.shared.getTranslatedText(key: key))
     }
     
     @objc(getText:resolve:reject:)
-    dynamic func getText(key: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) {
+    dynamic func getText(key: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         let text = Didomi.shared.getText(key: key)
         resolve(text)
     }
-    
-    @objc(setLogLevel:)
-    dynamic func setLogLevel(minLevel: UInt8) {
+
+    @objc(setLogLevel:resolve:reject:)
+    dynamic func setLogLevel(minLevel: UInt8, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         var level: UInt8
         
         switch minLevel {
@@ -362,19 +377,39 @@ class RNDidomi: RCTEventEmitter {
         }
         
         Didomi.shared.setLogLevel(minLevel: level)
+        resolve(0)
     }
 
-    @objc(setUser:algorithm:secretId:salt:digest:)
-    dynamic func setUser(id: String, algorithm: String?, secretId: String?, salt: String?, digest: String?) {
+    @objc(clearUser:reject:)
+    func clearUser(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        Didomi.shared.clearUser()
+        resolve(0)
+    }
+
+    @objc(setUser:algorithm:secretId:salt:digest:resolve:reject:)
+    dynamic func setUser(id: String, algorithm: String?, secretId: String?, salt: String?, digest: String?, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         if let algorithm = algorithm, let secretId = secretId, let digest = digest {
             Didomi.shared.setUser(id: id, algorithm: algorithm, secretId: secretId, salt: salt, digest: digest)
         } else {
             Didomi.shared.setUser(id: id)
         }
+        resolve(0)
+    }
+
+    @objc(setUserAndSetupUI:resolve:reject:)
+    dynamic func setUserAndSetupUI(id: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        DispatchQueue.main.async {
+            if let containerController = RCTPresentedViewController() {
+                Didomi.shared.setUser(id: id, containerController: containerController)
+            } else {
+                Didomi.shared.setUser(id: id)
+            }
+        }
+        resolve(0)
     }
 
-    @objc(setUserWithHashAuth:algorithm:secretId:digest:salt:)
-    dynamic func setUserWithHashAuth(id: String, algorithm: String, secretId: String, digest: String, salt: String?) {
+    @objc(setUserWithHashAuth:algorithm:secretId:digest:salt:resolve:reject:)
+    dynamic func setUserWithHashAuth(id: String, algorithm: String, secretId: String, digest: String, salt: String?, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         Didomi.shared.setUser(
             userAuthParams: UserAuthWithHashParams(
                 id: id,
@@ -382,10 +417,34 @@ class RNDidomi: RCTEventEmitter {
                 secretID: secretId,
                 digest: digest,
                 salt: salt))
+        resolve(0)
     }
 
-    @objc(setUserWithHashAuthWithExpiration:algorithm:secretId:digest:salt:expiration:)
-    dynamic func setUserWithHashAuthWithExpiration(id: String, algorithm: String, secretId: String, digest: String, salt: String?, expiration: Double) {
+
+    @objc(setUserWithHashAuthAndSetupUI:algorithm:secretId:digest:salt:resolve:reject:)
+    dynamic func setUserWithHashAuthAndSetupUI(id: String, algorithm: String, secretId: String, digest: String, salt: String?, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        let userAuthParams = UserAuthWithHashParams(
+            id: id,
+            algorithm: algorithm,
+            secretID: secretId,
+            digest: digest,
+            salt: salt
+        )
+        DispatchQueue.main.async {
+            if let containerController = RCTPresentedViewController() {
+                    Didomi.shared.setUser(
+                        userAuthParams: userAuthParams,
+                        containerController: containerController
+                    )
+            } else {
+                Didomi.shared.setUser(userAuthParams: userAuthParams)
+            }
+        }
+        resolve(0)
+    }
+
+    @objc(setUserWithHashAuthWithExpiration:algorithm:secretId:digest:salt:expiration:resolve:reject:)
+    dynamic func setUserWithHashAuthWithExpiration(id: String, algorithm: String, secretId: String, digest: String, salt: String?, expiration: Double, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         Didomi.shared.setUser(
             userAuthParams: UserAuthWithHashParams(
                 id: id,
@@ -394,20 +453,66 @@ class RNDidomi: RCTEventEmitter {
                 digest: digest,
                 salt: salt,
                 legacyExpiration: expiration))
+        resolve(0)
+    }
+
+    @objc(setUserWithHashAuthWithExpirationAndSetupUI:algorithm:secretId:digest:salt:expiration:resolve:reject:)
+    dynamic func setUserWithHashAuthWithExpirationAndSetupUI(id: String, algorithm: String, secretId: String, digest: String, salt: String?, expiration: Double, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        let userAuthParams = UserAuthWithHashParams(
+            id: id,
+            algorithm: algorithm,
+            secretID: secretId,
+            digest: digest,
+            salt: salt,
+            legacyExpiration: expiration
+        )
+        DispatchQueue.main.async {
+            if let containerController = RCTPresentedViewController() {
+                    Didomi.shared.setUser(
+                        userAuthParams: userAuthParams,
+                        containerController: containerController
+                    )
+            } else {
+                Didomi.shared.setUser(userAuthParams: userAuthParams)
+            }
+        }
+        resolve(0)
     }
 
-    @objc(setUserWithEncryptionAuth:algorithm:secretId:initializationVector:)
-    dynamic func setUserWithEncryptionAuth(id: String, algorithm: String, secretId: String, initializationVector: String) {
+    @objc(setUserWithEncryptionAuth:algorithm:secretId:initializationVector:resolve:reject:)
+    dynamic func setUserWithEncryptionAuth(id: String, algorithm: String, secretId: String, initializationVector: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         Didomi.shared.setUser(
             userAuthParams: UserAuthWithEncryptionParams(
                 id: id,
                 algorithm: algorithm,
                 secretID: secretId,
                 initializationVector: initializationVector))
+        resolve(0)
+    }
+
+    @objc(setUserWithEncryptionAuthAndSetupUI:algorithm:secretId:initializationVector:resolve:reject:)
+    dynamic func setUserWithEncryptionAuthAndSetupUI(id: String, algorithm: String, secretId: String, initializationVector: String, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        let userAuthParams = UserAuthWithEncryptionParams(
+            id: id,
+            algorithm: algorithm,
+            secretID: secretId,
+            initializationVector: initializationVector
+        )
+        DispatchQueue.main.async {
+            if let containerController = RCTPresentedViewController() {
+                    Didomi.shared.setUser(
+                        userAuthParams: userAuthParams,
+                        containerController: containerController
+                    )
+            } else {
+                Didomi.shared.setUser(userAuthParams: userAuthParams)
+            }
+        }
+        resolve(0)
     }
 
-    @objc(setUserWithEncryptionAuthWithExpiration:algorithm:secretId:initializationVector:expiration:)
-    dynamic func setUserWithEncryptionAuthWithExpiration(id: String, algorithm: String, secretId: String, initializationVector: String, expiration: Double) {
+    @objc(setUserWithEncryptionAuthWithExpiration:algorithm:secretId:initializationVector:expiration:resolve:reject:)
+    dynamic func setUserWithEncryptionAuthWithExpiration(id: String, algorithm: String, secretId: String, initializationVector: String, expiration: Double, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
         Didomi.shared.setUser(
             userAuthParams: UserAuthWithEncryptionParams(
                 id: id,
@@ -415,6 +520,29 @@ class RNDidomi: RCTEventEmitter {
                 secretID: secretId,
                 initializationVector: initializationVector,
                 legacyExpiration: expiration))
+        resolve(0)
+    }
+
+    @objc(setUserWithEncryptionAuthWithExpirationAndSetupUI:algorithm:secretId:initializationVector:expiration:resolve:reject:)
+    dynamic func setUserWithEncryptionAuthWithExpirationAndSetupUI(id: String, algorithm: String, secretId: String, initializationVector: String, expiration: Double, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) {
+        let userAuthParams = UserAuthWithEncryptionParams(
+            id: id,
+            algorithm: algorithm,
+            secretID: secretId,
+            initializationVector: initializationVector,
+            legacyExpiration: expiration
+        )
+        DispatchQueue.main.async {
+            if let containerController = RCTPresentedViewController() {
+                    Didomi.shared.setUser(
+                        userAuthParams: userAuthParams,
+                        containerController: containerController
+                    )
+            } else {
+                Didomi.shared.setUser(userAuthParams: userAuthParams)
+            }
+        }
+        resolve(0)
     }
 
     @objc public enum Views : Int, RawRepresentable {
@@ -423,7 +551,6 @@ class RNDidomi: RCTEventEmitter {
         
         case vendors
     }
-    
 }
 
 // MARK: Didomi Specific structs
@@ -527,138 +654,158 @@ extension RNDidomi {
                 "on_preferences_click_vendor_disagree",
                 "on_preferences_click_vendor_save_choices",
                 "on_sync_done",
-                "on_sync_error"
+                "on_sync_error",
+                "on_language_updated",
+                "on_language_update_failed"
         ]
     }
+
+    private func initEventListener() {
     
-    private func initEventListener(){
-        
         didomiEventListener.onConsentChanged = { event in
-            self.sendEvent(withName: "on_consent_changed", body:"")
+            self.dispatchEvent(withName: "on_consent_changed", body:"")
         }
         
         didomiEventListener.onReady = { event in
-            self.sendEvent(withName: "on_ready", body: "")
+            self.dispatchEvent(withName: "on_ready", body: "")
         }
         
         didomiEventListener.onError = { event in
-            self.sendEvent(withName: "on_error", body: "")
+            self.dispatchEvent(withName: "on_error", body: "")
         }
         
         didomiEventListener.onShowNotice = { event in
-            self.sendEvent(withName: "on_show_notice", body: "")
+            self.dispatchEvent(withName: "on_show_notice", body: "")
         }
         
         didomiEventListener.onHideNotice = { event in
-            self.sendEvent(withName: "on_hide_notice", body: "")
+            self.dispatchEvent(withName: "on_hide_notice", body: "")
         }
         
         didomiEventListener.onNoticeClickAgree = { event in
-            self.sendEvent(withName: "on_notice_click_agree", body: "")
+            self.dispatchEvent(withName: "on_notice_click_agree", body: "")
         }
         
         didomiEventListener.onNoticeClickDisagree = { event in
-            self.sendEvent(withName: "on_notice_click_disagree", body: "")
+            self.dispatchEvent(withName: "on_notice_click_disagree", body: "")
         }
         
         didomiEventListener.onNoticeClickMoreInfo = { event in
-            self.sendEvent(withName: "on_notice_click_more_info", body: "")
+            self.dispatchEvent(withName: "on_notice_click_more_info", body: "")
         }
-        
+
         didomiEventListener.onNoticeClickViewVendors = { event in
-            self.sendEvent(withName: "on_notice_click_view_vendors", body: "")
+            self.dispatchEvent(withName: "on_notice_click_view_vendors", body: "")
         }
-        
+
         didomiEventListener.onNoticeClickPrivacyPolicy = { event in
-            self.sendEvent(withName: "on_notice_click_privacy_policy", body: "")
+            self.dispatchEvent(withName: "on_notice_click_privacy_policy", body: "")
         }
         
         didomiEventListener.onShowPreferences = { event in
-            self.sendEvent(withName: "on_show_preferences", body: "")
+            self.dispatchEvent(withName: "on_show_preferences", body: "")
         }
         
         didomiEventListener.onHidePreferences = { event in
-            self.sendEvent(withName: "on_hide_preferences", body: "")
+            self.dispatchEvent(withName: "on_hide_preferences", body: "")
         }
         
         didomiEventListener.onPreferencesClickAgreeToAll = { event in
-            self.sendEvent(withName: "on_preferences_click_agree_to_all", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_agree_to_all", body: "")
         }
         
         didomiEventListener.onPreferencesClickDisagreeToAll = { event in
-            self.sendEvent(withName: "on_preferences_click_disagree_to_all", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_disagree_to_all", body: "")
         }
         
         didomiEventListener.onPreferencesClickAgreeToAllPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_agree_to_all_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_agree_to_all_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickDisagreeToAllPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_disagree_to_all_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_disagree_to_all_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickResetAllPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_reset_all_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_reset_all_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickAgreeToAllVendors = { event in
-            self.sendEvent(withName: "on_preferences_click_agree_to_all_vendors", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_agree_to_all_vendors", body: "")
         }
         
         didomiEventListener.onPreferencesClickDisagreeToAllVendors = { event in
-            self.sendEvent(withName: "on_preferences_click_disagree_to_all_vendors", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_disagree_to_all_vendors", body: "")
         }
         
         didomiEventListener.onPreferencesClickPurposeAgree = { event, purposeId in
-            self.sendEvent(withName: "on_preferences_click_purpose_agree", body: purposeId)
+            self.dispatchEvent(withName: "on_preferences_click_purpose_agree", body: purposeId)
         }
         
         didomiEventListener.onPreferencesClickPurposeDisagree = { event, purposeId in
-            self.sendEvent(withName: "on_preferences_click_purpose_disagree", body: purposeId)
+            self.dispatchEvent(withName: "on_preferences_click_purpose_disagree", body: purposeId)
         }
         
         didomiEventListener.onPreferencesClickCategoryAgree = { event, categoryId in
-            self.sendEvent(withName: "on_preferences_click_category_agree", body: categoryId)
+            self.dispatchEvent(withName: "on_preferences_click_category_agree", body: categoryId)
         }
         
         didomiEventListener.onPreferencesClickCategoryDisagree = { event, categoryId in
-            self.sendEvent(withName: "on_preferences_click_category_disagree", body: categoryId)
+            self.dispatchEvent(withName: "on_preferences_click_category_disagree", body: categoryId)
         }
         
         didomiEventListener.onPreferencesClickViewVendors = { event in
-            self.sendEvent(withName: "on_preferences_click_view_vendors", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_view_vendors", body: "")
         }
         
         didomiEventListener.onPreferencesClickViewPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_view_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_view_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickSaveChoices = { event in
-            self.sendEvent(withName: "on_preferences_click_save_choices", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_save_choices", body: "")
         }
         
         didomiEventListener.onPreferencesClickVendorAgree = { event, vendorId in
-            self.sendEvent(withName: "on_preferences_click_vendor_agree", body: vendorId)
+            self.dispatchEvent(withName: "on_preferences_click_vendor_agree", body: vendorId)
         }
         
         didomiEventListener.onPreferencesClickVendorDisagree = { event, vendorId in
-            self.sendEvent(withName: "on_preferences_click_vendor_disagree", body: vendorId)
+            self.dispatchEvent(withName: "on_preferences_click_vendor_disagree", body: vendorId)
         }
         
         didomiEventListener.onPreferencesClickVendorSaveChoices = { event in
-            self.sendEvent(withName: "on_preferences_click_vendor_save_choices", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_vendor_save_choices", body: "")
         }
         
         didomiEventListener.onSyncDone = { event, organizationUserId in
-            self.sendEvent(withName: "on_sync_done", body: organizationUserId)
+            self.dispatchEvent(withName: "on_sync_done", body: organizationUserId)
         }
 
         didomiEventListener.onSyncError = { event, error in
-            self.sendEvent(withName: "on_sync_error", body: error)
+            self.dispatchEvent(withName: "on_sync_error", body: error)
+        }
+        
+        didomiEventListener.onLanguageUpdated = { event, languageCode in
+            self.dispatchEvent(withName: "on_language_updated", body: languageCode)
+        }
+
+        didomiEventListener.onLanguageUpdateFailed = { event, reason in
+            self.dispatchEvent(withName: "on_language_update_failed", body: reason)
         }
 
         Didomi.shared.addEventListener(listener: didomiEventListener)
     }
+
+    /// Sends the specified event only if the react-native bridge is still valid
+    private func dispatchEvent(withName: String, body: String?) {
+        if self.bridge != nil {
+            self.sendEvent(withName: withName, body: body)
+        } else {
+            // Event emitter is not valid anymore, remove event listener
+            Didomi.shared.removeEventListener(listener: didomiEventListener)
+        }
+    }
 }
 
 extension Int {