@algorandfoundation/react-native-passkey-autofill 1.0.0-canary.3 → 1.0.0-canary.5

package/.eslintrc.js

@@ -2,4 +2,7 @@ module.exports = {
   root: true,
   extends: ['universe/native', 'universe/web'],
   ignorePatterns: ['build'],
+  rules: {
+    'node/handle-callback-err': 'off',
+  },
 };

package/.releaserc

@@ -0,0 +1,23 @@
+{
+  "branches": [
+    "release",
+    {
+      "name": "main",
+      "prerelease": "canary"
+    }
+  ],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/changelog",
+    "@semantic-release/npm",
+    [
+      "@semantic-release/git",
+      {
+        "assets": ["package.json", "CHANGELOG.md"],
+        "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+      }
+    ],
+    "@semantic-release/github"
+  ]
+}

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# [1.0.0-canary.5](https://github.com/algorandfoundation/react-native-passkey-autofill/compare/v1.0.0-canary.4...v1.0.0-canary.5) (2026-03-24)
+
+
+### Features
+
+* **android:** add allowed credentials mapping ([e7134fc](https://github.com/algorandfoundation/react-native-passkey-autofill/commit/e7134fc1e5bf09649155e38010e4ef9728580812))
+* **android:** credential compatibility with system-provided clientDataHash and compact JSON ([428e96f](https://github.com/algorandfoundation/react-native-passkey-autofill/commit/428e96f89b73cd35fdbfaa6669f39da68403e17e))

package/CONTRIBUTING.md

@@ -50,6 +50,16 @@ The project includes an example app in the `example/` directory. You can use it
 
 For more details on how the project is structured, see the [Architecture Guide](./ARCHITECTURE.md).
 
+### Testing
+
+Before submitting a Pull Request, ensure that both JavaScript and Native tests pass:
+
+```bash
+npm run test:all
+```
+
+For more details on the testing strategy, refer to the [Testing section in README.md](./README.md#🧪-testing).
+
 ## Submitting a Pull Request
 
 1. Create a new branch for your feature or bugfix:

package/README.md

@@ -1,6 +1,12 @@
-# 🔑 react-native-passkey-autofill
+# @algorandfoundation/react-native-passkey-autofill
 
-Passkey AutoFill for React Native using DP256.
+<p align="center">
+  <img src="./example/assets/banner.png" width="100%" />
+</p>
+
+<p align="center">
+  Passkey AutoFill for React Native using DP256.
+</p>
 
 # 🚀 Get Started
 
@@ -9,7 +15,7 @@ For bare React Native projects, you must ensure that you have [installed and con
 ### Add the package to your npm dependencies
 
 ```bash
-npm install react-native-passkey-autofill
+npm install @algorandfoundation/react-native-passkey-autofill
 ```
 
 ### Configure for Android
@@ -25,7 +31,7 @@ If you are using Expo, you can configure the plugin in your `app.json` or `app.c
   "expo": {
     "plugins": [
       [
-        "react-native-passkey-autofill",
+        "@algorandfoundation/react-native-passkey-autofill",
         {
           "site": "https://your-fido-server.com",
           "label": "My Custom Credential Provider"
@@ -60,17 +66,49 @@ await ReactNativePasskeyAutofill.configureIntentActions(
 await ReactNativePasskeyAutofill.clearCredentials();
 ```
 
+## 🧪 Testing
+
+The project is set up with a comprehensive testing approach covering both JavaScript and Native (Kotlin) sides.
+
+### JavaScript Tests
+Run unit tests for the TypeScript module using Jest:
+```bash
+npm test
+```
+
+### Native Android Tests
+Run unit tests for the Kotlin code using JUnit and Robolectric. These tests are executed via the example app's Gradle wrapper:
+```bash
+npm run test:android
+```
+
+### All Tests
+Run both JS and Native tests:
+```bash
+npm run test:all
+```
+
+### Continuous Integration (CI)
+The project includes a GitHub Actions workflow that automatically runs linting, JS tests, and Native Android tests on every push and pull request to the `main` or `release` branches. You can find the configuration in `.github/workflows/ci.yml`.
+
+### Integration Testing (E2E)
+For full end-to-end testing that covers the bridge between JavaScript and Native, we recommend using [Maestro](https://maestro.mobile.dev/). It provides a clean, YAML-based way to automate UI flows and verify the integration of the Passkey Autofill service with the system UI.
+
+## 📱 Example App
+
+The [example](./example) app demonstrates how to integrate this module with a full wallet implementation.
+
 # 🤝 Contributing
 
 Contributions are very welcome! Please refer to guidelines described in the [contributing guide](./CONTRIBUTING.md).
 
 # 💖 Acknowledgements
 
-This has been the commination of many different efforts and ideas. We would like to thank the following individuals and organizations for their contributions:
+This has been the culmination of many different efforts and ideas. We would like to thank the following individuals and organizations for their contributions:
 
 - [Bruno Martins](https://github.com/bmartins) the architect at [Algorand Foundation](https://github.com/algorandfoundation) for conceptualizing and guiding the project.
 - [HashMapsData2Value](https://github.com/HashMapsData2Value) for his guidance and support in DP256 and XHD and his work on the native autofill libraries.
-- [Will Beaumont](https://github.com/mjbeau) for working though integration within the Pera wallet
+- [Will Beaumont](https://github.com/mjbeau) for working through integration within the Pera wallet
 - [Michael T Chuang](https://github.com/michaeltchuang) for his work in KMP integrations and client libraries.
 
 # 📄 License

package/android/build.gradle

@@ -27,6 +27,7 @@ if (useManagedAndroidSdkVersions) {
     defaultConfig {
       minSdkVersion safeExtGet("minSdkVersion", 24)
       targetSdkVersion safeExtGet("targetSdkVersion", 36)
+      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
   }
 }
@@ -43,6 +44,12 @@ android {
   kotlinOptions {
     freeCompilerArgs += ["-opt-in=kotlin.time.ExperimentalTime", "-opt-in=kotlin.RequiresOptIn"]
   }
+  testOptions {
+    unitTests.includeAndroidResources = true
+  }
+  packagingOptions {
+    pickFirst '**/libc++_shared.so'
+  }
 }
 
 dependencies {
@@ -59,6 +66,17 @@ dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
+
+  // Testing dependencies
+  testImplementation "junit:junit:4.13.2"
+  testImplementation "org.robolectric:robolectric:4.11.1"
+  testImplementation "io.mockk:mockk:1.13.8"
+  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
+
+  androidTestImplementation "androidx.test:runner:1.5.2"
+  androidTestImplementation "androidx.test:rules:1.5.0"
+  androidTestImplementation "androidx.test.ext:junit:1.1.5"
+  androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
 }
 
 repositories {

package/android/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
             android:enabled="true"
             android:exported="true"
             android:label="@string/passkey_autofill_label"
-            android:icon="@mipmap/ic_launcher"
             android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
             tools:targetApi="upside_down_cake">
             <intent-filter>

package/android/src/main/java/co/algorand/passkeyautofill/CreatePasskeyActivity.kt

@@ -6,7 +6,12 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
+import android.graphics.Color
+import android.graphics.Typeface
+import android.view.Gravity
 import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
@@ -31,61 +36,174 @@ class CreatePasskeyActivity : AppCompatActivity() {
         const val TAG = "CreatePasskeyActivity"
     }
 
-    private var origin: String = "unknown-origin"
+    private var origin: String = "unknown-origin" // Derivation origin (rpId or hash)
+    private var displayOrigin: String = "unknown-origin"
     private var userHandle: String = "unknown-user"
     private var userName: String = "User"
     private var userId: String = "unknown-id"
+    private var bundleRequestJson: String? = null
     private var request: ProviderCreateCredentialRequest? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         
         request = PendingIntentHandler.retrieveProviderCreateCredentialRequest(intent)
+        val credentialData = intent.getBundleExtra("CREDENTIAL_DATA")
+        
+        if (credentialData != null) {
+            bundleRequestJson = credentialData.getString("requestJson")
+        }
+
         if (request != null) {
             try {
+                val systemOrigin = credentialRepository.getOrigin(request!!.callingAppInfo)
+                origin = systemOrigin
+                displayOrigin = systemOrigin
+
                 val publicKeyRequest = request!!.callingRequest as CreatePublicKeyCredentialRequest
-                val requestJson = JSONObject(publicKeyRequest.requestJson)
+                val rawJson = bundleRequestJson ?: publicKeyRequest.requestJson
+                val requestJson = JSONObject(rawJson)
+                val pkJson = if (requestJson.has("publicKey")) requestJson.getJSONObject("publicKey") else requestJson
                 
                 // Use RP ID as origin for derivation if available, otherwise fallback to app signature
-                val rpId = requestJson.optJSONObject("rp")?.optString("id")
-                origin = rpId ?: credentialRepository.getOrigin(request!!.callingAppInfo)
+                val rpId = pkJson.optJSONObject("rp")?.optString("id")
+                if (rpId != null && rpId.isNotEmpty()) {
+                    origin = rpId
+                    displayOrigin = rpId
+                }
                 
-                val userJson = requestJson.optJSONObject("user")
-                userHandle = userJson?.optString("name") ?: "unknown-user"
-                userName = userJson?.optString("displayName") ?: userHandle
-                userId = userJson?.optString("id") ?: "unknown-id"
+                userHandle = pkJson.optJSONObject("user")?.optString("name") ?: "unknown-user"
+                userName = pkJson.optJSONObject("user")?.optString("displayName") ?: userHandle
+                userId = pkJson.optJSONObject("user")?.optString("id") ?: "unknown-id"
             } catch (e: Exception) {
                 Log.e(TAG, "Error parsing request", e)
             }
         }
 
-        // Simple UI for demonstration
-        val layout = android.widget.LinearLayout(this).apply {
-            orientation = android.widget.LinearLayout.VERTICAL
-            setPadding(50, 50, 50, 50)
+        // Improved UI
+        val layout = LinearLayout(this).apply {
+            val padding = (32 * resources.displayMetrics.density).toInt()
+            orientation = LinearLayout.VERTICAL
+            setPadding(padding, padding, padding, padding)
+            gravity = Gravity.CENTER_HORIZONTAL
+            setBackgroundColor(Color.WHITE)
         }
         
+        // Header with App Icon and Provider Label
+        try {
+            val appInfo = packageManager.getApplicationInfo(packageName, 0)
+            val appIcon = packageManager.getApplicationIcon(appInfo)
+            val appLabel = packageManager.getApplicationLabel(appInfo)
+
+            val density = resources.displayMetrics.density
+            val iconSize = (48 * density).toInt()
+            val iconMargin = (12 * density).toInt()
+            val headerPadding = (40 * density).toInt()
+
+            val header = LinearLayout(this).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_VERTICAL
+                setPadding(0, 0, 0, headerPadding)
+            }
+
+            val iconView = ImageView(this).apply {
+                setImageDrawable(appIcon)
+                layoutParams = LinearLayout.LayoutParams(iconSize, iconSize).apply {
+                    marginEnd = iconMargin
+                }
+            }
+            header.addView(iconView)
+
+            val providerLabel = TextView(this).apply {
+                text = appLabel
+                textSize = 16f
+                typeface = Typeface.DEFAULT_BOLD
+                setTextColor(Color.DKGRAY)
+            }
+            header.addView(providerLabel)
+            layout.addView(header)
+        } catch (e: Exception) {
+            // Fallback if app info cannot be loaded
+        }
+
         val title = TextView(this).apply {
-            text = "Create New Passkey"
-            textSize = 24f
-            setPadding(0, 0, 0, 50)
+            text = "Create Passkey"
+            textSize = 28f
+            typeface = Typeface.DEFAULT_BOLD
+            setPadding(0, 0, 0, (8 * resources.displayMetrics.density).toInt())
+            setTextColor(Color.BLACK)
         }
         layout.addView(title)
 
-        val info = TextView(this).apply {
-            text = "For: $userName\nAt: $origin"
-            setPadding(0, 0, 0, 50)
+        val description = TextView(this).apply {
+            text = "Create a new passkey for $displayOrigin"
+            textSize = 16f
+            setPadding(0, 0, 0, (40 * resources.displayMetrics.density).toInt())
+            gravity = Gravity.CENTER_HORIZONTAL
+            setTextColor(Color.GRAY)
+        }
+        layout.addView(description)
+
+        val userInfoContainer = LinearLayout(this).apply {
+            orientation = LinearLayout.VERTICAL
+            setPadding(0, 0, 0, (50 * resources.displayMetrics.density).toInt())
+            gravity = Gravity.CENTER_HORIZONTAL
+        }
+
+        val userLabel = TextView(this).apply {
+            text = "ACCOUNT"
+            textSize = 12f
+            typeface = Typeface.DEFAULT_BOLD
+            setTextColor(Color.GRAY)
+            setPadding(0, 0, 0, (4 * resources.displayMetrics.density).toInt())
         }
-        layout.addView(info)
+        userInfoContainer.addView(userLabel)
+
+        val userValue = TextView(this).apply {
+            text = userName
+            textSize = 20f
+            typeface = Typeface.DEFAULT_BOLD
+            setTextColor(Color.BLACK)
+        }
+        userInfoContainer.addView(userValue)
+        
+        if (userHandle != userName) {
+            val handleValue = TextView(this).apply {
+                text = userHandle
+                textSize = 14f
+                setTextColor(Color.GRAY)
+            }
+            userInfoContainer.addView(handleValue)
+        }
+        layout.addView(userInfoContainer)
         
         val confirmButton = Button(this).apply {
             text = "Create Passkey"
             setOnClickListener {
                 handleCreation()
             }
+            layoutParams = LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            ).apply {
+                setMargins(0, 0, 0, (8 * resources.displayMetrics.density).toInt())
+            }
         }
         layout.addView(confirmButton)
 
+        val cancelButton = Button(this, null, android.R.attr.borderlessButtonStyle).apply {
+            text = "Cancel"
+            setOnClickListener {
+                setResult(RESULT_CANCELED)
+                finish()
+            }
+            layoutParams = LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            )
+        }
+        layout.addView(cancelButton)
+
         setContentView(layout)
     }
 
@@ -93,8 +211,25 @@ class CreatePasskeyActivity : AppCompatActivity() {
     private fun handleCreation() {
         try {
             val req = request ?: throw IllegalStateException("No request found")
-            val publicKeyRequest = req.callingRequest as CreatePublicKeyCredentialRequest
-            val requestOptions = PublicKeyCredentialCreationOptions(publicKeyRequest.requestJson)
+            
+            // Prefer using the request JSON from the bundle if available
+            val rawRequestJson = bundleRequestJson ?: run {
+                val publicKeyRequest = req.callingRequest as CreatePublicKeyCredentialRequest
+                publicKeyRequest.requestJson
+            }
+
+            val requestJson = JSONObject(rawRequestJson)
+            val passkeyReqJson = if (requestJson.has("publicKey")) {
+                requestJson.getJSONObject("publicKey").toString()
+            } else {
+                rawRequestJson
+            }
+            val requestOptions = try {
+                PublicKeyCredentialCreationOptions(passkeyReqJson)
+            } catch (e: org.json.JSONException) {
+                Log.e(TAG, "Invalid passkey creation request JSON: $passkeyReqJson")
+                throw e
+            }
 
             val keyPair: KeyPair = credentialRepository.createDeterministicKeyPair(this, origin, userHandle)
             val credentialId = credentialRepository.generateCredentialId(keyPair)
@@ -131,25 +266,34 @@ class CreatePasskeyActivity : AppCompatActivity() {
             )
 
             val resultIntent = Intent()
-            val responseJson = JSONObject(fidoCredential.json())
-            val passkeyDetails = JSONObject()
-            
-            val ecPubKey = keyPair.public as java.security.interfaces.ECPublicKey
-            val ecPrivKey = keyPair.private as java.security.interfaces.ECPrivateKey
-            
-            fun to32(bi: java.math.BigInteger): ByteArray {
-                var ba = bi.toByteArray()
-                if (ba.size < 32) {
-                    ba = ByteArray(32 - ba.size) + ba
+            val fullJson = JSONObject(fidoCredential.json())
+            val respJson = fullJson.getJSONObject("response")
+
+            // Ensure compact clientDataJSON for registration too
+            val sanitizedOrigin = credentialRepository.getOrigin(req.callingAppInfo).replace(Regex("/$"), "")
+            val challenge = if (requestJson.has("publicKey")) {
+                requestJson.getJSONObject("publicKey").getString("challenge")
+            } else {
+                requestJson.getString("challenge")
+            }
+
+            val clientDataJSONString = if (sanitizedOrigin.startsWith("https://") || sanitizedOrigin.startsWith("http://")) {
+                "{\"type\":\"webauthn.create\",\"challenge\":\"$challenge\",\"origin\":\"$sanitizedOrigin\",\"crossOrigin\":false}"
+            } else {
+                val json = JSONObject()
+                json.put("type", "webauthn.create")
+                json.put("challenge", challenge)
+                json.put("origin", sanitizedOrigin)
+                json.put("crossOrigin", false)
+                if (sanitizedOrigin.startsWith("android:apk-key-hash:")) {
+                    json.put("androidPackageName", req.callingAppInfo.packageName)
                 }
-                return ba.copyOfRange(ba.size - 32, ba.size)
+                json.toString()
             }
-            
-            val x = to32(ecPubKey.w.affineX)
-            val y = to32(ecPubKey.w.affineY)
-            val s = to32(ecPrivKey.s)
+            val clientDataJSONb64 = AndroidBase64.encodeToString(clientDataJSONString.toByteArray(), AndroidBase64.URL_SAFE or AndroidBase64.NO_WRAP or AndroidBase64.NO_PADDING)
+            respJson.put("clientDataJSON", clientDataJSONb64)
 
-            val createResponse = CreatePublicKeyCredentialResponse(responseJson.toString())
+            val createResponse = CreatePublicKeyCredentialResponse(fullJson.toString())
             
             PendingIntentHandler.setCreateCredentialResponse(
                 resultIntent,

package/android/src/main/java/co/algorand/passkeyautofill/GetPasskeyActivity.kt

@@ -6,7 +6,12 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
+import android.graphics.Color
+import android.graphics.Typeface
+import android.view.Gravity
 import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
@@ -34,8 +39,10 @@ class GetPasskeyActivity : AppCompatActivity() {
     }
 
     private var origin: String = "unknown-origin"
+    private var displayOrigin: String = "unknown-origin"
     private var userHandle: String = "unknown-user"
     private var credentialIdEnc: String? = null
+    private var bundleRequestJson: String? = null
     private var request: ProviderGetCredentialRequest? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,39 +51,147 @@ class GetPasskeyActivity : AppCompatActivity() {
         request = PendingIntentHandler.retrieveProviderGetCredentialRequest(intent)
         val credentialData = intent.getBundleExtra("CREDENTIAL_DATA")
 
-        if (request != null && credentialData != null) {
-            origin = credentialRepository.getOrigin(request!!.callingAppInfo)
+        if (credentialData != null) {
             credentialIdEnc = credentialData.getString("credentialId")
             userHandle = credentialData.getString("userHandle") ?: "unknown-user"
+            bundleRequestJson = credentialData.getString("requestJson")
+        }
+
+        if (request != null) {
+            origin = credentialRepository.getOrigin(request!!.callingAppInfo)
+            displayOrigin = origin
+            
+            // Try to extract rpId for better display
+            val rawJson = bundleRequestJson ?: (request?.credentialOptions?.get(0) as? GetPublicKeyCredentialOption)?.requestJson
+            if (rawJson != null) {
+                try {
+                    val jsonObj = JSONObject(rawJson)
+                    val pkJson = if (jsonObj.has("publicKey")) jsonObj.getJSONObject("publicKey") else jsonObj
+                    val rpId = pkJson.optString("rpId")
+                    if (rpId.isNotEmpty()) {
+                        displayOrigin = rpId
+                    }
+                } catch (e: Exception) {
+                    // ignore
+                }
+            }
         }
 
-        // Simple UI
-        val layout = android.widget.LinearLayout(this).apply {
-            orientation = android.widget.LinearLayout.VERTICAL
-            setPadding(50, 50, 50, 50)
+        // Improved UI
+        val layout = LinearLayout(this).apply {
+            val padding = (32 * resources.displayMetrics.density).toInt()
+            orientation = LinearLayout.VERTICAL
+            setPadding(padding, padding, padding, padding)
+            gravity = Gravity.CENTER_HORIZONTAL
+            setBackgroundColor(Color.WHITE)
+        }
+
+        // Header with App Icon and Provider Label
+        try {
+            val appInfo = packageManager.getApplicationInfo(packageName, 0)
+            val appIcon = packageManager.getApplicationIcon(appInfo)
+            val appLabel = packageManager.getApplicationLabel(appInfo)
+
+            val density = resources.displayMetrics.density
+            val iconSize = (48 * density).toInt()
+            val iconMargin = (12 * density).toInt()
+            val headerPadding = (40 * density).toInt()
+
+            val header = LinearLayout(this).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_VERTICAL
+                setPadding(0, 0, 0, headerPadding)
+            }
+
+            val iconView = ImageView(this).apply {
+                setImageDrawable(appIcon)
+                layoutParams = LinearLayout.LayoutParams(iconSize, iconSize).apply {
+                    marginEnd = iconMargin
+                }
+            }
+            header.addView(iconView)
+
+            val providerLabel = TextView(this).apply {
+                text = appLabel
+                textSize = 16f
+                typeface = Typeface.DEFAULT_BOLD
+                setTextColor(Color.DKGRAY)
+            }
+            header.addView(providerLabel)
+            layout.addView(header)
+        } catch (e: Exception) {
+            // Fallback if app info cannot be loaded
         }
 
         val title = TextView(this).apply {
             text = "Use Passkey"
-            textSize = 24f
-            setPadding(0, 0, 0, 50)
+            textSize = 28f
+            typeface = Typeface.DEFAULT_BOLD
+            setPadding(0, 0, 0, (8 * resources.displayMetrics.density).toInt())
+            setTextColor(Color.BLACK)
         }
         layout.addView(title)
 
-        val info = TextView(this).apply {
-            text = "User: $userHandle\nAt: $origin"
-            setPadding(0, 0, 0, 50)
+        val description = TextView(this).apply {
+            text = "Sign in to $displayOrigin"
+            textSize = 16f
+            setPadding(0, 0, 0, (40 * resources.displayMetrics.density).toInt())
+            gravity = Gravity.CENTER_HORIZONTAL
+            setTextColor(Color.GRAY)
+        }
+        layout.addView(description)
+
+        val userInfoContainer = LinearLayout(this).apply {
+            orientation = LinearLayout.VERTICAL
+            setPadding(0, 0, 0, (50 * resources.displayMetrics.density).toInt())
+            gravity = Gravity.CENTER_HORIZONTAL
+        }
+
+        val userLabel = TextView(this).apply {
+            text = "ACCOUNT"
+            textSize = 12f
+            typeface = Typeface.DEFAULT_BOLD
+            setTextColor(Color.GRAY)
+            setPadding(0, 0, 0, (4 * resources.displayMetrics.density).toInt())
         }
-        layout.addView(info)
+        userInfoContainer.addView(userLabel)
+
+        val userValue = TextView(this).apply {
+            text = userHandle
+            textSize = 20f
+            typeface = Typeface.DEFAULT_BOLD
+            setTextColor(Color.BLACK)
+        }
+        userInfoContainer.addView(userValue)
+        layout.addView(userInfoContainer)
 
         val confirmButton = Button(this).apply {
             text = "Sign In"
             setOnClickListener {
                 handleAssertion()
             }
+            layoutParams = LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            ).apply {
+                setMargins(0, 0, 0, (8 * resources.displayMetrics.density).toInt())
+            }
         }
         layout.addView(confirmButton)
 
+        val cancelButton = Button(this, null, android.R.attr.borderlessButtonStyle).apply {
+            text = "Cancel"
+            setOnClickListener {
+                setResult(RESULT_CANCELED)
+                finish()
+            }
+            layoutParams = LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            )
+        }
+        layout.addView(cancelButton)
+
         setContentView(layout)
     }
 
@@ -84,19 +199,61 @@ class GetPasskeyActivity : AppCompatActivity() {
     private fun handleAssertion() {
         try {
             val req = request ?: throw IllegalStateException("No request found")
-            val option = req.credentialOptions[0] as GetPublicKeyCredentialOption
-            val requestOptions = PublicKeyCredentialRequestOptions(option.requestJson)
+            
+            // Prefer using the request JSON from the bundle if available, as it's specifically for this entry
+            val rawRequestJson = bundleRequestJson ?: run {
+                val option = req.credentialOptions[0] as GetPublicKeyCredentialOption
+                option.requestJson
+            }
+            
+            val requestJson = JSONObject(rawRequestJson)
+            val passkeyReqJson = if (requestJson.has("publicKey")) {
+                requestJson.getJSONObject("publicKey").toString()
+            } else {
+                rawRequestJson
+            }
+            val requestOptions = try {
+                PublicKeyCredentialRequestOptions(passkeyReqJson)
+            } catch (e: org.json.JSONException) {
+                Log.e(TAG, "Invalid passkey request JSON: $passkeyReqJson")
+                throw e
+            }
 
             val credId = AndroidBase64.decode(credentialIdEnc!!, AndroidBase64.DEFAULT)
 
-            val requestJson = JSONObject(option.requestJson)
-            val challenge = requestJson.getString("challenge")
+            val passkeyRequestJsonObj = JSONObject(passkeyReqJson)
+            val challenge = if (passkeyRequestJsonObj.has("challenge")) {
+                passkeyRequestJsonObj.getString("challenge")
+            } else {
+                throw org.json.JSONException("No value for challenge in requestJson: $passkeyReqJson")
+            }
             val sanitizedOrigin = origin.replace(Regex("/$"), "")
 
-            val clientDataHash = option.requestData.getByteArray("androidx.credentials.BUNDLE_KEY_CLIENT_DATA_HASH")
-                ?: MessageDigest.getInstance("SHA-256").digest(
-                    "{\"type\":\"webauthn.get\",\"challenge\":\"$challenge\",\"origin\":\"$sanitizedOrigin\",\"crossOrigin\":false}".toByteArray(Charsets.UTF_8)
-                )
+            // Look for system-provided clientDataHash (e.g. from Chrome)
+            val systemClientDataHash = run {
+                val option = req.credentialOptions.find { opt ->
+                    opt is GetPublicKeyCredentialOption && (opt.requestJson == rawRequestJson || 
+                        try { JSONObject(opt.requestJson).toString() == JSONObject(rawRequestJson!!).toString() } catch(e: Exception) { false })
+                } as? GetPublicKeyCredentialOption
+                option?.requestData?.getByteArray("androidx.credentials.BUNDLE_KEY_CLIENT_DATA_HASH")
+            }
+
+            val clientDataJSONString = if (sanitizedOrigin.startsWith("https://") || sanitizedOrigin.startsWith("http://")) {
+                // Compact JSON for web origins to match browser hashing (no spaces, specific order)
+                "{\"type\":\"webauthn.get\",\"challenge\":\"$challenge\",\"origin\":\"$sanitizedOrigin\",\"crossOrigin\":false}"
+            } else {
+                val json = JSONObject()
+                json.put("type", "webauthn.get")
+                json.put("challenge", challenge)
+                json.put("origin", sanitizedOrigin)
+                json.put("crossOrigin", false)
+                if (sanitizedOrigin.startsWith("android:apk-key-hash:")) {
+                    json.put("androidPackageName", req.callingAppInfo.packageName)
+                }
+                json.toString()
+            }
+
+            val clientDataHash = systemClientDataHash ?: MessageDigest.getInstance("SHA-256").digest(clientDataJSONString.toByteArray(Charsets.UTF_8))
 
             val dbCred = credentialRepository.getCredential(this, credId)
                 ?: throw IllegalStateException("Credential not found")
@@ -104,7 +261,7 @@ class GetPasskeyActivity : AppCompatActivity() {
             val response = AuthenticatorAssertionResponse(
                 requestOptions = requestOptions,
                 credentialId = credId,
-                origin = credentialRepository.getOrigin(req.callingAppInfo),
+                origin = sanitizedOrigin,
                 up = true,
                 uv = true,
                 be = true,
@@ -125,13 +282,23 @@ class GetPasskeyActivity : AppCompatActivity() {
                 authenticatorAttachment = "platform"
             )
 
-            // Manual addition of clientDataJSON if needed by some RPs, following reference
-            val clientDataJSONb64 = getClientDataJSONb64(origin, challenge)
+            // Manual addition of clientDataJSON and signature to the response JSON
+            val clientDataJSONb64 = AndroidBase64.encodeToString(clientDataJSONString.toByteArray(), AndroidBase64.URL_SAFE or AndroidBase64.NO_WRAP or AndroidBase64.NO_PADDING)
+            val signatureb64 = AndroidBase64.encodeToString(response.signature, AndroidBase64.URL_SAFE or AndroidBase64.NO_WRAP or AndroidBase64.NO_PADDING)
+
+            val fullJson = JSONObject(fidoCredential.json())
+            val respJson = fullJson.getJSONObject("response")
+            respJson.put("clientDataJSON", clientDataJSONb64)
+            respJson.put("signature", signatureb64)
 
-            val delimiter = "response\":{"
-            val credentialJson = fidoCredential.json().substringBeforeLast(delimiter) + delimiter +
-                    "\"clientDataJSON\":\"$clientDataJSONb64\"," +
-                    fidoCredential.json().substringAfterLast(delimiter)
+            // Add clientExtensionResults as seen in the example
+            val clientExtensionResults = JSONObject()
+            val credProps = JSONObject()
+            credProps.put("rk", true)
+            clientExtensionResults.put("credProps", credProps)
+            fullJson.put("clientExtensionResults", clientExtensionResults)
+
+            val credentialJson = fullJson.toString()
 
             val resultIntent = Intent()
             val passkeyCredential = PublicKeyCredential(credentialJson)
@@ -149,9 +316,4 @@ class GetPasskeyActivity : AppCompatActivity() {
         finish()
     }
 
-    private fun getClientDataJSONb64(origin: String, challenge: String): String {
-        val sanitizedOrigin = origin.replace(Regex("/$"), "")
-        val jsonString = "{\"type\":\"webauthn.get\",\"challenge\":\"$challenge\",\"origin\":\"$sanitizedOrigin\",\"crossOrigin\":false}"
-        return AndroidBase64.encodeToString(jsonString.toByteArray(), AndroidBase64.NO_WRAP)
-    }
 }

package/android/src/main/java/co/algorand/passkeyautofill/service/PasskeyAutofillCredentialProviderService.kt

@@ -26,8 +26,10 @@ import androidx.credentials.provider.ProviderClearCredentialStateRequest
 import androidx.credentials.provider.PublicKeyCredentialEntry
 import co.algorand.passkeyautofill.credentials.CredentialRepository
 import co.algorand.passkeyautofill.credentials.Credential
+import co.algorand.passkeyautofill.utils.PasskeyUtils
 import com.tencent.mmkv.MMKV
 import kotlinx.coroutines.*
+import org.json.JSONArray
 import org.json.JSONObject
 
 @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
@@ -127,7 +129,7 @@ class PasskeyAutofillCredentialProviderService: CredentialProviderService() {
     /**
      * Fake a list of available PublicKeyCredential Entries
      */
-    private fun processGetCredentialRequest(request: BeginGetCredentialRequest): BeginGetCredentialResponse{
+    private fun processGetCredentialRequest(request: BeginGetCredentialRequest): BeginGetCredentialResponse {
         // Ensure we have a master key available. If not, we can't sign anything, so don't show entries.
         if (!credentialRepository.isMasterKeyAvailable(this)) {
             return BeginGetCredentialResponse(emptyList())
@@ -138,42 +140,66 @@ class PasskeyAutofillCredentialProviderService: CredentialProviderService() {
         }
 
         val action = credentialRepository.getGetPasskeyAction(this) ?: DEFAULT_GET_PASSKEY_ACTION
+        val allEntries = mutableListOf<PublicKeyCredentialEntry>()
 
-        val entries = credentials.mapNotNull { credential ->
-            try {
-                // Find suitable option for this entry
-                val option = request.beginGetCredentialOptions.find { opt -> 
-                    if (opt !is BeginGetPublicKeyCredentialOption) return@find false
-                    
-                    // In a real app, we'd check if this credential's origin matches the request's origin
-                    // For now, we return all credentials that match the requested type.
-                    true
-                } as? BeginGetPublicKeyCredentialOption
-
-                if (option == null) {
-                    return@mapNotNull null
-                }
+        for (option in request.beginGetCredentialOptions) {
+            if (option !is BeginGetPublicKeyCredentialOption) continue
 
-                val data = Bundle()
-                data.putString("credentialId", credential.credentialId)
-                data.putString("userHandle", credential.userHandle)
-                data.putString("requestJson", option.requestJson)
-
-                PublicKeyCredentialEntry.Builder(
-                    this@PasskeyAutofillCredentialProviderService,
-                    credential.userHandle,
-                    createNewPendingIntent(action, GET_PASSKEY_INTENT, data),
-                    option
-                )
-                    .setIcon(Icon.createWithResource(this@PasskeyAutofillCredentialProviderService, android.R.drawable.ic_lock_lock))
-                    .build()
+            val requestJsonStr = option.requestJson
+            var allowCredentials: JSONArray? = null
+            try {
+                val json = JSONObject(requestJsonStr)
+                val pk = if (json.has("publicKey")) json.getJSONObject("publicKey") else json
+                allowCredentials = pk.optJSONArray("allowCredentials")
             } catch (e: Exception) {
-                Log.e(TAG, "Error building PublicKeyCredentialEntry", e)
+                Log.e(TAG, "Error parsing requestJson", e)
+            }
+
+            val allowedIds = if (allowCredentials != null && allowCredentials.length() > 0) {
+                val ids = mutableSetOf<String>()
+                for (i in 0 until allowCredentials.length()) {
+                    ids.add(allowCredentials.getJSONObject(i).getString("id"))
+                }
+                ids
+            } else {
                 null
             }
+
+            for (credential in credentials) {
+                if (allowedIds != null) {
+                    val isAllowed = allowedIds.any { allowedId ->
+                        allowedId == credential.credentialId ||
+                        PasskeyUtils.normalizeBase64(allowedId) == PasskeyUtils.normalizeBase64(credential.credentialId)
+                    }
+                    if (!isAllowed) continue
+                }
+
+                try {
+                    val data = Bundle()
+                    data.putString("credentialId", credential.credentialId)
+                    data.putString("userHandle", credential.userHandle)
+                    data.putString("requestJson", option.requestJson)
+
+                    // Use a unique requestCode for each PendingIntent to avoid data being overwritten
+                    val uniqueRequestCode = (credential.credentialId + option.requestJson).hashCode()
+
+                    val entry = PublicKeyCredentialEntry.Builder(
+                        this,
+                        credential.userHandle,
+                        createNewPendingIntent(action, uniqueRequestCode, data),
+                        option
+                    )
+                        .setIcon(Icon.createWithResource(this, android.R.drawable.ic_lock_lock))
+                        .build()
+                    allEntries.add(entry)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Error building PublicKeyCredentialEntry", e)
+                }
+            }
         }
-        return BeginGetCredentialResponse(entries)
+        return BeginGetCredentialResponse(allEntries)
     }
+
     override fun onClearCredentialStateRequest(
         request: ProviderClearCredentialStateRequest,
         cancellationSignal: CancellationSignal,
@@ -186,12 +212,17 @@ class PasskeyAutofillCredentialProviderService: CredentialProviderService() {
     private fun createNewPendingIntent(action: String, requestCode: Int, extra: Bundle?): PendingIntent{
         MMKV.initialize(this)
         val intent = Intent(action)
-        // Set component to be explicit to this library's activities
-        val componentName = when(requestCode) {
-            GET_PASSKEY_INTENT -> android.content.ComponentName(packageName, "co.algorand.passkeyautofill.GetPasskeyActivity")
-            CREATE_PASSKEY_INTENT -> android.content.ComponentName(packageName, "co.algorand.passkeyautofill.CreatePasskeyActivity")
+
+        // Determine component based on action instead of requestCode
+        val getAction = credentialRepository.getGetPasskeyAction(this) ?: DEFAULT_GET_PASSKEY_ACTION
+        val createAction = credentialRepository.getCreatePasskeyAction(this) ?: DEFAULT_CREATE_PASSKEY_ACTION
+
+        val componentName = when(action) {
+            getAction -> android.content.ComponentName(packageName, "co.algorand.passkeyautofill.GetPasskeyActivity")
+            createAction -> android.content.ComponentName(packageName, "co.algorand.passkeyautofill.CreatePasskeyActivity")
             else -> null
         }
+
         if (componentName != null) {
             intent.component = componentName
         } else {

package/android/src/main/java/co/algorand/passkeyautofill/utils/PasskeyUtils.kt

@@ -0,0 +1,7 @@
+package co.algorand.passkeyautofill.utils
+
+object PasskeyUtils {
+    fun normalizeBase64(s: String): String {
+        return s.replace("-", "+").replace("_", "/").replace("=", "")
+    }
+}

package/ios/ReactNativePasskeyAutofillModule.swift

@@ -10,26 +10,25 @@ public class ReactNativePasskeyAutofillModule: Module {
     // The module will be accessible from `requireNativeModule('ReactNativePasskeyAutofill')` in JavaScript.
     Name("ReactNativePasskeyAutofill")
 
-    // Defines constant property on the module.
-    Constant("PI") {
-      Double.pi
+    AsyncFunction("setMasterKey") { (secret: String) in
+      // TODO: Implement for iOS
     }
 
-    // Defines event names that the module can send to JavaScript.
-    Events("onChange")
+    AsyncFunction("setHdRootKeyId") { (id: String) in
+      // TODO: Implement for iOS
+    }
+
+    AsyncFunction("getHdRootKeyId") { () -> String? in
+      // TODO: Implement for iOS
+      return nil
+    }
 
-    // Defines a JavaScript synchronous function that runs the native code on the JavaScript thread.
-    Function("hello") {
-      return "Hello world! 👋"
+    AsyncFunction("clearCredentials") {
+      // TODO: Implement for iOS
     }
 
-    // Defines a JavaScript function that always returns a Promise and whose native code
-    // is by default dispatched on the different thread than the JavaScript runtime runs on.
-    AsyncFunction("setValueAsync") { (value: String) in
-      // Send an event to JavaScript.
-      self.sendEvent("onChange", [
-        "value": value
-      ])
+    AsyncFunction("configureIntentActions") { (getPasskeyAction: String, createPasskeyAction: String) in
+      // TODO: Implement for iOS
     }
 
     // Enables the module to be used as a native view. Definition components that are accepted as part of the

package/lefthook.yml

@@ -0,0 +1,13 @@
+# Lefthook configuration
+# Refer to https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md
+
+pre-commit:
+  commands:
+    lint:
+      run: npm run lint
+
+pre-push:
+  parallel: true
+  commands:
+    test:
+      run: npm run test:all

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "@algorandfoundation/react-native-passkey-autofill",
-  "version": "1.0.0-canary.3",
+  "version": "1.0.0-canary.5",
   "description": "Passkey AutoFill React Native",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",
-    "lint": "expo-module lint",
-    "test": "expo-module test",
-    "prepare": "expo-module prepare",
+    "lint": "ESLINT_USE_FLAT_CONFIG=false expo-module lint",
+    "test": "CI=true expo-module test",
+    "test:android": "cd example/android && ./gradlew :algorandfoundation-react-native-passkey-autofill:testDebugUnitTest --no-daemon",
+    "test:android:instrumented": "cd example/android && ./gradlew :algorandfoundation-react-native-passkey-autofill:connectedDebugAndroidTest --no-daemon",
+    "test:all": "npm run test && npm run test:android",
+    "prepare": "expo-module prepare && npx lefthook install",
     "prepublishOnly": "expo-module prepublishOnly",
     "expo-module": "expo-module",
     "open:ios": "xed example/ios",
@@ -24,22 +28,38 @@
     "@algorandfoundation/react-native-passkey-autofill",
     "ReactNativePasskeyAutofill"
   ],
-  "repository": "https://github.com/algorandfoundation/react-native-passkey-autofill",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/algorandfoundation/react-native-passkey-autofill.git"
+  },
   "bugs": {
     "url": "https://github.com/algorandfoundation/react-native-passkey-autofill/issues"
   },
-  "author": "Algorand Foundation <michael.feher@algorand.foundation> (https://github.com/algorandfoundation)",
+  "author": "Algorand Foundation",
   "license": "Apache-2.0",
   "homepage": "https://github.com/algorandfoundation/react-native-passkey-autofill#readme",
   "dependencies": {
     "@algorandfoundation/react-native-keystore": "^1.0.0-canary.6"
   },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "testMatch": [
+      "<rootDir>/src/**/__tests__/**/*.test.ts"
+    ]
+  },
   "devDependencies": {
     "@expo/config-plugins": "^9.0.0",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^12.0.6",
+    "@semantic-release/npm": "^13.1.5",
     "@types/react": "~19.1.1",
     "expo": "^55.0.1",
     "expo-module-scripts": "^55.0.2",
-    "react-native": "0.82.1"
+    "lefthook": "^2.1.4",
+    "react-native": "0.82.1",
+    "semantic-release": "^25.0.3"
   },
   "peerDependencies": {
     "expo": "*",