Add use of capability access token

Add callback parameter to fetch provider information from the host app

Update breaking changes in the use of the v0.2.1 of module apis

Author: predatorx7

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.1
+
+- Updated breaking changes in the use of the v0.2.1 of module apis
+- Add use of capability access token
+- Add callback parameter to fetch provider information from the host app
+
 ## 0.1.7
 
 - Replace getDouble with getNumber for better type safety for numbers in android library

InappRnSdk.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/generated/**/*.h"
-  s.dependency "ReclaimInAppSdk"
+  s.dependency "ReclaimInAppSdk", "~> 0.2.1"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

README.md

@@ -59,7 +59,7 @@ add the following to the end of settings.gradle:
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     String flutterStorageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"
-    String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.1.2/repo"
+    String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.2.1/repo"
     repositories {
         google()
         mavenCentral()
@@ -78,7 +78,7 @@ or alternatively add the following repositories to the relevant repositories blo
 
 ```groovy
 String flutterStorageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"
-String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.1.2/repo"
+String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.2.1/repo"
 maven {
     url "$reclaimStorageUrl"
 }
@@ -108,13 +108,13 @@ Ignore if you already have this declaration in your `Podfile`.
 
 ```ruby
 # Cocoapods is the recommended way to install the SDK.
-pod 'ReclaimInAppSdk', '~> 0.1.4'
+pod 'ReclaimInAppSdk', '~> 0.2.1'
 ```
 
 ##### From a specific tag
 
 ```ruby
-pod 'ReclaimInAppSdk', :git => 'https://github.com/reclaimprotocol/reclaim-inapp-ios-sdk.git', :tag => '0.1.4'
+pod 'ReclaimInAppSdk', :git => 'https://github.com/reclaimprotocol/reclaim-inapp-ios-sdk.git', :tag => '0.2.1'
 ```
 
 ##### From git HEAD
@@ -126,7 +126,7 @@ pod 'ReclaimInAppSdk', :git => 'https://github.com/reclaimprotocol/reclaim-inapp
 ##### From a specific commit
 
 ```ruby
-pod 'ReclaimInAppSdk', :git => 'https://github.com/reclaimprotocol/reclaim-inapp-ios-sdk.git', :commit => '184d41628026768feb703dc7bb9a3d913c6b271e'
+pod 'ReclaimInAppSdk', :git => 'https://github.com/reclaimprotocol/reclaim-inapp-ios-sdk.git', :commit => 'eeb5a5484a5927217065e5c988fab8201cb2db2e'
 ```
 
 ##### From a specific branch
@@ -151,7 +151,7 @@ target 'InappRnSdkExample' do
   )
 
   # This is the line that you may need to add in your podfile.
-  pod 'ReclaimInAppSdk', '~> 0.1.4'
+  pod 'ReclaimInAppSdk', '~> 0.2.1'
 
   pre_install do |installer|
     system("cd ../../ && npx bob build --target codegen")

android/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['InappRnSdk_' + name]
   }
   String flutterStorageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"
-  String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.1.2/repo"
+  String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.2.1/repo"
   repositories {
     google()
     mavenCentral()
@@ -98,7 +98,7 @@ android {
 }
 
 String flutterStorageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"
-String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.1.2/repo"
+String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.2.1/repo"
 
 repositories {
   mavenCentral()
@@ -118,7 +118,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   //noinspection UseTomlInstead
-  implementation "org.reclaimprotocol:inapp_sdk:0.1.2"
+  implementation "org.reclaimprotocol:inapp_sdk:0.2.1"
 }
 
 if (isNewArchitectureEnabled()) {

android/src/main/java/com/reclaimprotocol/inapp_rn_sdk/InappRnSdkModule.kt

@@ -1,6 +1,5 @@
 package com.reclaimprotocol.inapp_rn_sdk
 
-import java.util.UUID
 import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
@@ -12,6 +11,7 @@ import com.facebook.react.module.annotations.ReactModule
 import org.reclaimprotocol.inapp_sdk.ReclaimOverrides
 import org.reclaimprotocol.inapp_sdk.ReclaimSessionStatus
 import org.reclaimprotocol.inapp_sdk.ReclaimVerification
+import java.util.UUID
 
 @ReactModule(name = InappRnSdkModule.NAME)
 class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
@@ -39,7 +39,10 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
       userInfoMap.putString("errorType", errorType)
       userInfoMap.putString("sessionId", exception.sessionId)
       userInfoMap.putBoolean("didSubmitManualVerification", exception.didSubmitManualVerification)
-      userInfoMap.putString("reason", if (exception is ReclaimVerification.ReclaimVerificationException.Failed) exception.reason else null)
+      userInfoMap.putString(
+        "reason",
+        if (exception is ReclaimVerification.ReclaimVerificationException.Failed) exception.reason else null
+      )
       promise?.reject("VERIFICATION_ERROR", "Verification Error", exception, userInfoMap)
     }
 
@@ -68,12 +71,12 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
     }
     val handler = ReclaimVerificationResultHandlerImpl(promise)
     reactContext.runOnUiQueueThread {
-      val appId =getString(request,"appId")
-      val secret = getString(request,"secret")
+      val appId = getString(request, "appId")
+      val secret = getString(request, "secret")
       val verificationRequest: ReclaimVerification.Request
       val session = request.getMap("session")
       val parametersRN = request.getMap("parameters")?.toHashMap()
-      val parameters =  mutableMapOf<String, String>()
+      val parameters = mutableMapOf<String, String>()
       if (parametersRN != null) {
         for (key in parametersRN.keys) {
           val value = parametersRN[key]
@@ -82,7 +85,6 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
           }
         }
       }
-      val hideLanding = getBoolean(request, "hideLanding")
       val autoSubmit = getBoolean(request, "autoSubmit")
       val acceptAiProviders = getBoolean(request, "acceptAiProviders")
       val webhookUrl = getString(request, "webhookUrl")
@@ -97,7 +99,6 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
             signature = getString(session, "signature") ?: "",
           ),
           parameters = parameters,
-          hideLanding = hideLanding ?: true,
           autoSubmit = autoSubmit ?: false,
           acceptAiProviders = acceptAiProviders ?: false,
           webhookUrl = webhookUrl,
@@ -114,16 +115,13 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
             signature = getString(session, "signature") ?: "",
           ),
           parameters = parameters,
-          hideLanding = hideLanding ?: true,
           autoSubmit = autoSubmit ?: false,
           acceptAiProviders = acceptAiProviders ?: false,
           webhookUrl = webhookUrl,
         )
       }
       ReclaimVerification.startVerification(
-        context = reactContext.applicationContext,
-        request = verificationRequest,
-        handler = handler
+        context = reactContext.applicationContext, request = verificationRequest, handler = handler
       )
     }
   }
@@ -151,36 +149,74 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
       logConsumer = getMap(overrides, "logConsumer"),
       sessionManagement = getMap(overrides, "sessionManagement"),
       appInfo = getMap(overrides, "appInfo"),
+      capabilityAccessToken = getString(overrides, "capabilityAccessToken"),
       promise,
     )
   }
 
-  private val replyHandlers: MutableMap<String, (Result<Boolean>) -> Unit> = mutableMapOf()
+  override fun clearAllOverrides(promise: Promise?) {
+    reactContext.runOnUiQueueThread {
+      ReclaimVerification.clearAllOverrides(
+        context = reactContext.applicationContext,
+      ) { result ->
+        result.onSuccess {
+          promise?.resolve(null)
+        }.onFailure { error ->
+          onPlatformException(promise, error)
+        }
+      }
+    }
+  }
 
   private fun setOverrides(
     provider: ReadableMap?,
     featureOptions: ReadableMap?,
     logConsumer: ReadableMap?,
     sessionManagement: ReadableMap?,
     appInfo: ReadableMap?,
+    capabilityAccessToken: String?,
     promise: Promise?
   ) {
     reactContext.runOnUiQueueThread {
       ReclaimVerification.setOverrides(
         context = reactContext.applicationContext,
         provider = if (provider == null) null else (
-          if (!hasValue(provider, "url"))
+          if (hasValue(provider, "jsonString"))
             ReclaimOverrides.ProviderInformation.FromJsonString(
               requireString(
                 provider, "jsonString"
               )
             )
-          else
+          else if (hasValue(provider, "url"))
             ReclaimOverrides.ProviderInformation.FromUrl(
               requireString(
                 provider, "url"
               )
             )
+          else if (getBoolean(provider, "canFetchProviderInformationFromHost") == true)
+            ReclaimOverrides.ProviderInformation.FromCallback(object : ReclaimOverrides.ProviderInformation.FromCallbackHandler {
+              override fun fetchProviderInformation(
+                appId: String,
+                providerId: String,
+                sessionId: String,
+                signature: String,
+                timestamp: String,
+                callback: (Result<String>) -> Unit
+              ) {
+                val args = Arguments.createMap()
+                args.putString("appId", appId)
+                args.putString("providerId", providerId)
+                args.putString("sessionId", sessionId)
+                args.putString("signature", signature)
+                args.putString("timestamp", timestamp)
+                val replyId = UUID.randomUUID().toString()
+                args.putString("replyId", replyId)
+                replyWithProviderInformationHandlers[replyId] = callback
+                emitOnProviderInformationRequest(args)
+              }
+            })
+          else
+            (throw IllegalStateException("Invalid provider information. canFetchProviderInformationFromHost was not true and jsonString, url were also not provided."))
         ),
         featureOptions = if (featureOptions == null) null else ReclaimOverrides.FeatureOptions(
           cookiePersist = getBoolean(featureOptions, "cookiePersist"),
@@ -257,31 +293,73 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
           appImageUrl = requireString(appInfo, "appImageUrl"),
           isRecurring = getBoolean(appInfo, "isRecurring") ?: false,
         ),
+        capabilityAccessToken = capabilityAccessToken
       ) { result ->
         result.onSuccess {
-            promise?.resolve(true)
-          }.onFailure { error ->
-            promise?.reject(error)
+          try {
+            Log.d(NAME, "(setOverrides) Success")
+            promise?.resolve(null)
+          } catch (e: Throwable) {
+            Log.e(NAME, "(setOverrides) Error resolving promise")
+          }
+
+        }.onFailure { error ->
+          try {
+            Log.d(NAME, "(setOverrides) Failure")
+            onPlatformException(promise, error)
+          } catch (e: Throwable) {
+            Log.e(NAME, "(setOverrides) Error rejecting promise", e)
           }
+        }
       }
     }
   }
 
+  private val replyHandlers: MutableMap<String, (Result<Boolean>) -> Unit> = mutableMapOf()
   override fun reply(replyId: String?, reply: Boolean) {
     if (replyId == null) {
-      Log.w(NAME, "Missing arg replyId")
+      Log.w(NAME, "(reply) Missing arg replyId")
       return
     }
     reactContext.runOnUiQueueThread {
       val callback = replyHandlers[replyId]
       if (callback != null) {
         callback(Result.success(reply))
       } else {
-        Log.w(NAME, "Missing reply handler for id: $replyId")
+        Log.w(NAME, "(reply) Missing reply handler for id: $replyId")
       }
     }
   }
 
+  private val replyWithProviderInformationHandlers: MutableMap<String, (Result<String>) -> Unit> =
+    mutableMapOf()
+
+  override fun replyWithProviderInformation(replyId: String?, providerInformation: String?) {
+    if (replyId == null) {
+      Log.w(NAME, "(replyWithProviderInformation) Missing arg replyId")
+      return
+    }
+    reactContext.runOnUiQueueThread {
+      val callback = replyWithProviderInformationHandlers[replyId]
+      if (callback != null) {
+        callback(Result.success(providerInformation ?: ""))
+      } else {
+        Log.w(NAME, "(replyWithProviderInformation) Missing reply handler for id: $replyId")
+      }
+    }
+  }
+
+  private fun onPlatformException(promise: Promise?, exception: Throwable) {
+    if (exception is ReclaimVerification.ReclaimPlatformException) {
+      val userInfoMap = Arguments.createMap()
+      userInfoMap.putString("message", exception.internalErrorMessage)
+      userInfoMap.putString("errorCode", exception.errorCode)
+      promise?.reject("PLATFORM_ERROR", exception.message, exception, userInfoMap)
+    } else {
+      promise?.reject("PLATFORM_ERROR", "Unexpected Error", exception)
+    }
+  }
+
   @Suppress("SameParameterValue")
   private fun hasValue(map: ReadableMap, key: String): Boolean {
     return map.hasKey(key) && !map.isNull(key)
@@ -315,7 +393,8 @@ class InappRnSdkModule(private val reactContext: ReactApplicationContext) :
     throw TypeCastException("Value for key $key is not a Number")
   }
 
-  private fun getString(map: ReadableMap, key: String): String? {
+  private fun getString(map: ReadableMap?, key: String): String? {
+    if (map == null) return null
     return if (!map.hasKey(key) || map.isNull(key)) {
       null
     } else {

documentation/migration.md

@@ -0,0 +1,40 @@
+# Migration
+
+## 0.2.1
+
+- Some overrides now require a valid `capabilityAccessToken`. Provide this when calling the `setOverrides` method.
+
+### Android
+
+#### Update repository URL
+
+- Update the version in `RECLAIM_STORAGE_BASE_URL` to `0.2.1`
+- With this change, repositories in your build.gradle or settings.gradle may look like this:
+
+```groovy
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+    String flutterStorageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"
+-    String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.1.2/repo"
++    String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.2.1/repo"
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url "$reclaimStorageUrl"
+        }
+        maven {
+            url "$flutterStorageUrl/download.flutter.io"
+        }
+    }
+}
+```
+
+- Build your android project again
+- Refer: https://github.com/reclaimprotocol/reclaim-inapp-reactnative-sdk/blob/main/README.md#android-setup
+
+### iOS
+
+- Make sure if you are using the latest versions of `ReclaimInAppSdk` cocoapod if you have overriden this dependency in your `Podfile`. Latest version on [cocoapods.org is 0.2.1](https://cocoapods.org/pods/ReclaimInAppSdk).
+- Run a `pod install --repo-update`. If this fails for reasons related to the `ReclaimInAppSdk`, try running `pod update ReclaimInAppSdk`.
+- Refer: https://github.com/reclaimprotocol/reclaim-inapp-reactnative-sdk/blob/main/README.md#android-setup

example/android/settings.gradle

@@ -7,7 +7,7 @@ includeBuild('../node_modules/@react-native/gradle-plugin')
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     String flutterStorageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"
-    String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.1.2/repo"
+    String reclaimStorageUrl = System.env.RECLAIM_STORAGE_BASE_URL ?: "https://reclaim-inapp-sdk.s3.ap-south-1.amazonaws.com/android/0.2.1/repo"
     repositories {
         google()
         mavenCentral()