Paypal analytics

PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalAnalytics.kt

@@ -10,6 +10,9 @@ internal object PayPalAnalytics {
 
     // Additional Conversion events
     const val HANDLE_RETURN_STARTED = "paypal:tokenize:handle-return:started"
+    const val HANDLE_RETURN_SUCCEEDED = "paypal:tokenize:handle-return:succeeded"
+    const val HANDLE_RETURN_FAILED = "paypal:tokenize:handle-return:failed"
+    const val HANDLE_RETURN_NO_RESULT = "paypal:tokenize:handle-return:no-result"
 
     // App Switch events
     const val APP_SWITCH_STARTED = "paypal:tokenize:app-switch:started"

PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalClient.kt

@@ -212,13 +212,6 @@ class PayPalClient internal constructor(
         val switchInitiatedTime = Uri.parse(approvalUrl).getQueryParameter("switch_initiated_time")
         val isAppSwitchFlow = !switchInitiatedTime.isNullOrEmpty()
 
-        if (isAppSwitchFlow) {
-            braintreeClient.sendAnalyticsEvent(
-                PayPalAnalytics.HANDLE_RETURN_STARTED,
-                analyticsParams
-            )
-        }
-
         approvalUrl?.let {
             val pairingId = Uri.parse(approvalUrl).getQueryParameter(tokenKey)
             if (!pairingId.isNullOrEmpty()) {

PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalLauncher.kt

@@ -6,16 +6,25 @@ import com.braintreepayments.api.BrowserSwitchClient
 import com.braintreepayments.api.BrowserSwitchException
 import com.braintreepayments.api.BrowserSwitchFinalResult
 import com.braintreepayments.api.BrowserSwitchStartResult
+import com.braintreepayments.api.core.AnalyticsClient
 import com.braintreepayments.api.core.BraintreeException
 
 /**
  * Responsible for launching PayPal user authentication in a web browser
  */
-class PayPalLauncher internal constructor(private val browserSwitchClient: BrowserSwitchClient) {
+class PayPalLauncher internal constructor(
+    private val browserSwitchClient: BrowserSwitchClient,
+    lazyAnalyticsClient: Lazy<AnalyticsClient>
+) {
     /**
      * Used to launch the PayPal flow in a web browser and deliver results to your Activity
      */
-    constructor() : this(BrowserSwitchClient())
+    constructor() : this(
+        browserSwitchClient = BrowserSwitchClient(),
+        lazyAnalyticsClient = AnalyticsClient.lazyInstance
+    )
+
+    private val analyticsClient: AnalyticsClient by lazyAnalyticsClient
 
     /**
      * Launches the PayPal flow by switching to a web browser for user authentication
@@ -73,17 +82,27 @@ class PayPalLauncher internal constructor(private val browserSwitchClient: Brows
         pendingRequest: PayPalPendingRequest.Started,
         intent: Intent
     ): PayPalPaymentAuthResult {
+        analyticsClient.sendEvent(PayPalAnalytics.HANDLE_RETURN_STARTED)
         return when (val browserSwitchResult =
             browserSwitchClient.completeRequest(intent, pendingRequest.pendingRequestString)) {
-            is BrowserSwitchFinalResult.Success -> PayPalPaymentAuthResult.Success(
-                browserSwitchResult
-            )
+            is BrowserSwitchFinalResult.Success -> {
+                analyticsClient.sendEvent(PayPalAnalytics.HANDLE_RETURN_SUCCEEDED)
+                PayPalPaymentAuthResult.Success(
+                    browserSwitchResult
+                )
+            }
 
-            is BrowserSwitchFinalResult.Failure -> PayPalPaymentAuthResult.Failure(
-                browserSwitchResult.error
-            )
+            is BrowserSwitchFinalResult.Failure -> {
+                analyticsClient.sendEvent(PayPalAnalytics.HANDLE_RETURN_FAILED)
+                PayPalPaymentAuthResult.Failure(
+                    browserSwitchResult.error
+                )
+            }
 
-            is BrowserSwitchFinalResult.NoResult -> PayPalPaymentAuthResult.NoResult
+            is BrowserSwitchFinalResult.NoResult -> {
+                analyticsClient.sendEvent(PayPalAnalytics.HANDLE_RETURN_NO_RESULT)
+                PayPalPaymentAuthResult.NoResult
+            }
         }
     }
 

PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalLauncherUnitTest.kt

@@ -7,8 +7,10 @@ import com.braintreepayments.api.BrowserSwitchException
 import com.braintreepayments.api.BrowserSwitchFinalResult
 import com.braintreepayments.api.BrowserSwitchOptions
 import com.braintreepayments.api.BrowserSwitchStartResult
+import com.braintreepayments.api.core.AnalyticsClient
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.verify
 import org.json.JSONException
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertSame
@@ -26,13 +28,14 @@ class PayPalLauncherUnitTest {
     private val intent: Intent = mockk(relaxed = true)
     private val options: BrowserSwitchOptions = mockk(relaxed = true)
     private val pendingRequestString = "pending_request_string"
+    private val analyticsClient: AnalyticsClient = mockk(relaxed = true)
 
     private lateinit var sut: PayPalLauncher
 
     @Before
     fun setup() {
         every { paymentAuthRequestParams.browserSwitchOptions } returns options
-        sut = PayPalLauncher(browserSwitchClient)
+        sut = PayPalLauncher(browserSwitchClient, lazy { analyticsClient })
     }
 
     @Test
@@ -102,14 +105,40 @@ class PayPalLauncherUnitTest {
         } returns browserSwitchFinalResult
 
         val paymentAuthResult = sut.handleReturnToApp(
-            PayPalPendingRequest.Started(pendingRequestString), intent
+            PayPalPendingRequest.Started(pendingRequestString),
+            intent
         )
 
         assertTrue(paymentAuthResult is PayPalPaymentAuthResult.Success)
         assertSame(
             browserSwitchFinalResult,
             (paymentAuthResult as PayPalPaymentAuthResult.Success).browserSwitchSuccess
         )
+        verify { analyticsClient.sendEvent(PayPalAnalytics.HANDLE_RETURN_SUCCEEDED) }
+    }
+
+    @Test
+    @Throws(JSONException::class)
+    fun `handleReturnToApp when result fails returns failed result`() {
+        val browserSwitchFinalResult = mockk<BrowserSwitchFinalResult.Failure>()
+        every {
+            browserSwitchClient.completeRequest(intent, pendingRequestString)
+        } returns browserSwitchFinalResult
+
+        val exception = BrowserSwitchException("BrowserSwitchException")
+        every { browserSwitchFinalResult.error } returns exception
+
+        val paymentAuthResult = sut.handleReturnToApp(
+            PayPalPendingRequest.Started(pendingRequestString),
+            intent
+        )
+
+        assertTrue(paymentAuthResult is PayPalPaymentAuthResult.Failure)
+        assertSame(
+            exception,
+            (paymentAuthResult as PayPalPaymentAuthResult.Failure).error
+        )
+        verify { analyticsClient.sendEvent(PayPalAnalytics.HANDLE_RETURN_FAILED) }
     }
 
     @Test
@@ -120,9 +149,11 @@ class PayPalLauncherUnitTest {
         } returns BrowserSwitchFinalResult.NoResult
 
         val paymentAuthResult = sut.handleReturnToApp(
-            PayPalPendingRequest.Started(pendingRequestString), intent
+            PayPalPendingRequest.Started(pendingRequestString),
+            intent
         )
 
         assertTrue(paymentAuthResult is PayPalPaymentAuthResult.NoResult)
+        verify { analyticsClient.sendEvent(PayPalAnalytics.HANDLE_RETURN_NO_RESULT) }
     }
 }