@primer-io/react-native 0.12.5 → 0.15.1

package/src/models/primer-config.ts

@@ -1,48 +1,50 @@
-import type {
-  OnClientSessionActionsCallback,
-  OnDismissCallback,
-  OnPrimerErrorCallback,
-  OnResumeSuccessCallback,
-  OnSavedPaymentInstrumentsFetchedCallback,
-  OnTokenAddedToVaultCallback,
-  OnTokenizeSuccessCallback,
-} from './primer-callbacks';
+import type { IClientSessionAction } from 'src/Primer';
+import type { IPrimerError } from 'src/RNPrimer';
+import type { PaymentInstrumentToken } from './payment-instrument-token';
+import type { PrimerResumeHandler } from './primer-request';
 import type { PrimerSettings } from './primer-settings';
 import type { PrimerTheme } from './primer-theme';
 
-export type PrimerConfig = IPrimerConfig;
-interface IPrimerConfig {
+export interface IPrimerConfig {
   /**
    * Include data for different payment methods (e.g. amount or business details)
    */
   settings?: PrimerSettings;
+
   /**
    * Set colors and dimensions for the Primer UI.
    */
   theme?: PrimerTheme;
+
+  // onClientTokenCallback?: (resumeHandler: PrimerResumeHandler) => void;
+
   /**
-   * Use this callback to grab a Primer payment instrument token and complete a payment.
+   * Use this callback to grab a Primer payment instrument and complete a payment.
    */
-  onTokenizeSuccess?: OnTokenizeSuccessCallback;
+  onTokenizeSuccess?: (paymentInstrument: PaymentInstrumentToken, resumeHandler: PrimerResumeHandler) => void;
 
-  onResumeSuccess?: OnResumeSuccessCallback;
+  /**
+   * Use this callback to resume a PENDING payment with the token provided.
+   */
+  onResumeSuccess?: (resumeToken: string, resumeHandler: PrimerResumeHandler | null) => void;
 
   /**
    * Use this callback to perform some action when a payment instrument was saved to Primer.
    */
-  onTokenAddedToVault?: OnTokenAddedToVaultCallback;
+  onTokenAddedToVault?: (paymentInstrument: PaymentInstrumentToken) => void;
+
   /**
    * Use this callback to perform some action when the Primer UI is dismissed.
    */
-  onDismiss?: OnDismissCallback;
+  onDismiss?: () => void;
+
   /**
    * Use this callback to perform some action when the SDK throws an error.
    */
-  onError?: OnPrimerErrorCallback;
+  onError?: (err: IPrimerError, resumeHandler: PrimerResumeHandler) => void;
+
   /**
-   * Use this to receive saved payment instruments fetch result.
+   * Use this callback to perform actions on payment methods, like surcharging.
    */
-  onSavedPaymentInstrumentsFetched?: OnSavedPaymentInstrumentsFetchedCallback;
-
-  onClientSessionActions?: OnClientSessionActionsCallback;
+  onClientSessionActions?: (clientSessionActions: IClientSessionAction[], resumeHandler: PrimerResumeHandler | null) => void;
 }

package/src/models/primer-intent.ts

@@ -34,7 +34,7 @@ const paymentMethods = [
 export type SinglePrimerPaymentMethod = typeof paymentMethods[number];
 export interface AnyPrimerPaymentMethodIntent {
   vault: boolean;
-  paymentMethod: 'Any';
+  paymentMethod: SinglePrimerPaymentMethod;
 }
 
 export type PrimerPaymentMethodIntent = ISinglePrimerPaymentMethodIntent;

package/src/models/primer-request.ts

@@ -1,21 +1,7 @@
 export type PrimerResumeHandler = IPrimerResumeHandler;
 
 interface IPrimerResumeHandler {
-  handleError: (error: string) => void;
-
+  handleNewClientToken: (clientToken: string) => void;
+  handleError: (error: Error) => void;
   handleSuccess: () => void;
-
-  handleNewClientToken: (token: string) => void;
-
-  /**
-   * @deprecated This method should not be used
-   * Please use handleError instead.
-   */
-  resumeWithError: (error: string | null) => void;
-
-  /**
-   * @deprecated This method should not be used.
-   * Please use handleSuccess or handleNewClientToken instead.
-   */
-  resumeWithSuccess: (clientToken: string | null) => void;
 }

package/src/models/primer-settings.ts

@@ -1,5 +1,6 @@
 import type { CountryCode } from './utils/countryCode';
 import type { CurrencyCode } from './utils/currencyCode';
+import type { RedirectScheme } from './utils/redirectScheme';
 
 export type PrimerSettings = IPrimerSettings;
 interface IPrimerSettings {
@@ -20,7 +21,7 @@ interface IOrder {
 
 interface IOrderItem {
   name: string;
-  unitAmount?: number;
+  amount: number;
   quantity: number;
   isPending?: boolean;
 }
@@ -50,7 +51,7 @@ interface IOptions {
   is3DSDevelopmentModeEnabled?: boolean;
   locale?: string;
   ios?: IIosOptions;
-  android?: IAndroidOptions;
+  redirectScheme?: RedirectScheme;
 }
 
 interface IIosOptions {
@@ -58,9 +59,6 @@ interface IIosOptions {
   urlSchemeIdentifier?: string;
   merchantIdentifier?: string;
 }
-interface IAndroidOptions {
-  redirectScheme?: string;
-}
 
 interface IAddress {
   line1?: String;

package/src/models/primer.ts

@@ -1,4 +1,4 @@
-import type { PrimerConfig } from './primer-config';
+import type { IPrimerConfig } from './primer-config';
 import type { PrimerPaymentMethodIntent } from './primer-intent';
 
 export interface IPrimer {
@@ -11,7 +11,7 @@ export interface IPrimer {
    * @param config Configuration object for the SDK. Use this to set listeners, theme,
    * and payment method specific settings.
    */
-  showUniversalCheckout(token: String, config: PrimerConfig): void;
+  showUniversalCheckout(token: string | null, config: IPrimerConfig): void;
 
   /**
    * Launch Primer's Vault Manager.
@@ -20,7 +20,7 @@ export interface IPrimer {
    * @param config Configuration object for the SDK. Use this to set listeners, theme,
    * and payment method specific settings.
    */
-  showVaultManager(token: String, config: PrimerConfig): void;
+  showVaultManager(token: string | null, config: IPrimerConfig): void;
 
   /**
    * Launch checkout with a specific payment method
@@ -29,9 +29,9 @@ export interface IPrimer {
    * @param config Configuration for the SDK.
    */
   showPaymentMethod(
-    token: String,
+    token: string | null,
     intent: PrimerPaymentMethodIntent,
-    config: PrimerConfig
+    config: IPrimerConfig
   ): void;
 
   /**

package/src/models/utils/redirectScheme.ts

@@ -0,0 +1,5 @@
+var redirectSchemes = [
+    'primer'
+] as const;
+
+export type RedirectScheme = typeof redirectSchemes[number];

package/ios/PrimerRN+PrimerDelegate.swift

@@ -1,147 +0,0 @@
-//
-//  PrimerRN+PrimerDelegate.swift
-//  primer-io-react-native
-//
-//  Created by Carl Eriksson on 22/09/2021.
-//
-import PrimerSDK
-
-extension PrimerRN: PrimerDelegate {
-
-    func clientTokenCallback(_ completion: @escaping (String?, Error?) -> Void) {
-        guard let clientToken = clientToken else {
-            checkoutFailed(with: ErrorTypeRN.clientTokenNotConfigured)
-            completion(nil, ErrorTypeRN.clientTokenNotConfigured)
-            return
-        }
-        completion(clientToken, nil)
-    }
-    
-    func onTokenizeSuccess(
-        _ paymentMethodToken: PaymentMethodToken,
-        resumeHandler: ResumeHandlerProtocol
-    ) {
-        do {
-            let json = try encoder.encode(paymentMethodToken)
-            let data = String(data: json, encoding: .utf8)!
-            self.onTokenizeSuccessCallback?([data])
-        } catch {
-            checkoutFailed(with: ErrorTypeRN.ParseJsonFailed)
-        }
-        onResumeFlowCallback = { error, clientToken in
-            if let error = error {
-                resumeHandler.handle(error: error)
-            } else if let clientToken = clientToken {
-                resumeHandler.handle(newClientToken: clientToken)
-            } else {
-                resumeHandler.handleSuccess()
-            }
-        }
-    }
-    
-    func onClientSessionActions(_ actions: [ClientSession.Action], resumeHandler: ResumeHandlerProtocol?) {
-        do {
-            let actionsRN: [[String: Any]] = actions.compactMap  {
-                
-                if ($0.`type` == "SELECT_PAYMENT_METHOD") {
-                    let network = ($0.params?["binData"] as? [String: Any])?["network"] as? String
-                    return [
-                        "type": "SELECT_PAYMENT_METHOD",
-                        "paymentMethodType": $0.params?["paymentMethodType"] as? String,
-                        "network": network,
-                    ]
-                }
-                    
-                if ($0.`type` == "UNSELECT_PAYMENT_METHOD") {
-                    return [
-                        "type": "UNSELECT_PAYMENT_METHOD",
-                    ]
-                }
-                
-                if ($0.`type` == "SET_BILLING_ADDRESS") {
-                    
-                    var billingAddress: [String: String] = [:]
-                    
-                    $0.params?.forEach { entry in
-                        if let value = entry.value as? String, !value.isEmpty {
-                            billingAddress[entry.key] = value
-                        }
-                    }
-                    
-                    return [
-                        "type": "SET_BILLING_ADDRESS",
-                        "params": [ "billingAddress": billingAddress ]
-                    ]
-                }
-                
-                return [ "type": "UNKNOWN" ]
-            }
-            
-            let request: [String: Any] = [
-                "actions": actionsRN
-            ]
-            
-            let data = try JSONSerialization.data(withJSONObject: request, options: .fragmentsAllowed)
-            let jsonString = String(data: data, encoding: .utf8)!
-            self.onClientSessionActionsCallback?([jsonString])
-            self.onClientSessionActionsCallback = nil
-        } catch {
-            checkoutFailed(with: ErrorTypeRN.ParseJsonFailed)
-        }
-        
-        onActionResumeCallback = { error, token in
-            if let token = token {
-                resumeHandler?.handle(newClientToken: token)
-            } else if let error = error {
-                resumeHandler?.handle(error: error)
-            } else {
-                resumeHandler?.handle(error: ErrorTypeRN.generic)
-            }
-        }
-    }
-    
-    func onResumeSuccess(_ clientToken: String, resumeHandler: ResumeHandlerProtocol) {
-        self.onResumeSuccessCallback?([clientToken])
-        
-        onResumeFlowCallback = { error, clientToken in
-            if let error = error {
-                resumeHandler.handle(error: error)
-            } else if let clientToken = clientToken {
-                resumeHandler.handle(newClientToken: clientToken)
-            } else {
-                resumeHandler.handleSuccess()
-            }
-        }
-    }
-    
-    func tokenAddedToVault(_ token: PaymentMethodToken) {
-        do {
-            let json = try encoder.encode(token)
-            let data = String(data: json, encoding: .utf8)!
-            self.onVaultSuccessCallback?([data])
-        } catch {
-            checkoutFailed(with: ErrorTypeRN.ParseJsonFailed)
-        }
-    }
-    
-    func onCheckoutDismissed() {
-        self.onDismissCallback?([])
-        self.onDismissCallback = nil
-    }
-    
-    func checkoutFailed(with error: Error) {
-        do {
-            if let error = error as? ErrorTypeRN {
-                let exception = PrimerErrorRN(exceptionType: error, description: nil)
-                let json = try encoder.encode(exception)
-                let data = String(data: json, encoding: .utf8)!
-                self.onPrimerErrorCallback?([data])
-            } else {
-                self.onPrimerErrorCallback?(["{\"exceptionType\":\"CheckoutFlowFailed\"}"])
-            }
-        } catch {
-            self.onPrimerErrorCallback?(["{\"exceptionType\":\"ParseJsonFailed\"}"])
-        }
-        haltExecution = true
-    }
-}

package/ios/PrimerRN.swift

@@ -1,166 +0,0 @@
-import UIKit
-import PrimerSDK
-
-typealias BasicCompletionBlock = ((Error?, String?) -> Void)
-
-@objc(PrimerRN)
-class PrimerRN: NSObject {
-    
-    let encoder = JSONEncoder()
-    
-    override init() {
-        encoder.outputFormatting = .prettyPrinted
-    }
-
-    var clientToken: String?
-    var settings: PrimerSettingsRN?
-    var theme: PrimerThemeRN?
-    var intent: PrimerIntentRN?
-    var onTokenizeSuccessCallback: RCTResponseSenderBlock?
-    var onClientSessionActionsCallback: RCTResponseSenderBlock?
-    var onResumeSuccessCallback: RCTResponseSenderBlock?
-    var onVaultSuccessCallback: RCTResponseSenderBlock?
-    var onDismissCallback: RCTResponseSenderBlock?
-    var onPrimerErrorCallback: RCTResponseSenderBlock?
-    var onResumeFlowCallback: BasicCompletionBlock?
-    var onActionResumeCallback: BasicCompletionBlock?
-    
-    private var sdkWasInitialised = false
-    internal var haltExecution = false
-    
-    @objc func configureSettings(_ request: String) {
-        do {
-            let json = request.data(using: .utf8)!
-            let settings = try JSONDecoder().decode(PrimerSettingsRN.self, from: json)
-            self.settings = settings
-        } catch {
-            checkoutFailed(with: ErrorTypeRN.ParseJsonFailed)
-        }
-    }
-
-    @objc func configureTheme(_ request: String) {
-        do {
-            let json = request.data(using: .utf8)!
-            let themeRN = try JSONDecoder().decode(PrimerThemeRN.self, from: json)
-            self.theme = themeRN
-        } catch {
-            checkoutFailed(with: ErrorTypeRN.ParseJsonFailed)
-        }
-    }
-    
-    @objc func configureIntent(_ request: String) {
-        do {
-            let json = request.data(using: .utf8)!
-            let intent = try JSONDecoder().decode(PrimerIntentRN.self, from: json)
-            self.intent = intent
-        } catch {
-            checkoutFailed(with: ErrorTypeRN.ParseJsonFailed)
-        }
-    }
-    
-    @objc func configureOnTokenizeSuccess(_ callback: @escaping RCTResponseSenderBlock) {
-        self.onTokenizeSuccessCallback = callback
-    }
-    
-    @objc func configureOnClientSessionActions(_ callback: @escaping RCTResponseSenderBlock) {
-        self.onClientSessionActionsCallback = callback
-    }
-    
-    @objc func configureOnResumeSuccess(_ callback: @escaping RCTResponseSenderBlock) {
-        self.onResumeSuccessCallback = callback
-    }
-    
-    @objc func configureOnVaultSuccess(_ callback: @escaping RCTResponseSenderBlock) {
-        self.onVaultSuccessCallback = callback
-    }
-
-    @objc func configureOnDismiss(_ callback: @escaping RCTResponseSenderBlock) {
-        self.onDismissCallback = callback
-    }
-
-    @objc func configureOnPrimerError(_ callback: @escaping RCTResponseSenderBlock) {
-        self.onPrimerErrorCallback = callback
-    }
-    
-    @objc func initialize(_ token: String) -> Void {
-        DispatchQueue.main.async { [weak self] in
-            do {
-                guard let viewController = RCTPresentedViewController() else {
-                    throw ErrorTypeRN.noIosViewController
-                }
-
-                guard let intent = self?.intent else {
-                    throw ErrorTypeRN.invalidPrimerIntent
-                }
-                
-                guard
-                    let settings = self?.settings?.asPrimerSettings(),
-                    let theme = self?.theme?.asPrimerTheme()
-                else {
-                    throw ErrorTypeRN.settingsNotConfigured
-                }
-                
-                self?.clientToken = token
-                
-                Primer.shared.delegate = self
-                Primer.shared.configure(settings: settings, theme: theme)
-                
-                DispatchQueue.main.async {
-                    if (intent.vault) {
-                        Primer.shared.showVaultManager(on: viewController, clientToken: token)
-                    } else {
-                        Primer.shared.showUniversalCheckout(on: viewController, clientToken: token)
-                    }
-                }
-            } catch {
-                self?.checkoutFailed(with: error)
-            }
-        }
-    }
-    
-    @objc func resume(_ request: String) -> Void {
-        DispatchQueue.main.async { [weak self] in
-            do {
-                let json = request.data(using: .utf8)!
-                let request = try JSONDecoder().decode(PrimerResumeRequest.self, from: json)
-                
-                if let error = request.error {
-                    self?.onResumeFlowCallback?(ErrorRN(message: error), nil)
-                } else if let clientToken = request.token {
-                    self?.onResumeFlowCallback?(nil, clientToken)
-                } else {
-                    self?.onResumeFlowCallback?(nil, nil)
-                }
-                
-                self?.onResumeFlowCallback = nil
-            } catch {
-                self?.checkoutFailed(with: error)
-            }
-        }
-    }
-    
-    @objc func actionResume(_ request: String) -> Void {
-        DispatchQueue.main.async { [weak self] in
-            do {
-                let json = request.data(using: .utf8)!
-                let request = try JSONDecoder().decode(PrimerResumeRequest.self, from: json)
-                
-                if let error = request.error {
-                    self?.onActionResumeCallback?(ErrorRN(message: error), nil)
-                } else if let clientToken = request.token {
-                    self?.onActionResumeCallback?(nil, clientToken)
-                } else {
-                    self?.onActionResumeCallback?(nil, self?.clientToken)
-                }
-                
-                self?.onActionResumeCallback = nil
-            } catch {
-                self?.checkoutFailed(with: error)
-            }
-        }
-    }
-    
-    @objc func dispose() -> Void {
-        
-    }
-}

package/ios/ReactNative.m

@@ -1,34 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface RCT_EXTERN_MODULE(PrimerRN, RCTViewManager)
-
-RCT_EXTERN_METHOD(configureSettings: (NSString *)request)
-
-RCT_EXTERN_METHOD(configureTheme: (NSString *)request)
-
-RCT_EXTERN_METHOD(configureIntent: (NSString *)request)
-
-RCT_EXTERN_METHOD(configureOnTokenizeSuccess: (RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(configureOnClientSessionActions: (RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(configureOnResumeSuccess: (RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(configureOnVaultSuccess: (RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(configureOnDismiss: (RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(configureOnPrimerError: (RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(configureOnSavedPaymentInstrumentsFetched: (RCTResponseSenderBlock)callback)
-
-RCT_EXTERN_METHOD(initialize: (NSString *)data)
-
-RCT_EXTERN_METHOD(resume: (NSString *)data)
-
-RCT_EXTERN_METHOD(actionResume: (NSString *)data)
-
-RCT_EXTERN_METHOD(dispose)
-
-@end