solution-plugin 1.4.1 → 1.4.3

package/android/build.gradle

@@ -10,14 +10,11 @@ buildscript {
 
   dependencies {
     classpath "com.android.tools.build:gradle:8.7.2"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
 
 apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
 
 apply plugin: "com.facebook.react"
 
@@ -56,12 +53,9 @@ repositories {
   google()
 }
 
-def kotlin_version = getExtOrDefault("kotlinVersion")
-
 dependencies {
   implementation "com.facebook.react:react-android"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "ai.advance.mobile-sdk.android:solution-lib:1.4.0"
+  implementation "ai.advance.mobile-sdk.android:solution-lib:1.4.3"
 }
 
 react {

package/android/src/main/java/com/solutionplugin/SolutionPluginModule.java

@@ -0,0 +1,109 @@
+package com.solutionplugin;
+
+import android.app.Application;
+import android.util.Log;
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
+
+import java.util.Map;
+
+import aai.liveness.sdk.Colors;
+import aai.liveness.sdk.GuardianSolutionSDK;
+import aai.liveness.sdk.ThemeType;
+import aai.telemetry.enums.PluginPlatform;
+
+@ReactModule(name = SolutionPluginModule.NAME)
+public class SolutionPluginModule extends NativeSolutionPluginSpec {
+    public static final String NAME = "SolutionPlugin";
+
+    private Application mApplication;
+
+    public SolutionPluginModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    private Application getApplication() {
+        if (mApplication == null) {
+            mApplication = (Application) getReactApplicationContext().getApplicationContext();
+        }
+        return mApplication;
+    }
+
+    @Override
+    @NonNull
+    public String getName() {
+        return NAME;
+    }
+
+    @ReactMethod
+    @Override
+    public void setThemeARGBColor(String light, String dark, Promise promise) {
+        try {
+            GuardianSolutionSDK.setThemeColors(
+                new Colors.Builder().setPrimaryColor(light).build(),
+                new Colors.Builder().setPrimaryColor(dark).build()
+            );
+            promise.resolve(true);
+        } catch (Exception e) {
+            promise.reject("SET_THEME_COLOR_ERROR", e.getMessage(), e);
+        }
+    }
+
+    @ReactMethod
+    @Override
+    public void setDarkThemeType(String type, Promise promise) {
+        try {
+            ThemeType themeType = (type != null) ? ThemeType.valueOf(type) : ThemeType.LIGHT;
+            GuardianSolutionSDK.setThemeType(themeType);
+            promise.resolve(null);
+        } catch (Exception e) {
+            promise.reject("SET_DARK_THEME_TYPE_ERROR", e.getMessage(), e);
+        }
+    }
+
+    @ReactMethod
+    @Override
+    public void getSDKVersion(Promise promise) {
+        Log.d("SolutionPluginModule", "getVersion");
+        try {
+            String version = GuardianSolutionSDK.getSDKVersion();
+            promise.resolve(version);
+        } catch (Exception e) {
+            promise.reject("GET_VERSION_ERROR", e.getMessage(), e);
+        }
+    }
+
+    @ReactMethod
+    @Override
+    public void start(String url, Promise promise) {
+        GuardianSolutionSDK.init(getApplication());
+        GuardianSolutionSDK.setPluginPlatform(PluginPlatform.ReactNative);
+        GuardianSolutionSDK.start(getCurrentActivity(), url, result -> {
+            WritableMap map = Arguments.createMap();
+            map.putString("code", result.getCode());
+            map.putString("signatureId", result.getSignatureId());
+            map.putString("finishRedirectUrl", result.getFinishRedirectUrl());
+            map.putBoolean("terminated", result.isTerminated());
+          Map<String, Object> extraInfo = result.getExtraInfo();
+            if (extraInfo != null) {
+                WritableMap extraInfoMap = Arguments.createMap();
+                for (String key : extraInfo.keySet()) {
+                    Object value = extraInfo.get(key);
+                    if (value instanceof String) {
+                        extraInfoMap.putString(key, (String) value);
+                    } else {
+                         extraInfoMap.putString(key, "");
+                    }
+                }
+                map.putMap("extraInfo", extraInfoMap);
+            }
+            promise.resolve(map);
+        });
+    }
+}

package/android/src/main/java/com/solutionplugin/SolutionPluginPackage.java

@@ -0,0 +1,27 @@
+package com.solutionplugin;
+
+import androidx.annotation.NonNull;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class SolutionPluginPackage implements ReactPackage {
+    @NonNull
+    @Override
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<>();
+        modules.add(new SolutionPluginModule(reactContext));
+        return modules;
+    }
+
+    @NonNull
+    @Override
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+}

package/ios/SolutionPlugin.swift

@@ -37,6 +37,7 @@ class SolutionPlugin: NSObject {
         resultDict["finishRedirectUrl"] = result.finishRedirectUrl
         // Use compactMapValues to remove nil values
         resultDict["extraInfo"] = result.extraInfo
+        resultDict["terminated"] = result.terminated
         resolver(resultDict)
       }))
       SolutionCenter.shared.pluginPlatform = "react-native"

package/lib/module/NativeSolutionPlugin.ts

@@ -10,6 +10,7 @@ export enum ThemeType {
 export interface EndResult {
   code: string;
   signatureId?: string;
+  terminated: boolean;
   finishRedirectUrl?: string;
   extraInfo?: { [key: string]: string };
 }

package/lib/typescript/src/NativeSolutionPlugin.d.ts

@@ -7,6 +7,7 @@ export declare enum ThemeType {
 export interface EndResult {
     code: string;
     signatureId?: string;
+    terminated: boolean;
     finishRedirectUrl?: string;
     extraInfo?: {
         [key: string]: string;

package/lib/typescript/src/NativeSolutionPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeSolutionPlugin.d.ts","sourceRoot":"","sources":["../../../src/NativeSolutionPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,oBAAY,SAAS;IACnB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,aAAa,kBAAkB;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACvC;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,gBAAgB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACxC;;AAED,wBAAwE"}
+{"version":3,"file":"NativeSolutionPlugin.d.ts","sourceRoot":"","sources":["../../../src/NativeSolutionPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,oBAAY,SAAS;IACnB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,aAAa,kBAAkB;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACvC;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,gBAAgB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACxC;;AAED,wBAAwE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solution-plugin",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "A plugin to add two numbers using native code.",
   "main": "./lib/module/index.js",
   "source": "src/index.tsx",

package/src/NativeSolutionPlugin.ts

@@ -10,6 +10,7 @@ export enum ThemeType {
 export interface EndResult {
   code: string;
   signatureId?: string;
+  terminated: boolean;
   finishRedirectUrl?: string;
   extraInfo?: { [key: string]: string };
 }

package/android/src/main/java/com/solutionplugin/SolutionPluginModule.kt

@@ -1,83 +0,0 @@
-package com.solutionplugin
-
-import aai.liveness.sdk.Colors
-import aai.liveness.sdk.GuardianSolutionSDK
-import aai.liveness.sdk.ThemeType
-import aai.telemetry.enums.PluginPlatform
-import android.app.Application
-import android.util.Log
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.module.annotations.ReactModule
-
-@ReactModule(name = SolutionPluginModule.NAME)
-class SolutionPluginModule(private val reactContext: ReactApplicationContext) :
-  NativeSolutionPluginSpec(reactContext) {
-
-
-  private val application: Application by lazy { reactContext.applicationContext as Application }
-
-  override fun getName() = NAME
-
-
-  @ReactMethod
-  override fun setThemeARGBColor(light: String, dark: String, promise: Promise) {
-    try {
-      GuardianSolutionSDK.setThemeColors(
-        Colors.Builder().setPrimaryColor(light).build(),
-        Colors.Builder().setPrimaryColor(dark).build()
-      )
-      promise.resolve(true)
-    } catch (e: Exception) {
-      promise.reject("SET_THEME_COLOR_ERROR", e.message, e)
-    }
-  }
-
-  @ReactMethod
-  override fun setDarkThemeType(type: String?, promise: Promise) {
-    try {
-      val themeType = ThemeType.valueOf(type ?: ThemeType.LIGHT.name)
-      GuardianSolutionSDK.setThemeType(themeType)
-    } catch (e: Exception) {
-      promise.reject("SET_DARK_THEME_TYPE_ERROR", e.message, e)
-    }
-  }
-
-  @ReactMethod
-  override fun getSDKVersion(promise: Promise) {
-    Log.d("SolutionPluginModule", "getVersion")
-    try {
-      val version = GuardianSolutionSDK.getSDKVersion()
-      promise.resolve(version)
-    } catch (e: Exception) {
-      promise.reject("GET_VERSION_ERROR", e.message, e)
-    }
-  }
-
-  @ReactMethod
-  override fun start(url: String?, promise: Promise) {
-    GuardianSolutionSDK.init(application)
-    GuardianSolutionSDK.setPluginPlatform(PluginPlatform.ReactNative)
-    GuardianSolutionSDK.start(getCurrentActivity(), url) { result ->
-      promise.resolve(
-        Arguments.createMap().apply {
-          putString("code", result.code)
-          putString("signatureId", result.signatureId)
-          putString("finishRedirectUrl", result.finishRedirectUrl)
-          if (result.extraInfo != null) {
-            val extraInfoMap = Arguments.createMap()
-            for ((key, value) in result.extraInfo) {
-              extraInfoMap.putString(key, value as? String ?: "")
-            }
-            putMap("extraInfo", extraInfoMap)
-          }
-        })
-    }
-  }
-
-  companion object {
-    const val NAME = "SolutionPlugin"
-  }
-}

package/android/src/main/java/com/solutionplugin/SolutionPluginPackage.kt

@@ -1,33 +0,0 @@
-package com.solutionplugin
-
-import com.facebook.react.BaseReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.module.model.ReactModuleInfo
-import com.facebook.react.module.model.ReactModuleInfoProvider
-import java.util.HashMap
-
-class SolutionPluginPackage : BaseReactPackage() {
-  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return if (name == SolutionPluginModule.NAME) {
-      SolutionPluginModule(reactContext)
-    } else {
-      null
-    }
-  }
-
-  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-    return ReactModuleInfoProvider {
-      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
-      moduleInfos[SolutionPluginModule.NAME] = ReactModuleInfo(
-        SolutionPluginModule.NAME,
-        SolutionPluginModule.NAME,
-        false,  // canOverrideExistingModule
-        false,  // needsEagerInit
-        false,  // isCxxModule
-        true // isTurboModule
-      )
-      moduleInfos
-    }
-  }
-}