@usercentrics/react-native-sdk 2.0.3-rc2 → 2.2.2-RC1

package/README.md

@@ -30,6 +30,8 @@ The Usercentrics Apps SDK is a Consent Management Platform framework for mobile,
 ### Requirements
 * Android 5.0 (API 21) or higher with Kotlin 1.5 or higher
 * iOS 11 or higher
+* React 17.0 or higher
+* React Native 0.65 or higher
 
 ## Installation
 

package/android/build.gradle

@@ -1,4 +1,4 @@
-def usercentrics_version = "2.0.2"
+def usercentrics_version = "2.2.1"
 version usercentrics_version
 
 buildscript {

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

@@ -2,10 +2,7 @@ package com.usercentrics.reactnativemodule
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.facebook.react.bridge.JavaOnlyMap
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableArray
-import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.*
 import com.facebook.soloader.SoLoader
 import com.usercentrics.reactnativemodule.api.FakeUsercentricsProxy
 import com.usercentrics.reactnativemodule.fake.FakePromise
@@ -39,6 +36,14 @@ class RNUsercentricsModuleTest {
             putString("version", "1.2.3")
         }
 
+        private val usercentricsConsentHistoryEntries = listOf(
+            UsercentricsConsentHistoryEntry(
+                status = false,
+                UsercentricsConsentType.EXPLICIT,
+                123
+            )
+        )
+
         private val usercentricsReadyStatus = UsercentricsReadyStatus(
             shouldShowCMP = false,
             consents = listOf(
@@ -47,7 +52,9 @@ class RNUsercentricsModuleTest {
                     status = false,
                     dataProcessor = "Facebook SDK",
                     type = UsercentricsConsentType.EXPLICIT,
-                    version = "1.0.1"
+                    version = "1.0.1",
+                    isEssential = false,
+                    history = usercentricsConsentHistoryEntries
                 )
             )
         )
@@ -74,7 +81,9 @@ class RNUsercentricsModuleTest {
                     status = false,
                     dataProcessor = "Facebook SDK",
                     type = UsercentricsConsentType.EXPLICIT,
-                    version = "1.0.1"
+                    version = "1.0.1",
+                    isEssential = false,
+                    history = usercentricsConsentHistoryEntries
                 )
             ),
             controllerId = "8620135313b043696b806868b20da905886a3a2598ddddc2b52973f9807d6b45",

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

@@ -1,11 +1,13 @@
 package com.usercentrics.reactnativemodule.api
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableMap
 import com.usercentrics.reactnativeusercentrics.api.UsercentricsProxy
 import com.usercentrics.sdk.*
 import com.usercentrics.sdk.errors.UsercentricsError
-import com.usercentrics.sdk.models.settings.UsercentricsConsent
 
 internal class FakeUsercentricsProxy(
     private val instanceAnswer: UsercentricsSDK? = null,
@@ -66,4 +68,24 @@ internal class FakeUsercentricsProxy(
     override fun reset() {
         resetCount++
     }
+
+    var showFirstLayerLayout: UsercentricsLayout? = null
+    var showFirstLayerBannerSettings: BannerSettings? = null
+    var showFirstLayerStyle: FirstLayerStyleSettings? = null
+
+    override fun showFirstLayer(
+        activity: Activity,
+        layout: UsercentricsLayout,
+        bannerSettings: BannerSettings?,
+        firstLayerStyleSettings: FirstLayerStyleSettings?,
+        promise: Promise
+    ) {
+        this.showFirstLayerLayout = layout
+        this.showFirstLayerBannerSettings = bannerSettings
+        this.showFirstLayerStyle = firstLayerStyleSettings
+    }
+
+    override fun showSecondLayer() {
+
+    }
 }

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

@@ -228,7 +228,8 @@ internal class GetCMPDataMock {
             hideButtonDeny = false,
             tabsServicesIsEnabled = true,
             isOverlayEnabled = true,
-            title = ""
+            title = "",
+            hideTogglesForServices = false
         )
         private val fakeTCF2Settings = TCF2Settings(
             togglesSpecialFeaturesToggleOff = "Off",

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

@@ -1,17 +1,27 @@
 package com.usercentrics.reactnativemodule.mock
 
+import com.usercentrics.sdk.UsercentricsConsentHistoryEntry
 import com.usercentrics.sdk.UsercentricsServiceConsent
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 
 internal class GetConsentsMock {
     companion object {
+
         val fakeWithData = listOf(
             UsercentricsServiceConsent(
                 templateId = "ocv9HNX_g",
                 status = false,
                 dataProcessor = "Facebook SDK",
                 type = UsercentricsConsentType.EXPLICIT,
-                version = "1.0.1"
+                version = "1.0.1",
+                history = listOf(
+                    UsercentricsConsentHistoryEntry(
+                        status = false,
+                        UsercentricsConsentType.EXPLICIT,
+                        123
+                    )
+                ),
+                isEssential = false
             )
         )
 
@@ -22,6 +32,14 @@ internal class GetConsentsMock {
                 "type" to 0,
                 "version" to "1.0.1",
                 "dataProcessor" to "Facebook SDK",
+                "isEssential" to false,
+                "history" to listOf(
+                    mapOf(
+                        "timestampInMillis" to 123,
+                        "type" to 0,
+                        "status" to false
+                    )
+                )
             )
         )
     }

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

@@ -92,6 +92,7 @@ internal class GetTCFDataMock {
                     deviceStorage = null,
                     usesCookies = false,
                     cookieRefresh = null,
+                    dataSharedOutsideEU = false
                 )
             ),
         )
@@ -182,6 +183,7 @@ internal class GetTCFDataMock {
                     "deviceStorageDisclosureUrl" to null,
                     "usesCookies" to false,
                     "cookieRefresh" to null,
+                    "dataSharedOutsideEU" to false
                 ),
             ),
         )

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

@@ -2,6 +2,7 @@ package com.usercentrics.reactnativemodule.mock
 
 import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
 import com.usercentrics.sdk.UserDecision
+import com.usercentrics.sdk.UsercentricsConsentHistoryEntry
 import com.usercentrics.sdk.UsercentricsServiceConsent
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 import com.usercentrics.sdk.services.tcf.TCFDecisionUILayer
@@ -18,7 +19,15 @@ internal class SaveDecisionsForTCFMock {
                 status = true,
                 dataProcessor = "Facebook SDK",
                 type = UsercentricsConsentType.EXPLICIT,
-                version = "1.0.1"
+                version = "1.0.1",
+                history = listOf(
+                    UsercentricsConsentHistoryEntry(
+                        status = false,
+                        UsercentricsConsentType.EXPLICIT,
+                        123
+                    )
+                ),
+                isEssential = false
             )
         )
 
@@ -62,6 +71,14 @@ internal class SaveDecisionsForTCFMock {
                 "type" to 0,
                 "version" to "1.0.1",
                 "dataProcessor" to "Facebook SDK",
+                "isEssential" to false,
+                "history" to listOf(
+                    mapOf(
+                        "timestampInMillis" to 123,
+                        "type" to 0,
+                        "status" to false
+                    )
+                )
             )
         )
     }

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

@@ -2,7 +2,6 @@ package com.usercentrics.reactnativemodule.mock
 
 import com.usercentrics.sdk.UserDecision
 
-
 internal class SaveDecisionsMock {
     companion object {
         val callDecisions = listOf(

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

@@ -0,0 +1,27 @@
+package com.usercentrics.reactnativemodule.mock
+
+import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
+
+internal class ShowFirstLayerMock {
+    companion object {
+        val arguments = mapOf(
+            "layout" to "POPUP_CENTER",
+            "bannerSettings" to mapOf(
+                "font" to null,
+                "logo" to null,
+            ),
+            "styleSettings" to mapOf(
+                "headerImage" to null,
+                "title" to mapOf(
+                    "alignment" to "END",
+                    "textSize" to 20.0,
+                ),
+                "message" to mapOf(
+                    "alignment" to "CENTER",
+                    "textSize" to 16,
+                ),
+                "cornerRadius" to 50
+            ),
+        ).toWritableMap()
+    }
+}

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

@@ -5,8 +5,11 @@ import android.content.Intent
 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.UsercentricsLayout
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 import com.usercentrics.sdk.services.tcf.TCFDecisionUILayer
+import java.lang.Exception
 
 internal class RNUsercentricsModule(
     reactContext: ReactApplicationContext,
@@ -69,6 +72,55 @@ internal class RNUsercentricsModule(
         currentActivity?.startActivityForResult(intent, showCMPRequestCode)
     }
 
+    @ReactMethod
+    fun showFirstLayer(options: ReadableMap, promise: Promise) {
+        UiThreadUtil.runOnUiThread {
+            try {
+                val assetManager = currentActivity!!.assets
+
+                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
+                )
+
+            } catch (e: Exception) {
+                promise.reject(e)
+            }
+        }
+    }
+
+    @ReactMethod
+    fun showSecondLayer(options: ReadableMap, promise: Promise) {
+        UiThreadUtil.runOnUiThread {
+            try {
+                val assetManager = currentActivity!!.assets
+
+                val bannerSettings =
+                    options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
+                val showCloseButton = options.getBoolean("showCloseButton")
+
+
+                UsercentricsBanner(currentActivity!!, bannerSettings).showSecondLayer(
+                    showCloseButton
+                ) {
+                    promise.resolve(it?.toWritableMap())
+                }
+
+            } catch (e: Exception) {
+                promise.reject(e)
+            }
+        }
+    }
+
     internal fun parseActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
         if (requestCode != showCMPRequestCode) return false
         assert(pendingPromise != null)

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

@@ -1,10 +1,18 @@
 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
@@ -23,6 +31,16 @@ interface UsercentricsProxy {
 
     fun parseResult(resultCode: Int, data: Intent?): UsercentricsConsentUserResponse?
 
+    fun showFirstLayer(
+        activity: Activity,
+        layout: UsercentricsLayout,
+        bannerSettings: BannerSettings?,
+        firstLayerStyleSettings: FirstLayerStyleSettings?,
+        promise: Promise
+    )
+
+    fun showSecondLayer()
+
     fun reset()
 }
 
@@ -32,7 +50,11 @@ internal class UsercentricsProxyImpl : UsercentricsProxy {
         get() = Usercentrics.instance
 
     override fun initialize(context: Context, options: UsercentricsOptions) {
-        Usercentrics.initialize(context, options)
+        try {
+            Usercentrics.initialize(context, options)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     override fun isReady(
@@ -55,6 +77,25 @@ internal class UsercentricsProxyImpl : UsercentricsProxy {
             .parseResult(resultCode, data)
     }
 
+    override fun showFirstLayer(
+        activity: Activity,
+        layout: UsercentricsLayout,
+        bannerSettings: BannerSettings?,
+        firstLayerStyleSettings: FirstLayerStyleSettings?,
+        promise: Promise
+    ) {
+        UsercentricsBanner(activity, bannerSettings).showFirstLayer(
+            layout,
+            firstLayerStyleSettings
+        ) {
+            promise.resolve(it?.toWritableMap())
+        }
+    }
+
+    override fun showSecondLayer() {
+
+    }
+
     override fun reset() = Usercentrics.reset()
 
 }

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

@@ -0,0 +1,160 @@
+package com.usercentrics.reactnativeusercentrics.extensions
+
+import android.content.res.AssetManager
+import android.graphics.Color
+import androidx.annotation.ColorInt
+import com.facebook.react.bridge.ReadableMap
+import com.usercentrics.sdk.*
+
+internal fun String.usercentricsLayoutFromEnumString(): UsercentricsLayout {
+    return when (this) {
+        "FULL" -> UsercentricsLayout.Full
+        "SHEET" -> UsercentricsLayout.Sheet
+        "POPUP_BOTTOM" -> UsercentricsLayout.Popup(PopupPosition.BOTTOM)
+        "POPUP_CENTER" -> UsercentricsLayout.Popup(PopupPosition.CENTER)
+        else -> throw IllegalArgumentException("Invalid layout: $this")
+    }
+}
+
+internal fun ReadableMap.bannerSettingsFromMap(assetManager: AssetManager): BannerSettings {
+    val customFont = getMap("font")
+    val customLogo = getMap("logo")
+
+    return BannerSettings(
+        customFont?.usercentricsFontFromMap(assetManager),
+        customLogo?.usercentricsImageFromMap()
+    )
+}
+
+internal fun ReadableMap.firstLayerStyleSettingsFromMap(assetManager: AssetManager): FirstLayerStyleSettings {
+    return FirstLayerStyleSettings(
+        headerImage = getMap("headerImage")?.headerImageFromMap(),
+        title = getMap("title")?.titleFromMap(assetManager),
+        message = getMap("message")?.messageFromMap(assetManager),
+        buttonLayout = getMap("buttonLayout")?.buttonLayoutFromMap(assetManager),
+        backgroundColor = getString("backgroundColorHex")?.deserializeColor(),
+        overlayColor = getString("overlayColorHex")?.deserializeColor(),
+        cornerRadius = getIntOrNull("cornerRadius")
+    )
+}
+
+internal fun ReadableMap.headerImageFromMap(): HeaderImageSettings? {
+    val isHidden = getBooleanOrNull("isHidden") ?: false
+    if (isHidden) {
+        return HeaderImageSettings.Hidden
+    }
+
+    val image = getMap("image")?.usercentricsImageFromMap() ?: return null
+
+    val isExtended = getBooleanOrNull("isExtended") ?: false
+    return if (isExtended) {
+        HeaderImageSettings.ExtendedLogoSettings(image)
+    } else {
+        HeaderImageSettings.LogoSettings(
+            image = image,
+            alignment = getString("alignment")?.sectionAlignmentFromMap(),
+            heightInDp = getDoubleOrNull("height")?.toFloat()
+        )
+    }
+}
+
+internal fun ReadableMap.titleFromMap(assetManager: AssetManager): TitleSettings {
+    val font = getMap("font")?.usercentricsFontFromMap(assetManager)
+    return TitleSettings(
+        alignment = getString("alignment")?.sectionAlignmentFromMap(),
+        textColor = getString("textColorHex")?.deserializeColor(),
+        font = font?.font,
+        textSizeInSp = font?.sizeInSp
+    )
+}
+
+internal fun ReadableMap.messageFromMap(assetManager: AssetManager): MessageSettings {
+    val font = getMap("font")?.usercentricsFontFromMap(assetManager)
+
+    return MessageSettings(
+        font = font?.font,
+        textSizeInSp = font?.sizeInSp,
+        textColor = getString("textColorHex")?.deserializeColor(),
+        alignment = getString("alignment")?.sectionAlignmentFromMap(),
+        linkTextColor = getString("linkTextColorHex")?.deserializeColor(),
+        underlineLink = getBooleanOrNull("linkTextUnderline")
+    )
+}
+
+internal fun String.sectionAlignmentFromMap(): SectionAlignment {
+    return SectionAlignment.valueOf(this)
+}
+
+internal fun ReadableMap.buttonLayoutFromMap(
+    assetManager: AssetManager
+): ButtonLayout? {
+    val layout = getString("layout")
+    val buttons: List<List<ButtonSettings>> = getArray("buttons")?.let { buttonsArray ->
+        val buttonsList: MutableList<List<ButtonSettings>> = mutableListOf()
+
+        for (rowIndex in 0 until buttonsArray.size()) {
+            val listRow = mutableListOf<ButtonSettings>()
+            val row = buttonsArray.getArray(rowIndex)
+            for (rowElement in 0 until row.size()) {
+                val element = row.getMap(rowElement)
+                listRow.add(element.buttonSettingsFromMap(assetManager))
+            }
+            buttonsList.add(listRow)
+        }
+
+        return@let buttonsList.toList()
+    } ?: listOf()
+
+    when (layout) {
+        "ROW" -> {
+            return ButtonLayout.Row(
+                buttons.flatten()
+            )
+        }
+        "COLUMN" -> {
+            return ButtonLayout.Column(
+                buttons.flatten()
+            )
+        }
+        "GRID" -> {
+            return ButtonLayout.Grid(
+                buttons
+            )
+        }
+    }
+
+    return null
+}
+
+internal fun ReadableMap.buttonSettingsFromMap(
+    assetManager: AssetManager
+): ButtonSettings {
+    val font = getMap("font")?.usercentricsFontFromMap(assetManager)
+    return ButtonSettings(
+        type = getString("buttonType")!!.deserializeButtonType(),
+        isAllCaps = getBooleanOrNull("isAllCaps"),
+        font = font?.font,
+        textColor = getString("textColorHex")?.deserializeColor(),
+        backgroundColor = getString("backgroundColorHex")?.deserializeColor(),
+        cornerRadius = getIntOrNull("cornerRadius"),
+        textSizeInSp = font?.sizeInSp
+    )
+}
+
+internal fun String.deserializeButtonType(): ButtonType {
+    return ButtonType.valueOf(this)
+}
+
+@ColorInt
+internal fun String.deserializeColor(): Int? {
+    val colorString: String =
+        if (!this.startsWith("#")) {
+            "#$this"
+        } else {
+            this
+        }
+
+    return runCatching {
+        Color.parseColor(colorString)
+    }.getOrNull()
+}

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

@@ -93,5 +93,6 @@ private fun TCFVendor.serialize(): WritableMap {
 //        "deviceStorage" to deviceStorage.serialize(),
         "usesCookies" to usesCookies,
         "cookieRefresh" to cookieRefresh,
+        "dataSharedOutsideEU" to dataSharedOutsideEU
     ).toWritableMap()
 }

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

@@ -1,8 +1,10 @@
 package com.usercentrics.reactnativeusercentrics.extensions
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
+import com.usercentrics.sdk.UsercentricsConsentHistoryEntry
 import com.usercentrics.sdk.UsercentricsServiceConsent
 
 internal fun List<UsercentricsServiceConsent>.toWritableArray(): WritableArray {
@@ -28,6 +30,25 @@ internal fun UsercentricsServiceConsent.toWritableMap(): WritableMap {
         }
         putString("version", version)
         putString("dataProcessor", dataProcessor)
+        putBoolean("isEssential", isEssential)
+        putArray("history", history.toWritableArray())
+    }
+}
+
+private fun List<UsercentricsConsentHistoryEntry>.toWritableArray(): ReadableArray? {
+    map {
+        Arguments.createMap().apply {
+            putBoolean("status", it.status)
+            putInt("type", it.type.ordinal)
+            putInt("timestampInMillis", it.timestampInMillis.toInt())
+        }
+    }.apply {
+        val array = Arguments.createArray()
+        forEach {
+            array.pushMap(it)
+        }
+
+        return array
     }
 }