Fix NoResult Error (#312)

* Only attempt completion of auth challenge when auth state is available.

* Fix issue where NoResult was being returned after Success.

* Clean up additional view model conventions.

* Remove unused import.

Author: sshropshire

Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderViewModel.kt

@@ -235,20 +235,17 @@ class ApproveOrderViewModel @Inject constructor(
                         OrderInfo(orderId, status, didAttemptThreeDSecureAuthentication)
                     }
                     approveOrderState = ActionState.Success(orderInfo)
-                    // discard authState
-                    authState = null
+                    discardAuthState()
                 }
 
                 is CardFinishApproveOrderResult.Failure -> {
                     approveOrderState = ActionState.Failure(approveOrderResult.error)
-                    // discard authState
-                    authState = null
+                    discardAuthState()
                 }
 
                 CardFinishApproveOrderResult.Canceled -> {
                     approveOrderState = ActionState.Failure(Exception("USER CANCELED"))
-                    // discard authState
-                    authState = null
+                    discardAuthState()
                 }
 
                 CardFinishApproveOrderResult.NoResult -> {
@@ -258,4 +255,8 @@ class ApproveOrderViewModel @Inject constructor(
             }
         }
     }
+
+    private fun discardAuthState() {
+        authState = null
+    }
 }

Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebViewModel.kt

@@ -149,33 +149,38 @@ class PayPalWebViewModel @Inject constructor(
         }
     }
 
+    private fun checkIfPayPalAuthFinished(intent: Intent): PayPalWebCheckoutFinishStartResult? =
+        authState?.let { paypalClient?.finishStart(intent, it) }
+
     fun completeAuthChallenge(intent: Intent) {
-        val result = authState?.let { paypalClient?.finishStart(intent, it) }
-        when (result) {
-            is PayPalWebCheckoutFinishStartResult.Success -> {
-                payPalWebCheckoutState = ActionState.Success(result)
-                // discard authState
-                authState = null
-            }
+        checkIfPayPalAuthFinished(intent)?.let { payPalAuthResult ->
+            when (payPalAuthResult) {
+                is PayPalWebCheckoutFinishStartResult.Success -> {
+                    payPalWebCheckoutState = ActionState.Success(payPalAuthResult)
+                    discardAuthState()
+                }
 
-            is PayPalWebCheckoutFinishStartResult.Canceled -> {
-                val error = Exception("USER CANCELED")
-                payPalWebCheckoutState = ActionState.Failure(error)
-                // discard authState
-                authState = null
-            }
+                is PayPalWebCheckoutFinishStartResult.Canceled -> {
+                    val error = Exception("USER CANCELED")
+                    payPalWebCheckoutState = ActionState.Failure(error)
+                    discardAuthState()
+                }
 
-            is PayPalWebCheckoutFinishStartResult.Failure -> {
-                Log.i(TAG, "Checkout Error: ${result.error.errorDescription}")
-                payPalWebCheckoutState = ActionState.Failure(result.error)
-                // discard authState
-                authState = null
-            }
+                is PayPalWebCheckoutFinishStartResult.Failure -> {
+                    Log.i(TAG, "Checkout Error: ${payPalAuthResult.error.errorDescription}")
+                    payPalWebCheckoutState = ActionState.Failure(payPalAuthResult.error)
+                    discardAuthState()
+                }
 
-            null, PayPalWebCheckoutFinishStartResult.NoResult -> {
-                // no result; re-enable PayPal button so user can retry
-                payPalWebCheckoutState = ActionState.Idle
+                PayPalWebCheckoutFinishStartResult.NoResult -> {
+                    // no result; re-enable PayPal button so user can retry
+                    payPalWebCheckoutState = ActionState.Idle
+                }
             }
         }
     }
+
+    private fun discardAuthState() {
+        authState = null
+    }
 }

Demo/src/main/java/com/paypal/android/ui/paypalwebvault/PayPalWebVaultViewModel.kt

@@ -124,31 +124,36 @@ class PayPalWebVaultViewModel @Inject constructor(
         }
     }
 
+    private fun checkIfPayPalAuthFinished(intent: Intent): PayPalWebCheckoutFinishVaultResult? =
+        authState?.let { paypalClient?.finishVault(intent, it) }
+
     fun completeAuthChallenge(intent: Intent) {
-        val result = authState?.let { paypalClient?.finishVault(intent, it) }
-        when (result) {
-            is PayPalWebCheckoutFinishVaultResult.Success -> {
-                vaultPayPalState = ActionState.Success(result)
-                // discard authState
-                authState = null
-            }
+        checkIfPayPalAuthFinished(intent)?.let { result ->
+            when (result) {
+                is PayPalWebCheckoutFinishVaultResult.Success -> {
+                    vaultPayPalState = ActionState.Success(result)
+                    discardAuthState()
+                }
 
-            is PayPalWebCheckoutFinishVaultResult.Failure -> {
-                vaultPayPalState = ActionState.Failure(result.error)
-                // discard authState
-                authState = null
-            }
+                is PayPalWebCheckoutFinishVaultResult.Failure -> {
+                    vaultPayPalState = ActionState.Failure(result.error)
+                    discardAuthState()
+                }
 
-            PayPalWebCheckoutFinishVaultResult.Canceled -> {
-                vaultPayPalState = ActionState.Failure(Exception("USER CANCELED"))
-                // discard authState
-                authState = null
-            }
+                PayPalWebCheckoutFinishVaultResult.Canceled -> {
+                    vaultPayPalState = ActionState.Failure(Exception("USER CANCELED"))
+                    discardAuthState()
+                }
 
-            null, PayPalWebCheckoutFinishVaultResult.NoResult -> {
-                // no result; re-enable PayPal button so user can retry
-                vaultPayPalState = ActionState.Idle
+                PayPalWebCheckoutFinishVaultResult.NoResult -> {
+                    // no result; re-enable PayPal button so user can retry
+                    vaultPayPalState = ActionState.Idle
+                }
             }
         }
     }
+
+    private fun discardAuthState() {
+        authState = null
+    }
 }

Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardViewModel.kt

@@ -207,20 +207,17 @@ class VaultCardViewModel @Inject constructor(
                         )
                     }
                     updateSetupTokenState = ActionState.Success(setupTokenInfo)
-                    // discard authState
-                    authState = null
+                    discardAuthState()
                 }
 
                 CardFinishVaultResult.Canceled -> {
                     updateSetupTokenState = ActionState.Failure(Exception("USER CANCELED"))
-                    // discard authState
-                    authState = null
+                    discardAuthState()
                 }
 
                 is CardFinishVaultResult.Failure -> {
                     updateSetupTokenState = ActionState.Failure(vaultResult.error)
-                    // discard authState
-                    authState = null
+                    discardAuthState()
                 }
 
                 CardFinishVaultResult.NoResult -> {
@@ -230,4 +227,8 @@ class VaultCardViewModel @Inject constructor(
             }
         }
     }
+
+    private fun discardAuthState() {
+        authState = null
+    }
 }