@primer-io/react-native 2.16.7 → 2.17.0-rc.10

package/src/models/PrimerRawData.ts

@@ -1,26 +1,22 @@
 export interface PrimerRawData {}
 
-export interface PrimerRawCardData extends PrimerRawData {
+export interface PrimerCardData extends PrimerRawData {
     cardNumber: string;
-    expiryMonth: string;
-    expiryYear: string;
+    expiryDate: string;
     cvv: string;
     cardholderName?: string;
 }
 
-export interface PrimerRawPhoneNumberData extends PrimerRawData {
+export interface PrimerPhoneNumberData extends PrimerRawData {
     phoneNumber: string;
 }
 
-export interface PrimerRawCardRedirectData extends PrimerRawData {}
-
-export interface PrimerBancontactCardRedirectData extends PrimerRawCardRedirectData {
+export interface PrimerBancontactCardData extends PrimerRawData {
     cardNumber: string;
-    expiryMonth: string;
-    expiryYear: string;
+    expiryDate: string;
     cardholderName: string;
 }
 
-export interface PrimerRawRetailerData extends PrimerRawData {
+export interface PrimerRetailerData extends PrimerRawData {
     id: string;
 }

package/src/models/PrimerSettings.ts

@@ -1,9 +1,4 @@
-import type {
-  PrimerErrorHandler,
-  PrimerPaymentCreationHandler,
-  PrimerResumeHandler,
-  PrimerTokenizationHandler
-} from "./PrimerInterfaces";
+
 import type { PrimerCheckoutData } from "./PrimerCheckoutData";
 import type { PrimerCheckoutAdditionalInfo } from "./PrimerCheckoutAdditionalInfo";
 import type { PrimerCheckoutPaymentMethodData } from "./PrimerCheckoutPaymentMethodData";
@@ -11,6 +6,13 @@ import type { PrimerClientSession } from "./PrimerClientSession";
 import type { PrimerPaymentMethodTokenData } from "./PrimerPaymentMethodTokenData";
 import type { PrimerError } from "./PrimerError";
 import type { IPrimerTheme } from "./PrimerTheme";
+import type {
+  PrimerPaymentCreationHandler,
+  PrimerTokenizationHandler,
+  PrimerResumeHandler,
+  PrimerErrorHandler,
+  PrimerHeadlessUniversalCheckoutResumeHandler
+} from "./PrimerHandlers";
 
 export type PrimerSettings = IPrimerSettings;
 
@@ -21,7 +23,7 @@ interface IPrimerSettings {
   uiOptions?: IPrimerUIOptions;
   debugOptions?: IPrimerDebugOptions;
 
-  // Common
+  // Dropin UI
   onBeforeClientSessionUpdate?: () => void;
   onClientSessionUpdate?: (clientSession: PrimerClientSession) => void;
   onBeforePaymentCreate?: (checkoutPaymentMethodData: PrimerCheckoutPaymentMethodData, handler: PrimerPaymentCreationHandler) => void;
@@ -30,17 +32,28 @@ interface IPrimerSettings {
   onResumeSuccess?: (resumeToken: string, handler: PrimerResumeHandler) => void;
   onResumePending?: (additionalInfo: PrimerCheckoutAdditionalInfo) => void;
   onCheckoutReceivedAdditionalInfo?: (additionalInfo: PrimerCheckoutAdditionalInfo) => void;
-  // PrimerErrorHandler will be undefined on the HUC flow.
   onError?: (error: PrimerError, checkoutData: PrimerCheckoutData | null, handler: PrimerErrorHandler | undefined) => void;
-
-  // Only on main SDK
   onDismiss?: () => void;
 
-  // Only on HUC
-  onPrepareStart?: (paymentMethod: string) => void;
-  onTokenizeStart?: (paymentMethod: string) => void;
-  onPaymentMethodShow?: (paymentMethod: string) => void;
-  onAvailablePaymentMethodsLoad?: (paymentMethods: string[]) => void;
+  headlessUniversalCheckoutCallbacks?: {
+    onAvailablePaymentMethodsLoad?: (availablePaymentMethods: any[]) => void;
+    onTokenizationStart?: (paymentMethodType: string) => void;
+    onTokenizationSuccess?: (paymentMethodTokenData: PrimerPaymentMethodTokenData, handler: PrimerHeadlessUniversalCheckoutResumeHandler) => void;
+
+    onCheckoutResume?: (resumeToken: string, handler: PrimerHeadlessUniversalCheckoutResumeHandler) => void;
+    onCheckoutPending?: (additionalInfo: PrimerCheckoutAdditionalInfo) => void;
+    onCheckoutAdditionalInfo?: (additionalInfo: PrimerCheckoutAdditionalInfo) => void;
+
+    onError?: (error: PrimerError, checkoutData: PrimerCheckoutData | null) => void;
+    onCheckoutComplete?: (checkoutData: PrimerCheckoutData) => void;
+    onBeforeClientSessionUpdate?: () => void;
+
+    onClientSessionUpdate?: (clientSession: PrimerClientSession) => void;
+    onBeforePaymentCreate?: (checkoutPaymentMethodData: PrimerCheckoutPaymentMethodData, handler: PrimerPaymentCreationHandler) => void;
+    onPreparationStart?: (paymentMethodType: string) => void;
+
+    onPaymentMethodShow?: (paymentMethodType: string) => void;
+  }
 }
 
 //----------------------------------------
@@ -66,10 +79,11 @@ interface IPrimerPaymentMethodOptions {
   * @obsoleted The IPrimerCardPaymentOptions is obsoleted on v.2.14.0
   */
   cardPaymentOptions?: IPrimerCardPaymentOptions;
-  
+
   goCardlessOptions?: IPrimerGoCardlessOptions;
   googlePayOptions?: IPrimerGooglePayOptions;
   klarnaOptions?: IPrimerKlarnaOptions;
+  threeDsOptions?: IPrimerThreeDsOptions;
 }
 
 interface IPrimerApayaOptions {
@@ -94,6 +108,7 @@ interface IPrimerGoCardlessOptions {
 interface IPrimerGooglePayOptions {
   merchantName?: string;
   allowedCardNetworks?: string[];
+  isCaptureBillingAddressEnabled?: boolean;
 }
 
 interface IPrimerKlarnaOptions {
@@ -115,3 +130,14 @@ interface IPrimerUIOptions {
 interface IPrimerDebugOptions {
   is3DSSanityCheckEnabled?: boolean;
 }
+
+//----------------------------------------
+
+interface IPrimerThreeDsOptions {
+  iOS?: {
+    threeDsAppRequestorUrl?: string;
+  };
+  android?: {
+    threeDsAppRequestorUrl?: string;
+  };
+}

package/android/src/main/java/com/primerioreactnative/huc/datamodels/manager/raw/cardRedirect/PrimerRNPRawCardRedirectData.kt

@@ -1,20 +0,0 @@
-package com.primerioreactnative.huc.datamodels.manager.raw.cardRedirect
-
-import io.primer.android.components.domain.core.models.bancontact.PrimerRawBancontactCardData
-import kotlinx.serialization.Serializable
-
-@Serializable
-internal data class PrimerRNRawBancontactCardData(
-  val cardNumber: String,
-  val expiryMonth: String,
-  val expiryYear: String,
-  val cardholderName: String
-) {
-  fun toPrimerRawBancontactCardData() =
-    PrimerRawBancontactCardData(
-      cardNumber,
-      expiryMonth,
-      expiryYear,
-      cardholderName
-    )
-}

package/android/src/main/java/com/primerioreactnative/huc/datamodels/manager/raw/phoneNumber/PrimerRNRawPhoneNumberData.kt

@@ -1,14 +0,0 @@
-package com.primerioreactnative.huc.datamodels.manager.raw.phoneNumber
-
-import io.primer.android.components.domain.core.models.phoneNumber.PrimerRawPhoneNumberData
-import kotlinx.serialization.Serializable
-
-@Serializable
-internal data class PrimerRNRawPhoneNumberData(
-  val phoneNumber: String? = null,
-) {
-  fun toPrimerRawPhoneNumberData() =
-    PrimerRawPhoneNumberData(
-      phoneNumber.orEmpty()
-    )
-}

package/android/src/main/java/com/primerioreactnative/huc/datamodels/manager/raw/retailOutlets/PrimerRNRawRetailOutletData.kt

@@ -1,12 +0,0 @@
-package com.primerioreactnative.huc.datamodels.manager.raw.retailOutlets
-
-import io.primer.android.components.domain.core.models.retailOutlet.PrimerRawRetailerData
-import kotlinx.serialization.Serializable
-
-@Serializable
-internal data class PrimerRNRawRetailOutletData(
-  val id: String
-) {
-
-  fun toPrimerRawRetailOutletData() = PrimerRawRetailerData(id)
-}

package/android/src/main/java/com/primerioreactnative/huc/events/PrimerHeadlessUniversalCheckoutEvent.kt

@@ -1,15 +0,0 @@
-package com.primerioreactnative.huc.events
-
-internal enum class PrimerHeadlessUniversalCheckoutEvent(val eventName: String) {
-  ON_HUC_AVAILABLE_PAYMENT_METHODS_LOADED("onHUCAvailablePaymentMethodsLoaded"),
-  ON_HUC_PREPARE_START("onHUCPrepareStart"),
-  ON_HUC_PAYMENT_METHOD_SHOW("onHUCPaymentMethodShow"),
-  ON_HUC_TOKENIZE_START("onHUCTokenizeStart"),
-  ON_CHECKOUT_COMPLETE("onCheckoutComplete"),
-  ON_BEFORE_CLIENT_SESSION_UPDATE("onBeforeClientSessionUpdate"),
-  ON_CLIENT_SESSION_UPDATE("onClientSessionUpdate"),
-  ON_BEFORE_PAYMENT_CREATE("onBeforePaymentCreate"),
-  ON_TOKENIZE_SUCCESS("onTokenizeSuccess"),
-  ON_RESUME_SUCCESS("onResumeSuccess"),
-  ON_ERROR("onError"),
-}

package/ios/DataModels/ImplementedRNCallbacks.swift

@@ -1,62 +0,0 @@
-//
-//  ImplementedRNCallbacks.swift
-//  primer-io-react-native
-//
-//  Created by Evangelos on 20/5/22.
-//
-
-import Foundation
-
-internal struct ImplementedRNCallbacks: Decodable {
-
-    internal var isOnCheckoutCompleteImplemented: Bool = false
-    internal var isOnBeforeClientSessionUpdateImplemented: Bool = false
-    internal var isOnClientSessionUpdateImplemented: Bool = false
-    internal var isOnBeforePaymentCreateImplemented: Bool = false
-    internal var isOnErrorImplemented: Bool = false
-    internal var isOnDismissImplemented: Bool = false
-    internal var isOnTokenizeSuccessImplemented: Bool = false
-    internal var isOnResumeSuccessImplemented: Bool = false
-    internal var isOnResumePendingImplemented: Bool = false
-    internal var isOnCheckoutReceivedAdditionalInfoImplemented: Bool = false
-    internal var isOnHUCTokenizeStartImplemented: Bool = false
-    internal var isOnHUCPrepareStartImplemented: Bool = false
-    internal var isOnHUCAvailablePaymentMethodsLoadedImplemented: Bool = false
-    internal var isOnHUCPaymentMethodShowImplemented: Bool = false
-
-    enum CodingKeys: String, CodingKey {
-        case isOnCheckoutCompleteImplemented = "onCheckoutComplete"
-        case isOnBeforeClientSessionUpdateImplemented = "onBeforeClientSessionUpdate"
-        case isOnClientSessionUpdateImplemented = "onClientSessionUpdate"
-        case isOnBeforePaymentCreateImplemented = "onBeforePaymentCreate"
-        case isOnErrorImplemented = "onError"
-        case isOnDismissImplemented = "onDismiss"
-        case isOnTokenizeSuccessImplemented = "onTokenizeSuccess"
-        case isOnResumeSuccessImplemented = "onResumeSuccess"
-        case isOnResumePendingImplemented = "onResumePending"
-        case isOnCheckoutReceivedAdditionalInfoImplemented = "onCheckoutReceivedAdditionalInfo"
-        case isOnHUCTokenizeStartImplemented = "onHUCTokenizeStart"
-        case isOnHUCPrepareStartImplemented = "onHUCPrepareStart"
-        case isOnHUCAvailablePaymentMethodsLoadedImplemented = "onHUCAvailablePaymentMethodsLoaded"
-        case isOnHUCPaymentMethodShowImplemented = "onHUCPaymentMethodShow"
-    }
-
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-
-        self.isOnCheckoutCompleteImplemented = (try? container.decode(Bool?.self, forKey: .isOnCheckoutCompleteImplemented)) ?? false
-        self.isOnBeforeClientSessionUpdateImplemented = (try? container.decode(Bool?.self, forKey: .isOnBeforeClientSessionUpdateImplemented)) ?? false
-        self.isOnClientSessionUpdateImplemented = (try? container.decode(Bool?.self, forKey: .isOnClientSessionUpdateImplemented)) ?? false
-        self.isOnBeforePaymentCreateImplemented = (try? container.decode(Bool?.self, forKey: .isOnBeforePaymentCreateImplemented)) ?? false
-        self.isOnErrorImplemented = (try? container.decode(Bool?.self, forKey: .isOnErrorImplemented)) ?? false
-        self.isOnDismissImplemented = (try? container.decode(Bool?.self, forKey: .isOnDismissImplemented)) ?? false
-        self.isOnTokenizeSuccessImplemented = (try? container.decode(Bool?.self, forKey: .isOnTokenizeSuccessImplemented)) ?? false
-        self.isOnResumeSuccessImplemented = (try? container.decode(Bool?.self, forKey: .isOnResumeSuccessImplemented)) ?? false
-        self.isOnResumePendingImplemented = (try? container.decode(Bool?.self, forKey: .isOnResumePendingImplemented)) ?? false
-        self.isOnCheckoutReceivedAdditionalInfoImplemented = (try? container.decode(Bool?.self, forKey: .isOnCheckoutReceivedAdditionalInfoImplemented)) ?? false
-        self.isOnHUCTokenizeStartImplemented = (try? container.decode(Bool?.self, forKey: .isOnHUCTokenizeStartImplemented)) ?? false
-        self.isOnHUCPrepareStartImplemented = (try? container.decode(Bool?.self, forKey: .isOnHUCPrepareStartImplemented)) ?? false
-        self.isOnHUCAvailablePaymentMethodsLoadedImplemented = (try? container.decode(Bool?.self, forKey: .isOnHUCAvailablePaymentMethodsLoadedImplemented)) ?? false
-        self.isOnHUCPaymentMethodShowImplemented = (try? container.decode(Bool?.self, forKey: .isOnHUCPaymentMethodShowImplemented)) ?? false
-    }
-}

package/ios/DataModels/PrimerErrorRN.swift

@@ -1,35 +0,0 @@
-
-struct NativeError: CustomNSError, LocalizedError, Codable {
-    
-    let errorId: String
-    let errorDescription: String?
-    let recoverySuggestion: String?
-    
-    var rnError: [String: String] {
-        var json: [String: String] = [
-            "errorId": errorId,
-            "description": errorDescription ?? "Something went wrong"
-        ]
-        
-        if let recoverySuggestion = recoverySuggestion {
-            json["recoverySuggestion"] = recoverySuggestion
-        }
-
-        return json
-    }
-}
-
-internal extension Error {
-    var rnError: [String: String] {
-        var json: [String: String] = [
-            "errorId": (self as NSError).domain,
-            "description": localizedDescription
-        ]
-        
-        if let recoverySuggestion = (self as NSError).localizedRecoverySuggestion {
-            json["recoverySuggestion"] = recoverySuggestion
-        }
-
-        return json
-    }
-}

package/ios/DataModels/PrimerSettingsRN.swift

@@ -1,84 +0,0 @@
-import PrimerSDK
-
-extension PrimerSettings {
-
-    static func initialize(with settingsStr: String?) throws -> PrimerSettings {
-        guard let settingsStr = settingsStr,
-              let settingsData = settingsStr.data(using: .utf8)
-        else {
-            return PrimerSettings()
-        }
-        
-        guard let settingsJson = (try JSONSerialization.jsonObject(with: settingsData)) as? [String: Any]
-        else {
-            return PrimerSettings()
-        }
-        
-        var paymentHandling: PrimerPaymentHandling = .auto
-        if let rnPaymentHandling = settingsJson["paymentHandling"] as? String,
-           rnPaymentHandling == "MANUAL" {
-            paymentHandling = .manual
-        }
-        
-        let rnLocaleDataLanguageCode = (settingsJson["localeData"] as? [String: Any])?["languageCode"] as? String
-        let rnLocaleDataLocaleCode = (settingsJson["localeData"] as? [String: Any])?["localeCode"] as? String
-        let localeData = PrimerLocaleData(
-            languageCode: rnLocaleDataLanguageCode,
-            regionCode: rnLocaleDataLocaleCode)
-        
-        let rnUrlScheme = ((settingsJson["paymentMethodOptions"] as? [String: Any])?["iOS"] as? [String: Any])?["urlScheme"] as? String
-        
-        var applePayOptions: PrimerApplePayOptions?
-        if let rnApplePayOptions = ((settingsJson["paymentMethodOptions"] as? [String: Any])?["applePayOptions"] as? [String: Any]),
-           let rnApplePayMerchantIdentifier = rnApplePayOptions["merchantIdentifier"] as? String,
-           let rnApplePayMerchantName = rnApplePayOptions["merchantName"] as? String {
-            if let rnApplePayIsCaptureBillingAddressEnabled = rnApplePayOptions["isCaptureBillingAddressEnabled"] as? Bool {
-                applePayOptions = PrimerApplePayOptions(merchantIdentifier: rnApplePayMerchantIdentifier, merchantName: rnApplePayMerchantName, isCaptureBillingAddressEnabled: rnApplePayIsCaptureBillingAddressEnabled)
-            } else {
-                applePayOptions = PrimerApplePayOptions(merchantIdentifier: rnApplePayMerchantIdentifier, merchantName: rnApplePayMerchantName)
-            }
-        }
-        
-        var klarnaOptions: PrimerKlarnaOptions?
-        if let rnKlarnaRecurringPaymentDescription = ((settingsJson["paymentMethodOptions"] as? [String: Any])?["klarnaOptions"] as? [String: Any])?["recurringPaymentDescription"] as? String {
-            klarnaOptions = PrimerKlarnaOptions(recurringPaymentDescription: rnKlarnaRecurringPaymentDescription)
-        }
-        
-        var uiOptions: PrimerUIOptions?
-        if let rnUIOptions = settingsJson["uiOptions"] as? [String: Any] {
-            
-            var theme: PrimerTheme?
-            if let rnTheme = rnUIOptions["theme"] as? [String: Any] {
-                let rnThemeData = (try JSONSerialization.data(withJSONObject: rnTheme))
-                let rnTheme = try JSONDecoder().decode(PrimerThemeRN.self, from: rnThemeData)
-                theme = rnTheme.asPrimerTheme()
-            }
-            
-            uiOptions = PrimerUIOptions(
-                isInitScreenEnabled: rnUIOptions["isInitScreenEnabled"] as? Bool,
-                isSuccessScreenEnabled: rnUIOptions["isSuccessScreenEnabled"] as? Bool,
-                isErrorScreenEnabled: rnUIOptions["isErrorScreenEnabled"] as? Bool,
-                theme: theme)
-        }
-        
-        var debugOptions: PrimerDebugOptions?
-        if let rnIs3DSSanityCheckEnabled = (settingsJson["debugOptions"] as? [String: Any])?["is3DSSanityCheckEnabled"] as? Bool {
-            debugOptions = PrimerDebugOptions(is3DSSanityCheckEnabled: rnIs3DSSanityCheckEnabled)
-        }
-        
-        let paymentMethodOptions = PrimerPaymentMethodOptions(
-            urlScheme: rnUrlScheme,
-            applePayOptions: applePayOptions,
-            klarnaOptions: klarnaOptions)
-        
-        let settings = PrimerSettings(
-            paymentHandling: paymentHandling,
-            localeData: localeData,
-            paymentMethodOptions: paymentMethodOptions,
-            uiOptions: uiOptions,
-            debugOptions: debugOptions)
-        
-        
-        return settings
-    }
-}

package/ios/Headless Universal Checkout/RNTPrimerHeadlessUniversalCheckout.m

@@ -1,62 +0,0 @@
-//
-//  RNTPrimerHeadlessUniversalCheckout.m
-//  primer-io-react-native
-//
-//  Created by Evangelos on 8/3/22.
-//
-
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-
-@interface RCT_EXTERN_MODULE(PrimerHeadlessUniversalCheckout, RCTEventEmitter)
-
-RCT_EXTERN_METHOD(startWithClientToken:(NSString *)clientToken settingsStr:(NSString *)settingsStr errorCallback:(RCTResponseSenderBlock)errorCallback successCallback: (RCTResponseSenderBlock)successCallback)
-
-RCT_EXTERN_METHOD(resumeWithClientToken:(NSString *)resumeToken)
-
-RCT_EXTERN_METHOD(showPaymentMethod:(NSString *)paymentMethodTypeStr
-                  resolver:(RCTPromiseResolveBlock)resolver
-                  rejecter:(RCTPromiseRejectBlock)rejecter)
-
-RCT_EXTERN_METHOD(getAssetForPaymentMethodType:(NSString *)paymentMethodTypeStr
-                  assetType:(NSString *)assetTypeStr
-                  errorCallback:(RCTResponseSenderBlock)errorCallback
-                  successCallback: (RCTResponseSenderBlock)successCallback)
-
-RCT_EXTERN_METHOD(getAssetForCardNetwork:(NSString *)cardNetworkStr
-                  assetType:(NSString *)assetTypeStr
-                  errorCallback:(RCTResponseSenderBlock)errorCallback
-                  successCallback: (RCTResponseSenderBlock)successCallback)
-
-RCT_EXTERN_METHOD(disposePrimerHeadlessUniversalCheckout)
-
-// MARK: - HELPERS
-
-RCT_EXTERN_METHOD(setImplementedRNCallbacks:(NSString *)implementedRNCallbacksStr resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-// MARK: - DECISION HANDLERS
-
-// MARK: Tokenization Handlers
-
-RCT_EXTERN_METHOD(handleTokenizationNewClientToken:(NSString *)newClientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-RCT_EXTERN_METHOD(handleTokenizationSuccess:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-RCT_EXTERN_METHOD(handleTokenizationFailure:(NSString *)errorMessage resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-// MARK: Resume Handlers
-
-RCT_EXTERN_METHOD(handleResumeWithNewClientToken:(NSString *)newClientToken resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-RCT_EXTERN_METHOD(handleResumeSuccess:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-RCT_EXTERN_METHOD(handleResumeFailure:(NSString *)errorMessage resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-// MARK: Payment Creation Handlers
-
-RCT_EXTERN_METHOD(handlePaymentCreationAbort:(NSString *)errorMessage resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-RCT_EXTERN_METHOD(handlePaymentCreationContinue:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-
-
-@end