3DS 2 on Android

Author: tgensol

README.md

@@ -2,7 +2,7 @@
 [![npm version](https://badge.fury.io/js/react-native-braintree-custom-ui.svg)](https://badge.fury.io/js/react-native-braintree-custom-ui)
 
 An effort to update https://github.com/kraffslol/react-native-braintree-xplat.
-Use Braintree Android SDK V2 & IOS V4, with 3D Secure V1 on every payment.
+Use Braintree Android SDK V2 with 3DS & IOS V4 with 3DS 2.
 
 ## Installation
 
@@ -27,6 +27,20 @@ You will need the CardinalMobile.framework for 3DS 2 (https://developers.braintr
 curl -L -ubraintree-team-sdk@cardinalcommerce:220cc9476025679c4e5c843666c27d97cfb0f951  "https://cardinalcommerce.bintray.com/ios/2.1.4-2/cardinalmobilesdk.zip" -o cardinalmobile2.1.4-2.zip
 ```
 
+For Android you will need to add this to you build.gradle 
+
+```
+repositories {
+    maven {
+        url "https://cardinalcommerce.bintray.com/android"
+        credentials {
+            username 'braintree-team-sdk@cardinalcommerce'
+            password '220cc9476025679c4e5c843666c27d97cfb0f951'
+        }
+    }
+}
+```
+
 ## Custom Integration
 If you only want to tokenize credit card information, you can use the following:
 

android/build.gradle

@@ -16,15 +16,15 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+    
 }
 
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"
-    compile 'com.braintreepayments.api:braintree:2.22.0'
+    compile 'com.braintreepayments.api:braintree:+'
     compile 'com.squareup.okhttp:okhttp:2.5.0'
-    // implementation 'com.braintreepayments.api:three-d-secure:3.4.2'
-    implementation 'com.braintreepayments.api:drop-in:2.+'
+    implementation 'com.braintreepayments.api:three-d-secure:3.4.2'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.3.1'
 }

android/src/main/java/com/pw/droplet/braintree/Braintree.java

@@ -6,7 +6,7 @@
 import com.braintreepayments.api.interfaces.BraintreeCancelListener;
 
 import java.io.IOException;
-
+import androidx.appcompat.app.AppCompatActivity;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
@@ -21,7 +21,6 @@
 import com.braintreepayments.api.models.ThreeDSecureRequest;
 import com.braintreepayments.api.models.PaymentMethodNonce;
 import com.braintreepayments.api.BraintreeFragment;
-import com.braintreepayments.api.BraintreePaymentActivity;
 import android.app.Activity;
 import com.braintreepayments.api.exceptions.InvalidArgumentException;
 import com.braintreepayments.api.exceptions.BraintreeError;
@@ -40,7 +39,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 
-public class Braintree extends ReactContextBaseJavaModule  implements ActivityEventListener {
+public class Braintree extends ReactContextBaseJavaModule  {
   private static final int PAYMENT_REQUEST = 1706816330;
   private String token;
 
@@ -54,7 +53,6 @@ public class Braintree extends ReactContextBaseJavaModule  implements ActivityEv
 
   public Braintree(ReactApplicationContext reactContext) {
     super(reactContext);
-      reactContext.addActivityEventListener(this);
   }
 
   @Override
@@ -80,12 +78,17 @@ public void setup(final String url, final Callback successCallback, final Callba
 Request request = new Request.Builder()
                      .url(url)
                      .build();
+                          Log.d("PAYMENT_REQUEST" ,url);
                      try {
 Response response = client.newCall(request).execute();
-                    
-        this.mBraintreeFragment = BraintreeFragment.newInstance(getCurrentActivity(),  response.body().string());
-         }catch(IOException e){}
-            
+String res = response.body().string();
+                         Log.d("PAYMENT_REQUEST",res);
+        this.mBraintreeFragment = BraintreeFragment.newInstance((AppCompatActivity) getCurrentActivity(),  res);
+           Log.d("PAYMENT_REQUEST", res);
+         }catch(IOException e){
+              Log.e("PAYMENT_REQUEST", "I got an error", e);
+         }
+           
                 this.mBraintreeFragment.addListener(new BraintreeCancelListener() {
             @Override
             public void onCancel(int requestCode) {
@@ -210,8 +213,40 @@ public void check3DSecure(final ReadableMap parameters, final Callback successCa
      Log.d("PAYMENT_REQUEST",parameters.getString("nonce"));
     this.successCallback = successCallback;
     this.errorCallback = errorCallback;
+
+//  .email("[email protected]")
+//     .billingAddress(address);
+//     .nonce(cardNonce.getNonce())
+//     .versionRequested(ThreeDSecureRequest.VERSION_2)
+//     .additionalInformation(additionalInformation);
+
+// ThreeDSecurePostalAddress address = new ThreeDSecurePostalAddress()
+//     .givenName("Jill") // ASCII-printable characters required, else will throw a validation error
+//     .surname("Doe") // ASCII-printable characters required, else will throw a validation error
+//     .phoneNumber("5551234567")
+//     .streetAddress("555 Smith St")
+//     .extendedAddress("#2")
+//     .locality("Chicago")
+//     .region("IL")
+//     .postalCode("12345")
+//     .countryCodeAlpha2("US");
+
+// // For best results, provide as many additional elements as possible.
+// ThreeDSecureAdditionalInformation additionalInformation = new ThreeDSecureAdditionalInformation()
+//     .shippingAddress(address);
+
+// ThreeDSecureRequest threeDSecureRequest = new ThreeDSecureRequest()
+//     .amount("10")
+//     .email("[email protected]")
+//     .billingAddress(address);
+//     .nonce(cardNonce.getNonce())
+//     .versionRequested(ThreeDSecureRequest.VERSION_2)
+//     .additionalInformation(additionalInformation);
+
 ThreeDSecureRequest threeDSecureRequest = new ThreeDSecureRequest()
         .nonce(parameters.getString("nonce"))
+         .email(parameters.getString("email"))
+           .versionRequested(ThreeDSecureRequest.VERSION_2)
         .amount(parameters.getString("amount"));
 
 ThreeDSecure.performVerification(this.mBraintreeFragment, threeDSecureRequest);
@@ -236,34 +271,7 @@ public void paypalRequest(final Callback successCallback, final Callback errorCa
 
   PayPal.requestOneTimePayment(this.mBraintreeFragment, request);
   }
-  @Override
-  public void onActivityResult(Activity activity, final int requestCode, final int resultCode, final Intent data) {
-    Log.d("PAYMENT_REQUEST","onActivityResult");
-    if (requestCode == PAYMENT_REQUEST) {
-      switch (resultCode) {
-        case Activity.RESULT_OK:
-          PaymentMethodNonce paymentMethodNonce = data.getParcelableExtra(
-            BraintreePaymentActivity.EXTRA_PAYMENT_METHOD_NONCE
-          );
-
-            this.successCallback.invoke(paymentMethodNonce.getNonce());
-          
-          break;
-        case BraintreePaymentActivity.BRAINTREE_RESULT_DEVELOPER_ERROR:
-        case BraintreePaymentActivity.BRAINTREE_RESULT_SERVER_ERROR:
-        case BraintreePaymentActivity.BRAINTREE_RESULT_SERVER_UNAVAILABLE:
-          this.errorCallback.invoke(
-            data.getSerializableExtra(BraintreePaymentActivity.EXTRA_ERROR_MESSAGE)
-          );
-          break;
-        case Activity.RESULT_CANCELED:
-          this.errorCallback.invoke("USER_CANCELLATION");
-          break;
-        default:
-          break;
-      }
-    }
-  }
+  
 
   public void onNewIntent(Intent intent){}
 }

ios/RCTBraintree/RCTBraintree.m

@@ -87,12 +87,17 @@ - (instancetype)init
     });
 }
 
+- (void)onLookupComplete:(__unused BTThreeDSecureRequest *)request result:(__unused BTThreeDSecureLookup *)lookup next:(void (^)(void))next {
+    // Optionally inspect the lookup result and prepare UI if a challenge is required
+    next();
+}
 
 - (void)run3DSecureCheck:(NSDictionary *)parameters callback: (RCTResponseSenderBlock)callback  {
             BTThreeDSecureRequest *threeDSecureRequest = [[BTThreeDSecureRequest alloc] init];
             threeDSecureRequest.amount = [NSDecimalNumber decimalNumberWithString: parameters[@"amount"]];
             threeDSecureRequest.nonce =  parameters[@"nonce"];
-    
+            // Make sure that self conforms to the BTThreeDSecureRequestDelegate protocol
+            threeDSecureRequest.threeDSecureRequestDelegate = self;
             threeDSecureRequest.email = parameters[@"email"];
             threeDSecureRequest.versionRequested = BTThreeDSecureVersion2;
 
@@ -115,23 +120,18 @@ - (void)run3DSecureCheck:(NSDictionary *)parameters callback: (RCTResponseSender
             self.paymentFlowDriver = [[BTPaymentFlowDriver alloc] initWithAPIClient:self.braintreeClient];
             self.paymentFlowDriver.viewControllerPresentingDelegate = self;
 
-    
             [self.paymentFlowDriver startPaymentFlow:threeDSecureRequest completion:^(BTPaymentFlowResult * _Nonnull result, NSError * _Nonnull error) {
                 NSArray *args = @[];
                 if (error) {
-                    NSLog(@"Finally error %@", error.description);
                     args = @[error.localizedDescription, [NSNull null]];
                     // Handle error
                 } else if (result) {
-                    NSLog(@"Finally %@", result);
                     BTThreeDSecureResult *threeDSecureResult = (BTThreeDSecureResult *)result;
-    
                     if (threeDSecureResult.tokenizedCard.threeDSecureInfo.liabilityShiftPossible) {
                         if (threeDSecureResult.tokenizedCard.threeDSecureInfo.liabilityShifted) {
                             args = @[[NSNull null], threeDSecureResult.tokenizedCard.nonce];
                         } else {
                             // 3D Secure authentication failed
-                            //   args = @[serialisationErr.description, [NSNull null]];
                             args = @[@"failed", [NSNull null]];
                         }
                     }else{

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-braintree-custom-ui",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Cross platform Braintree module",
   "main": "index",
   "author": {

react-native-braintree-custom-ui.podspec

@@ -0,0 +1,20 @@
+require 'json'
+package = JSON.parse(File.read('./package.json'))
+
+Pod::Spec.new do |s|
+  s.name             = "RCTBraintree"
+  s.version          = package["version"]
+  s.summary          = package["description"]
+  s.requires_arc     = true
+  s.license          = { :type => package["license"] }
+  s.homepage         = package["homepage"]
+  s.authors          = { package["author"]["name"] => package["author"]["email"] }
+  s.source           = { :git => s.homepage, :tag => "v#{s.version}" }
+  s.platform         = :ios, "9.0"
+  s.source_files     = 'ios/RCTBraintree/**/*.{h,m}'
+  s.dependency         'React'
+  s.dependency 'Braintree'
+  s.dependency 'Braintree/DataCollector'
+  s.dependency 'Braintree/PaymentFlow'
+   
+end