react-native-tpay 1.3.12 → 1.3.14

package/ios/Source/Configuration/TransactionConfiguration.swift

@@ -11,27 +11,34 @@ final class TransactionConfiguration {
 
     // MARK: - API
 
-    static func single(transactionConfiguration: String) -> Transaction? {
-        guard let trancationData = transactionConfiguration.data(using: .utf8),
-              let singleTransaction = try? JSONDecoder().decode(T.SingleTransaction.self, from: trancationData) else {
+    static func single(transactionConfiguration: String) -> SingleTransaction? {
+        guard let transactionData = transactionConfiguration.data(using: .utf8),
+              let singleTransaction = try? JSONDecoder().decode(T.SingleTransaction.self, from: transactionData) else {
             return nil
         }
 
+
         let payerContext = makeTransactionPayerContext(from: singleTransaction)
-        let notification = makeNotification(from: singleTransaction.notifications)
+        let callbacks = makeCallbacksConfiguration(from: singleTransaction.notifications)
 
-        return SingleTransaction(amount: singleTransaction.amount, description: singleTransaction.description, hiddenDescription: singleTransaction.hiddenDescription, payerContext: payerContext, notification: notification)
+        let baseTransaction = Tpay.SingleTransaction(amount: singleTransaction.amount, description: singleTransaction.description, hiddenDescription: singleTransaction.hiddenDescription, payerContext: payerContext)
+        let wrappedSingleTransaction = SingleTransaction(singleTransaction: baseTransaction, callbacks: callbacks)
+        return wrappedSingleTransaction;
     }
 
-    static func cardTokenTransaction(transactionConfiguration: String) -> Transaction? {
-        guard let trancationData = transactionConfiguration.data(using: .utf8),
-              let tokenPayment = try? JSONDecoder().decode(T.TokenPayment.self, from: trancationData) else {
+    static func cardTokenTransaction(transactionConfiguration: String) -> SingleTransaction? {
+        guard let transactionData = transactionConfiguration.data(using: .utf8),
+              let tokenPayment = try? JSONDecoder().decode(T.TokenPayment.self, from: transactionData) else {
             return nil
         }
+
         let payerContext = makeTokenPayerContext(from: tokenPayment)
-        let notification = makeNotification(from: tokenPayment.notifications)
 
-        return SingleTransaction(amount: tokenPayment.amount, description: tokenPayment.description, hiddenDescription: tokenPayment.hiddenDescription, payerContext: payerContext, notification: notification)
+        let callbacks = makeCallbacksConfiguration(from: tokenPayment.notifications)
+
+        let baseTransaction = Tpay.SingleTransaction(amount: tokenPayment.amount, description: tokenPayment.description, hiddenDescription: tokenPayment.hiddenDescription, payerContext: payerContext)
+        let wrappedSingleTransaction = SingleTransaction(singleTransaction: baseTransaction, callbacks: callbacks)
+        return wrappedSingleTransaction;
     }
 
     static func addCard(tokenisationConfiguration: String) -> TokenizationData? {
@@ -53,7 +60,6 @@ final class TransactionConfiguration {
         }
 
         let callbacks = makeCallbacksConfiguration(from: cardPayment.callbacks)
-        let notification = makeNotification(from: cardPayment.callbacks.notifications)
 
         let card = cardPayment.creditCard.flatMap { creditCard -> Headless.Models.Card? in
             Headless.Models.Card(number: creditCard.number, expiryDate: .init(month: creditCard.expiryDate.month, year: creditCard.expiryDate.year), securityCode: creditCard.securityCode, shouldTokenize: creditCard.config.shouldSave)
@@ -70,8 +76,7 @@ final class TransactionConfiguration {
                      paymentChannel: paymentChannel,
                      card: card,
                      cardToken: cardToken,
-                     callbacks: callbacks,
-                     notification: notification
+                     callbacks: callbacks
         )
     }
 
@@ -84,7 +89,6 @@ final class TransactionConfiguration {
         }
 
         let callbacks = makeCallbacksConfiguration(from: blikPayment.callbacks)
-        let notification = makeNotification(from: blikPayment.callbacks.notifications)
 
         return .init(amount: blikPayment.paymentDetails.amount,
                      description: blikPayment.paymentDetails.description,
@@ -93,8 +97,7 @@ final class TransactionConfiguration {
                      token: blikPayment.code,
                      alias: blikPayment.alias?.value,
                      paymentChannel: paymentChannel,
-                     callbacks: callbacks,
-                     notification: notification
+                     callbacks: callbacks
         )
     }
 
@@ -110,15 +113,13 @@ final class TransactionConfiguration {
         }
 
         let callbacks = makeCallbacksConfiguration(from: bankPayment.callbacks)
-        let notification = makeNotification(from: bankPayment.callbacks.notifications)
 
         return .init(amount: bankPayment.paymentDetails.amount,
                      description: bankPayment.paymentDetails.description,
                      hiddenDescription: bankPayment.paymentDetails.hiddenDescription,
                      payerContext: .init(payer: payer),
                      paymentChannel: paymentChannel,
-                     callbacks: callbacks,
-                     notification: notification
+                     callbacks: callbacks
         )
     }
 
@@ -131,7 +132,6 @@ final class TransactionConfiguration {
         }
 
         let callbacks = makeCallbacksConfiguration(from: digitalWalletPayment.callbacks)
-        let notification = makeNotification(from: digitalWalletPayment.callbacks.notifications)
 
         return .init(amount: digitalWalletPayment.paymentDetails.amount,
                      description: digitalWalletPayment.paymentDetails.description,
@@ -139,8 +139,7 @@ final class TransactionConfiguration {
                      payerContext: .init(payer: payer),
                      paymentChannel: paymentChannel,
                      token: digitalWalletPayment.applePayToken,
-                     callbacks: callbacks,
-                     notification: notification
+                     callbacks: callbacks
         )
     }
 
@@ -153,15 +152,13 @@ final class TransactionConfiguration {
         }
 
         let callbacks = makeCallbacksConfiguration(from: payPoPayment.callbacks)
-        let notification = makeNotification(from: payPoPayment.callbacks.notifications)
 
         return .init(amount: payPoPayment.paymentDetails.amount,
                     description: payPoPayment.paymentDetails.description,
                     hiddenDescription: payPoPayment.paymentDetails.hiddenDescription,
                     payerContext: .init(payer: payer),
                     paymentChannel: paymentChannel,
-                    callbacks: callbacks,
-                    notification: notification
+                    callbacks: callbacks
         )
     }
 
@@ -228,7 +225,17 @@ final class TransactionConfiguration {
     private static func makeCallbacksConfiguration(from callbacks: T.Callbacks) -> CallbacksConfiguration {
         return .init(successRedirectUrl: URL(string: callbacks.redirects?.successUrl ?? Defaults.successRedirectUrl.absoluteString) ?? Defaults.successRedirectUrl,
                      errorRedirectUrl: URL(string: callbacks.redirects?.errorUrl ?? Defaults.errorRedirectUrl.absoluteString) ?? Defaults.errorRedirectUrl,
-                     notificationsUrl: callbacks.notifications.flatMap { URL(string: $0.url) })
+                     notificationsUrl: callbacks.notifications.flatMap { URL(string: $0.url) },
+                     notificationEmail: callbacks.notifications.flatMap { $0.email }
+        )
+    }
+
+    private static func makeCallbacksConfiguration(from notifications: T.Callbacks.Notifications?) -> CallbacksConfiguration {
+        return .init(successRedirectUrl: URL(string: Defaults.successRedirectUrl.absoluteString) ?? Defaults.successRedirectUrl,
+                     errorRedirectUrl: URL(string: Defaults.errorRedirectUrl.absoluteString) ?? Defaults.errorRedirectUrl,
+                     notificationsUrl: notifications.flatMap { URL(string: $0.url) },
+                     notificationEmail: notifications.flatMap { $0.email }
+        )
     }
 
     private static func makeCardBrand(from brand: String) -> CardToken.Brand {
@@ -241,10 +248,4 @@ final class TransactionConfiguration {
             return CardToken.Brand.other(brand)
         }
     }
-
-    private static func makeNotification(from notifications: T.Callbacks.Notifications?) -> Tpay.NotificationConfiguration? {
-
-        guard let notifications = notifications else { return nil }
-        return Tpay.NotificationConfiguration(url: URL(string: notifications.url), email: notifications.email)
-    }
 }

package/ios/Source/Model/Domain/BankPayment.swift

@@ -10,5 +10,4 @@ struct BankPayment: Transaction {
     let payerContext: PayerContext?
     let paymentChannel: Headless.Models.PaymentChannel
     let callbacks: CallbacksConfiguration
-    let notification: Tpay.Notification?
 }

package/ios/Source/Model/Domain/BlikPayment.swift

@@ -12,5 +12,4 @@ struct BlikPayment: Transaction {
     let alias: String?
     let paymentChannel: Headless.Models.PaymentChannel
     let callbacks: CallbacksConfiguration
-    let notification: Tpay.Notification?
 }

package/ios/Source/Model/Domain/CardPayment.swift

@@ -12,5 +12,4 @@ struct CardPayment: Transaction {
     let card: Headless.Models.Card?
     let cardToken: Headless.Models.CardToken?
     let callbacks: CallbacksConfiguration
-    let notification: Tpay.Notification?
 }

package/ios/Source/Model/Domain/DigitalWalletPayment.swift

@@ -11,5 +11,4 @@ struct DigitalWalletPayment: Transaction {
     let paymentChannel: Headless.Models.PaymentChannel
     let token: String
     let callbacks: CallbacksConfiguration
-    let notification: Tpay.Notification?
 }

package/ios/Source/Model/Domain/PayPoPayment.swift

@@ -10,5 +10,4 @@ struct PayPoPayment: Transaction {
     let payerContext: PayerContext?
     let paymentChannel: Headless.Models.PaymentChannel
     let callbacks: CallbacksConfiguration
-    let notification: Tpay.Notification?
 }

package/ios/Source/Model/Domain/SingleTransaction.swift

@@ -0,0 +1,11 @@
+import Tpay
+
+struct SingleTransaction: Transaction {
+    let singleTransaction: Tpay.SingleTransaction
+    let callbacks: CallbacksConfiguration
+
+    var amount: Double { singleTransaction.amount }
+    var description: String { singleTransaction.description }
+    var hiddenDescription: String? { singleTransaction.hiddenDescription }
+    var payerContext: PayerContext? { singleTransaction.payerContext }
+}

package/ios/Source/Model/Domain/TokenisationData.swift

@@ -1,10 +1,3 @@
-//
-//  TokenisationData.swift
-//  flutter_tpay
-//
-//  Created by Karol Kaluga on 26/03/2024.
-//
-
 import Foundation
 import Tpay
 

package/ios/Source/TpaySDK.swift

@@ -72,7 +72,8 @@ final class TpayRNModule: NSObject, RCTBridgeModule {
 
         DispatchQueue.main.async { [weak self] in
             do {
-                try self?.paymentPresentation.presentPayment(for: singleTransaction)
+                try TpayModule.configure(callbacks: singleTransaction.callbacks)
+                try self?.paymentPresentation.presentPayment(for: singleTransaction.singleTransaction)
             } catch {
                 safeResolve(ConfigurationResult.configurationFailure(error: error).toJson())
             }
@@ -89,7 +90,8 @@ final class TpayRNModule: NSObject, RCTBridgeModule {
 
         DispatchQueue.main.async { [weak self] in
             do {
-                try self?.tokenCardPresentation.presentPayment(for: singleTransaction)
+                try TpayModule.configure(callbacks: singleTransaction.callbacks)
+                try self?.tokenCardPresentation.presentPayment(for: singleTransaction.singleTransaction)
             } catch {
                 resolve(ConfigurationResult.configurationFailure(error: error).toJson())
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tpay",
-  "version": "1.3.12",
+  "version": "1.3.14",
   "description": "The Tpay SDK empowers your app to seamlessly integrate Tpay’s payment functionalities, providing a comprehensive and developer-friendly solution for managing payments.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-tpay.podspec

@@ -38,5 +38,5 @@ Pod::Spec.new do |s|
     s.dependency "ReactCommon/turbomodule/core"
    end
   end
-  s.dependency "Tpay-SDK", "1.3.6"
+  s.dependency "Tpay-SDK", "1.3.8"
 end