Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.stytch.sdk.biometrics

import android.os.Build
import android.security.keystore.KeyGenParameterSpec
import android.security.keystore.KeyPermanentlyInvalidatedException
import android.security.keystore.KeyProperties
import android.security.keystore.UserNotAuthenticatedException
import androidx.biometric.BiometricManager
import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
Expand All @@ -17,6 +17,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext
import java.security.InvalidAlgorithmParameterException
import java.security.InvalidKeyException
import java.security.KeyStore
import java.util.concurrent.Executors
import javax.crypto.Cipher
Expand All @@ -37,7 +38,10 @@ public actual class BiometricsProvider(
var errorEncounteredWhenGeneratingKey = false
try {
ensureSecretKeyIsAvailable(allowedAuthenticators)
} catch (_: KeyPermanentlyInvalidatedException) {
} catch (_: UserNotAuthenticatedException) {
// This is a type of `InvalidKeyException`, but doesn't require the registration to be revoked, just for the user to re-auth
return BiometricsAvailability.UserAuthenticationRequired
} catch (_: InvalidKeyException) {
removeRegistration()
return BiometricsAvailability.RegistrationRevoked
} catch (_: IllegalStateException) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ public sealed class BiometricsAvailability {

@Serializable public data object RegistrationRevoked : BiometricsAvailability()

@Serializable public data object UserAuthenticationRequired : BiometricsAvailability()

@Serializable public data class Unavailable(
public val reason: String?,
public val code: Int? = null,
Expand Down
Loading