Catch more cancel errors for Android

Author: incorbador

packages/corbado_auth/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.1
+* Bump version for passkeys
+
 ## 1.2.0
 * Deprecate the customDomain setting (this does not have to be configured to production projects)
 * Bump passkeys and flutter_keychain version

packages/corbado_auth/pubspec.yaml

@@ -2,7 +2,7 @@ name: corbado_auth
 description: Flutter package for Corbado Auth. Enables authentication on Android and iOS using passkeys.
 homepage: https://docs.corbado.com/overview/welcome
 repository: https://github.com/corbado/flutter-passkeys/tree/main/packages/corbado_auth
-version: 1.2.0
+version: 1.2.1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

packages/passkeys/passkeys/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.3.2
+* Bump version for passkeys_android
+
 ## 1.3.1
 * Bump versions for passkeys_ios, passkeys_android and passkeys_platform_interface
 

packages/passkeys/passkeys/pubspec.yaml

@@ -2,7 +2,7 @@ name: passkeys
 description: Flutter plugin enabling simple passkey authentication. Can be either used with a ready-to-use relying party server (Corbado) or with your custom relying party.
 homepage: https://docs.corbado.com/overview/welcome
 repository: https://github.com/corbado/flutter-passkeys/tree/main/packages/passkeys/passkeys
-version: 1.3.1
+version: 1.3.2
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -24,7 +24,7 @@ dependencies:
   http: ^1.1.0
   json_annotation: ^4.8.1
   openapi_generator_annotations: ^4.10.0
-  passkeys_android: ^1.2.0
+  passkeys_android: ^1.2.1
   passkeys_ios: ^1.2.0
   passkeys_platform_interface: ^1.2.0
   ua_client_hints: ^1.1.3

packages/passkeys/passkeys_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.1
+
+* Catch more situations when a user interrupts biometrics ceremony (e.g. providing his fingerprint).
+
 ## 1.2.0
 
 * Bump passkeys_platform_interface version.

packages/passkeys/passkeys_android/android/src/main/java/com/corbado/passkeys_android/MessageHandler.java

@@ -23,6 +23,7 @@
 import androidx.credentials.exceptions.GetCredentialException;
 import androidx.credentials.exceptions.NoCredentialException;
 import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialDomException;
+import androidx.credentials.exceptions.publickeycredential.CreatePublicKeyCredentialException;
 import androidx.credentials.exceptions.publickeycredential.GetPublicKeyCredentialDomException;
 
 import com.corbado.passkeys_android.models.login.AllowCredentialType;
@@ -105,7 +106,10 @@ public void onResult(CreateCredentialResponse res) {
                 @Override
                 public void onError(CreateCredentialException e) {
                     Exception platformException = e;
-                    if (e instanceof CreateCredentialCancellationException) {
+                    if (Objects.equals(e.getMessage(), "Unable to create key during registration")) {
+                        // currently, Android throws this error when users skip the fingerPrint animation => we interpret this as a cancellation for now
+                        platformException = new Messages.FlutterError("cancelled", e.getMessage(), "");
+                    } else if (e instanceof CreateCredentialCancellationException) {
                         platformException = new Messages.FlutterError("cancelled", e.getMessage(), "");
                     } else if (e instanceof CreatePublicKeyCredentialDomException) {
                         if (Objects.equals(e.getMessage(), "User is unable to create passkeys.")) {
@@ -179,7 +183,12 @@ public void onResult(GetCredentialResponse res) {
                 @Override
                 public void onError(GetCredentialException e) {
                     Exception platformException = e;
-                    if (e instanceof GetCredentialCancellationException) {
+                    Log.e(TAG, "onError called", e);
+
+                    // currently, Android throws this error when users skip the fingerPrint animation => we interpret this as a cancellation for now
+                    if (Objects.equals(e.getMessage(), "None of the allowed credentials can be authenticated")) {
+                        platformException = new Messages.FlutterError("cancelled", e.getMessage(), "");
+                    } else if (e instanceof GetCredentialCancellationException) {
                         platformException = new Messages.FlutterError("cancelled", e.getMessage(), "");
                     } else if (e instanceof NoCredentialException) {
                         platformException = new Messages.FlutterError("android-no-credential", e.getMessage(), "");

packages/passkeys/passkeys_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: passkeys_android
 description: Android implementation of the Corbado passkeys plugin. Manages the creation of passkeys on Android devices.
 homepage: https://docs.corbado.com/overview/welcome
 repository: https://github.com/corbado/flutter-passkeys/tree/main/packages/passkeys/passkeys_android
-version: 1.2.0
+version: 1.2.1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"