Finish FIDO2 basic handling in PasskeyHandler

wordpress-mobile · Jan 23, 2024 · 783d171 · 783d171
1 parent 8b67694
commit 783d171
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/webauthn/PasskeyHandler.kt b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/webauthn/PasskeyHandler.kt
@@ -21,19 +21,20 @@ class PasskeyHandler {
         )
         { result: ActivityResult ->
             if (result.resultCode == Activity.RESULT_OK && result.data != null) {
-                onResult(PasskeyDataResult(isFailure = false))
+                onResult(parseFIDO2IntentData(result.data, userId, challengeInfo))
             } else {
                 onResult(PasskeyDataResult(isFailure = true))
             }
         }
     }
 
     private fun parseFIDO2IntentData(
-        resultData: Intent,
+        resultData: Intent?,
         userId: String,
         challengeInfo: WebauthnChallengeInfo
-    ): PasskeyDataResult? =
-            resultData.takeIf { it.hasExtra(Fido.FIDO2_KEY_CREDENTIAL_EXTRA) }
+    ): PasskeyDataResult =
+            resultData
+                    ?.takeIf { it.hasExtra(Fido.FIDO2_KEY_CREDENTIAL_EXTRA) }
                     ?.getByteArrayExtra(Fido.FIDO2_KEY_CREDENTIAL_EXTRA)
                     ?.let { PublicKeyCredential.deserializeFromBytes(it).toJson() }
                     ?.let { clientData ->
@@ -43,7 +44,7 @@ class PasskeyHandler {
                                 twoStepNonce = challengeInfo.twoStepNonce,
                                 clientData = clientData
                         )
-                    }
+                    } ?: PasskeyDataResult(isFailure = true)
 
     data class PasskeyDataResult(
         val isFailure: Boolean,