Merge pull request pikaju#103 from nabinadhikari/master

Custom PayPalPaymentIntent and PayPalPaymentUserAction

Author: pikaju

android/src/main/java/com/example/flutter_braintree/FlutterBraintreeCustom.java

@@ -52,17 +52,31 @@ protected void tokenizeCreditCard() {
                 .cardNumber(intent.getStringExtra("cardNumber"))
                 .expirationMonth(intent.getStringExtra("expirationMonth"))
                 .expirationYear(intent.getStringExtra("expirationYear"))
-                .cvv(intent.getStringExtra("cvv"));
+                .cvv(intent.getStringExtra("cvv"))
+                .validate(false)
+                .cardholderName(intent.getStringExtra("cardholderName"));
         Card.tokenize(braintreeFragment, builder);
     }
 
     protected void requestPaypalNonce() {
         Intent intent = getIntent();
+        String paypalIntent;
+        switch (intent.getStringExtra("payPalPaymentIntent")){
+            case PayPalRequest.INTENT_ORDER: paypalIntent = PayPalRequest.INTENT_ORDER; break;
+            case PayPalRequest.INTENT_SALE: paypalIntent = PayPalRequest.INTENT_SALE; break;
+            default: paypalIntent = PayPalRequest.INTENT_AUTHORIZE; break;
+        }
+        String payPalPaymentUserAction = PayPalRequest.USER_ACTION_DEFAULT;
+        if (PayPalRequest.USER_ACTION_COMMIT.equals(intent.getStringExtra("payPalPaymentUserAction"))) {
+            payPalPaymentUserAction = PayPalRequest.USER_ACTION_COMMIT;
+        }
         PayPalRequest request = new PayPalRequest(intent.getStringExtra("amount"))
                 .currencyCode(intent.getStringExtra("currencyCode"))
                 .displayName(intent.getStringExtra("displayName"))
                 .billingAgreementDescription(intent.getStringExtra("billingAgreementDescription"))
-                .intent(PayPalRequest.INTENT_AUTHORIZE);
+                .intent(paypalIntent)
+                .userAction(payPalPaymentUserAction);
+        
 
         if (intent.getStringExtra("amount") == null) {
             // Vault flow

android/src/main/java/com/example/flutter_braintree/FlutterBraintreePlugin.java

@@ -98,6 +98,7 @@ public void onMethodCall(MethodCall call, Result result) {
       intent.putExtra("expirationMonth", (String) request.get("expirationMonth"));
       intent.putExtra("expirationYear", (String) request.get("expirationYear"));
       intent.putExtra("cvv", (String) request.get("cvv"));
+      intent.putExtra("cardholderName", (String) request.get("cardholderName"));
       activity.startActivityForResult(intent, CUSTOM_ACTIVITY_REQUEST_CODE);
     } else if (call.method.equals("requestPaypalNonce")) {
       String authorization = call.argument("authorization");
@@ -109,6 +110,8 @@ public void onMethodCall(MethodCall call, Result result) {
       intent.putExtra("amount", (String) request.get("amount"));
       intent.putExtra("currencyCode", (String) request.get("currencyCode"));
       intent.putExtra("displayName", (String) request.get("displayName"));
+      intent.putExtra("payPalPaymentIntent", (String) request.get("payPalPaymentIntent"));
+      intent.putExtra("payPalPaymentUserAction", (String) request.get("payPalPaymentUserAction"));
       intent.putExtra("billingAgreementDescription", (String) request.get("billingAgreementDescription"));
       activity.startActivityForResult(intent, CUSTOM_ACTIVITY_REQUEST_CODE);
     } else {

ios/Classes/BaseFlutterBraintreePlugin.swift

@@ -32,6 +32,7 @@ open class BaseFlutterBraintreePlugin: NSObject {
         dict["isDefault"] = nonce?.isDefault
         if let paypalNonce = nonce as? BTPayPalAccountNonce {
             dict["paypalPayerId"] = paypalNonce.payerID
+            dict["description"] = paypalNonce.email
         }
         return dict
     }

ios/Classes/FlutterBraintreeCustomPlugin.swift

@@ -40,7 +40,24 @@ public class FlutterBraintreeCustomPlugin: BaseFlutterBraintreePlugin, FlutterPl
                 paypalRequest.currencyCode = requestInfo["currencyCode"] as? String
                 paypalRequest.displayName = requestInfo["displayName"] as? String
                 paypalRequest.billingAgreementDescription = requestInfo["billingAgreementDescription"] as? String
-                
+                if let intent = requestInfo["payPalPaymentIntent"] as? String {
+                    switch intent {
+                    case "order":
+                        paypalRequest.intent = BTPayPalRequestIntent.order
+                    case "sale":
+                        paypalRequest.intent = BTPayPalRequestIntent.sale
+                    default:
+                        paypalRequest.intent = BTPayPalRequestIntent.authorize
+                    }
+                }
+                if let userAction = requestInfo["payPalPaymentUserAction"] as? String {
+                    switch userAction {
+                    case "commit":
+                        paypalRequest.userAction = BTPayPalRequestUserAction.commit
+                    default:
+                        paypalRequest.userAction = BTPayPalRequestUserAction.default
+                    }
+                }
                 driver.tokenizePayPalAccount(with: paypalRequest) { (nonce, error) in
                     self.handleResult(nonce: nonce, error: error, flutterResult: result)
                     self.isHandlingResult = false
@@ -66,6 +83,7 @@ public class FlutterBraintreeCustomPlugin: BaseFlutterBraintreePlugin, FlutterPl
             card.expirationMonth = cardRequestInfo["expirationMonth"] as? String
             card.expirationYear = cardRequestInfo["expirationYear"] as? String
             card.cvv = cardRequestInfo["cvv"] as? String
+            card.cardholderName = cardRequestInfo["cardholderName"] as? String
 
             cardClient.tokenizeCard(card) { (nonce, error) in
                 self.handleResult(nonce: nonce, error: error, flutterResult: result)

lib/src/request.dart

@@ -90,6 +90,7 @@ class BraintreeCreditCardRequest {
     required this.expirationMonth,
     required this.expirationYear,
     required this.cvv,
+    this.cardholderName,
   });
 
   /// Number shown on the credit card.
@@ -104,11 +105,15 @@ class BraintreeCreditCardRequest {
   /// A 3 or 4 digit card verification value assigned to credit cards.
   String cvv;
 
+  /// Cardholder name
+  String? cardholderName;
+
   Map<String, dynamic> toJson() => {
         'cardNumber': cardNumber,
         'expirationMonth': expirationMonth,
         'expirationYear': expirationYear,
         'cvv': cvv,
+        'cardholderName': cardholderName
       };
 }
 
@@ -147,6 +152,8 @@ class BraintreePayPalRequest {
     this.currencyCode,
     this.displayName,
     this.billingAgreementDescription,
+    this.payPalPaymentIntent,
+    this.payPalPaymentUserAction,
   });
 
   /// Amount of the transaction. If [amount] is `null`, PayPal will use the billing agreement (Vault) flow.
@@ -162,16 +169,59 @@ class BraintreePayPalRequest {
   /// Description for the billing agreement for the Vault flow.
   String? billingAgreementDescription;
 
+  /// PayPalPaymentIntent. Options are INTENT_AUTHORIZE,INTENT_SALE,INTENT_ORDER
+  PayPalPaymentIntent? payPalPaymentIntent;
+
+  ///PayPalPaymentUserAction. Options are USER_ACTION_DEFAULT, USER_ACTION_COMMIT
+  PayPalPaymentUserAction? payPalPaymentUserAction;
+
   /// Converts this request object into a JSON-encodable format.
   Map<String, dynamic> toJson() => {
         if (amount != null) 'amount': amount,
         if (currencyCode != null) 'currencyCode': currencyCode,
         if (displayName != null) 'displayName': displayName,
         if (billingAgreementDescription != null)
           'billingAgreementDescription': billingAgreementDescription,
+        'payPalPaymentIntent': payPalPaymentIntent == null
+            ? PayPalPaymentIntent.INTENT_AUTHORIZE.rawValue
+            : payPalPaymentIntent?.rawValue,
+        if (payPalPaymentUserAction != null)
+          'payPalPaymentUserAction': payPalPaymentUserAction?.rawValue,
       };
 }
 
+enum PayPalPaymentUserAction { USER_ACTION_DEFAULT, USER_ACTION_COMMIT }
+
+extension PayPalPaymentUserActionExtension on PayPalPaymentUserAction {
+  String? get rawValue {
+    switch (this) {
+      case PayPalPaymentUserAction.USER_ACTION_DEFAULT:
+        return '';
+      case PayPalPaymentUserAction.USER_ACTION_COMMIT:
+        return 'commit';
+      default:
+        return null;
+    }
+  }
+}
+
+enum PayPalPaymentIntent { INTENT_ORDER, INTENT_SALE, INTENT_AUTHORIZE }
+
+extension PayPalPaymentIntentExtension on PayPalPaymentIntent {
+  String? get rawValue {
+    switch (this) {
+      case PayPalPaymentIntent.INTENT_AUTHORIZE:
+        return 'authorize';
+      case PayPalPaymentIntent.INTENT_SALE:
+        return 'sale';
+      case PayPalPaymentIntent.INTENT_ORDER:
+        return 'order';
+      default:
+        return null;
+    }
+  }
+}
+
 enum ApplePaySummaryItemType {
   Final,
   Pending,