fix: add missing client credential json

awesome-algorand · Apr 19, 2024 · e06e624 · e06e624
1 parent 07585c8
commit e06e624
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/src/main/java/foundation/algorand/nuauth/GetPasskeyViewModel.kt b/app/src/main/java/foundation/algorand/nuauth/GetPasskeyViewModel.kt
@@ -81,7 +81,7 @@ class GetPasskeyViewModel: ViewModel() {
         val requestOptions = PublicKeyCredentialRequestOptions(option.requestJson)
         val credIdEnc = requestInfo!!.getString("credentialId")
         val credId = Base64.decode(credIdEnc!!)
-        //  val clientDataHash = option.requestData.getByteArray("androidx.credentials.BUNDLE_KEY_CLIENT_DATA_HASH")
+        val clientDataHash = option.requestData.getByteArray("androidx.credentials.BUNDLE_KEY_CLIENT_DATA_HASH")
         val packageName = request.callingAppInfo.packageName
         val userHandle = requestInfo.getString("userHandle")
         val origin = credentialRepository.appInfoToOrigin(request.callingAppInfo)
@@ -96,7 +96,7 @@ class GetPasskeyViewModel: ViewModel() {
             bs = true,
             userHandle = userHandle!!.toByteArray(),
             packageName = packageName,
-            // clientDataHash = clientDataHash!!
+             clientDataHash = clientDataHash!!
         )
         val keyPair = credentialRepository.getKeyPair(context, credId)
 
@@ -105,17 +105,38 @@ class GetPasskeyViewModel: ViewModel() {
         sig.initSign(keyPair.private as ECPrivateKey )
         sig.update(response.dataToSign())
         response.signature = sig.sign()
+        val options = request.credentialOptions[0] as GetPublicKeyCredentialOption
+        val json = options.requestJson
+        val requestJson = JSONObject(json)
+
 
         val credential = FidoPublicKeyCredential(
             rawId = credId, response = response, authenticatorAttachment = "platform"
         )
+//         add clientDataJSON to the response
+        val clientDataJSONb64 = getClientDataJSONb64(origin, requestJson.get("challenge") as String)
+        val delimiter = "response\":{"
+        val credentialJson = credential.json().substringBeforeLast(delimiter)+ delimiter +
+                "\"clientDataJSON\":\"$clientDataJSONb64\","+
+                credential.json().substringAfterLast(delimiter)
         Log.d(TAG, credential.toString())
         val result = Intent()
-        val passkeyCredential = PublicKeyCredential(credential.json())
+        val passkeyCredential = PublicKeyCredential(credentialJson)
         PendingIntentHandler.setGetCredentialResponse(
             result, GetCredentialResponse(passkeyCredential)
         )
         return result
     }
+    @OptIn(ExperimentalEncodingApi::class)
+    private fun getClientDataJSONb64(origin: String, challenge:String): String {
+
+        val origin = origin.replace(Regex("/$"), "")
+
+        val jsonString =
+            "{\"type\":\"webauthn.get\",\"challenge\":\"$challenge\",\"origin\":\"$origin\",\"crossOrigin\":false}"
+        val jsonByteArray = jsonString.toByteArray()
+        Log.d("MainActivity","+++ ClientDataJSON: $jsonString")
+        return Base64.encode(jsonByteArray)
+    }
 
 }