payment methods

.travis.yml

@@ -23,8 +23,10 @@ matrix:
           - tools
           - build-tools-25.0.0
           - build-tools-26.0.2
+          - build-tools-28.0.3
           - android-21
           - android-26
+          - android-28
           - sys-img-armeabi-v7a-android-21
           - extra-android-m2repository
           - extra-google-m2repository

android/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
-def DEFAULT_COMPILE_SDK_VERSION             = 26
-def DEFAULT_TARGET_SDK_VERSION              = 26
-def DEFAULT_BUILD_TOOLS_VERSION             = '26.0.2'
+def DEFAULT_COMPILE_SDK_VERSION             = 28
+def DEFAULT_TARGET_SDK_VERSION              = 28
+def DEFAULT_BUILD_TOOLS_VERSION             = '28.0.3'
 def DEFAULT_GOOGLE_PLAY_SERVICES_VERSION    = '11.8.0'
 def DEFAULT_FIREBASE_MESSAGING_VERSION      = '11.8.0'
 
@@ -34,11 +34,11 @@ dependencies {
 
   implementation fileTree(include: ['*.jar'], dir: 'libs')
   implementation 'com.facebook.react:react-native:+'
-  implementation 'com.android.support:support-v4:27.1.0'
-  implementation 'com.android.support:appcompat-v7:27.1.0'
+  implementation 'com.android.support:support-v4:28.0.0'
+  implementation 'com.android.support:appcompat-v7:28.0.0'
   implementation "com.google.android.gms:play-services-wallet:$googlePlayServicesVersion"
   implementation "com.google.firebase:firebase-core:$firebaseVersion"
-  implementation 'com.stripe:stripe-android:8.1.0'
+  implementation "com.github.khealth:stripe-android:google-pay-SNAPSHOT"
   implementation 'com.github.tipsi:CreditCardEntry:1.5.1'
 }
 
@@ -47,4 +47,4 @@ repositories {
     url 'https://maven.google.com/'
     name 'Google'
   }
-}
+}

android/src/main/java/com/gettipsi/stripe/DirectKeyProvider.java

@@ -0,0 +1,28 @@
+package com.gettipsi.stripe;
+
+import com.stripe.android.EphemeralKeyProvider;
+import com.stripe.android.EphemeralKeyUpdateListener;
+
+import com.gettipsi.stripe.StripeModule;
+import com.facebook.react.bridge.ReadableMap;
+
+
+public class DirectKeyProvider implements EphemeralKeyProvider {
+
+    private String mRawKey;
+
+    public DirectKeyProvider(String rawKey) {
+        mRawKey = rawKey;
+    }
+
+    @Override
+    public void createEphemeralKey(String apiVersion,
+                                    final EphemeralKeyUpdateListener keyUpdateListener) {
+        if(mRawKey == null) {
+            StripeModule.getInstance().delayEphermalKeyResolution(apiVersion, keyUpdateListener);
+        }
+        else {
+            keyUpdateListener.onKeyUpdate(mRawKey);
+        }
+    }
+}

android/src/main/java/com/gettipsi/stripe/StripeModule.java

@@ -15,6 +15,7 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
 import com.gettipsi.stripe.dialog.AddCardDialogFragment;
 import com.gettipsi.stripe.util.ArgCheck;
 import com.gettipsi.stripe.util.Converters;
@@ -26,6 +27,13 @@
 import com.stripe.android.model.Source;
 import com.stripe.android.model.SourceParams;
 import com.stripe.android.model.Token;
+import com.stripe.android.CustomerSession;
+import com.stripe.android.model.Customer;
+import com.stripe.android.view.PaymentMethodsActivity;
+import com.stripe.android.PaymentConfiguration;
+import com.stripe.android.EphemeralKeyUpdateListener;
+import com.stripe.android.StripeError;
+import com.stripe.android.view.PaymentMethodsActivityStarter;
 
 import static com.gettipsi.stripe.Errors.*;
 import static com.gettipsi.stripe.util.Converters.convertSourceToWritableMap;
@@ -37,11 +45,14 @@
 import static com.gettipsi.stripe.util.InitializationOptions.ANDROID_PAY_MODE_PRODUCTION;
 import static com.gettipsi.stripe.util.InitializationOptions.ANDROID_PAY_MODE_TEST;
 import static com.gettipsi.stripe.util.InitializationOptions.PUBLISHABLE_KEY;
+import static com.gettipsi.stripe.util.InitializationOptions.EPHEMERAL_KEY;
 
 public class StripeModule extends ReactContextBaseJavaModule {
 
   private static final String MODULE_NAME = StripeModule.class.getSimpleName();
 
+  private static final int REQUEST_CODE_SELECT_SOURCE = 55;
+
   private static StripeModule sInstance = null;
 
   public static StripeModule getInstance() {
@@ -53,7 +64,7 @@ public Stripe getStripe() {
   }
 
   @Nullable
-  private Promise mCreateSourcePromise;
+  private Promise mCurrentPromise;
 
   @Nullable
   private Source mCreatedSource;
@@ -63,14 +74,35 @@ public Stripe getStripe() {
   private PayFlow mPayFlow;
   private ReadableMap mErrorCodes;
 
+  private EphemeralKeyUpdateListener mEphemeralKeyReceiver;
+
   private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
 
     @Override
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-      boolean handled = getPayFlow().onActivityResult(activity, requestCode, resultCode, data);
-      if (!handled) {
-        super.onActivityResult(activity, requestCode, resultCode, data);
-      }
+        if (requestCode == REQUEST_CODE_SELECT_SOURCE) {
+            super.onActivityResult(activity, requestCode, resultCode, data);
+            if(resultCode == Activity.RESULT_OK) {
+              String selectedSource = data.getStringExtra(PaymentMethodsActivity.EXTRA_SELECTED_PAYMENT);
+              Source source = Source.fromString(selectedSource);
+              WritableMap result = convertSourceToWritableMap(source);
+              result.putString("resultType", "STPSource");
+              mCurrentPromise.resolve(result);
+            }
+            else {
+              mCurrentPromise.reject(
+                getErrorCode(mErrorCodes, "cancelled"),
+                getDescription(mErrorCodes, "cancelled")
+              );
+            }
+            mCurrentPromise = null;
+        } else {
+          boolean handled = getPayFlow().onActivityResult(activity, requestCode, resultCode, data);
+          if (!handled) {
+            super.onActivityResult(activity, requestCode, resultCode, data);
+          }
+
+        }
     }
   };
 
@@ -102,6 +134,7 @@ public void init(@NonNull ReadableMap options, @NonNull ReadableMap errorCodes)
       mPublicKey = newPubKey;
       mStripe = new Stripe(getReactApplicationContext(), mPublicKey);
       getPayFlow().setPublishableKey(mPublicKey);
+      PaymentConfiguration.init(mPublicKey);
     }
 
     if (newAndroidPayMode != null) {
@@ -133,6 +166,19 @@ private static int androidPayModeToEnvironment(@NonNull String androidPayMode) {
     return ANDROID_PAY_MODE_TEST.equals(androidPayMode.toLowerCase()) ? WalletConstants.ENVIRONMENT_TEST : WalletConstants.ENVIRONMENT_PRODUCTION;
   }
 
+  public void delayEphermalKeyResolution(String apiVersion,
+                                    final EphemeralKeyUpdateListener keyUpdateListener) {
+                                    mEphemeralKeyReceiver = keyUpdateListener;
+                                    mCurrentPromise.resolve(apiVersion);
+                                    mCurrentPromise = null;
+                                    }
+
+  private void launchWithCustomer() {
+    Activity currentActivity = getCurrentActivity();
+    new PaymentMethodsActivityStarter(currentActivity).startForResult(REQUEST_CODE_SELECT_SOURCE);
+  }
+
+
   @ReactMethod
   public void deviceSupportsAndroidPay(final Promise promise) {
     getPayFlow().deviceSupportsAndroidPay(false, promise);
@@ -297,7 +343,7 @@ public void onSuccess(Source source) {
               getDescription(mErrorCodes, "activityUnavailable")
             );
           } else {
-            mCreateSourcePromise = promise;
+            mCurrentPromise = promise;
             mCreatedSource = source;
             String redirectUrl = source.getRedirect().getUrl();
             Intent browserIntent = new Intent(currentActivity, OpenBrowserActivity.class)
@@ -312,50 +358,114 @@ public void onSuccess(Source source) {
     });
   }
 
+  private void retrieveCustomerSession() {
+    CustomerSession.getInstance().retrieveCurrentCustomer(
+            new CustomerSession.CustomerRetrievalListener() {
+              @Override
+              public void onCustomerRetrieved(Customer customer) {
+                // got customer, continue by launching the payment methods dialog
+                launchWithCustomer();
+              }
+
+              @Override
+              public void onError(int httpCode, String errorMessage, StripeError error) {
+                // failed to get customer
+                mCurrentPromise.reject("StripeError",errorMessage);
+                mCurrentPromise = null;
+              }
+            });
+  }
+
+  @ReactMethod
+  public void paymentRequestWithPaymentMethods(ReadableMap params, final Promise promise) {
+    Activity currentActivity = getCurrentActivity();
+    try {
+      ArgCheck.nonNull(currentActivity);
+      ArgCheck.notEmptyString(mPublicKey);
+
+      String ephemeralKey = Converters.getStringOrNull(params, EPHEMERAL_KEY);
+      mCurrentPromise = promise;
+
+      CustomerSession.initCustomerSession(
+              getReactApplicationContext(),
+              new DirectKeyProvider(ephemeralKey));
+
+      if(mCurrentPromise != null) {
+        retrieveCustomerSession();
+      }
+      else {
+        // this means that there was already an attempt to retrieve the key and promise was resolved.
+        // there's difference in behvior between versions, and nulling the receiver is a good way of
+        // knowing to restart later
+        mEphemeralKeyReceiver = null;
+      }
+
+    } catch (Exception e) {
+      promise.reject(toErrorCode(e), e.getMessage());
+    }
+  }
+
+  @ReactMethod
+  public void completePaymentRequestWithPaymentMethods(String ephemeralKey, final Promise promise) {
+    mCurrentPromise = promise;
+    if(mEphemeralKeyReceiver != null) {
+      mEphemeralKeyReceiver.onKeyUpdate(ephemeralKey);
+      mEphemeralKeyReceiver = null;
+    }
+    else {
+      // didnt have receiver so retrieve the session now
+      CustomerSession.endCustomerSession();
+      CustomerSession.initCustomerSession(
+              getReactApplicationContext(),
+              new DirectKeyProvider(ephemeralKey));
+      retrieveCustomerSession();
+    }
+  }
+
   void processRedirect(@Nullable Uri redirectData) {
-    if (mCreatedSource == null || mCreateSourcePromise == null) {
+    if (mCreatedSource == null || mCurrentPromise == null) {
 
       return;
     }
 
     if (redirectData == null) {
 
-      mCreateSourcePromise.reject(
+      mCurrentPromise.reject(
         getErrorCode(mErrorCodes, "redirectCancelled"),
         getDescription(mErrorCodes, "redirectCancelled")
       );
       mCreatedSource = null;
-      mCreateSourcePromise = null;
+      mCurrentPromise = null;
       return;
     }
 
     final String clientSecret = redirectData.getQueryParameter("client_secret");
     if (!mCreatedSource.getClientSecret().equals(clientSecret)) {
-      mCreateSourcePromise.reject(
+      mCurrentPromise.reject(
         getErrorCode(mErrorCodes, "redirectNoSource"),
         getDescription(mErrorCodes, "redirectNoSource")
       );
       mCreatedSource = null;
-      mCreateSourcePromise = null;
+      mCurrentPromise = null;
       return;
     }
 
     final String sourceId = redirectData.getQueryParameter("source");
     if (!mCreatedSource.getId().equals(sourceId)) {
-      mCreateSourcePromise.reject(
+      mCurrentPromise.reject(
         getErrorCode(mErrorCodes, "redirectWrongSourceId"),
         getDescription(mErrorCodes, "redirectWrongSourceId")
       );
       mCreatedSource = null;
-      mCreateSourcePromise = null;
+      mCurrentPromise = null;
       return;
     }
 
-    final Promise promise = mCreateSourcePromise;
+    final Promise promise = mCurrentPromise;
 
     // Nulls those properties to avoid processing them twice
     mCreatedSource = null;
-    mCreateSourcePromise = null;
+    mCurrentPromise = null;
 
     new AsyncTask<Void, Void, Void>() {
       @Override

android/src/main/java/com/gettipsi/stripe/util/Converters.java

@@ -164,7 +164,7 @@ public static Collection<String> getAllowedShippingCountryCodes(final ReadableMa
     return allowedCountryCodesForShipping;
   }
 
-  public static ArrayList<CountrySpecification> getAllowedShippingCountries(final ReadableMap map) {
+public static ArrayList<CountrySpecification> getAllowedShippingCountries(final ReadableMap map) {
     ArrayList<CountrySpecification> allowedCountriesForShipping = new ArrayList<>();
     ReadableArray countries = getValue(map, "shipping_countries", (ReadableArray) null);
 
@@ -199,7 +199,8 @@ public static Card createCard(final ReadableMap cardData) {
       getValue(cardData, "funding"),
       getValue(cardData, "country"),
       getValue(cardData, "currency"),
-      getValue(cardData, "id")
+      getValue(cardData, "id"),
+      null
     );
   }
 
@@ -367,7 +368,7 @@ public static void pushRightTypeToMap(@NonNull WritableMap map, @NonNull String
     }
   }
 
-  public static WritableMap convertAddressToWritableMap(final UserAddress address){
+public static WritableMap convertAddressToWritableMap(final UserAddress address){
     WritableMap result = Arguments.createMap();
 
     if (address == null) return result;
@@ -391,14 +392,16 @@ public static WritableMap convertAddressToWritableMap(final UserAddress address)
 
   public static BankAccount createBankAccount(ReadableMap accountData) {
     BankAccount account = new BankAccount(
-      // required fields only
-      accountData.getString("accountNumber"),
-      accountData.getString("countryCode"),
-      accountData.getString("currency"),
-      getValue(accountData, "routingNumber", "")
+            accountData.getString("accountNumber"),
+            getValue(accountData, "accountHolderName"),
+            getValue(accountData, "accountHolderType"),
+            null,
+            accountData.getString("countryCode"),
+            accountData.getString("currency"),
+            null,
+            null,
+            getValue(accountData, "routingNumber", "")
     );
-    account.setAccountHolderName(getValue(accountData, "accountHolderName"));
-    account.setAccountHolderType(getValue(accountData, "accountHolderType"));
 
     return account;
   }
@@ -413,7 +416,7 @@ public static void putIfNotEmpty(final WritableMap map, final String key, final
     }
   }
 
-  public static UserAddress getBillingAddress(PaymentData paymentData) {
+    public static UserAddress getBillingAddress(PaymentData paymentData) {
     if (paymentData != null && paymentData.getCardInfo() != null) {
       return paymentData.getCardInfo().getBillingAddress();
     }

android/src/main/java/com/gettipsi/stripe/util/InitializationOptions.java

@@ -10,5 +10,6 @@ public abstract class InitializationOptions {
   public static final String ANDROID_PAY_MODE_KEY = "androidPayMode";
   public static final String ANDROID_PAY_MODE_PRODUCTION = "production";
   public static final String ANDROID_PAY_MODE_TEST = "test";
+  public static final String EPHEMERAL_KEY = "ephemeralKey";
 
 }