From 8a72e5c1c262eab00e6921cd792ceba875dd47c2 Mon Sep 17 00:00:00 2001
From: Oussama <khzouroussama@gmail.com>
Date: Tue, 11 Apr 2023 10:16:24 +0100
Subject: [PATCH 1/3] chore: bacs ios implementation + working example

---
 example/ios/Podfile.lock                      |   2 +-
 example/server/index.ts                       |   1 +
 example/src/App.tsx                           |   6 +
 .../src/screens/BacsDebitPaymentScreen.tsx    | 135 ++++++++++++++++++
 example/src/screens/HomeScreen.tsx            |   8 ++
 .../src/screens/PaymentsUICompleteScreen.tsx  |   4 +
 ios/PaymentMethodFactory.swift                |  29 ++++
 src/types/PaymentIntent.ts                    |  12 +-
 src/types/PaymentMethod.ts                    |  15 +-
 9 files changed, 208 insertions(+), 4 deletions(-)
 create mode 100644 example/src/screens/BacsDebitPaymentScreen.tsx

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 4e59344d2a..92feb06ef6 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -650,4 +650,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: d98ea981c14c48ddbbd4f2d6bcf130927b15a93f
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
diff --git a/example/server/index.ts b/example/server/index.ts
index 952aec557c..df8ea32c92 100644
--- a/example/server/index.ts
+++ b/example/server/index.ts
@@ -71,6 +71,7 @@ function getKeys(payment_method?: string) {
       secret_key = process.env.STRIPE_SECRET_KEY_WECHAT;
       break;
     case 'paypal':
+    case 'bacs_debit':
       publishable_key = process.env.STRIPE_PUBLISHABLE_KEY_UK;
       secret_key = process.env.STRIPE_SECRET_KEY_UK;
       break;
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 4835c70271..85353fbc64 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -41,6 +41,7 @@ import PayPalScreen from './screens/PayPalScreen';
 import AffirmScreen from './screens/AffirmScreen';
 import CollectBankAccountScreen from './screens/CollectBankAccountScreen';
 import CashAppScreen from './screens/CashAppScreen';
+import BacsDebitPaymentScreen from './screens/BacsDebitPaymentScreen';
 
 const Stack = createNativeStackNavigator<RootStackParamList>();
 
@@ -83,6 +84,7 @@ export type RootStackParamList = {
   CashAppScreen: undefined;
   AffirmScreen: undefined;
   CollectBankAccountScreen: undefined;
+  BacsDebitPaymentScreen: undefined;
 };
 
 declare global {
@@ -200,6 +202,10 @@ export default function App() {
             name="SepaPaymentScreen"
             component={SepaPaymentScreen}
           />
+          <Stack.Screen
+            name="BacsDebitPaymentScreen"
+            component={BacsDebitPaymentScreen}
+          />
           <Stack.Screen
             name="SepaSetupFuturePaymentScreen"
             component={SepaSetupFuturePaymentScreen}
diff --git a/example/src/screens/BacsDebitPaymentScreen.tsx b/example/src/screens/BacsDebitPaymentScreen.tsx
new file mode 100644
index 0000000000..9da662312e
--- /dev/null
+++ b/example/src/screens/BacsDebitPaymentScreen.tsx
@@ -0,0 +1,135 @@
+import { PaymentIntent, BillingDetails } from '@stripe/stripe-react-native';
+import React, { useState } from 'react';
+import { Alert, StyleSheet, TextInput } from 'react-native';
+import { useConfirmPayment } from '@stripe/stripe-react-native';
+import Button from '../components/Button';
+import PaymentScreen from '../components/PaymentScreen';
+import { API_URL } from '../Config';
+import { colors } from '../colors';
+
+export default function BacsPaymentScreen() {
+  const [email, setEmail] = useState('');
+  const { confirmPayment, loading } = useConfirmPayment();
+  const [sortCode, setSortCode] = useState('');
+  const [accountNumber, setAccountNumber] = useState('');
+  const [canPay, setCanPay] = useState(true);
+
+  const fetchPaymentIntentClientSecret = async () => {
+    const response = await fetch(`${API_URL}/create-payment-intent`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        email,
+        currency: 'gbp',
+        items: ['id-1'],
+        payment_method_types: ['bacs_debit'],
+      }),
+    });
+    const { clientSecret, error } = await response.json();
+
+    return { clientSecret, error };
+  };
+
+  const handlePayPress = async () => {
+    const { clientSecret, error: clientSecretError } =
+      await fetchPaymentIntentClientSecret();
+
+    if (clientSecretError) {
+      Alert.alert(`Error`, clientSecretError);
+      return;
+    }
+
+    const billingDetails: BillingDetails = {
+      name: 'John Doe',
+      email: email,
+      address: {
+        country: 'UK',
+        line1: 'test',
+        city: 'test',
+      },
+    };
+    setCanPay(false);
+    const { error, paymentIntent } = await confirmPayment(clientSecret, {
+      paymentMethodType: 'BacsDebit',
+      paymentMethodData: { billingDetails, sortCode, accountNumber },
+    });
+
+    if (error) {
+      Alert.alert(`Error code: ${error.code}`, error.message);
+    } else if (paymentIntent) {
+      if (paymentIntent.status === PaymentIntent.Status.Processing) {
+        Alert.alert(
+          'Processing',
+          `The debit has been successfully submitted and is now processing.`
+        );
+      } else if (paymentIntent.status === PaymentIntent.Status.Succeeded) {
+        Alert.alert(
+          'Success',
+          `The payment was confirmed successfully! currency: ${paymentIntent.currency}`
+        );
+      } else {
+        Alert.alert('Payment status:', paymentIntent.status);
+      }
+    }
+    setCanPay(true);
+  };
+
+  return (
+    <PaymentScreen paymentMethod="bacs_debit">
+      <TextInput
+        autoCapitalize="none"
+        placeholder="E-mail"
+        keyboardType="email-address"
+        onChange={(value) => setEmail(value.nativeEvent.text)}
+        style={styles.input}
+      />
+      <TextInput
+        autoCapitalize="characters"
+        placeholder="sortCode"
+        onChange={(value) => setSortCode(value.nativeEvent.text.toLowerCase())}
+        style={styles.input}
+      />
+
+      <TextInput
+        autoCapitalize="characters"
+        placeholder="accountNumber"
+        onChange={(value) =>
+          setAccountNumber(value.nativeEvent.text.toLowerCase())
+        }
+        style={styles.input}
+      />
+      <Button
+        variant="primary"
+        onPress={handlePayPress}
+        title="Pay"
+        disabled={!canPay}
+        accessibilityLabel="Pay"
+        loading={loading}
+      />
+    </PaymentScreen>
+  );
+}
+
+const styles = StyleSheet.create({
+  cardField: {
+    width: '100%',
+    height: 50,
+    marginVertical: 30,
+  },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginVertical: 20,
+  },
+  text: {
+    marginLeft: 12,
+  },
+  input: {
+    height: 44,
+    borderBottomColor: colors.slate,
+    borderBottomWidth: 1.5,
+    marginBottom: 20,
+  },
+});
diff --git a/example/src/screens/HomeScreen.tsx b/example/src/screens/HomeScreen.tsx
index 3529394c56..4631a641b1 100644
--- a/example/src/screens/HomeScreen.tsx
+++ b/example/src/screens/HomeScreen.tsx
@@ -149,6 +149,14 @@ export default function HomeScreen() {
               }}
             />
           </View>
+          <View style={styles.buttonContainer}>
+            <Button
+              title="Bacs Direct Debit payment"
+              onPress={() => {
+                navigation.navigate('BacsDebitPaymentScreen');
+              }}
+            />
+          </View>
           <View style={styles.buttonContainer}>
             <Button
               title="BECS Direct Debit payment"
diff --git a/example/src/screens/PaymentsUICompleteScreen.tsx b/example/src/screens/PaymentsUICompleteScreen.tsx
index 159b167793..54ed12684c 100644
--- a/example/src/screens/PaymentsUICompleteScreen.tsx
+++ b/example/src/screens/PaymentsUICompleteScreen.tsx
@@ -30,6 +30,10 @@ export default function PaymentsUICompleteScreen() {
       },
     });
     const { paymentIntent, ephemeralKey, customer } = await response.json();
+    console.log({
+      paymentIntent,
+      API_URL,
+    });
     setClientSecret(paymentIntent);
     return {
       paymentIntent,
diff --git a/ios/PaymentMethodFactory.swift b/ios/PaymentMethodFactory.swift
index dcad5ddb34..9d4ad83871 100644
--- a/ios/PaymentMethodFactory.swift
+++ b/ios/PaymentMethodFactory.swift
@@ -57,6 +57,8 @@ class PaymentMethodFactory {
                 return try createAffirmPaymentMethodParams()
             case STPPaymentMethodType.cashApp:
                 return try createCashAppPaymentMethodParams()
+            case STPPaymentMethodType.bacsDebit:
+                return try createBacsPaymentMethodParams()
 //            case STPPaymentMethodType.weChatPay:
 //                return try createWeChatPayPaymentMethodParams()
             default:
@@ -110,6 +112,8 @@ class PaymentMethodFactory {
                 return nil
             case STPPaymentMethodType.cashApp:
                 return nil
+            case STPPaymentMethodType.bacsDebit:
+                return nil
             default:
                 throw PaymentMethodError.paymentNotSupported
             }
@@ -278,6 +282,28 @@ class PaymentMethodFactory {
 
         return STPPaymentMethodParams(sepaDebit: params, billingDetails: billingDetails, metadata: nil)
     }
+    
+    private func createBacsPaymentMethodParams() throws -> STPPaymentMethodParams {
+        let params = STPPaymentMethodBacsDebitParams()
+
+        guard let billingDetails = billingDetailsParams else {
+            throw PaymentMethodError.bacsPaymentMissingParams
+        }
+        
+        guard let accountNumber = self.paymentMethodData?["accountNumber"] as? String else {
+            throw PaymentMethodError.bacsPaymentMissingParams
+        }
+        
+        guard let sortCode = self.paymentMethodData?["sortCode"] as? String else {
+            throw PaymentMethodError.bacsPaymentMissingParams
+        }
+
+        params.accountNumber = accountNumber
+        params.sortCode = sortCode
+
+        return STPPaymentMethodParams(bacsDebit: params, billingDetails: billingDetails, metadata: nil)
+    }
+    
 
     private func createOXXOPaymentMethodParams() throws -> STPPaymentMethodParams {
         let params = STPPaymentMethodOXXOParams()
@@ -404,6 +430,7 @@ enum PaymentMethodError: Error {
     case cardPaymentOptionsMissingParams
     case bancontactPaymentMissingParams
     case sepaPaymentMissingParams
+    case bacsPaymentMissingParams
     case giropayPaymentMissingParams
     case p24PaymentMissingParams
     case afterpayClearpayPaymentMissingParams
@@ -431,6 +458,8 @@ extension PaymentMethodError: LocalizedError {
             return NSLocalizedString("You must provide billing details", comment: "Create payment error")
         case .sepaPaymentMissingParams:
             return NSLocalizedString("You must provide billing details and IBAN", comment: "Create payment error")
+        case .bacsPaymentMissingParams:
+            return NSLocalizedString("You must provide billing details, Sort code and Account number", comment: "Create payment error")
         case .epsPaymentMissingParams:
             return NSLocalizedString("You must provide billing details", comment: "Create payment error")
         case .afterpayClearpayPaymentMissingParams:
diff --git a/src/types/PaymentIntent.ts b/src/types/PaymentIntent.ts
index 425d125d4b..645160b7c0 100644
--- a/src/types/PaymentIntent.ts
+++ b/src/types/PaymentIntent.ts
@@ -47,7 +47,8 @@ export type ConfirmParams =
   | USBankAccountParams
   | PayPalParams
   | AffirmParams
-  | CashAppParams;
+  | CashAppParams
+  | BacsParams;
 
 export type ConfirmOptions = PaymentMethod.ConfirmOptions;
 
@@ -166,6 +167,15 @@ export interface SepaParams {
   };
 }
 
+export interface BacsParams {
+  paymentMethodType: 'BacsDebit';
+  paymentMethodData: {
+    accountNumber: string;
+    sortCode: string;
+    billingDetails: BillingDetails;
+  };
+}
+
 export interface GiropayParams {
   paymentMethodType: 'Giropay';
   paymentMethodData: {
diff --git a/src/types/PaymentMethod.ts b/src/types/PaymentMethod.ts
index 625d866b73..88f0f6852f 100644
--- a/src/types/PaymentMethod.ts
+++ b/src/types/PaymentMethod.ts
@@ -44,7 +44,8 @@ export type CreateParams =
   | USBankAccountParams
   | PayPalParams
   | AffirmParams
-  | CashAppParams;
+  | CashAppParams
+  | BacsParams;
 
 export type ConfirmParams = CreateParams;
 
@@ -126,6 +127,15 @@ export interface SepaParams {
   };
 }
 
+export interface BacsParams {
+  paymentMethodType: 'BacsDebit';
+  paymentMethodData: {
+    accountNumber: string;
+    sortCode: string;
+    billingDetails: BillingDetails;
+  };
+}
+
 export interface GiropayParams {
   paymentMethodType: 'Giropay';
   paymentMethodData: {
@@ -303,7 +313,8 @@ export type Type =
   | 'Upi'
   | 'USBankAccount'
   | 'PayPal'
-  | 'Unknown';
+  | 'Unknown'
+  | 'BacsDebit';
 
 export type CollectBankAccountParams = {
   paymentMethodType: 'USBankAccount';

From 4981399d551cf5d5061afcff8fb70912fa8b613c Mon Sep 17 00:00:00 2001
From: Oussama <khzouroussama@gmail.com>
Date: Tue, 11 Apr 2023 11:43:13 +0100
Subject: [PATCH 2/3] chore: added android implementation for bacs payments

---
 .../PaymentMethodCreateParamsFactory.kt       | 24 +++++++++++++++++++
 .../src/screens/BacsDebitPaymentScreen.tsx    |  1 +
 2 files changed, 25 insertions(+)

diff --git a/android/src/main/java/com/reactnativestripesdk/PaymentMethodCreateParamsFactory.kt b/android/src/main/java/com/reactnativestripesdk/PaymentMethodCreateParamsFactory.kt
index 2f8208bb06..dbfe246983 100644
--- a/android/src/main/java/com/reactnativestripesdk/PaymentMethodCreateParamsFactory.kt
+++ b/android/src/main/java/com/reactnativestripesdk/PaymentMethodCreateParamsFactory.kt
@@ -38,6 +38,7 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.PayPal -> createPayPalParams()
         PaymentMethod.Type.Affirm -> createAffirmParams()
         PaymentMethod.Type.CashAppPay -> createCashAppParams()
+        PaymentMethod.Type.BacsDebit -> createBacsParams()
         else -> {
           throw Exception("This paymentMethodType is not supported yet")
         }
@@ -97,6 +98,28 @@ class PaymentMethodCreateParamsFactory(
     throw PaymentMethodCreateParamsException("You must provide billing details")
   }
 
+  @Throws(PaymentMethodCreateParamsException::class)
+  private fun createBacsParams(): PaymentMethodCreateParams {
+    billingDetailsParams?.let {
+      val accountNumber = getValOr(paymentMethodData, "accountNumber", null) ?: run {
+        throw PaymentMethodCreateParamsException("You must provide Account number")
+      }
+      val sortCode = getValOr(paymentMethodData, "sortCode", null) ?: run {
+        throw PaymentMethodCreateParamsException("You must provide Sort code")
+      }
+
+      return PaymentMethodCreateParams.create(
+        bacsDebit = PaymentMethodCreateParams.BacsDebit(
+          accountNumber = accountNumber,
+          sortCode = sortCode
+        ),
+        billingDetails = it
+      )
+    }
+
+    throw PaymentMethodCreateParamsException("You must provide billing details")
+  }
+
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createOXXOParams(): PaymentMethodCreateParams {
     billingDetailsParams?.let {
@@ -230,6 +253,7 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.AuBecsDebit,
         PaymentMethod.Type.Klarna,
         PaymentMethod.Type.PayPal,
+        PaymentMethod.Type.BacsDebit,
         PaymentMethod.Type.CashAppPay -> {
           val params = createPaymentMethodParams(paymentMethodType)
 
diff --git a/example/src/screens/BacsDebitPaymentScreen.tsx b/example/src/screens/BacsDebitPaymentScreen.tsx
index 9da662312e..e03332074a 100644
--- a/example/src/screens/BacsDebitPaymentScreen.tsx
+++ b/example/src/screens/BacsDebitPaymentScreen.tsx
@@ -51,6 +51,7 @@ export default function BacsPaymentScreen() {
       },
     };
     setCanPay(false);
+
     const { error, paymentIntent } = await confirmPayment(clientSecret, {
       paymentMethodType: 'BacsDebit',
       paymentMethodData: { billingDetails, sortCode, accountNumber },

From e6a6760ac8d44ec23f5176a70d90419c719947b0 Mon Sep 17 00:00:00 2001
From: Oussama <khzouroussama@gmail.com>
Date: Tue, 11 Apr 2023 12:51:36 +0100
Subject: [PATCH 3/3] chore: added e2e tests

---
 e2e-tests/bacs-payment.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 e2e-tests/bacs-payment.yml

diff --git a/e2e-tests/bacs-payment.yml b/e2e-tests/bacs-payment.yml
new file mode 100644
index 0000000000..0f7b37138e
--- /dev/null
+++ b/e2e-tests/bacs-payment.yml
@@ -0,0 +1,22 @@
+appId: ${APP_ID}
+---
+- launchApp
+- tapOn: 'Bank Debits'
+- tapOn: 'Bacs Direct Debit payment'
+- assertVisible:
+    text: 'E-mail'
+- tapOn:
+    text: 'E-mail'
+- inputText: 'test@stripe.com'
+- tapOn:
+    text: 'sortCode'
+- inputText: '108800'
+- tapOn:
+    text: 'accountNumber'
+- inputText: '90012345'
+- tapOn:
+    text: 'Pay'
+    retryTapIfNoChange: false
+- assertVisible:
+    text: 'Processing'
+- tapOn: 'OK'