@usercentrics/react-native-sdk 2.23.3 → 2.24.1

package/README.md

@@ -25,22 +25,22 @@ The Usercentrics Apps SDK is a native Consent Management Platform solution for m
 ## 📋 Requirements
 
 ### Mobile Platforms
-* **Android 5.0 (API 21)** or higher
+* **Android 7.0 (API 24)** or higher
 * **iOS 11** or higher
 
 ### Development Environment
 * **Node.js 18.0+** (LTS recommended)
 * **npm 9.0+** or **Yarn 1.22+**
 * **TypeScript 5.1+**
-* **React 18.2+**
+* **React 18.2+** (React 19 supported)
 * **React Native 0.74.3+** (with Fabric support)
 
 ### Android Development
 * **Java 17+** (OpenJDK or Oracle JDK)
-* **Android SDK** with API 33+ platforms
+* **Android SDK** with API 34+ platforms
 * **Android NDK 25+**
-* **Gradle 8.2+**
-* **Kotlin 1.9.22+**
+* **Gradle 8.2+** (Gradle 8.13 used)
+* **Kotlin 1.9.22+** (Kotlin 2.0.21 recommended)
 * **Android Gradle Plugin 8.2+**
 
 ### iOS Development (macOS only)

package/android/build-legacy.gradle

@@ -1,4 +1,4 @@
-def usercentrics_version = "2.23.3"
+def usercentrics_version = "2.24.1"
 version usercentrics_version
 
 buildscript {
@@ -78,4 +78,14 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
+}
+
+// Fix for Gradle task dependency issue with React Native autolinking
+// This ensures that packageReleaseResources task waits for generateReleaseResValues to complete
+afterEvaluate {
+    if (project.tasks.findByName("packageReleaseResources") && project.tasks.findByName(":usercentrics_react-native-sdk:generateReleaseResValues")) {
+        project.tasks.named("packageReleaseResources").configure {
+            dependsOn(":usercentrics_react-native-sdk:generateReleaseResValues")
+        }
+    }
 }

package/android/build.gradle.kts

@@ -1,10 +1,21 @@
+val usercentricsVersion = "2.24.1"
+val reactNativeVersion = "+"
+
+fun BooleanProperty(name: String): Boolean {
+    return project.hasProperty(name) && project.property(name) == "true"
+}
+
+val isNewArchitectureEnabled = BooleanProperty("newArchEnabled")
+val isHermesEnabled = BooleanProperty("hermesEnabled")
+
 plugins {
     id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    id("kotlin-android")
 }
 
-val usercentricsVersion = "2.23.3"
-val reactNativeVersion = "0.79.6"
+if (isNewArchitectureEnabled) {
+    apply(plugin = "com.facebook.react")
+}
 
 android {
     namespace = "com.usercentrics.reactnative"
@@ -16,15 +27,14 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("proguard-rules.pro")
 
-        val isNewArchEnabled = project.findProperty("newArchEnabled") == "true"
-        val isHermesEnabled = project.findProperty("hermesEnabled") == "true"
-        
-        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchEnabled.toString())
+        // BuildConfig flags
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString())
         buildConfigField("boolean", "IS_HERMES_ENABLED", isHermesEnabled.toString())
-        
+
         ndk {
             abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
         }
+
     }
 
     compileOptions {
@@ -35,14 +45,12 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 
     sourceSets {
-        getByName("main").java.srcDirs("src/main/kotlin")
+        getByName("main").java.srcDirs(
+            "src/main/kotlin",
+            "$buildDir/generated/codegen/NativeModules"
+        )
     }
 
     buildFeatures {
@@ -54,23 +62,33 @@ android {
             useLegacyPackaging = false
         }
     }
+
 }
 
 dependencies {
     implementation("com.facebook.react:react-android:$reactNativeVersion")
     implementation("com.usercentrics.sdk:usercentrics-ui:$usercentricsVersion")
 
-    // Unit tests (JVM)
+    // Unit tests
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.mockk:mockk:1.13.12")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
-    testImplementation("com.facebook.react:react-android:$reactNativeVersion")
 
-    // Instrumented tests (Android)
+    // Instrumented tests
     androidTestImplementation("com.facebook.react:react-android:$reactNativeVersion")
     androidTestImplementation("io.mockk:mockk-android:1.12.0")
     androidTestImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
     androidTestImplementation("androidx.test:runner:1.4.0")
     androidTestImplementation("androidx.test:rules:1.4.0")
+}
+
+// Fix for Gradle task dependency issue with React Native autolinking
+// This ensures that packageReleaseResources task waits for generateReleaseResValues to complete
+afterEvaluate {
+    if (project.tasks.findByName("packageReleaseResources") != null && project.tasks.findByName(":usercentrics_react-native-sdk:generateReleaseResValues") != null) {
+        project.tasks.named("packageReleaseResources").configure {
+            dependsOn(":usercentrics_react-native-sdk:generateReleaseResValues")
+        }
+    }
 }

package/android/gradle.properties

@@ -2,6 +2,4 @@ org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
 
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
-
-hermesEnabled=true
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64

package/android/src/main/java/com/usercentrics/reactnative/RNUsercentricsPackage.kt

@@ -1,22 +1,51 @@
 package com.usercentrics.reactnative
 
-import com.facebook.react.ReactPackage
+import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModuleList
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
-import com.facebook.react.turbomodule.core.interfaces.TurboModule
 import com.usercentrics.reactnative.api.UsercentricsProxyImpl
 
-class RNUsercentricsPackage : ReactPackage {
+@ReactModuleList(
+    nativeModules = [
+        RNUsercentricsModule::class,
+    ],
+)
+class RNUsercentricsPackage : TurboReactPackage() {
 
     private val usercentricsProxy = UsercentricsProxyImpl()
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): MutableList<ViewManager<*, *>> {
-        return mutableListOf()
+    override fun getModule(s: String, reactApplicationContext: ReactApplicationContext): NativeModule? {
+        when (s) {
+            RNUsercentricsModule.NAME -> {
+                val reactContextProvider = ReactContextProviderImpl(reactApplicationContext)
+                return RNUsercentricsModule(reactApplicationContext, usercentricsProxy, reactContextProvider)
+            }
+        }
+        return null
     }
 
-    override fun createNativeModules(reactContext: ReactApplicationContext): MutableList<NativeModule> {
-        val reactContextProvider = ReactContextProviderImpl(reactContext)
-        return mutableListOf(RNUsercentricsModule(reactContext, usercentricsProxy, reactContextProvider))
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
+        ReactModuleInfoProvider {
+            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+            val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+            moduleInfos[RNUsercentricsModule.NAME] =
+                ReactModuleInfo(
+                    RNUsercentricsModule.NAME,
+                    RNUsercentricsModule.NAME,
+                    false, // canOverrideExistingModule
+                    false, // needsEagerInit
+                    true, // hasConstants
+                    false, // isCxxModule
+                    isTurboModule,
+                )
+            moduleInfos
+        }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return emptyList()
     }
 }

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,85 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+# Set library name
+set(LIB_TARGET_NAME react_codegen_RNUsercentricsModule)
+
+# Add compile options
+add_compile_options(
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+  -Wpedantic
+  -Wno-gnu-zero-variadic-macro-arguments
+  -Wno-dollar-in-identifier-extension
+)
+
+# Find source files
+file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp)
+
+# Create the library
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED
+  ${LIB_CUSTOM_SRCS}
+)
+
+# Include directories
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC
+  .
+)
+
+# Link libraries based on React Native version
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
+else()
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    folly_runtime
+    glog
+    jsi
+    react_codegen_rncore
+    react_debug
+    react_nativemodule_core
+    react_render_core
+    react_render_debug
+    react_render_graphics
+    react_render_mapbuffer
+    react_render_componentregistry
+    react_utils
+    rrc_view
+    turbomodulejsijni
+    yoga
+  )
+endif()
+
+# Compile options based on React Native version
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+  target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)
+else()
+  target_compile_options(
+    ${LIB_TARGET_NAME}
+    PRIVATE
+    -DLOG_TAG=\"ReactNative\"
+    -fexceptions
+    -frtti
+    -std=c++20
+    -Wall
+  )
+endif()
+
+# Additional include directories
+target_include_directories(
+ ${CMAKE_PROJECT_NAME}
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)

package/android/src/main/jni/RNUsercentricsModule.cpp

@@ -0,0 +1,21 @@
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> RNUsercentricsModule_ModuleProvider(
+    const std::string &moduleName,
+    const JavaTurboModule::InitParams &params) {
+  // This is a placeholder implementation
+  // The actual module is implemented in Java/Kotlin
+  return nullptr;
+}
+
+} // namespace react
+} // namespace facebook
+
+
+

package/android/src/main/jni/rn_usercentrics.cpp

@@ -0,0 +1,22 @@
+#include <jni.h>
+#include <jsi/jsi.h>
+#include <fbjni/fbjni.h>
+#include <ReactCommon/CallInvokerHolder.h>
+#include <ReactCommon/TurboModuleUtils.h>
+
+namespace facebook {
+namespace react {
+
+// This is a minimal C++ TurboModule bridge that delegates to the Kotlin implementation
+// The actual TurboModule implementation is in RNUsercentricsModule.kt
+
+extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+    return facebook::jni::initialize(vm, [] {
+        // No additional initialization needed
+        // The Kotlin TurboModule will be loaded via TurboReactPackage
+    });
+}
+
+} // namespace react
+} // namespace facebook
+

package/ios/Extensions/UsercentricsOptions+Dict.swift

@@ -33,7 +33,7 @@ public extension UsercentricsOptions {
             options.networkMode = NetworkMode.initialize(from: networkModeValue)
         }
 
-        if let consentMediationValue = dictionary["networkMode"] as? Bool {
+        if let consentMediationValue = dictionary["consentMediation"] as? Bool {
             options.consentMediation = consentMediationValue
         }
         

package/lib/NativeUsercentrics.d.ts

@@ -1,5 +1,6 @@
+import { TurboModule } from 'react-native';
 import type { UsercentricsOptions, UsercentricsReadyStatus, BannerSettings, UsercentricsConsentUserResponse, UsercentricsServiceConsent, UsercentricsCMPData, AdditionalConsentModeData, TCFData, CCPAData, UserDecision, TCFUserDecisions } from './models';
-export interface Spec {
+export interface Spec extends TurboModule {
     configure(options: UsercentricsOptions): void;
     isReady(): Promise<UsercentricsReadyStatus>;
     showFirstLayer(options?: BannerSettings): Promise<UsercentricsConsentUserResponse>;

package/lib/NativeUsercentrics.js

@@ -1,5 +1,6 @@
-import { NativeModules } from 'react-native';
-const { RNUsercentricsModule } = NativeModules;
+import { NativeModules, TurboModuleRegistry } from 'react-native';
+// Try to get TurboModule first, fallback to NativeModule
+const RNUsercentricsModule = TurboModuleRegistry.get('RNUsercentricsModule') || NativeModules.RNUsercentricsModule;
 if (!RNUsercentricsModule) {
     throw new Error('Usercentrics React Native SDK: Native module not found. ' +
         'Make sure the SDK is properly installed and linked. ' +

package/lib/NativeUsercentrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeUsercentrics.js","sourceRoot":"","sources":["../src/NativeUsercentrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA8D7C,MAAM,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC;AAE/C,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC1B,MAAM,IAAI,KAAK,CACb,0DAA0D;QAC1D,sDAAsD;QACtD,wCAAwC;QACxC,0DAA0D,CAC3D,CAAC;AACJ,CAAC;AAED,eAAe,oBAA4B,CAAC"}
+{"version":3,"file":"NativeUsercentrics.js","sourceRoot":"","sources":["../src/NativeUsercentrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AA8D/E,yDAAyD;AACzD,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,GAAG,CAAO,sBAAsB,CAAC,IAAI,aAAa,CAAC,oBAAoB,CAAC;AAEzH,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC1B,MAAM,IAAI,KAAK,CACb,0DAA0D;QAC1D,sDAAsD;QACtD,wCAAwC;QACxC,0DAA0D,CAC3D,CAAC;AACJ,CAAC;AAED,eAAe,oBAA4B,CAAC"}

package/lib/fabric/NativeUsercentricsModule.d.ts

@@ -0,0 +1,30 @@
+import type { TurboModule } from 'react-native';
+export interface Spec extends TurboModule {
+    configure(options: Object): void;
+    isReady(): Promise<Object>;
+    showFirstLayer(options?: Object): Promise<Object>;
+    showSecondLayer(options?: Object): Promise<Object>;
+    restoreUserSession(controllerId: string): Promise<Object>;
+    getControllerId(): Promise<string>;
+    clearUserSession(): Promise<Object>;
+    getConsents(): Promise<Array<Object>>;
+    getCMPData(): Promise<Object>;
+    getAdditionalConsentModeData(): Promise<Object>;
+    getTCFData(): Promise<Object>;
+    getUserSessionData(): Promise<string>;
+    getUSPData(): Promise<Object>;
+    getABTestingVariant(): Promise<string>;
+    setCMPId(id: number): void;
+    setABTestingVariant(variant: string): void;
+    changeLanguage(language: string): Promise<void>;
+    acceptAll(consentType: number): Promise<Array<Object>>;
+    acceptAllForTCF(fromLayer: number, consentType: number): Promise<Array<Object>>;
+    denyAll(consentType: number): Promise<Array<Object>>;
+    denyAllForTCF(fromLayer: number, consentType: number): Promise<Array<Object>>;
+    saveDecisions(decisions: Array<Object>, consentType: number): Promise<Array<Object>>;
+    saveDecisionsForTCF(tcfDecisions: Object, fromLayer: number, saveDecisions: Array<Object>, consentType: number): Promise<Array<Object>>;
+    saveOptOutForCCPA(isOptedOut: boolean, consentType: number): Promise<Array<Object>>;
+    track(event: number): void;
+}
+declare const _default: Spec | null;
+export default _default;

package/lib/fabric/NativeUsercentricsModule.js

@@ -0,0 +1,3 @@
+import { TurboModuleRegistry } from 'react-native';
+export default TurboModuleRegistry.get('RNUsercentricsModule');
+//# sourceMappingURL=NativeUsercentricsModule.js.map

package/lib/fabric/NativeUsercentricsModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeUsercentricsModule.js","sourceRoot":"","sources":["../../src/fabric/NativeUsercentricsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAiDnD,eAAe,mBAAmB,CAAC,GAAG,CAAO,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "@usercentrics/react-native-sdk",
-  "version": "2.23.3",
+  "version": "2.24.1",
   "description": "Usercentrics SDK",
   "homepage": "https://usercentrics.com",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "Usercentrics <developer@usercentrics.com>",
   "iosPackageName": "react-native-usercentrics",
-  "iosPackageVersion": "2.23.3",
+  "iosPackageVersion": "2.24.1",
   "license": "SEE LICENSE IN LICENSE",
   "files": [
     "android",
     "ios",
     "lib",
+    "src",
     "react-native-usercentrics.podspec",
-    "!android/build",
+    "react-native.config.js",
     "!.DS_Store",
     "!.gradle",
     "!.idea",
@@ -39,7 +40,9 @@
     "run-android": "./scripts/run-android.sh",
     "check-requirements": "./scripts/check-requirements.sh",
     "auto-setup": "./scripts/auto-setup.sh",
-    "publish-local": "./scripts/publish-local.sh"
+    "publish-local": "./scripts/publish-local.sh",
+    "prepublishOnly": "node scripts/generate-codegen-jni.js",
+    "pack:local": "node scripts/generate-codegen-jni.js && npm pack"
   },
   "devDependencies": {
     "@babel/core": "^7.25.10",
@@ -96,5 +99,13 @@
     "react-native-safe-area-context": "^5.6.1",
     "react-native-screens": "^4.16.0",
     "react-native-webview": "^13.16.0"
+  },
+  "codegenConfig": {
+    "name": "RNUsercentricsModule",
+    "type": "all",
+    "jsSrcsDir": "./src/fabric",
+    "android": {
+      "javaPackageName": "com.usercentrics.reactnative"
+    }
   }
 }

package/react-native.config.js

@@ -0,0 +1,15 @@
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        sourceDir: './android',
+        packageImportPath: 'import com.usercentrics.reactnative.RNUsercentricsPackage;',
+        packageInstance: 'new RNUsercentricsPackage()',
+        componentDescriptors: []
+      },
+      ios: {
+        sourceDir: './ios',
+      },
+    },
+  },
+};

package/src/NativeUsercentrics.ts

@@ -0,0 +1,75 @@
+import { NativeModules, TurboModuleRegistry, TurboModule } from 'react-native';
+import type {
+  UsercentricsOptions,
+  UsercentricsReadyStatus,
+  BannerSettings,
+  UsercentricsConsentUserResponse,
+  UsercentricsServiceConsent,
+  UsercentricsCMPData,
+  AdditionalConsentModeData,
+  TCFData,
+  CCPAData,
+  UserDecision,
+  TCFUserDecisions,
+} from './models';
+
+export interface Spec extends TurboModule {
+  // Configuration
+  configure(options: UsercentricsOptions): void;
+  isReady(): Promise<UsercentricsReadyStatus>;
+
+  // UI Methods
+  showFirstLayer(options?: BannerSettings): Promise<UsercentricsConsentUserResponse>;
+  showSecondLayer(options?: BannerSettings): Promise<UsercentricsConsentUserResponse>;
+
+  // Session Management
+  restoreUserSession(controllerId: string): Promise<UsercentricsReadyStatus>;
+  getControllerId(): Promise<string>;
+  clearUserSession(): Promise<UsercentricsReadyStatus>;
+
+  // Data Retrieval
+  getConsents(): Promise<Array<UsercentricsServiceConsent>>;
+  getCMPData(): Promise<UsercentricsCMPData>;
+  getAdditionalConsentModeData(): Promise<AdditionalConsentModeData>;
+  getTCFData(): Promise<TCFData>;
+  getUserSessionData(): Promise<string>;
+  getUSPData(): Promise<CCPAData>;
+  getABTestingVariant(): Promise<string>;
+
+  // Configuration Setters
+  setCMPId(id: number): void;
+  setABTestingVariant(variant: string): void;
+  changeLanguage(language: string): Promise<void>;
+
+  // Consent Actions
+  acceptAll(consentType: number): Promise<Array<UsercentricsServiceConsent>>;
+  acceptAllForTCF(fromLayer: number, consentType: number): Promise<Array<UsercentricsServiceConsent>>;
+  denyAll(consentType: number): Promise<Array<UsercentricsServiceConsent>>;
+  denyAllForTCF(fromLayer: number, consentType: number): Promise<Array<UsercentricsServiceConsent>>;
+  
+  saveDecisions(decisions: Array<UserDecision>, consentType: number): Promise<Array<UsercentricsServiceConsent>>;
+  saveDecisionsForTCF(
+    tcfDecisions: TCFUserDecisions,
+    fromLayer: number,
+    saveDecisions: Array<UserDecision>,
+    consentType: number
+  ): Promise<Array<UsercentricsServiceConsent>>;
+  saveOptOutForCCPA(isOptedOut: boolean, consentType: number): Promise<Array<UsercentricsServiceConsent>>;
+
+  // Analytics
+  track(event: number): void;
+}
+
+// Try to get TurboModule first, fallback to NativeModule
+const RNUsercentricsModule = TurboModuleRegistry.get<Spec>('RNUsercentricsModule') || NativeModules.RNUsercentricsModule;
+
+if (!RNUsercentricsModule) {
+  throw new Error(
+    'Usercentrics React Native SDK: Native module not found. ' +
+    'Make sure the SDK is properly installed and linked. ' +
+    'For iOS, run "cd ios && pod install". ' +
+    'For Android, make sure autolinking is working correctly.'
+  );
+}
+
+export default RNUsercentricsModule as Spec;