Google Pay Public Methods Single Result (#862)

* Update Google Pay * Update CHANGELOG * Fix spacing
braintree · Dec 18, 2023 · 5633f12 · 5633f12
1 parent 75c09ae
commit 5633f12
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,12 +41,13 @@
     * Remove `GooglePayListener` and `GooglePayRequestPaymentCallback`
     * Add `GooglePayLauncher`, `GooglePayPaymentAuthRequest`, 
       `GooglePayPaymentAuthRequestCallback`, `GooglePayPaymentAuthResult`, 
-      `GooglePayTokenizeCallback` and `GooglePayLauncherCallback`
+      `GooglePayTokenizeCallback`, `GooglePayTokenizationParameters` and `GooglePayLauncherCallback`
     * Remove overload constructors, `setListener, and `onActivityResult` from `GooglePayClient`
     * Change `GooglePayClient#requestPayment` parameters and rename to 
       `GooglePayClient#createPaymentAuthRequest`
     * Add `GooglePayClient#tokenize` 
     * Remove `merchantId` from `GooglePayRequest`
+    * Change `GooglePayGetTokenizationParametersCallback` parameters
   * ThreeDSecure
     * Remove `ThreeDSecureListener`
     * Add `ThreeDSecureLauncher`, `ThreeDSecurePaymentAuthResult`, 

diff --git a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayClient.java b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayClient.java
@@ -158,13 +158,12 @@ public void isReadyToPay(@NonNull final FragmentActivity activity,
     public void getTokenizationParameters(
             @NonNull final GooglePayGetTokenizationParametersCallback callback) {
         braintreeClient.getConfiguration((configuration, e) -> {
-            if (configuration == null) {
-                callback.onResult(null, null);
+            if (configuration == null && e != null) {
+                callback.onTokenizationParametersResult(new GooglePayTokenizationParameters.Failure(e));
                 return;
             }
-            callback.onResult(
-                    getTokenizationParameters(configuration, braintreeClient.getAuthorization()),
-                    getAllowedCardNetworks(configuration));
+            callback.onTokenizationParametersResult(new GooglePayTokenizationParameters.Success(
+                    getTokenizationParameters(configuration, braintreeClient.getAuthorization()), getAllowedCardNetworks(configuration)));
         });
 
     }

diff --git a/...y/src/main/java/com/braintreepayments/api/GooglePayGetTokenizationParametersCallback.java b/...y/src/main/java/com/braintreepayments/api/GooglePayGetTokenizationParametersCallback.java
@@ -1,7 +1,5 @@
 package com.braintreepayments.api;
 
-import androidx.annotation.Nullable;
-
 import com.google.android.gms.wallet.PaymentMethodTokenizationParameters;
 
 import java.util.Collection;
@@ -17,17 +15,17 @@ public interface GooglePayGetTokenizationParametersCallback {
      * Wallet or Google Pay integrations, or when full control over the
      * {@link com.google.android.gms.wallet.MaskedWalletRequest} and
      * {@link com.google.android.gms.wallet.FullWalletRequest} is required.
-     *
+     * <p>
      * {@link PaymentMethodTokenizationParameters} should be supplied to the
      * {@link com.google.android.gms.wallet.MaskedWalletRequest} via
-     * {@link com.google.android.gms.wallet.MaskedWalletRequest.Builder#setPaymentMethodTokenizationParameters(PaymentMethodTokenizationParameters)}
+     * {@link
+     * com.google.android.gms.wallet.MaskedWalletRequest.Builder#setPaymentMethodTokenizationParameters(PaymentMethodTokenizationParameters)}
      * and {@link Collection<Integer>} allowedCardNetworks should be supplied to the
      * {@link com.google.android.gms.wallet.MaskedWalletRequest} via
-     * {@link com.google.android.gms.wallet.MaskedWalletRequest.Builder#addAllowedCardNetworks(Collection)}.
+     * {@link
+     * com.google.android.gms.wallet.MaskedWalletRequest.Builder#addAllowedCardNetworks(Collection)}.
      *
-     * @param parameters {@link PaymentMethodTokenizationParameters}
-     * @param allowedCardNetworks {@link Collection<Integer>} of card networks supported by the current
-     *        Braintree merchant account.
+     * @param tokenizationParameters {@link GooglePayTokenizationParameters}
      */
-    void onResult(@Nullable PaymentMethodTokenizationParameters parameters, @Nullable Collection<Integer> allowedCardNetworks);
+    void onTokenizationParametersResult(GooglePayTokenizationParameters tokenizationParameters);
 }
diff --git a/GooglePay/src/main/java/com/braintreepayments/api/GooglePayTokenizationParameters.kt b/GooglePay/src/main/java/com/braintreepayments/api/GooglePayTokenizationParameters.kt
@@ -0,0 +1,21 @@
+package com.braintreepayments.api
+
+import com.google.android.gms.wallet.PaymentMethodTokenizationParameters
+
+/**
+ * A request used to get Braintree specific tokenization parameters for a Google Pay
+ */
+sealed class GooglePayTokenizationParameters {
+
+    /**
+     * The request was successfully created
+     */
+    class Success(val parameters: PaymentMethodTokenizationParameters,
+                  val allowedCardNetworks: Collection<Integer>
+    ) : GooglePayTokenizationParameters()
+
+    /**
+     * There was an [error] creating the request
+     */
+    class Failure(val error: Exception) : GooglePayTokenizationParameters()
+}
diff --git a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayClientUnitTest.java b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayClientUnitTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -1247,13 +1248,11 @@ public void getTokenizationParameters_forwardsParametersAndAllowedCardsToCallbac
                 new MockGooglePayInternalClientBuilder().build();
         GooglePayClient sut = new GooglePayClient(braintreeClient, internalGooglePayClient);
 
-        GooglePayGetTokenizationParametersCallback getTokenizationParametersCallback =
-                mock(GooglePayGetTokenizationParametersCallback.class);
-        sut.getTokenizationParameters(getTokenizationParametersCallback);
-
-        verify(getTokenizationParametersCallback).onResult(
-                any(PaymentMethodTokenizationParameters.class),
-                eq(sut.getAllowedCardNetworks(configuration)));
+        sut.getTokenizationParameters(tokenizationParameters -> {
+            assertTrue(tokenizationParameters instanceof GooglePayTokenizationParameters.Success);
+            assertNotNull(((GooglePayTokenizationParameters.Success) tokenizationParameters).getParameters());
+            assertEquals(sut.getAllowedCardNetworks(configuration), ((GooglePayTokenizationParameters.Success) tokenizationParameters).getAllowedCardNetworks());
+        });
     }
 
     // endregion