@usercentrics/react-native-sdk 2.3.0 → 2.5.2

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 [Release Notes](https://docs.usercentrics.com/cmp_in_app_sdk/latest/about/history/)
 
+# 2.5.2
+
+## Resolved Issues
+
+    * TCF String solved issue when signalling legitimate interests
+
+# 2.5.1
+
+## Resolved Issues
+
+    * TCF String solved issue with encoding to shorten the length of the string
+
+# 2.5.0
+
+## Features
+
+- **[UI]** Controller ID section was redesigned to have a better UX.
+- `CCPAData` exposes the encoded `uspString`.
+
+## Improvements
+
+- Improve stability and performance issues.
+
+## Resolved Issues
+
+- General bug fixes.
+- **[iOS]** Access to `rootViewController` depending on API version.
+
+# 2.4.0
+
+## Features
+
+- **[Customization]** You now have full control over the appearance of the First & Second Layer via our Admin Interface Style options and our Programmatic API. We have updated and extended our Programmatic API to simplify banner customization.
+- **[UI]** Legal links are now added to our the First Layer, and can be hidden or shown as desired via programmatic API.
+- **[CCPA]** Consent button can now be customized via the Admin Interface.
+
+## Improvements
+
+- Improve initialization flow for stability and avoid edge case crashes.
+
+## Resolved Issues
+
+- Solve stability issues and bug fixes.
+
 # 2.3.0
 
 ## Features
@@ -55,4 +99,4 @@
 
 # 2.0.1
 
-- Initial version of the library.
+- Initial version of the library.

package/android/build.gradle

@@ -1,4 +1,4 @@
-def usercentrics_version = "2.3.0"
+def usercentrics_version = "2.5.2"
 version usercentrics_version
 
 buildscript {

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/RNUsercentricsModuleTest.kt

@@ -15,10 +15,12 @@ import com.usercentrics.reactnativeusercentrics.extensions.serialize
 import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
 import com.usercentrics.sdk.*
 import com.usercentrics.sdk.errors.UsercentricsError
+import com.usercentrics.sdk.models.common.NetworkMode
 import com.usercentrics.sdk.models.common.UsercentricsLoggerLevel
 import com.usercentrics.sdk.models.common.UsercentricsVariant
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 import com.usercentrics.sdk.services.tcf.TCFDecisionUILayer
+import com.usercentrics.sdk.services.tcf.interfaces.TCFData
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
@@ -36,6 +38,7 @@ class RNUsercentricsModuleTest {
             putInt("loggerlevel", 0)
             putInt("timeoutMillis", 1000)
             putString("version", "1.2.3")
+            putInt("networkMode", 1)
         }
 
         private val usercentricsConsentHistoryEntries = listOf(
@@ -94,6 +97,7 @@ class RNUsercentricsModuleTest {
         )
         assertEquals(1000L, usercentricsProxy.initializeOptionsArgument?.timeoutMillis)
         assertEquals("1.2.3", usercentricsProxy.initializeOptionsArgument?.version)
+        assertEquals(NetworkMode.EU, usercentricsProxy.initializeOptionsArgument?.networkMode)
     }
 
     @Test
@@ -204,21 +208,6 @@ class RNUsercentricsModuleTest {
         assertEquals("abc", promise.resolveValue)
     }
 
-    @Test
-    fun testGetTCString() {
-        val usercentricsSDK = mockk<UsercentricsSDK>()
-        every { usercentricsSDK.getTCString() }.returns("abc")
-        val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
-        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
-        val promise = FakePromise()
-
-        module.getTCFString(promise)
-
-        verify(exactly = 1) { usercentricsSDK.getTCString() }
-        assertEquals("abc", promise.resolveValue)
-    }
-
     @Test
     fun testGetConsents() {
         val usercentricsSDK = mockk<UsercentricsSDK>()
@@ -306,7 +295,9 @@ class RNUsercentricsModuleTest {
     @Test
     fun testGetTCFData() {
         val usercentricsSDK = mockk<UsercentricsSDK>()
-        every { usercentricsSDK.getTCFData() }.returns(GetTCFDataMock.fake)
+        every { usercentricsSDK.getTCFData(any()) }.answers {
+            firstArg<(TCFData) -> Unit>().invoke(GetTCFDataMock.fake)
+        }
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
@@ -317,7 +308,7 @@ class RNUsercentricsModuleTest {
 
         val result = promise.resolveValue
 
-        verify(exactly = 1) { usercentricsSDK.getTCFData() }
+        verify(exactly = 1) { usercentricsSDK.getTCFData(any()) }
         assertEquals(GetTCFDataMock.expected.toWritableMap(), result)
     }
 
@@ -563,7 +554,6 @@ class RNUsercentricsModuleTest {
             GetConsentsMock.fakeWithData
         )
 
-
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
         val module = RNUsercentricsModule(contextMock, usercentricsProxy)
@@ -590,4 +580,4 @@ class RNUsercentricsModuleTest {
 
         assertEquals(1, usercentricsProxy.resetCount)
     }
-}
+}

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/api/FakeUsercentricsProxy.kt

@@ -53,19 +53,12 @@ internal class FakeUsercentricsProxy(
     var showFirstLayerBannerSettings: BannerSettings? = null
     var showFirstLayerStyle: FirstLayerStyleSettings? = null
 
-    override fun showFirstLayer(
-        activity: Activity,
-        layout: UsercentricsLayout,
-        bannerSettings: BannerSettings?,
-        firstLayerStyleSettings: FirstLayerStyleSettings?,
-        promise: Promise
-    ) {
+    override fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise) {
         this.showFirstLayerLayout = layout
         this.showFirstLayerBannerSettings = bannerSettings
-        this.showFirstLayerStyle = firstLayerStyleSettings
+        this.showFirstLayerStyle = bannerSettings?.firstLayerSettings
     }
 
-    override fun showSecondLayer() {
-
+    override fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
     }
-}
+}

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/mock/GetTCFDataMock.kt

@@ -95,6 +95,7 @@ internal class GetTCFDataMock {
                     dataSharedOutsideEU = false
                 )
             ),
+            tcString = "abc"
         )
 
         // From the debugger
@@ -186,6 +187,7 @@ internal class GetTCFDataMock {
                     "dataSharedOutsideEU" to false
                 ),
             ),
+            "tcString" to "abc"
         )
     }
-}
+}

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/mock/GetUSPDataMock.kt

@@ -13,6 +13,7 @@ internal class GetUSPDataMock {
 
         // From the debugger
         val expected = mapOf(
+            "uspString" to "1YN-",
             "version" to 1,
             "noticeGiven" to true,
             "optedOut" to false,

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/RNUsercentricsModule.kt

@@ -3,7 +3,6 @@ package com.usercentrics.reactnativeusercentrics
 import com.facebook.react.bridge.*
 import com.usercentrics.reactnativeusercentrics.api.UsercentricsProxy
 import com.usercentrics.reactnativeusercentrics.extensions.*
-import com.usercentrics.sdk.UsercentricsBanner
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 import com.usercentrics.sdk.services.tcf.TCFDecisionUILayer
 
@@ -17,17 +16,8 @@ internal class RNUsercentricsModule(
 
     @ReactMethod
     fun configure(options: ReadableMap) {
-        var alreadyConfigured = false
-        usercentricsProxy.isReady({
-            alreadyConfigured = true
-        }, {
-            alreadyConfigured = true
-        })
-
-        if (!alreadyConfigured) {
-            val usercentricsOptions = options.usercentricsOptionsFromMap() ?: return
-            usercentricsProxy.initialize(reactApplicationContext, usercentricsOptions)
-        }
+        val usercentricsOptions = options.usercentricsOptionsFromMap() ?: return
+        usercentricsProxy.initialize(reactApplicationContext, usercentricsOptions)
     }
 
     @ReactMethod
@@ -48,16 +38,7 @@ internal class RNUsercentricsModule(
                 val layout = options.getString("layout")!!.usercentricsLayoutFromEnumString()
                 val bannerSettings =
                     options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
-                val styleSettings =
-                    options.getMap("styleSettings")?.firstLayerStyleSettingsFromMap(assetManager)
-
-                usercentricsProxy.showFirstLayer(
-                    currentActivity!!,
-                    layout,
-                    bannerSettings,
-                    styleSettings,
-                    promise
-                )
+                usercentricsProxy.showFirstLayer(currentActivity!!, layout, bannerSettings, promise)
 
             } catch (e: Exception) {
                 promise.reject(e)
@@ -73,15 +54,7 @@ internal class RNUsercentricsModule(
 
                 val bannerSettings =
                     options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
-                val showCloseButton = options.getBoolean("showCloseButton")
-
-
-                UsercentricsBanner(currentActivity!!, bannerSettings).showSecondLayer(
-                    showCloseButton
-                ) {
-                    promise.resolve(it?.toWritableMap())
-                }
-
+                usercentricsProxy.showSecondLayer(currentActivity!!, bannerSettings, promise)
             } catch (e: Exception) {
                 promise.reject(e)
             }
@@ -97,11 +70,6 @@ internal class RNUsercentricsModule(
         })
     }
 
-    @ReactMethod
-    fun getTCFString(promise: Promise) {
-        promise.resolve(usercentricsProxy.instance.getTCString())
-    }
-
     @ReactMethod
     fun getControllerId(promise: Promise) {
         promise.resolve(usercentricsProxy.instance.getControllerId())
@@ -124,7 +92,9 @@ internal class RNUsercentricsModule(
 
     @ReactMethod
     fun getTCFData(promise: Promise) {
-        promise.resolve(usercentricsProxy.instance.getTCFData().serialize())
+        usercentricsProxy.instance.getTCFData {
+            promise.resolve(it.serialize())
+        }
     }
 
     @ReactMethod
@@ -226,4 +196,4 @@ internal class RNUsercentricsModule(
     fun reset() {
         usercentricsProxy.reset()
     }
-}
+}

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/api/UsercentricsProxy.kt

@@ -2,38 +2,19 @@ package com.usercentrics.reactnativeusercentrics.api
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.util.Log
 import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReadableMap
-import com.usercentrics.reactnativeusercentrics.extensions.bannerSettingsFromMap
-import com.usercentrics.reactnativeusercentrics.extensions.firstLayerStyleSettingsFromMap
 import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
-import com.usercentrics.reactnativeusercentrics.extensions.usercentricsLayoutFromEnumString
 import com.usercentrics.sdk.*
 import com.usercentrics.sdk.errors.UsercentricsError
-import java.lang.Exception
 
 interface UsercentricsProxy {
+
     val instance: UsercentricsSDK
 
     fun initialize(context: Context, options: UsercentricsOptions)
-
-    fun isReady(
-        onSuccess: (UsercentricsReadyStatus) -> Unit,
-        onFailure: (UsercentricsError) -> Unit
-    )
-
-    fun showFirstLayer(
-        activity: Activity,
-        layout: UsercentricsLayout,
-        bannerSettings: BannerSettings?,
-        firstLayerStyleSettings: FirstLayerStyleSettings?,
-        promise: Promise
-    )
-
-    fun showSecondLayer()
-
+    fun isReady(onSuccess: (UsercentricsReadyStatus) -> Unit, onFailure: (UsercentricsError) -> Unit)
+    fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise)
+    fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise)
     fun reset()
 }
 
@@ -50,30 +31,19 @@ internal class UsercentricsProxyImpl : UsercentricsProxy {
         }
     }
 
-    override fun isReady(
-        onSuccess: (UsercentricsReadyStatus) -> Unit,
-        onFailure: (UsercentricsError) -> Unit
-    ) = Usercentrics.isReady(onSuccess, onFailure)
+    override fun isReady(onSuccess: (UsercentricsReadyStatus) -> Unit, onFailure: (UsercentricsError) -> Unit) = Usercentrics.isReady(onSuccess, onFailure)
 
-    override fun showFirstLayer(
-        activity: Activity,
-        layout: UsercentricsLayout,
-        bannerSettings: BannerSettings?,
-        firstLayerStyleSettings: FirstLayerStyleSettings?,
-        promise: Promise
-    ) {
-        UsercentricsBanner(activity, bannerSettings).showFirstLayer(
-            layout,
-            firstLayerStyleSettings
-        ) {
+    override fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise) {
+        UsercentricsBanner(activity, bannerSettings).showFirstLayer(layout) {
             promise.resolve(it?.toWritableMap())
         }
     }
 
-    override fun showSecondLayer() {
-
+    override fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
+        UsercentricsBanner(activity, bannerSettings).showSecondLayer {
+            promise.resolve(it?.toWritableMap())
+        }
     }
 
     override fun reset() = Usercentrics.reset()
-
-}
+}

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/CCPADataExtensions.kt

@@ -5,6 +5,7 @@ import com.usercentrics.ccpa.CCPAData
 
 internal fun CCPAData.serialize(): WritableMap {
     return mapOf(
+        "uspString" to toUSPString(),
         "version" to version,
         "noticeGiven" to noticeGiven,
         "optedOut" to optedOut,

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/FirstLayerOptionsExtensions.kt

@@ -20,9 +20,16 @@ internal fun ReadableMap.bannerSettingsFromMap(assetManager: AssetManager): Bann
     val customFont = getMap("font")
     val customLogo = getMap("logo")
 
+    val rawFirstLayerStyleSettings = getMap("firstLayerSettings")
+    val rawSecondLayerStyleSettings = getMap("secondLayerSettings")
+    val rawLegalLinkSettings = getString("links")
+
     return BannerSettings(
-        customFont?.bannerFontFromMap(assetManager),
-        customLogo?.bannerLogoFromMap()
+        font = customFont?.bannerFontFromMap(assetManager),
+        logo = customLogo?.bannerLogoFromMap(),
+        firstLayerSettings = rawFirstLayerStyleSettings?.firstLayerStyleSettingsFromMap(assetManager),
+        secondLayerSettings = rawSecondLayerStyleSettings?.secondLayerStyleSettingsFromMap(assetManager),
+        links = rawLegalLinkSettings?.legalLinksFromEnumString()
     )
 }
 
@@ -146,6 +153,23 @@ internal fun String.deserializeButtonType(): ButtonType {
     return ButtonType.valueOf(this)
 }
 
+internal fun ReadableMap.secondLayerStyleSettingsFromMap(assetManager: AssetManager): SecondLayerStyleSettings {
+    return SecondLayerStyleSettings(
+        buttonLayout = getMap("buttonLayout")?.buttonLayoutFromMap(assetManager),
+        showCloseButton = getBoolean("showCloseButton"),
+    )
+}
+
+internal fun String?.legalLinksFromEnumString(): LegalLinksSettings? {
+    return when (this) {
+        "BOTH" -> LegalLinksSettings.BOTH
+        "NONE" -> LegalLinksSettings.NONE
+        "FIRST_LAYER_ONLY" -> LegalLinksSettings.FIRST_LAYER_ONLY
+        "SECOND_LAYER_ONLY" -> LegalLinksSettings.SECOND_LAYER_ONLY
+        else -> null
+    }
+}
+
 @ColorInt
 internal fun String.deserializeColor(): Int? {
     val colorString: String =

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/TCFDataExtensions.kt

@@ -10,7 +10,8 @@ internal fun TCFData.serialize(): WritableMap {
         "specialFeatures" to specialFeatures.map { it.serialize() },
         "specialPurposes" to specialPurposes.map { it.serialize() },
         "stacks" to stacks.map { it.serialize() },
-        "vendors" to vendors.map { it.serialize() }
+        "vendors" to vendors.map { it.serialize() },
+        "tcString" to tcString
     ).toWritableMap()
 }
 

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/UserOptionsExtensions.kt

@@ -2,6 +2,7 @@ package com.usercentrics.reactnativeusercentrics.extensions
 
 import com.facebook.react.bridge.ReadableMap
 import com.usercentrics.sdk.UsercentricsOptions
+import com.usercentrics.sdk.models.common.NetworkMode
 import com.usercentrics.sdk.models.common.UsercentricsLoggerLevel
 
 internal fun ReadableMap.usercentricsOptionsFromMap(): UsercentricsOptions? {
@@ -29,6 +30,17 @@ internal fun ReadableMap.usercentricsOptionsFromMap(): UsercentricsOptions? {
             usercentricsOptions.defaultLanguage = it
         }
 
+        getIntOrNull("networkMode")?.let {
+            usercentricsOptions.networkMode = when (it) {
+                0 -> NetworkMode.WORLD
+                1 -> NetworkMode.EU
+                else -> {
+                    assert(false)
+                    NetworkMode.WORLD
+                }
+            }
+        }
+
         usercentricsOptions
     }
 }

package/ios/Extensions/BannerSettings+Dict.swift

@@ -5,8 +5,21 @@ extension BannerSettings {
     init?(from dictionary: NSDictionary?) {
         guard let dictionary = dictionary else { return nil }
 
-        self.init(font: BannerFontHolder(from: dictionary["font"] as? NSDictionary)?.font,
-                  logo: UIImage(from: dictionary["logo"] as? NSDictionary))
+        let bannerFontHolder = BannerFontHolder(from: dictionary["font"] as? NSDictionary)
+
+        let firstLayerStyleSettingsDict = dictionary["firstLayerSettings"] as? NSDictionary
+        let firstLayerSettings = FirstLayerStyleSettings(from: firstLayerStyleSettingsDict, bannerFontHolder: bannerFontHolder)
+
+        let secondLayerStyleSettingsDict = dictionary["secondLayerSettings"] as? NSDictionary
+        let secondLayerSettings = SecondLayerStyleSettings(from: secondLayerStyleSettingsDict, bannerFontHolder: bannerFontHolder)
+
+        let links = LegalLinksSettings.from(enumString: dictionary["links"] as? String)
+
+        self.init(font: bannerFontHolder?.font,
+                  logo: UIImage(from: dictionary["logo"] as? NSDictionary),
+                  links: links,
+                  firstLayerSettings: firstLayerSettings,
+                  secondLayerSettings: secondLayerSettings)
     }
 }
 
@@ -62,6 +75,14 @@ extension FirstLayerStyleSettings {
     }
 }
 
+extension SecondLayerStyleSettings {
+    init?(from dictionary: NSDictionary?, bannerFontHolder: BannerFontHolder?) {
+        guard let dictionary = dictionary else { return nil }
+
+        self.init(buttonLayout: ButtonLayout.from(dictionary: dictionary["buttonLayout"] as? NSDictionary, fallbackFont: bannerFontHolder?.boldFont),
+                  showCloseButton: dictionary["showCloseButton"] as? Bool)
+    }
+}
 
 extension HeaderImageSettings {
     static func from(dictionary: NSDictionary?) -> HeaderImageSettings? {
@@ -225,3 +246,22 @@ extension NSTextAlignment {
         }
     }
 }
+
+extension LegalLinksSettings {
+    static func from(enumString: String?) -> LegalLinksSettings? {
+        guard let enumString = enumString else { return nil }
+
+        switch enumString {
+            case "BOTH":
+                return .both
+            case "FIRST_LAYER_ONLY":
+                return .firstLayerOnly
+            case "NONE":
+                return LegalLinksSettings.none
+            case "SECOND_LAYER_ONLY":
+                return .secondLayerOnly
+            default:
+                return nil
+        }
+    }
+}

package/ios/Extensions/CCPAData+Dict.swift

@@ -4,6 +4,7 @@ import Usercentrics
 extension CCPAData {
     func toDictionary() -> NSDictionary {
         return [
+            "uspString": self.toUSPString(),
             "version": self.version,
             "noticeGiven": self.noticeGiven?.boolValue as Any,
             "optedOut": self.optedOut?.boolValue as Any,

package/ios/Extensions/UsercentricsOptions+Dict.swift

@@ -2,7 +2,7 @@ import Foundation
 import Usercentrics
 
 public extension UsercentricsOptions {
-    convenience init?(from dictionary: NSDictionary) {
+    static func initialize(from dictionary: NSDictionary) -> UsercentricsOptions? {
         guard let settingsId = dictionary["settingsId"] as? String else {
             return nil
         }
@@ -25,11 +25,11 @@ public extension UsercentricsOptions {
             options.version = version
         }
 
-        self.init(settingsId: settingsId,
-                  defaultLanguage: options.defaultLanguage,
-                  version: options.version,
-                  timeoutMillis: options.timeoutMillis,
-                  loggerLevel: options.loggerLevel)
+        if let networkModeValue = dictionary["networkMode"] as? Int {
+            options.networkMode = NetworkMode.initialize(from: networkModeValue)
+        }
+
+        return options
     }
 }
 
@@ -47,3 +47,17 @@ public extension UsercentricsLoggerLevel {
         }
     }
 }
+
+public extension NetworkMode {
+    static func initialize(from value: Int) -> NetworkMode {
+        switch value {
+        case 0:
+            return NetworkMode.world
+        case 1:
+            return NetworkMode.eu
+        default:
+            assert(false)
+            return NetworkMode.world
+        }
+    }
+}

package/ios/Manager/UsercentricsManager.swift

@@ -11,21 +11,18 @@ public protocol UsercentricsManager {
     func showFirstLayer(bannerSettings: BannerSettings?,
                         hostView: UIViewController,
                         layout: UsercentricsLayout,
-                        settings: FirstLayerStyleSettings?,
                         dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void)
 
     func showSecondLayer(bannerSettings: BannerSettings?,
                          hostView: UIViewController,
-                         showCloseButton: Bool,
                          dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void)
 
-    func getTCString() -> String
     func getControllerId() -> String
     func getConsents() -> [UsercentricsServiceConsent]
     func getCMPData() -> UsercentricsCMPData
     func getUserSessionData() -> String
     func getUSPData() -> CCPAData
-    func getTCFData() -> TCFData
+    func getTCFData(callback: @escaping (TCFData) -> Void)
 
     func changeLanguage(language: String, onSuccess: @escaping (() -> Void), onFailure: @escaping ((Error) -> Void))
 
@@ -53,15 +50,6 @@ final class UsercentricsManagerImplementation: UsercentricsManager {
     }
 
     func configure(options: UsercentricsOptions) {
-        var isConfigured: Bool = false
-        isReady { _ in
-            isConfigured = true
-        } onFailure: { _ in
-            isConfigured = true
-        }
-
-        guard !isConfigured else { return }
-        
         UsercentricsCore.configure(options: options)
     }
 
@@ -72,31 +60,22 @@ final class UsercentricsManagerImplementation: UsercentricsManager {
     func showFirstLayer(bannerSettings: BannerSettings?,
                         hostView: UIViewController,
                         layout: UsercentricsLayout,
-                        settings: FirstLayerStyleSettings?,
                         dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) {
         UsercentricsBanner(bannerSettings: bannerSettings).showFirstLayer(hostView: hostView,
                                                                           layout: layout,
-                                                                          settings: settings,
                                                                           completionHandler: dismissViewHandler)
     }
 
     func showSecondLayer(bannerSettings: BannerSettings?,
                          hostView: UIViewController,
-                         showCloseButton: Bool,
                          dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) {
-        UsercentricsBanner(bannerSettings: bannerSettings).showSecondLayer(hostView: hostView,
-                                                                           showCloseButton: showCloseButton,
-                                                                           completionHandler: dismissViewHandler)
+        UsercentricsBanner(bannerSettings: bannerSettings).showSecondLayer(hostView: hostView, completionHandler: dismissViewHandler)
     }
 
     func restoreUserSession(controllerId: String, onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void)) {
         UsercentricsCore.shared.restoreUserSession(controllerId: controllerId, onSuccess: onSuccess, onFailure: onFailure)
     }
 
-    func getTCString() -> String {
-        return UsercentricsCore.shared.getTCString()
-    }
-
     func getControllerId() -> String {
         return UsercentricsCore.shared.getControllerId()
     }
@@ -117,8 +96,8 @@ final class UsercentricsManagerImplementation: UsercentricsManager {
         return UsercentricsCore.shared.getUSPData()
     }
 
-    func getTCFData() -> TCFData {
-        return UsercentricsCore.shared.getTCFData()
+    func getTCFData(callback: @escaping (TCFData) -> Void) {
+        UsercentricsCore.shared.getTCFData(callback: callback)
     }
     
     func changeLanguage(language: String, onSuccess: @escaping (() -> Void), onFailure: @escaping ((Error) -> Void)) {