react-native-persona 2.32.1 → 2.32.2

package/RNPersonaInquiry2.podspec

@@ -2,7 +2,7 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-persona_sdk_version = '2.41.2'
+persona_sdk_version = '2.41.3'
 
 Pod::Spec.new do |s|
   s.name          = 'RNPersonaInquiry2'

package/android/build.gradle

@@ -3,6 +3,8 @@ def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 35
 
 buildscript {
+    ext.kotlin_version = '2.1.21'
+
     if (project == rootProject) {
         repositories {
             google()
@@ -11,11 +13,13 @@ buildscript {
 
         dependencies {
             classpath 'com.android.tools.build:gradle:8.1.1'
+            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         }
     }
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -40,8 +44,11 @@ android {
         disable 'GradleCompatible'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
     }
     dexOptions {
         preDexLibraries = false
@@ -65,6 +72,9 @@ dependencies {
     implementation("com.facebook.react:react-android:+")
 
     // NB: be sure to bump `nfc-impl` in example/android/app/build.gradle as well
-    implementation 'com.withpersona.sdk2:inquiry:2.32.1'
+    implementation 'com.withpersona.sdk2:inquiry:2.32.2'
     implementation("androidx.fragment:fragment:1.8.6")
+
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

package/android/src/main/java/com/withpersona/sdk2/reactnative/InlineInquiryWrapperFragment.kt

@@ -0,0 +1,103 @@
+package com.withpersona.sdk2.reactnative
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.withpersona.sdk2.inquiry.ExperimentalInlineApi
+import com.withpersona.sdk2.inquiry.inline_inquiry.InlineInquiryController
+import com.withpersona.sdk2.inquiry.inline_inquiry.InlineInquiryScreen
+import com.withpersona.sdk2.inquiry.types.DEFAULT_REQUEST_KEY
+import kotlinx.coroutines.launch
+
+/**
+ * Wrapper fragment that acts as a parent for [InquiryFragment] and implements
+ * [InlineInquiryController] to receive event callbacks from the child [InquiryFragment].
+ */
+@OptIn(ExperimentalInlineApi::class)
+class InlineInquiryWrapperFragment : Fragment(), InlineInquiryController {
+
+    companion object {
+        private const val ARG_REQUEST_KEY = "pi2_rn_request_key"
+
+        const val ARG_EVENT = "pi2_rn_event"
+
+        fun newInstance(
+            requestKey: String,
+            inquiryFragment: Fragment,
+        ): InlineInquiryWrapperFragment = InlineInquiryWrapperFragment().apply {
+            arguments = Bundle().apply {
+                putString(ARG_REQUEST_KEY, requestKey)
+            }
+
+            // This is a hack in order to let InlineInquiryWrapperFragment launch the InquiryFragment.
+            // This is very difficult to do without code changes to the SDK side. This hack should
+            // not cause any issues since the fragment should only need to be launched once.
+            // On kill/restore, the fragment state should be saved by the fragment manager.
+            this.inquiryFragment = inquiryFragment
+        }
+    }
+
+    private var inlineInquiryScreen: InlineInquiryScreen? = null
+    private var inquiryFragment: Fragment? = null
+    private var requestKey: String? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return FrameLayout(requireContext()).apply {
+            id = R.id.pi2_rn_wrapper_fragment_frame_layout
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+            )
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        requestKey = arguments?.getString(ARG_REQUEST_KEY)
+
+        childFragmentManager.setFragmentResultListener(DEFAULT_REQUEST_KEY, viewLifecycleOwner) { _, result ->
+            parentFragmentManager.setFragmentResult(DEFAULT_REQUEST_KEY, result)
+        }
+
+        // Only add the fragment on first launch. On save/restore, the fragment manager should
+        // restore the fragment for us.
+        if (savedInstanceState == null) {
+            inquiryFragment?.let { fragment ->
+                childFragmentManager
+                    .beginTransaction()
+                    .add(R.id.pi2_rn_wrapper_fragment_frame_layout, fragment)
+                    .commit()
+            }
+        }
+    }
+
+    override fun onAttached(inlineInquiryScreen: InlineInquiryScreen) {
+        this.inlineInquiryScreen = inlineInquiryScreen
+        viewLifecycleOwner.lifecycleScope.launch {
+            inlineInquiryScreen.eventFlow.collect {
+                val requestKey = requestKey
+                if (requestKey != null) {
+                    parentFragmentManager.setFragmentResult(
+                        requestKey,
+                        Bundle().apply {
+                            putParcelable(ARG_EVENT, it)
+                        }
+                    )
+                }
+            }
+        }
+    }
+
+    override fun onDetached() {
+        inlineInquiryScreen = null
+    }
+}

package/android/src/main/java/com/withpersona/sdk2/reactnative/InquiryEventEmitter.kt

@@ -0,0 +1,25 @@
+package com.withpersona.sdk2.reactnative
+
+import com.facebook.react.bridge.Arguments.createMap
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.events.RCTEventEmitter
+import com.withpersona.sdk2.inquiry.ExperimentalInlineApi
+import com.withpersona.sdk2.inquiry.inline_inquiry.InquiryEvent
+
+class InquiryEventEmitter(
+    private val reactContext: ReactContext,
+    private val targetId: Int,
+) {
+
+    @OptIn(ExperimentalInlineApi::class)
+    fun emitEvent(inquiryEvent: InquiryEvent) {
+        val map = InquiryUtils.inquiryEventToMap(inquiryEvent)
+
+        if (map != null) {
+            val params = createMap()
+            params.putMap("event", map)
+            reactContext.getJSModule<RCTEventEmitter?>(RCTEventEmitter::class.java)
+                .receiveEvent(targetId, "onEvent", params)
+        }
+    }
+}

package/android/src/main/java/com/withpersona/sdk2/reactnative/{InquiryEventEmitter.java → InquiryResultEmitter.java}

@@ -18,10 +18,10 @@ import com.withpersona.sdk2.inquiry.InquiryResponse;
 
 import java.util.Map;
 
-public class InquiryEventEmitter {
+public class InquiryResultEmitter {
     @NonNull private final ReactContext reactContext;
 
-    public InquiryEventEmitter(@NonNull ReactContext reactContext) {
+    public InquiryResultEmitter(@NonNull ReactContext reactContext) {
         this.reactContext = reactContext;
     }
 

package/android/src/main/java/com/withpersona/sdk2/reactnative/InquiryUtils.java

@@ -1,6 +1,8 @@
 package com.withpersona.sdk2.reactnative;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableArray;
@@ -9,12 +11,14 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.withpersona.sdk2.inquiry.ClientThemeSource;
 import com.withpersona.sdk2.inquiry.Environment;
+import com.withpersona.sdk2.inquiry.ExperimentalInlineApi;
 import com.withpersona.sdk2.inquiry.Fields;
 import com.withpersona.sdk2.inquiry.Inquiry;
 import com.withpersona.sdk2.inquiry.InquiryBuilder;
 import com.withpersona.sdk2.inquiry.InquiryTemplateBuilder;
 import com.withpersona.sdk2.inquiry.ServerThemeSource;
 import com.withpersona.sdk2.inquiry.StyleVariant;
+import com.withpersona.sdk2.inquiry.inline_inquiry.InquiryEvent;
 import com.withpersona.sdk2.inquiry.types.collected_data.CollectedData;
 import com.withpersona.sdk2.inquiry.types.collected_data.DocumentFile;
 import com.withpersona.sdk2.inquiry.types.collected_data.GovernmentIdCapture;
@@ -260,6 +264,28 @@ class InquiryUtils {
         return collectedDataMap;
     }
 
+    @OptIn(markerClass = ExperimentalInlineApi.class)
+    @Nullable
+    protected static ReadableMap inquiryEventToMap(@NonNull InquiryEvent inquiryEvent) {
+        WritableMap inquiryEventMap = Arguments.createMap();
+
+        if (inquiryEvent instanceof InquiryEvent.StartEvent) {
+            InquiryEvent.StartEvent start = (InquiryEvent.StartEvent) inquiryEvent;
+            inquiryEventMap.putString("type", "start");
+            inquiryEventMap.putString("inquiryId", start.getInquiryId());
+            inquiryEventMap.putString("sessionToken", start.getSessionToken());
+        } else if (inquiryEvent instanceof  InquiryEvent.PageChange) {
+            InquiryEvent.PageChange pageChange = (InquiryEvent.PageChange) inquiryEvent;
+            inquiryEventMap.putString("type", "page_change");
+            inquiryEventMap.putString("name", pageChange.getName());
+            inquiryEventMap.putString("path", pageChange.getPath());
+        } else {
+            return null;
+        }
+
+        return inquiryEventMap;
+    }
+
     private static Environment environmentFromString(@Nullable String environment) {
         if (environment == null) {
             return null;

package/android/src/main/java/com/withpersona/sdk2/reactnative/PersonaInquiryModule2.java

@@ -1,5 +1,7 @@
 package com.withpersona.sdk2.reactnative;
 
+import static com.withpersona.sdk2.reactnative.InquiryUtils.inquiryEventToMap;
+
 import android.app.Activity;
 import android.content.Intent;
 
@@ -60,7 +62,7 @@ public class PersonaInquiryModule2 extends ReactContextBaseJavaModule
     if (requestCode == PERSONA_INQUIRY_REQUEST_CODE) {
       InquiryResponse response = Inquiry.onActivityResult(data);
 
-      new InquiryEventEmitter(reactContext).emitResponse(response);
+      new InquiryResultEmitter(reactContext).emitResponse(response);
     }
   }
 
@@ -123,28 +125,6 @@ public class PersonaInquiryModule2 extends ReactContextBaseJavaModule
     });
   }
 
-  @OptIn(markerClass = ExperimentalInlineApi.class)
-  @Nullable
-  private ReadableMap inquiryEventToMap(@NonNull InquiryEvent inquiryEvent) {
-    WritableMap inquiryEventMap = Arguments.createMap();
-
-    if (inquiryEvent instanceof InquiryEvent.StartEvent) {
-      InquiryEvent.StartEvent start = (InquiryEvent.StartEvent) inquiryEvent;
-      inquiryEventMap.putString("type", "start");
-      inquiryEventMap.putString("inquiryId", start.getInquiryId());
-      inquiryEventMap.putString("sessionToken", start.getSessionToken());
-    } else if (inquiryEvent instanceof  InquiryEvent.PageChange) {
-      InquiryEvent.PageChange pageChange = (InquiryEvent.PageChange) inquiryEvent;
-      inquiryEventMap.putString("type", "page_change");
-      inquiryEventMap.putString("name", pageChange.getName());
-      inquiryEventMap.putString("path", pageChange.getPath());
-    } else {
-      return null;
-    }
-
-    return inquiryEventMap;
-  }
-
   @Nullable
   private DeviceEventManagerModule.RCTDeviceEventEmitter getJsModule() {
     try {

package/android/src/main/java/com/withpersona/sdk2/reactnative/PersonaInquiryViewManager.java

@@ -2,8 +2,8 @@ package com.withpersona.sdk2.reactnative;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static com.withpersona.sdk2.inquiry.types.ConstsKt.DEFAULT_REQUEST_KEY;
+import static com.withpersona.sdk2.reactnative.InlineInquiryWrapperFragment.ARG_EVENT;
 
-import android.graphics.Color;
 import android.view.Choreographer;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,7 +14,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
@@ -23,6 +22,7 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.withpersona.sdk2.inquiry.Inquiry;
 import com.withpersona.sdk2.inquiry.InquiryResponse;
+import com.withpersona.sdk2.inquiry.inline_inquiry.InquiryEvent;
 
 import java.util.Map;
 
@@ -107,6 +107,12 @@ class PersonaInquiryViewManager extends ViewGroupManager<FrameLayout> {
                                 "phasedRegistrationNames",
                                 MapBuilder.of("bubbled", "onError")
                         )
+                ).put(
+                        "onEvent",
+                        MapBuilder.of(
+                                "phasedRegistrationNames",
+                                MapBuilder.of("bubbled", "onEvent")
+                        )
                 ).build();
     }
 
@@ -131,12 +137,12 @@ class PersonaInquiryViewManager extends ViewGroupManager<FrameLayout> {
             return;
         }
 
-        Fragment fragment = inquiry
+        Fragment inquiryFragment = inquiry
                 .buildInlineInquiry()
                 .build()
                 .createFragment();
 
-        if (fragment == null) {
+        if (inquiryFragment == null) {
             return;
         }
 
@@ -146,15 +152,31 @@ class PersonaInquiryViewManager extends ViewGroupManager<FrameLayout> {
             return;
         }
 
+        final String requestKey = "pi2_rn_inquiry_" + reactNativeViewId;
+        InquiryEventEmitter inquiryEventEmitter = new InquiryEventEmitter(reactContext, root.getId());
+
         activity.getSupportFragmentManager()
-            .setFragmentResultListener(DEFAULT_REQUEST_KEY, activity, (requestKey, result) -> {
+            .setFragmentResultListener(DEFAULT_REQUEST_KEY, activity, (reqKey, result) -> {
                 InquiryResponse response = Inquiry.extractInquiryResponseFromBundle(result, reactContext);
-                new InquiryEventEmitter(reactContext).emitResponse(response, root);
+                new InquiryResultEmitter(reactContext).emitResponse(response, root);
             });
+        activity.getSupportFragmentManager()
+                .setFragmentResultListener(requestKey, activity,  (reqKey, result) -> {
+                    InquiryEvent event = result.getParcelable(ARG_EVENT);
+
+                    if (event != null) {
+                        inquiryEventEmitter.emitEvent(event);
+                    }
+                });
+
+        Fragment wrapperFragment = InlineInquiryWrapperFragment.Companion.newInstance(
+                requestKey,
+                inquiryFragment
+        );
 
         activity.getSupportFragmentManager()
                 .beginTransaction()
-                .replace(reactNativeViewId, fragment, String.valueOf(reactNativeViewId))
+                .replace(reactNativeViewId, wrapperFragment, String.valueOf(reactNativeViewId))
                 .commit();
         parentView.requestLayout();
     }

package/android/src/main/res/values/ids.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <item name="pi2_rn_inquiry_options" type="id" />
+    <item name="pi2_rn_wrapper_fragment_frame_layout" type="id" />
 </resources>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-persona",
   "title": "React Native Persona",
-  "version": "2.32.1",
+  "version": "2.32.2",
   "description": "Launch a mobile native implementation of the Persona inquiry flow from React Native.",
   "homepage": "https://docs.withpersona.com/docs/react-native-sdk-integration",
   "bugs": "https://github.com/persona-id/persona-inquiry-sdk-public",