@capgo/capacitor-passkey 8.3.10 → 8.5.1

package/ios/Sources/CapacitorPasskeyPlugin/CapacitorPasskey.swift

@@ -1,3 +1,5 @@
+import AuthenticationServices
+import Capacitor
 import Foundation
 
 @objc public class CapacitorPasskey: NSObject {
@@ -31,6 +33,36 @@ import Foundation
 
         return data
     }
+
+    static func errorName(for code: ASAuthorizationError.Code) -> String {
+        switch code {
+        case .canceled, .failed, .notHandled:
+            return "NotAllowedError"
+        case .matchedExcludedCredential:
+            return "InvalidStateError"
+        default:
+            return "UnknownError"
+        }
+    }
+
+    static func nativeErrorDetails(from error: Error) -> JSObject? {
+        guard let authorizationError = error as? ASAuthorizationError else {
+            return nil
+        }
+
+        let nsError = error as NSError
+        var details: JSObject = [
+            "platform": "ios",
+            "code": authorizationError.code.rawValue,
+            "domain": nsError.domain
+        ]
+
+        if let reason = nsError.userInfo[NSLocalizedFailureReasonErrorKey] as? String {
+            details["failureReason"] = reason
+        }
+
+        return details
+    }
 }
 
 struct PasskeyPluginError: Error {

package/ios/Sources/CapacitorPasskeyPlugin/CapacitorPasskeyPlugin.swift

@@ -119,9 +119,9 @@ private func normalizeDomain(_ value: String?) -> String? {
 
 @objc(CapacitorPasskeyPlugin)
 public class CapacitorPasskeyPlugin: CAPPlugin,
-    CAPBridgedPlugin,
-    ASAuthorizationControllerDelegate,
-    ASAuthorizationControllerPresentationContextProviding {
+                                     CAPBridgedPlugin,
+                                     ASAuthorizationControllerDelegate,
+                                     ASAuthorizationControllerPresentationContextProviding {
     public let identifier = "CapacitorPasskeyPlugin"
     public let jsName = "CapacitorPasskey"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -166,7 +166,12 @@ public class CapacitorPasskeyPlugin: CAPPlugin,
             let assertionRequest = try JSONDecoder().decode(PasskeyAssertionRequestJSON.self, from: requestJson)
             let origin = normalizedOrigin(call.getString("origin"), rpId: assertionRequest.rpId)
             let authorizationRequest = try buildAssertionRequest(from: assertionRequest, origin: origin)
-            performAuthorization(call: call, request: authorizationRequest, operation: .assertion)
+            performAuthorization(
+                call: call,
+                request: authorizationRequest,
+                operation: .assertion,
+                preferImmediatelyAvailableCredentials: call.getBool("preferImmediatelyAvailableCredentials") ?? false
+            )
         } catch let error as PasskeyPluginError {
             reject(call, error: error)
         } catch {
@@ -237,14 +242,17 @@ public class CapacitorPasskeyPlugin: CAPPlugin,
 
         clearPendingRequest()
         if let authorizationError = error as? ASAuthorizationError {
-            switch authorizationError.code {
-            case .canceled, .failed, .notHandled:
-                reject(call, name: "NotAllowedError", message: authorizationError.localizedDescription, error: error)
-            case .matchedExcludedCredential:
-                reject(call, name: "InvalidStateError", message: authorizationError.localizedDescription, error: error)
-            default:
-                reject(call, name: "UnknownError", message: authorizationError.localizedDescription, error: error)
+            var data: JSObject = [:]
+            if let native = CapacitorPasskey.nativeErrorDetails(from: error) {
+                data["native"] = native
             }
+            reject(
+                call,
+                name: CapacitorPasskey.errorName(for: authorizationError.code),
+                message: authorizationError.localizedDescription,
+                error: error,
+                data: data
+            )
             return
         }
 
@@ -255,7 +263,12 @@ public class CapacitorPasskeyPlugin: CAPPlugin,
         bridge?.viewController?.view.window ?? ASPresentationAnchor()
     }
 
-    private func performAuthorization(call: CAPPluginCall, request: ASAuthorizationRequest, operation: PasskeyOperation) {
+    private func performAuthorization(
+        call: CAPPluginCall,
+        request: ASAuthorizationRequest,
+        operation: PasskeyOperation,
+        preferImmediatelyAvailableCredentials: Bool = false
+    ) {
         pendingCall = call
         pendingOperation = operation
 
@@ -263,7 +276,11 @@ public class CapacitorPasskeyPlugin: CAPPlugin,
             let controller = ASAuthorizationController(authorizationRequests: [request])
             controller.delegate = self
             controller.presentationContextProvider = self
-            controller.performRequests()
+            if #available(iOS 16.0, *), preferImmediatelyAvailableCredentials {
+                controller.performRequests(options: .preferImmediatelyAvailableCredentials)
+            } else {
+                controller.performRequests()
+            }
         }
     }
 
@@ -381,8 +398,15 @@ public class CapacitorPasskeyPlugin: CAPPlugin,
         reject(call, name: error.name, message: error.message)
     }
 
-    private func reject(_ call: CAPPluginCall, name: String, message: String, error: Error? = nil) {
-        let data: JSObject = ["name": name]
-        call.reject(message, name, error, data)
+    private func reject(
+        _ call: CAPPluginCall,
+        name: String,
+        message: String,
+        error: Error? = nil,
+        data: JSObject = [:]
+    ) {
+        var payload = data
+        payload["name"] = name
+        call.reject(message, name, error, payload)
     }
 }

package/ios/Tests/CapacitorPasskeyPluginTests/CapacitorPasskeyPluginTests.swift

@@ -1,3 +1,4 @@
+import AuthenticationServices
 import XCTest
 @testable import CapacitorPasskeyPlugin
 
@@ -14,4 +15,56 @@ class CapacitorPasskeyPluginTests: XCTestCase {
 
         XCTAssertEqual(input, decoded)
     }
+
+    func testErrorNameMatrix() {
+        let cases: [(ASAuthorizationError.Code, String)] = [
+            (.canceled, "NotAllowedError"),
+            (.failed, "NotAllowedError"),
+            (.notHandled, "NotAllowedError"),
+        ]
+
+        for (code, expected) in cases {
+            XCTAssertEqual(
+                CapacitorPasskey.errorName(for: code),
+                expected,
+                "ASAuthorizationError.Code rawValue \(code.rawValue)"
+            )
+        }
+
+        if #available(iOS 18.0, *) {
+            XCTAssertEqual(
+                CapacitorPasskey.errorName(for: .matchedExcludedCredential),
+                "InvalidStateError"
+            )
+        }
+    }
+
+    func testNativeErrorDetailsMatrix() throws {
+        let associationFailure = NSError(
+            domain: ASAuthorizationError.errorDomain,
+            code: ASAuthorizationError.Code.failed.rawValue,
+            userInfo: [NSLocalizedFailureReasonErrorKey: "Unable to verify webcredentials association"]
+        )
+        let associationDetails = try XCTUnwrap(CapacitorPasskey.nativeErrorDetails(from: associationFailure))
+        XCTAssertEqual(associationDetails["code"] as? Int, 1004)
+        XCTAssertEqual(associationDetails["platform"] as? String, "ios")
+        XCTAssertEqual(associationDetails["domain"] as? String, ASAuthorizationError.errorDomain)
+        XCTAssertEqual(
+            associationDetails["failureReason"] as? String,
+            "Unable to verify webcredentials association"
+        )
+
+        let canceled = NSError(
+            domain: ASAuthorizationError.errorDomain,
+            code: ASAuthorizationError.Code.canceled.rawValue,
+            userInfo: [:]
+        )
+        let canceledDetails = try XCTUnwrap(CapacitorPasskey.nativeErrorDetails(from: canceled))
+        XCTAssertEqual(canceledDetails["code"] as? Int, 1001)
+        XCTAssertEqual(canceledDetails["platform"] as? String, "ios")
+        XCTAssertNil(canceledDetails["failureReason"])
+
+        let unrelated = NSError(domain: NSURLErrorDomain, code: NSURLErrorTimedOut, userInfo: nil)
+        XCTAssertNil(CapacitorPasskey.nativeErrorDetails(from: unrelated))
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-passkey",
-  "version": "8.3.10",
+  "version": "8.5.1",
   "description": "Capacitor passkey plugin with a WebAuthn-style shim for Capacitor apps.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",