Merge pull request #49 from Keyri-Co/feature/update_rn_and_dependencies

Feature/update rn and dependencies

.eslintrc.js

@@ -1,92 +1,14 @@
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-    ecmaFeatures: {
-      jsx: true,
-    },
-    ecmaVersion: 2018,
-    sourceType: 'module',
-  },
-  ignorePatterns: ['scripts', 'lib', 'docs', 'example', 'app.plugin.js'],
+  env: { node: true, es6: true },
   plugins: ['@typescript-eslint'],
-  extends: ['plugin:@typescript-eslint/recommended', '@react-native'],
+  extends: "prettier",
   rules: {
-    // eslint
-    'semi': 'off',
-    'curly': ['warn', 'multi-or-nest', 'consistent'],
-    'no-mixed-spaces-and-tabs': ['warn', 'smart-tabs'],
-    'no-async-promise-executor': 'warn',
-    'require-await': 'warn',
-    'no-return-await': 'warn',
-    'no-await-in-loop': 'warn',
-    'comma-dangle': 'off', // prettier already detects this
-    'no-restricted-syntax': [
-      'error',
-      {
-        selector: 'TSEnumDeclaration',
-        message: "Enums have various disadvantages, use TypeScript's union types instead.",
-      },
-    ],
-    // prettier
-    'prettier/prettier': ['warn'],
-    // typescript
-    '@typescript-eslint/no-use-before-define': 'off',
+    curly: ['error', 'multi-line'],
     '@typescript-eslint/no-unused-vars': [
       'error',
-      {
-        vars: 'all',
-        args: 'after-used',
-        ignoreRestSiblings: false,
-        varsIgnorePattern: '^_',
-        argsIgnorePattern: '^_',
-      },
-    ],
-    '@typescript-eslint/explicit-function-return-type': [
-      'warn',
-      {
-        allowExpressions: true,
-      },
-    ],
-    '@typescript-eslint/no-namespace': 'off',
-    '@typescript-eslint/ban-ts-comment': 'off',
-    '@typescript-eslint/no-unsafe-assignment': 'error',
-    // react plugin
-    'react/no-unescaped-entities': 'off',
-    // react native plugin
-    'react-native/no-unused-styles': 'warn',
-    'react-native/split-platform-components': 'off',
-    'react-native/no-inline-styles': 'warn',
-    'react-native/no-color-literals': 'off',
-    'react-native/no-raw-text': 'off',
-    'react-native/no-single-element-style-arrays': 'warn',
-    '@typescript-eslint/strict-boolean-expressions': [
-      'error',
-      {
-        allowString: false,
-        allowNullableObject: false,
-        allowNumber: false,
-        allowNullableBoolean: true,
-      },
-    ],
-    '@typescript-eslint/no-non-null-assertion': 'error',
-    '@typescript-eslint/no-unnecessary-condition': 'error',
-
-    // react hooks
-    'react-hooks/exhaustive-deps': [
-      'error',
-      {
-        additionalHooks:
-          '(useDerivedValue|useAnimatedStyle|useAnimatedProps|useWorkletCallback|useFrameProcessor)',
-      },
+      { argsIgnorePattern: '^_', destructuredArrayIgnorePattern: '^_' },
     ],
   },
-  env: {
-    node: true,
-  },
-  globals: {
-    _log: 'readonly',
-  },
 };

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 18
 
 jobs:
   lint:

.gitignore

@@ -28,6 +28,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+ios/.xcode.env.local
 
 # Android/IJ
 #
@@ -40,10 +41,17 @@ project.xcworkspace
 .hprof
 local.properties
 android.iml
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
-# Cocoapods
+# Ruby / CocoaPods
 #
 example/ios/Pods
+example/vendor/bundle/
+# Temporary files created by Metro to check the health of the file watcher
+example/.metro-health-check*
 
 # node.js
 #
@@ -53,14 +61,11 @@ yarn-debug.log
 yarn-error.log
 /package-lock.json
 
-# BUCK
-buck-out/
-\.buckd/
-android/app/libs
-android/keystores/debug.keystore
-
 # Expo
 .expo/*
 
 # generated by bob
 lib/
+
+# testing
+example/coverage

.prettierrc.js

@@ -1,4 +1,6 @@
 module.exports = {
+  arrowParens: 'avoid',
+  bracketSameLine: true,
   quoteProps: 'consistent',
   singleQuote: true,
   tabWidth: 2,

Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+gem 'cocoapods', '~> 1.13'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

android/build.gradle

@@ -1,17 +1,13 @@
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['Keyri_kotlinVersion']
-
   repositories {
     google()
     mavenCentral()
-    jcenter()
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.2'
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath("com.android.tools.build:gradle")
+    classpath("com.facebook.react:react-native-gradle-plugin")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
   }
 }
 
@@ -121,9 +117,9 @@ dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation 'com.keyri:keyrisdk:4.1.1'
-  implementation 'com.keyri:scanner:4.1.1'
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+  implementation 'com.keyri:keyrisdk:4.2.4'
+  implementation 'com.keyri:scanner:4.2.4'
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
   implementation 'androidx.activity:activity-ktx:1.7.2'
-  implementation("com.squareup.okhttp3:okhttp-urlconnection:4.10.0")
+  implementation("com.squareup.okhttp3:okhttp-urlconnection:4.12.0")
 }

android/gradle.properties

@@ -1,6 +1,4 @@
-Keyri_kotlinVersion=1.8.21
-Keyri_minSdkVersion=23
-Keyri_compileSdkVersion=33
-Keyri_targetSdkVersion=33
-compileSdkVersion=33
-android.useAndroidX=true
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+newArchEnabled=false
+hermesEnabled=true
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m

android/src/main/java/com/reactnativekeyri/KeyriNativeModule.kt

@@ -14,9 +14,11 @@ import com.facebook.react.bridge.WritableNativeMap
 import com.keyrico.keyrisdk.Keyri
 import com.keyrico.keyrisdk.entity.session.Session
 import com.keyrico.keyrisdk.exception.DenialException
-import com.keyrico.keyrisdk.sec.fraud.enums.EventType
+import com.keyrico.keyrisdk.sec.fraud.event.EventType
 import com.keyrico.scanner.easyKeyriAuth
 import kotlinx.coroutines.*
+import org.json.JSONObject
+import java.lang.IllegalStateException
 
 class KeyriNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
@@ -55,7 +57,7 @@ class KeyriNativeModule(private val reactContext: ReactApplicationContext) : Rea
   @ReactMethod
   fun initialize(data: ReadableMap, promise: Promise) {
     try {
-      appKey = data.getString("appKey") ?: throw java.lang.IllegalStateException("You need to provide appKey")
+      appKey = data.getString("appKey") ?: throw IllegalStateException("You need to provide appKey")
       publicApiKey = data.takeIf { it.hasKey("publicApiKey") }?.getString("publicApiKey")
       serviceEncryptionKey = data.takeIf { it.hasKey("serviceEncryptionKey") }?.getString("serviceEncryptionKey")
       blockEmulatorDetection = data.takeIf { it.hasKey("blockEmulatorDetection") }?.getBoolean("blockEmulatorDetection")
@@ -163,11 +165,12 @@ class KeyriNativeModule(private val reactContext: ReactApplicationContext) : Rea
   fun sendEvent(data: ReadableMap, promise: Promise) {
     keyriCoroutineScope(promise) {
       val publicUserId = data.takeIf { it.hasKey("publicUserId") }?.getString("publicUserId") ?: "ANON"
-      val eventType = data.getString("eventType")
-        ?: throw java.lang.IllegalStateException("You need to provide eventType")
+      val eventType = data.getString("eventType") ?: throw IllegalStateException("You need to provide eventType")
+      val eventMetadata = data.takeIf { it.hasKey("eventMetadata") }?.getString("eventMetadata")
       val success = data.getBoolean("success")
 
-      val type = EventType.values().first { it.type == eventType }
+      val jsonMetadata = eventMetadata?.let(::JSONObject)
+      val type = EventType.custom(eventType, jsonMetadata)
 
       val fingerprintEventResponse = keyri.sendEvent(publicUserId, type, success).getOrThrow()
 
@@ -181,6 +184,20 @@ class KeyriNativeModule(private val reactContext: ReactApplicationContext) : Rea
     }
   }
 
+  @ReactMethod
+  fun createFingerprint(promise: Promise) {
+    keyriCoroutineScope(promise) {
+      val fingerprintRequest = keyri.createFingerprint().getOrThrow()
+
+      WritableNativeMap().apply {
+        putString("clientEncryptionKey", fingerprintRequest.clientEncryptionKey)
+        putString("encryptedPayload", fingerprintRequest.encryptedPayload)
+        putString("iv", fingerprintRequest.iv)
+        putString("salt", fingerprintRequest.salt)
+      }
+    }
+  }
+
   @ReactMethod
   fun initiateQrSession(sessionId: String, publicUserId: String?, promise: Promise) {
     keyriCoroutineScope(promise) {
@@ -337,7 +354,7 @@ class KeyriNativeModule(private val reactContext: ReactApplicationContext) : Rea
   @ReactMethod
   fun initializeDefaultConfirmationScreen(payload: String, promise: Promise) {
     keyriCoroutineScope(promise) {
-      val session = activeSession ?: throw java.lang.IllegalStateException("Session not found")
+      val session = activeSession ?: throw IllegalStateException("Session not found")
 
       val fm = requireNotNull((reactContext.currentActivity as? AppCompatActivity)?.supportFragmentManager)
       val result = keyri.initializeDefaultConfirmationScreen(fm, session, payload)
@@ -358,9 +375,8 @@ class KeyriNativeModule(private val reactContext: ReactApplicationContext) : Rea
   fun processLink(data: ReadableMap, promise: Promise) {
     keyriCoroutineScope(promise) {
       val publicUserId: String? = data.takeIf { it.hasKey("publicUserId") }?.getString("publicUserId")
-      val url: String = data.getString("url") ?: throw java.lang.IllegalStateException("You need to provide url")
-      val payload: String = data.getString("payload")
-        ?: throw java.lang.IllegalStateException("You need to provide payload")
+      val url: String = data.getString("url") ?: throw IllegalStateException("You need to provide url")
+      val payload: String = data.getString("payload") ?: throw IllegalStateException("You need to provide payload")
 
       val uri = Uri.parse(url)
       val fm = requireNotNull((reactContext.currentActivity as? AppCompatActivity)?.supportFragmentManager)
@@ -391,7 +407,7 @@ class KeyriNativeModule(private val reactContext: ReactApplicationContext) : Rea
 
   private fun finishSession(payload: String, isApproved: Boolean, trustNewBrowser: Boolean = false, promise: Promise) {
     keyriCoroutineScope(promise) {
-      val session = activeSession ?: throw java.lang.IllegalStateException("Session not found")
+      val session = activeSession ?: throw IllegalStateException("Session not found")
 
       if (isApproved) {
         session.confirm(payload, reactContext, trustNewBrowser)

babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
 };