Skip to content

fix(android): contain setup errors and cancel invalidated passkey work #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: stable
Choose a base branch
from
+34 −23
Open

fix(android): contain setup errors and cancel invalidated passkey work #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 34 additions & 23 deletions android/src/main/java/com/reactnativepasskey/PasskeyModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import androidx.credentials.exceptions.publickeycredential.GetPublicKeyCredentia

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch

import org.json.JSONArray
Expand All @@ -30,13 +32,17 @@ class PasskeyModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
return "Passkey"
}

override fun invalidate() {
mainScope.cancel()
super.invalidate()
}

@ReactMethod
fun create(requestJson: String, forcePlatformKey: Boolean, forceSecurityKey: Boolean, promise: Promise) {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val createPublicKeyCredentialRequest = CreatePublicKeyCredentialRequest(requestJson)

mainScope.launch {
try {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val createPublicKeyCredentialRequest = CreatePublicKeyCredentialRequest(requestJson)
val activity = reactApplicationContext.currentActivity
?: run { promise.reject("RequestFailed", "No active Activity"); return@launch }

Expand All @@ -49,6 +55,8 @@ class PasskeyModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
} catch (e: CreateCredentialException) {
val errorCode = handleRegistrationException(e)
promise.reject(errorCode, e.errorMessage?.toString() ?: errorCode)
} catch (e: CancellationException) {
throw e
} catch (e: Throwable) {
promise.reject("UnknownError", e.message ?: "UnknownError")
}
Expand Down Expand Up @@ -93,15 +101,14 @@ class PasskeyModule(reactContext: ReactApplicationContext) : ReactContextBaseJav

@ReactMethod
fun get(requestJson: String, forcePlatformKey: Boolean, forceSecurityKey: Boolean, preferImmediatelyAvailable: Boolean, promise: Promise) {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val getCredentialRequest =
GetCredentialRequest(
listOf(GetPublicKeyCredentialOption(requestJson)),
preferImmediatelyAvailableCredentials = preferImmediatelyAvailable
)

mainScope.launch {
try {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val getCredentialRequest =
GetCredentialRequest(
listOf(GetPublicKeyCredentialOption(requestJson)),
preferImmediatelyAvailableCredentials = preferImmediatelyAvailable
)
val activity = reactApplicationContext.currentActivity
?: run { promise.reject("RequestFailed", "No active Activity"); return@launch }

Expand All @@ -114,6 +121,8 @@ class PasskeyModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
} catch (e: GetCredentialException) {
val errorCode = handleAuthenticationException(e)
promise.reject(errorCode, e.errorMessage?.toString() ?: errorCode)
} catch (e: CancellationException) {
throw e
} catch (e: Throwable) {
promise.reject("UnknownError", e.message ?: "UnknownError")
}
Expand All @@ -130,16 +139,17 @@ class PasskeyModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
*/
@ReactMethod
fun signalUnknownCredential(rpId: String, credentialId: String, promise: Promise) {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val requestJson = JSONObject().apply {
put("rpId", rpId)
put("credentialId", credentialId)
}.toString()

mainScope.launch {
try {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val requestJson = JSONObject().apply {
put("rpId", rpId)
put("credentialId", credentialId)
}.toString()
credentialManager.signalCredentialState(SignalUnknownCredentialRequest(requestJson))
promise.resolve(null)
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
promise.reject("SignalFailed", e.message ?: "signalUnknownCredential failed", e)
}
Expand All @@ -162,17 +172,18 @@ class PasskeyModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
allAcceptedCredentialIdsJson: String,
promise: Promise
) {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val requestJson = JSONObject().apply {
put("rpId", rpId)
put("userId", userId)
put("allAcceptedCredentialIds", JSONArray(allAcceptedCredentialIdsJson))
}.toString()

mainScope.launch {
try {
val credentialManager = CredentialManager.create(reactApplicationContext.applicationContext)
val requestJson = JSONObject().apply {
put("rpId", rpId)
put("userId", userId)
put("allAcceptedCredentialIds", JSONArray(allAcceptedCredentialIdsJson))
}.toString()
credentialManager.signalCredentialState(SignalAllAcceptedCredentialIdsRequest(requestJson))
promise.resolve(null)
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
promise.reject("SignalFailed", e.message ?: "signalAllAcceptedCredentials failed", e)
}
Expand Down