@qore-id/react-native-qoreid-sdk 2.0.2 → 2.1.0

package/RNQoreIdSdk.podspec

@@ -11,12 +11,18 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "https://.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
-  s.private_header_files = "ios/**/*.h"
-  s.dependency 'QoreIDSDK'
 
+  if defined?($RNQoreidAsStaticFramework)
+    Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNQoreidAsStaticFramework}'"
+    s.static_framework = $RNQoreidAsStaticFramework
+  else
+    s.static_framework = false
+  end
+
+  s.dependency 'QoreIDSDK'
 
   install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -21,6 +21,8 @@ apply plugin: "kotlin-android"
 
 apply plugin: "com.facebook.react"
 
+apply from: file('../scripts/android/setupQoreid.gradle.kts')
+
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNQoreIdSdk_" + name]).toInteger()
 }

package/android/src/main/java/com/qoreid/reactnativeqoreidsdk/RNQoreIdSdkModule.kt

@@ -8,9 +8,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.BaseActivityEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.qoreid.sdk.core.OnFlowRequestIdCallback
 import com.qoreid.sdk.core.QoreIDParams
 import com.qoreid.sdk.core.QoreIDSdk
@@ -26,8 +24,7 @@ import com.qoreid.sdk.core.models.SuccessResult
 import com.qoreid.sdk.core.models.VerificationExtraData
 
 @ReactModule(name = RNQoreIdSdkModule.NAME)
-class RNQoreIdSdkModule(context: ReactApplicationContext) :
-        NativeRNQoreIdSdkSpec(context) {
+class RNQoreIdSdkModule(context: ReactApplicationContext) : NativeRNQoreIdSdkSpec(context) {
 
   override fun getName(): String {
     return NAME
@@ -36,40 +33,42 @@ class RNQoreIdSdkModule(context: ReactApplicationContext) :
   private var qoreIdResult: QoreIDResult? = null
 
   init {
-    context.addActivityEventListener(object : BaseActivityEventListener () {
-      override fun onActivityResult(
-        activity: Activity,
-        requestCode: Int,
-        resultCode: Int,
-        data: Intent?
-      ) {
-        if (resultCode == QORE_ID_RESULT_CODE && data!= null) {
-          qoreIdResult =
-            if (Build.VERSION.SDK_INT < 33) {
-              data.extras?.getSerializable(QORE_ID_RESULT_EXTRA_KEY) as QoreIDResult
-            } else {
-              data.extras?.getSerializable(
-                QORE_ID_RESULT_EXTRA_KEY,
-                QoreIDResult::class.java
-              )
+    context.addActivityEventListener(
+            object : BaseActivityEventListener() {
+              override fun onActivityResult(
+                      activity: Activity,
+                      requestCode: Int,
+                      resultCode: Int,
+                      data: Intent?
+              ) {
+                if (resultCode == QORE_ID_RESULT_CODE && data != null) {
+                  qoreIdResult =
+                          if (Build.VERSION.SDK_INT < 33) {
+                            data.extras?.getSerializable(QORE_ID_RESULT_EXTRA_KEY) as QoreIDResult
+                          } else {
+                            data.extras?.getSerializable(
+                                    QORE_ID_RESULT_EXTRA_KEY,
+                                    QoreIDResult::class.java
+                            )
+                          }
+                  processQoreIDResult(context, qoreIdResult!!)
+                }
+              }
             }
-          processQoreIDResult(context, qoreIdResult!!)
-        }
-      }
-    })
+    )
 
     QoreIDSdk.Callbacks.onFlowRequestId(
             object : OnFlowRequestIdCallback {
               override fun onValue(flowRequestId: Long) {
                 Log.i("QORE_ID", flowRequestId.toString())
                 val event =
-                  Arguments.createMap().apply {
+                        Arguments.createMap().apply {
                           putString("data", flowRequestId.toString())
                           putString("message", "QOREID SDK INITIALIZED")
                           putString("event", "SESSION_RESULT")
                         }
 
-                 emitOnResult( event)
+                emitOnResult(event)
               }
             }
     )
@@ -157,7 +156,7 @@ class RNQoreIdSdkModule(context: ReactApplicationContext) :
 
     QoreIDSdk.s(BuildConfig.s)
     QoreIDSdk.params(qoreIDParams)
-    QoreIDSdk.launch(requireNotNull(reactApplicationContext.currentActivity ))
+    QoreIDSdk.launch(requireNotNull(reactApplicationContext.currentActivity))
   }
 
   fun processQoreIDResult(context: ReactApplicationContext, qoreIdResult: QoreIDResult) {

package/app.plugin.js

@@ -0,0 +1,30 @@
+const {
+  createRunOncePlugin,
+  withDangerousMod,
+} = require('expo/config-plugins');
+
+const { execSync } = require('child_process');
+
+const pkg = require('@qore-id/react-native-qoreid-sdk/package.json');
+
+const withQoreIdExpo = (config) => {
+  config = withDangerousMod(config, [
+    'android',
+    (cfg) => {
+      execSync('npx qoreid-android-setup', { stdio: 'inherit' });
+      return cfg;
+    },
+  ]);
+
+  config = withDangerousMod(config, [
+    'ios',
+    (cfg) => {
+      execSync('npx qoreid-ios-setup', { stdio: 'inherit' });
+      return cfg;
+    },
+  ]);
+
+  return config;
+};
+
+module.exports = createRunOncePlugin(withQoreIdExpo, pkg.name, pkg.version);

package/ios/RNQoreIdSdk.h

@@ -1,14 +1 @@
-#import <RNQoreIdSdkSpec/RNQoreIdSdkSpec.h>
 #import <Foundation/Foundation.h>
-
-// When `use_frameworks!` is used, the generated Swift header is inside ExpoModulesCore module.
-// Otherwise, it's available only locally with double-quoted imports.
-#if __has_include(<RNQoreIdSdk/RNQoreIdSdk-Swift.h>)
-#import <RNQoreIdSdk/RNQoreIdSdk-Swift.h>
-#else
-#import "RNQoreIdSdk-Swift.h"
-#endif
-
-@interface RNQoreIdSdk : NativeRNQoreIdSdkSpecBase <NativeRNQoreIdSdkSpec>
-
-@end

package/ios/RNQoreIdSdk.mm

@@ -1,33 +1,42 @@
 #import "RNQoreIdSdk.h"
+#import <RNQoreIdSdkSpec/RNQoreIdSdkSpec.h>
 #import <UIKit/UIKit.h>
 
+#if __has_include(<RNQoreIdSdk/RNQoreIdSdk-Swift.h>)
+#import <RNQoreIdSdk/RNQoreIdSdk-Swift.h>
+#else
+#import "RNQoreIdSdk-Swift.h"
+#endif
+
+@interface RNQoreIdSdk : NativeRNQoreIdSdkSpecBase <NativeRNQoreIdSdkSpec>
+
+@end
+
 @implementation RNQoreIdSdk {
   RCTRNQoreIdSdk *qoreIdSdk;
 }
 
-- (id) init {
+- (id)init {
 
-  if(self = [super init]) {
+  if (self = [super init]) {
 
     qoreIdSdk = [RCTRNQoreIdSdk shared];
 
-    [qoreIdSdk setOnEmitResult:^(NSDictionary<NSString *,id> * _Nonnull result) {
-      [self emitOnResult:result];
-    }];
+    [qoreIdSdk
+        setOnEmitResult:^(NSDictionary<NSString *, id> *_Nonnull result) {
+          [self emitOnResult:result];
+        }];
   }
 
   return self;
 }
 
-
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-    (const facebook::react::ObjCTurboModule::InitParams &)params
-{
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
   return std::make_shared<facebook::react::NativeRNQoreIdSdkSpecJSI>(params);
 }
 
-+ (NSString *)moduleName
-{
++ (NSString *)moduleName {
   return @"RNQoreIdSdk";
 }
 

package/ios/ViewController.swift

@@ -5,18 +5,18 @@
 //  Created by Guru King on 03/10/2023.
 //
 
-import UIKit
 import QoreIDSDK
+import UIKit
 
 class ViewController: UIViewController {
-    var param:QoreIDParam?
-    var onQoreIdResult:((QoreIDResult) -> ())?
-    
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        QoreIdSdk.shared.launch(param: param ?? QoreIDParam(), vc: self, "react_native_ios_sdk") { [weak self] result in
-            self?.onQoreIdResult!(result)
-        }
+  var param: QoreIDParam?
+  var onQoreIdResult: ((QoreIDResult) -> Void)?
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    QoreIdSdk.shared.launch(param: param ?? QoreIDParam(), vc: self, "react_native_ios_sdk") {
+      [weak self] result in
+      self?.onQoreIdResult!(result)
     }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qore-id/react-native-qoreid-sdk",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "QoreId React Native SDK",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -10,16 +10,20 @@
       "types": "./lib/typescript/src/index.d.ts",
       "default": "./lib/module/index.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./plugin": "./app.plugin.js"
   },
   "files": [
     "src",
     "lib",
+    "scripts",
     "android",
     "ios",
     "cpp",
     "*.podspec",
+    "*.rb",
     "react-native.config.js",
+    "app.plugin.js",
     "!ios/build",
     "!android/build",
     "!android/gradle",
@@ -31,6 +35,12 @@
     "!**/__mocks__",
     "!**/.*"
   ],
+  "bin": {
+    "qoreid-android-setup": "./scripts/js/android-setup.js",
+    "qoreid-ios-setup": "./scripts/js/ios-setup.js",
+    "qoreid-setup": "./scripts/js/setup.js",
+    "qoreid-uninstall": "./scripts/js/uninstall.js"
+  },
   "scripts": {
     "example": "yarn workspace @qore-id/react-native-qoreid-sdk-example",
     "test": "jest",
@@ -38,12 +48,14 @@
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
     "prepare": "bob build",
-    "release": "release-it --only-version"
+    "release": "release-it --only-version",
+    "preuninstall": "node ./scripts/js/uninstall.js"
   },
   "keywords": [
     "react-native",
     "ios",
-    "android"
+    "android",
+    "expo"
   ],
   "repository": {
     "type": "git",
@@ -75,7 +87,10 @@
     "del-cli": "^6.0.0",
     "eslint": "^9.35.0",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-jest": "^29.2.1",
     "eslint-plugin-prettier": "^5.5.4",
+    "expo": "^54.0.25",
+    "expo-module-scripts": "^5.0.7",
     "jest": "^29.7.0",
     "prettier": "^3.6.2",
     "react": "19.1.0",
@@ -87,9 +102,15 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
+    "expo": "*",
     "react": "*",
     "react-native": "*"
   },
+  "peerDependenciesMeta": {
+    "expo": {
+      "optional": true
+    }
+  },
   "workspaces": [
     "example"
   ],

package/scripts/android/setupQoreid.gradle.kts

@@ -0,0 +1,225 @@
+import java.io.File
+
+val rootGradleFile =
+  rootProject.file("build.gradle.kts").takeIf { it.exists() }
+    ?: rootProject.file("build.gradle")
+
+val appBuildGradle = rootProject.file("app/build.gradle.kts").takeIf { it.exists() }
+  ?: rootProject.file("app/build.gradle")
+
+
+// === Register setup task ===
+rootProject.tasks.register("setupQoreid") {
+  group = "qoreid"
+  description = "One-click Qoreid SDK setup for React Native"
+  doLast {
+    // === 1. Add Maven repo to root build.gradle(.kts) ===
+    if (rootGradleFile.exists()) {
+      var content = rootGradleFile.readText()
+      if (!content.contains("repo.qoreid.com")) {
+
+        val mavenBlock = """
+            maven {
+                      url = uri("https://repo.qoreid.com/repository/maven-releases/")
+                    }
+          """.trimIndent()
+
+        if (content.contains("allprojects")) {
+          content = content.replace(
+            Regex("""allprojects\s\{\s*repositories\s*\{"""),
+            """allprojects {
+    repositories {
+      $mavenBlock"""
+          )
+        } else {
+          content += """
+
+  allprojects {
+      repositories {
+          google()
+          mavenCentral()
+          $mavenBlock
+          maven { url 'https://jitpack.io' }
+      }
+  }
+  """.trimIndent()
+        }
+
+        rootGradleFile.writeText(content)
+        println("Added Qoreid to repository")
+      } else {
+        println("Qoreid repo already added")
+      }
+    }
+
+    // === 2. Extract namespace ===
+    // Helpful to allow overriding via env var for CI/CD scenarios and CNG expo projects
+    val fullNamespace = System.getenv("FULL_ANDROID_NAMESPACE")
+
+    val namespace = fullNamespace ?: appBuildGradle.readText()
+      .let {
+        // Attempt 1: Standard assignment with quotes (e.g., namespace = "com.full.path")
+        Regex("""namespace\s*=\s*["']([^"']+)["']""").find(it)
+
+        // Attempt 2: Method call with quotes (e.g., namespace 'com.full.path')
+        // We use \s+ to ensure there is space after 'namespace'
+        ?: Regex("""namespace\s+["']([^"']+)["']""").find(it)
+
+        // Attempt 3: Assignment or method call without quotes (e.g., namespace com.full.path)
+        // This is less common but necessary if quotes are the issue.
+        // It captures any sequence of non-whitespace, non-quote characters after 'namespace'.
+        ?: Regex("""namespace\s*=?\s*([^\s"']+)""").find(it)
+    }
+    ?.groupValues?.get(1)
+      ?: "com.example.app"
+
+    val packagePath = namespace.replace('.', '/')
+    val possibleActivityFiles = listOf(
+      "app/src/main/java/$packagePath/MainActivity.kt",
+      "app/src/main/java/$packagePath/MainActivity.java",
+      "app/src/main/kotlin/$packagePath/MainActivity.kt",
+      "app/src/main/kotlin/$packagePath/MainActivity.java",
+    )
+
+    val activityFile = possibleActivityFiles
+      .map { rootProject.file(it) }
+      .firstOrNull { it.exists() }
+
+    if (activityFile == null) {
+      println("MainActivity not found! Searched for namespace: $namespace")
+      println("Please manually add RNQoreIdSdkModule.initialize(this) inside onCreate().")
+    } else {
+      var content = activityFile.readText()
+      val importLine = "import com.qoreid.reactnativeqoreidsdk.RNQoreIdSdkModule"
+      val initCall = "RNQoreIdSdkModule.initialize(this)"
+
+      var changed = false
+
+      // === (1) Insert import right after last import ===
+      if (!content.contains(importLine)) {
+        val importRegex = Regex("""import .+""")
+        val imports = importRegex.findAll(content).toList()
+
+        content = if (imports.isNotEmpty()) {
+          // Insert after last import
+          val lastImport = imports.last()
+          content.replaceRange(
+            lastImport.range.last + 1,
+            lastImport.range.last + 1,
+            "\n$importLine"
+          )
+        } else {
+          // No imports → insert after package
+          content.replace(
+            Regex("""(package .*)"""),
+            "$1\n$importLine"
+          )
+        }
+        changed = true
+      }
+
+      // === (2) Insert init call before the final '}' of onCreate ===
+      val onCreateRegex = Regex("""onCreate\s*\([^)]*\)\s*\{([\s\S]*?)\}""")
+      val match = onCreateRegex.find(content)
+
+      if (match != null && !content.contains(initCall)) {
+        val insertionPoint = match.range.last // just before the closing }
+
+        // rewrite: insert call before closing }
+        content = content.substring(0, insertionPoint) +
+          "   \n$initCall\n " +
+          content.substring(insertionPoint)
+
+        changed = true
+      }
+
+      if (changed) {
+        activityFile.writeText(content)
+        println("Injected Qoreid init into ${activityFile.name}")
+      } else {
+        println("MainActivity already configured")
+      }
+    }
+
+  }
+}
+
+
+// =================================================================
+// === Register removal task (CLEANUP) ===
+// =================================================================
+rootProject.tasks.register("removeQoreidSetup") {
+  group = "qoreid"
+  description = "Removes Qoreid SDK configuration from Android project files"
+  doLast {
+    // 1. Remove Maven repo from root build.gradle(.kts)
+    if (rootGradleFile.exists()) {
+      var content = rootGradleFile.readText()
+
+      val mavenBlock = """
+            maven {
+                  url = uri("https://repo.qoreid.com/repository/maven-releases/")
+                }
+          """.trimIndent()
+
+      if (content.contains(mavenBlock)) {
+        // Replace the maven block with an empty string
+        content = content.replace(mavenBlock, "")
+
+        rootGradleFile.writeText(content)
+        println("Removed Qoreid Maven repository from ${rootGradleFile.name}")
+      } else {
+        println("Qoreid repo not found in root build.gradle - skipping removal.")
+      }
+    }
+
+    // 2. Remove configuration from MainActivity
+    val namespace = appBuildGradle.readText()
+      .let { text ->
+        Regex("""namespace\s*=\s*["']([^"']+)["']""").find(text)
+          ?: Regex("""namespace ["']([^"']+)["']""").find(text)
+      }?.groupValues?.get(1)
+      ?: "com.example.app"
+
+    val packagePath = namespace.replace('.', '/')
+    val possibleActivityFiles = listOf(
+      "app/src/main/java/$packagePath/MainActivity.kt",
+      "app/src/main/java/$packagePath/MainActivity.java",
+      "app/src/main/kotlin/$packagePath/MainActivity.kt",
+      "app/src/main/kotlin/$packagePath/MainActivity.java",
+    )
+
+    val activityFile = possibleActivityFiles
+      .map { rootProject.file(it) }
+      .firstOrNull { it.exists() }
+    if (activityFile != null && activityFile.exists()) {
+      var content = activityFile.readText()
+      val importLine = "import com.qoreid.reactnativeqoreidsdk.RNQoreIdSdkModule"
+      val initCall = "RNQoreIdSdkModule.initialize(this)"
+      var changed = false
+
+      // Remove import line (must handle leading newline)
+      if (content.contains(importLine)) {
+        // Remove the import line, including the preceding newline
+        content = content.replace("\n$importLine", "")
+        changed = true
+      }
+
+      // Remove init call (must handle surrounding formatting added by setup script)
+      if (content.contains(initCall)) {
+        // Safely remove the call along with its preceding whitespace and the newline
+        // inserted by the setup script (which used "  $initCall\n  ")
+        // Escaping the initCall string is crucial for safe regex use.
+        content = content.replace(Regex("""\s*${Regex.escape(initCall)}\s*\n?"""), "")
+        changed = true
+      }
+
+      if (changed) {
+        activityFile.writeText(content)
+        println("Removed Qoreid init and import from ${activityFile.name}")
+      } else {
+        println("MainActivity was not configured for Qoreid - skipping removal.")
+      }
+    }
+  }
+}