Introduce PasskeyRequestData model

wordpress-mobile · Jan 30, 2024 · eb7e240 · eb7e240
1 parent dfea9d0
commit eb7e240
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/Login2FaFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/Login2FaFragment.java
@@ -48,6 +48,7 @@
 import org.wordpress.android.login.util.SiteUtils;
 import org.wordpress.android.login.webauthn.PasskeyRequest;
 import org.wordpress.android.login.webauthn.Fido2ClientHandler;
+import org.wordpress.android.login.webauthn.PasskeyRequest.PasskeyRequestData;
 import org.wordpress.android.login.widgets.WPLoginInputRow;
 import org.wordpress.android.login.widgets.WPLoginInputRow.OnEditorCommitListener;
 import org.wordpress.android.util.AppLog;
@@ -629,9 +630,15 @@ public void onWebauthnChallengeReceived(WebauthnChallengeReceived event) {
             return;
         }
 
+        PasskeyRequestData passkeyRequestData = new PasskeyRequestData(
+                event.mUserId,
+                event.mChallengeInfo.getTwoStepNonce(),
+                event.mRawChallengeInfoJson
+        );
+
         new PasskeyRequest(
                 requireContext(),
-                event,
+                passkeyRequestData,
                 result -> {
                     mDispatcher.dispatch(
                             AuthenticationActionBuilder.newFinishSecurityKeyChallengeAction(

diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/webauthn/PasskeyRequest.kt b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/webauthn/PasskeyRequest.kt
@@ -12,20 +12,19 @@ import androidx.credentials.GetPublicKeyCredentialOption
 import androidx.credentials.PublicKeyCredential
 import androidx.credentials.exceptions.GetCredentialException
 import org.wordpress.android.fluxc.store.AccountStore.FinishWebauthnChallengePayload
-import org.wordpress.android.fluxc.store.AccountStore.WebauthnChallengeReceived
 import java.util.concurrent.Executors
 
 class PasskeyRequest(
     context: Context,
-    challengeEvent: WebauthnChallengeReceived,
+    requestData: PasskeyRequestData,
     onSuccess: (FinishWebauthnChallengePayload) -> Unit,
     onFailure: (Throwable) -> Unit
 ) {
     init {
         val executor = Executors.newSingleThreadExecutor()
         val signal = CancellationSignal()
         val getCredRequest = GetCredentialRequest(
-                listOf(GetPasswordOption(), GetPublicKeyCredentialOption(challengeEvent.mRawChallengeInfoJson))
+                listOf(GetPasswordOption(), GetPublicKeyCredentialOption(requestData.requestJson))
         )
 
         val passkeyRequestCallback = object : CredentialManagerCallback<GetCredentialResponse, GetCredentialException> {
@@ -36,8 +35,8 @@ class PasskeyRequest(
 
             override fun onResult(result: GetCredentialResponse) {
                 FinishWebauthnChallengePayload().apply {
-                    mUserId = challengeEvent.mUserId
-                    mTwoStepNonce = challengeEvent.mChallengeInfo.twoStepNonce
+                    mUserId = requestData.userId
+                    mTwoStepNonce = requestData.twoStepNonce
                     mClientData = result.toJson().orEmpty()
                 }.let { onSuccess(it) }
             }
@@ -67,6 +66,12 @@ class PasskeyRequest(
         }
     }
 
+    data class PasskeyRequestData(
+        val userId: String,
+        val twoStepNonce: String,
+        val requestJson: String
+    )
+
     companion object {
         const val TAG = "PasskeyRequest"
     }