fix(rokt): align session support and URL validation

Author: thomson-t

.trunk/trunk.yaml

@@ -43,14 +43,12 @@ lint:
     - dotenv-linter@3.3.0
     # ESLint 9+ defaults to flat config only; this repo uses .eslintrc.js (ESLint 8 style).
     # Trunk runs ESLint in an isolated env without the repo's node_modules; bundle the same
-    # plugins/parser as package.json plus the sample app config/plugins so ESLint resolves in CI.
-    - eslint@8.57.0:
+    # plugins/parser as package.json so @typescript-eslint/* resolves (CI + local).
+    - eslint@8.57.1:
         packages:
-          - '@react-native/eslint-config@0.84.0'
-          - '@typescript-eslint/eslint-plugin@8.56.1'
-          - '@typescript-eslint/parser@8.56.1'
+          - '@typescript-eslint/eslint-plugin@5.62.0'
+          - '@typescript-eslint/parser@5.62.0'
           - 'eslint-config-prettier@8.10.0'
-          - 'eslint-plugin-jest@29.15.0'
           - 'eslint-plugin-prettier@4.2.1'
     - git-diff-check
     - ktlint@0.43.2

ExpoTestApp/README.md

@@ -99,6 +99,9 @@ The Rokt section also demonstrates:
 - Rokt event listeners for callbacks and placement events
 - Using `RoktLayoutView` as an embedded placeholder component
 
+On Android, the Rokt session APIs require `android-core` and
+`android-rokt-kit` `5.77.0` or newer.
+
 ### Implementation guide: Shoppable Ads (`selectShoppableAds`)
 
 Use `MParticle.Rokt.selectShoppableAds(identifier, attributes, roktConfig?)` when you need the Shoppable Ads experience instead of `selectPlacements`.

MIGRATING.md

@@ -31,8 +31,8 @@ MParticle.Rokt.getSessionId(): Promise<string | null>
 ```
 
 `close()` is supported on iOS and Android. Session APIs are backed by the iOS
-mParticle Rokt kit; Android currently resolves safely without changing the
-session until the Android mParticle Rokt kit exposes equivalent public APIs.
+mParticle Rokt kit. On Android, apps that use these session APIs must use
+`android-core` and `android-rokt-kit` `5.77.0` or newer.
 
 ### Expo Config Plugin
 

README.md

@@ -292,6 +292,10 @@ In Expo apps, use `iosKits: ["mParticle-Rokt"]` for standard Rokt placements. Th
 
 See [MIGRATING.md](./MIGRATING.md) for release-specific migration guidance.
 
+For Android integrations that use `MParticle.Rokt.setSessionId()` or
+`MParticle.Rokt.getSessionId()`, `android-core` and `android-rokt-kit`
+`5.77.0` or newer are required.
+
 See [Identity](http://docs.mparticle.com/developers/sdk/ios/identity/) for more information on supplying an `MPIdentityApiRequest` object during SDK initialization.
 
 4. Remember to start Metro with:

android/src/main/java/com/mparticle/react/rokt/MPRoktModuleImpl.kt

@@ -66,13 +66,12 @@ class MPRoktModuleImpl(
         sessionId: String,
         promise: Promise,
     ) {
-        Logger.warning("setSessionId is not supported on Android")
+        MParticle.getInstance()?.Rokt()?.setSessionId(sessionId)
         promise.resolve(null)
     }
 
     fun getSessionId(promise: Promise) {
-        Logger.warning("getSessionId is not supported on Android")
-        promise.resolve(null)
+        promise.resolve(MParticle.getInstance()?.Rokt()?.getSessionId())
     }
 
     fun setRoktEventHandler(roktEventHandler: MpRoktEventCallback) {

ios/RNMParticle/RNMPRokt.mm

@@ -213,52 +213,55 @@ - (void)selectShoppableAds:(NSString *)identifier
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)close:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
-    [self closeWithResolve:resolve reject:reject];
+    (void)reject;
+    [self closeWithResolve:resolve];
 }
 
 - (void)setSessionId:(NSString *)sessionId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
-    [self setSessionIdWithString:sessionId resolve:resolve reject:reject];
+    (void)reject;
+    [self setSessionIdWithString:sessionId resolve:resolve];
 }
 
 - (void)getSessionId:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
-    [self getSessionIdWithResolve:resolve reject:reject];
+    (void)reject;
+    [self getSessionIdWithResolve:resolve];
 }
 #else
 RCT_EXPORT_METHOD(close:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [self closeWithResolve:resolve reject:reject];
+    (void)reject;
+    [self closeWithResolve:resolve];
 }
 
 RCT_EXPORT_METHOD(setSessionId:(NSString *)sessionId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [self setSessionIdWithString:sessionId resolve:resolve reject:reject];
+    (void)reject;
+    [self setSessionIdWithString:sessionId resolve:resolve];
 }
 
 RCT_EXPORT_METHOD(getSessionId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [self getSessionIdWithResolve:resolve reject:reject];
+    (void)reject;
+    [self getSessionIdWithResolve:resolve];
 }
 #endif
 
 - (void)closeWithResolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject
 {
     [[[MParticle sharedInstance] rokt] close];
     resolve(nil);
 }
 
 - (void)setSessionIdWithString:(NSString *)sessionId
                        resolve:(RCTPromiseResolveBlock)resolve
-                        reject:(RCTPromiseRejectBlock)reject
 {
     [[[MParticle sharedInstance] rokt] setSessionId:sessionId ?: @""];
     resolve(nil);
 }
 
 - (void)getSessionIdWithResolve:(RCTPromiseResolveBlock)resolve
-                         reject:(RCTPromiseRejectBlock)reject
 {
     NSString *sessionId = [[[MParticle sharedInstance] rokt] getSessionId];
     resolve(sessionId ?: [NSNull null]);

plugin/src/withMParticleIOS.ts

@@ -97,7 +97,19 @@ function getIOSCustomBaseURL(props: MParticlePluginProps): string | null {
     return null;
   }
 
-  if (!/^https:\/\/[^\s]+$/.test(customBaseURL)) {
+  let parsedCustomBaseURL: URL;
+  try {
+    parsedCustomBaseURL = new URL(customBaseURL);
+  } catch {
+    throw new Error(
+      'react-native-mparticle iosCustomBaseURL must be a valid https URL'
+    );
+  }
+
+  if (
+    parsedCustomBaseURL.protocol !== 'https:' ||
+    !parsedCustomBaseURL.hostname
+  ) {
     throw new Error(
       'react-native-mparticle iosCustomBaseURL must be a valid https URL'
     );

sample/README.md

@@ -70,7 +70,10 @@ The sample Podfile pins the standard Rokt kit with:
 pod 'mParticle-Rokt', '~> 9.2'
 ```
 
-The sample app includes buttons for Rokt close/session APIs. Payment-extension installation and native URL callback forwarding are not configured in this release.
+The sample Android app pins `com.mparticle:android-core` and
+`com.mparticle:android-rokt-kit` to `5.78.5` so the Rokt session APIs work on
+Android. Payment-extension installation and native URL callback forwarding are
+not configured in this release.
 
 ## Running the Sample App
 

sample/android/app/build.gradle

@@ -110,8 +110,8 @@ android {
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
-    implementation("com.mparticle:android-core:5.76.1")
-    implementation("com.mparticle:android-rokt-kit:5.76.1")
+    implementation("com.mparticle:android-core:5.78.5")
+    implementation("com.mparticle:android-rokt-kit:5.78.5")
 
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")