Merge changes from feat/ACC-3390-ACH-iOS-wrapper

primer-io · Jul 23, 2024 · d3caaf3 · d3caaf3
2 parents 04c85bd + d7e559d
commit d3caaf3
Show file tree

Hide file tree

Showing 17 changed files with 137 additions and 268 deletions.
diff --git a/packages/example/android/app/build.gradle b/packages/example/android/app/build.gradle
@@ -126,10 +126,10 @@ dependencies {
 
   implementation project(':primerioreactnative')
 
-  implementation "io.primer:3ds-android:1.4.2"
+  implementation "io.primer:3ds-android:1.4.3"
   implementation "io.primer:ipay88-my-android:1.0.3"
   implementation "io.primer:klarna-android:1.0.4"
-  implementation "io.primer:stripe-android:1.1.0" // TODO TWS: use release version
+  implementation "io.primer:stripe-android:1.0.0"
 
   implementation project(path: ':primerioreactnative')
 

diff --git a/packages/example/android/app/src/main/res/values/strings.xml b/packages/example/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">example</string>
+
+    <string name="stripe_ach_full_mandate_text">Would you like to accept this mandate?</string> 
 </resources>
diff --git a/packages/example/ios/example_0_70_6Tests/HelpersTests/ErrorExtensionTests.swift b/packages/example/ios/example_0_70_6Tests/HelpersTests/ErrorExtensionTests.swift
@@ -25,12 +25,13 @@ class ErrorExtensionTests: XCTestCase {
     }
 
     func testRNErrorForPrimerError() {
-        let error = PrimerError.generic(message: "message", userInfo: ["test1": "test2"], diagnosticsId: "diagnosticsId123")
+        let error = PrimerError.unknown(userInfo: ["test1": "test2"], diagnosticsId: "diagnosticsId123")
 
         let expected: [String: String] = [
-            "errorId": "primer-generic",
+            "description": "[unknown] Something went wrong (diagnosticsId: diagnosticsId123)",
+            "errorId": "unknown",
             "diagnosticsId": "diagnosticsId123",
-            "description": "[primer-generic] Generic error | Message: message | Data: {\n  \"test1\" : \"test2\"\n}) (diagnosticsId: diagnosticsId123)"
+            "recoverySuggestion": "Contact Primer and provide them diagnostics id diagnosticsId123"
         ]
         XCTAssertEqual(error.rnError, expected)
     }

diff --git a/packages/example/src/components/PrimerCardNumberInputElement.tsx b/packages/example/src/components/PrimerCardNumberInputElement.tsx
diff --git a/packages/example/src/models/IClientSessionRequestBody.ts b/packages/example/src/models/IClientSessionRequestBody.ts
@@ -7,6 +7,7 @@ export interface IClientSessionRequestBody {
     customerId?: string;
     orderId?: string;
     currencyCode?: string;
+    metadata?: IClientSessionMetadata;
     order?: IClientSessionOrder;
     metadata: IClientSessionMetadata;
     customer?: IClientSessionCustomer;
@@ -20,6 +21,11 @@ export interface IClientSessionOrder {
 
 export interface IClientSessionMetadata {
     scenario?: string;
+    deviceInfo?: IClientSessionDeviceInfo;
+}
+
+export interface IClientSessionDeviceInfo {
+    ipAddress?: string;
 }
 
 export interface IClientSessionCustomer {
@@ -97,7 +103,10 @@ export let appPaymentParameters: AppPaymentParameters = {
         orderId: `rn-order-${makeRandomString(8)}`,
         currencyCode: 'EUR',
         metadata: {
-            "scenario": "STRIPE_ACH_ONEOFF"
+          scenario: 'STRIPE_ACH_ONEOFF',
+          deviceInfo : {
+            ipAddress: '127.0.0.1'
+          } 
         },
         order: {
             countryCode: 'DE',

diff --git a/packages/example/src/screens/CheckoutScreen.tsx b/packages/example/src/screens/CheckoutScreen.tsx
@@ -254,41 +254,50 @@ const CheckoutScreen = (props: any) => {
                 android: {
                     threeDsAppRequestorUrl: "https://primer.io"
                 }
-            }
+            },
+            stripeOptions: {
+                publishableKey: "pk_test_51O8zfQKUK6bXIdC2xPvSS6UvriE9kwpvttwB7H9PAzhNAZoGzLgiDOyd4WooozeWHxoRrKo6b2VjZYxNCMX3W7bk00rMDivjau",
+                mandateData: {
+                    fullMandateResourceKey: "stripe_ach_full_mandate_text", // TODO TWS: iOS to define localized string with this exact key
+                    // merchantName: "Primer Inc.",
+                }
+            },
         },
         uiOptions: {
             isInitScreenEnabled: true,
             isSuccessScreenEnabled: true,
             isErrorScreenEnabled: true,
             theme: {
-                colors: {
-                    mainColor: {
-                        red: 214,
-                        green: 255,
-                        blue: 1,
-                        alpha: 255
-                    },
-                    background: {
-                        red: 255,
-                        green: 214,
-                        blue: 1,
-                        alpha: 255
-                    }
-                },
-                darkModeColors: {
-                    mainColor: {
-                        red: 1,
-                        green: 255,
-                        blue: 1,
-                        alpha: 255
-                    },
-                    background: {
-                        red: 255,
-                        green: 1,
-                        blue: 255,
-                        alpha: 255
-                    }
-                }
+                // 👇 Uncomment to try theming drop-in checkout
+
+                // colors: {
+                //     mainColor: {
+                //         red: 214,
+                //         green: 255,
+                //         blue: 1,
+                //         alpha: 255
+                //     },
+                //     background: {
+                //         red: 255,
+                //         green: 214,
+                //         blue: 1,
+                //         alpha: 255
+                //     }
+                // },
+                // darkModeColors: {
+                //     mainColor: {
+                //         red: 1,
+                //         green: 255,
+                //         blue: 1,
+                //         alpha: 255
+                //     },
+                //     background: {
+                //         red: 255,
+                //         green: 1,
+                //         blue: 255,
+                //         alpha: 255
+                //     }
+                // }
             }
         },
         debugOptions: {

diff --git a/packages/sdk/android/build.gradle b/packages/sdk/android/build.gradle
@@ -150,7 +150,7 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
-  implementation 'io.primer:android:2.27.2-snapshot' // TODO TWS: use release version
+  implementation 'io.primer:android:2.27.6-snapshot'
 
   testImplementation 'io.mockk:mockk:1.13.10'
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'

diff --git a/...ages/sdk/android/src/main/java/com/primerioreactnative/PrimerCardNumberEditTextManager.kt b/...ages/sdk/android/src/main/java/com/primerioreactnative/PrimerCardNumberEditTextManager.kt
diff --git a/packages/sdk/android/src/main/java/com/primerioreactnative/PrimerRN.kt b/packages/sdk/android/src/main/java/com/primerioreactnative/PrimerRN.kt
@@ -14,7 +14,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.json.JSONObject
 
-class PrimerRN(reactContext: ReactApplicationContext, private val json: Json) :
+class PrimerRN(private val reactContext: ReactApplicationContext, private val json: Json) :
   ReactContextBaseJavaModule(reactContext) {
   private val mListener = PrimerRNEventListener()
 
@@ -36,7 +36,7 @@ class PrimerRN(reactContext: ReactApplicationContext, private val json: Json) :
         if (settingsStr.isBlank()) PrimerSettingsRN() else json.decodeFromString(
           settingsStr
         )
-      startSdk(settings.toPrimerSettings())
+      startSdk(settings.toPrimerSettings(reactContext))
       promise.resolve(null)
     } catch (e: Exception) {
       Log.e("PrimerRN", "configure settings error: $e")

diff --git a/...es/sdk/android/src/main/java/com/primerioreactnative/PrimerRNHeadlessUniversalCheckout.kt b/...es/sdk/android/src/main/java/com/primerioreactnative/PrimerRNHeadlessUniversalCheckout.kt
@@ -49,7 +49,7 @@ class PrimerRNHeadlessUniversalCheckout(
       PrimerHeadlessUniversalCheckout.current.start(
         reactContext,
         clientToken,
-        settings.toPrimerSettings(),
+        settings.toPrimerSettings(reactContext),
         listener,
         listener
       )

diff --git a/packages/sdk/android/src/main/java/com/primerioreactnative/ReactNativePackage.kt b/packages/sdk/android/src/main/java/com/primerioreactnative/ReactNativePackage.kt
@@ -38,10 +38,6 @@ class ReactNativePackage : ReactPackage {
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
     return mutableListOf(
-      PrimerCardNumberEditTextManager(),
-      PrimerCardholderNameEditTextManager(),
-      PrimerExpiryEditTextManager(),
-      PrimerCvvEditTextManager(),
       PrimerKlarnaPaymentViewManager(reactContext)
     )
   }

diff --git a/...oreactnative/components/datamodels/core/PrimerRNHeadlessUniversalCheckoutPaymentMethod.kt b/...oreactnative/components/datamodels/core/PrimerRNHeadlessUniversalCheckoutPaymentMethod.kt
@@ -21,5 +21,5 @@ internal fun PrimerHeadlessUniversalCheckoutPaymentMethod.toPrimerRNHeadlessUniv
   PrimerRNHeadlessUniversalCheckoutPaymentMethod(
     paymentMethodType,
     supportedPrimerSessionIntents,
-    paymentMethodManagerCategories.minus(PrimerPaymentMethodManagerCategory.CARD_COMPONENTS)
+    paymentMethodManagerCategories
   )