react-native-tpay 1.3.11 → 1.3.12

package/ios/Source/Configuration/TransactionConfiguration.swift

@@ -18,8 +18,9 @@ final class TransactionConfiguration {
         }
 
         let payerContext = makeTransactionPayerContext(from: singleTransaction)
+        let notification = makeNotification(from: singleTransaction.notifications)
 
-        return SingleTransaction(amount: singleTransaction.amount, description: singleTransaction.description, hiddenDescription: singleTransaction.hiddenDescription, payerContext: payerContext)
+        return SingleTransaction(amount: singleTransaction.amount, description: singleTransaction.description, hiddenDescription: singleTransaction.hiddenDescription, payerContext: payerContext, notification: notification)
     }
 
     static func cardTokenTransaction(transactionConfiguration: String) -> Transaction? {
@@ -28,7 +29,9 @@ final class TransactionConfiguration {
             return nil
         }
         let payerContext = makeTokenPayerContext(from: tokenPayment)
-        return SingleTransaction(amount: tokenPayment.amount, description: tokenPayment.description, hiddenDescription: tokenPayment.hiddenDescription, payerContext: payerContext)
+        let notification = makeNotification(from: tokenPayment.notifications)
+
+        return SingleTransaction(amount: tokenPayment.amount, description: tokenPayment.description, hiddenDescription: tokenPayment.hiddenDescription, payerContext: payerContext, notification: notification)
     }
 
     static func addCard(tokenisationConfiguration: String) -> TokenizationData? {
@@ -50,6 +53,7 @@ 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)
@@ -66,7 +70,9 @@ final class TransactionConfiguration {
                      paymentChannel: paymentChannel,
                      card: card,
                      cardToken: cardToken,
-                     callbacks: callbacks)
+                     callbacks: callbacks,
+                     notification: notification
+        )
     }
 
     static func blikPayment(blikPaymentConfiguration: String, paymentChannels: [Headless.Models.PaymentChannel]) -> BlikPayment? {
@@ -78,6 +84,7 @@ 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,
@@ -86,25 +93,33 @@ final class TransactionConfiguration {
                      token: blikPayment.code,
                      alias: blikPayment.alias?.value,
                      paymentChannel: paymentChannel,
-                     callbacks: callbacks)
+                     callbacks: callbacks,
+                     notification: notification
+        )
     }
 
-    static func bankPayment(bankPaymentConfiguration: String, paymentChannels: [Headless.Models.PaymentChannel]) -> BankPayment? {
+    static func bankPayment(bankPaymentConfiguration: String, paymentChannels: [Headless.Models.PaymentChannel]) throws -> BankPayment? {
         guard let bankPaymentData = bankPaymentConfiguration.data(using: .utf8),
               let bankPayment = try? JSONDecoder().decode(T.BankPayment.self, from: bankPaymentData),
-              let payer = makePayer(from: bankPayment.payer),
-              let paymentChannel = paymentChannels.first(where: { $0.paymentKind == .pbl }) else {
+              let payer = makePayer(from: bankPayment.payer) else {
             return nil
         }
 
+        guard let paymentChannel = paymentChannels.first(where: { $0.has(channelId: bankPayment.channelId) }) else {
+            throw PaymentChannelError.unknownPaymentChannel
+        }
+
         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)
+                     callbacks: callbacks,
+                     notification: notification
+        )
     }
 
     static func digitalWalletPayment(digitalWalletPaymentConfiguration: String, paymentChannels: [Headless.Models.PaymentChannel]) -> DigitalWalletPayment? {
@@ -116,6 +131,7 @@ 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,
@@ -123,7 +139,9 @@ final class TransactionConfiguration {
                      payerContext: .init(payer: payer),
                      paymentChannel: paymentChannel,
                      token: digitalWalletPayment.applePayToken,
-                     callbacks: callbacks)
+                     callbacks: callbacks,
+                     notification: notification
+        )
     }
 
     static func payPoPayment(payPoPaymentConfiguration: String, paymentChannels: [Headless.Models.PaymentChannel]) -> PayPoPayment? {
@@ -135,13 +153,16 @@ 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)
+                    description: payPoPayment.paymentDetails.description,
+                    hiddenDescription: payPoPayment.paymentDetails.hiddenDescription,
+                    payerContext: .init(payer: payer),
+                    paymentChannel: paymentChannel,
+                    callbacks: callbacks,
+                    notification: notification
+        )
     }
 
 
@@ -220,4 +241,10 @@ 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/Extension/Models/PaymentChannel+Compare.swift

@@ -0,0 +1,7 @@
+import Tpay
+
+extension Headless.Models.PaymentChannel {
+    func has(channelId: Int) -> Bool {
+        return String(channelId) == self.id
+    }
+}

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

@@ -10,4 +10,5 @@ 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,4 +12,5 @@ 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,4 +12,5 @@ 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/ConfigurationResult.swift

@@ -11,6 +11,7 @@ struct ConfigurationResult: Encodable {
         static let paymentCompleted = "paymentCompleted"
         static let paymentCancelled = "paymentCancelled"
         static let paymentError = "paymentError"
+        static let paymentClosed = "moduleClosed"
         static let tokenPaymentCompleted = "tokenPaymentCompleted"
         static let tokenPaymentCancelled = "tokenPaymentCancelled"
         static let tokenPaymentError = "tokenPaymentError"
@@ -66,6 +67,10 @@ struct ConfigurationResult: Encodable {
         return .errorResult(type: Constant.tokenPaymentError, error: error)
     }
 
+    static func paymentClosed() -> ConfigurationResult {
+        return .init(type: Constant.paymentClosed, message: nil)
+    }
+
     static func tokenizationCompleted() -> ConfigurationResult {
         return .init(type: Constant.tokenizationCompleted, message: nil)
     }

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

@@ -11,4 +11,5 @@ 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,4 +10,5 @@ struct PayPoPayment: Transaction {
     let payerContext: PayerContext?
     let paymentChannel: Headless.Models.PaymentChannel
     let callbacks: CallbacksConfiguration
+    let notification: Tpay.Notification?
 }

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

@@ -0,0 +1,3 @@
+enum PaymentChannelError: Error {
+    case unknownPaymentChannel
+}

package/ios/Source/Model/Transportation/Transportation+BankPayment.swift

@@ -5,7 +5,6 @@ extension Transportation {
         // MARK: - Properties
 
         let channelId: Int
-        let bankName: String
         let paymentDetails: PaymentDetails
         let payer: Payer
         let callbacks: Callbacks

package/ios/Source/Model/Transportation/Transportation+SingleTransaction.swift

@@ -8,5 +8,6 @@ extension Transportation {
         let description: String
         let hiddenDescription: String?
         let payerContext: PayerContext?
+        let notifications: Callbacks.Notifications?
     }
 }

package/ios/Source/Model/Transportation/Transportation+TokenPayment.swift

@@ -9,5 +9,6 @@ extension Transportation {
         let description: String
         let hiddenDescription: String?
         let payer: Payer?
+        let notifications: Callbacks.Notifications?
     }
 }

package/ios/Source/Presentation/PaymentPresentation.swift

@@ -33,6 +33,11 @@ final class PaymentPresentation: PaymentDelegate {
         complete()
     }
 
+    func onPaymentClosed() {
+        paymentResult?(ConfigurationResult.paymentClosed().toJson())
+        complete()
+    }
+
     func onPaymentCancelled(transactionId: String) {
         paymentResult?(ConfigurationResult.paymentCancelled(transactionId: transactionId).toJson())
         complete()

package/ios/Source/TpaySDK.swift

@@ -302,14 +302,14 @@ final class TpayRNModule: NSObject, RCTBridgeModule {
     }
 
     private func invokeBankPayment(_ json: String, resolve: @escaping RCTPromiseResolveBlock, paymentChannels: [Headless.Models.PaymentChannel]) {
-        guard let bankPayment = TransactionConfiguration.bankPayment(bankPaymentConfiguration: json, paymentChannels: paymentChannels) else {
-            resolve(ScreenlessResult.methodCallError().toJson())
-            return
-        }
-
         do {
+            guard let bankPayment = try TransactionConfiguration.bankPayment(bankPaymentConfiguration: json, paymentChannels: paymentChannels) else {
+                resolve(ScreenlessResult.methodCallError().toJson())
+                return
+            }
+            
             try TpayModule.configure(callbacks: bankPayment.callbacks)
-            try Headless.invokePayment(for: bankPayment, using: bankPayment.paymentChannel) { result in
+            try Headless.invokePayment(for: bankPayment, using: bankPayment.paymentChannel, allowedPaymentKinds: Headless.Models.PaymentKind.allCases) { result in
                 switch result {
                 case let .success(transaction):
                     resolve(ScreenlessResult.paymentCreated(continueUrl: transaction.continueUrl, transactionId: transaction.ongoingTransaction.id).toJson())

package/lib/commonjs/model/screenless/transfer_payment.js

@@ -12,10 +12,9 @@ class TransferPayment extends _screenless_payment.ScreenlessPayment {
   /**
    * @param channelId - channel id of a bank in Tpay system
    */
-  constructor(channelId, bankName, paymentDetails, payer, callbacks) {
+  constructor(channelId, paymentDetails, payer, callbacks) {
     super(paymentDetails, payer, callbacks);
     this.channelId = channelId;
-    this.bankName = bankName;
   }
 }
 exports.TransferPayment = TransferPayment;

package/lib/commonjs/model/screenless/transfer_payment.js.map

@@ -1 +1 @@
-{"version":3,"names":["_screenless_payment","require","TransferPayment","ScreenlessPayment","constructor","channelId","bankName","paymentDetails","payer","callbacks","exports"],"sourceRoot":"../../../../src","sources":["model/screenless/transfer_payment.ts"],"mappings":";;;;;;AAGA,IAAAA,mBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACO,MAAMC,eAAe,SAASC,qCAAiB,CAAC;EAIrD;AACF;AACA;EACEC,WAAWA,CACTC,SAAiB,EACjBC,QAAgB,EAChBC,cAA8B,EAC9BC,KAAY,EACZC,SAAoB,EACpB;IACA,KAAK,CAACF,cAAc,EAAEC,KAAK,EAAEC,SAAS,CAAC;IACvC,IAAI,CAACJ,SAAS,GAAGA,SAAS;IAC1B,IAAI,CAACC,QAAQ,GAAGA,QAAQ;EAC1B;AACF;AAACI,OAAA,CAAAR,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_screenless_payment","require","TransferPayment","ScreenlessPayment","constructor","channelId","paymentDetails","payer","callbacks","exports"],"sourceRoot":"../../../../src","sources":["model/screenless/transfer_payment.ts"],"mappings":";;;;;;AAGA,IAAAA,mBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACO,MAAMC,eAAe,SAASC,qCAAiB,CAAC;EAGrD;AACF;AACA;EACEC,WAAWA,CACTC,SAAiB,EACjBC,cAA8B,EAC9BC,KAAY,EACZC,SAAoB,EACpB;IACA,KAAK,CAACF,cAAc,EAAEC,KAAK,EAAEC,SAAS,CAAC;IACvC,IAAI,CAACH,SAAS,GAAGA,SAAS;EAC5B;AACF;AAACI,OAAA,CAAAP,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/module/model/screenless/transfer_payment.js

@@ -9,10 +9,9 @@ export class TransferPayment extends ScreenlessPayment {
   /**
    * @param channelId - channel id of a bank in Tpay system
    */
-  constructor(channelId, bankName, paymentDetails, payer, callbacks) {
+  constructor(channelId, paymentDetails, payer, callbacks) {
     super(paymentDetails, payer, callbacks);
     this.channelId = channelId;
-    this.bankName = bankName;
   }
 }
 //# sourceMappingURL=transfer_payment.js.map

package/lib/module/model/screenless/transfer_payment.js.map

@@ -1 +1 @@
-{"version":3,"names":["ScreenlessPayment","TransferPayment","constructor","channelId","bankName","paymentDetails","payer","callbacks"],"sourceRoot":"../../../../src","sources":["model/screenless/transfer_payment.ts"],"mappings":";;AAGA,SAASA,iBAAiB,QAAQ,sBAAsB;;AAExD;AACA;AACA;AACA,OAAO,MAAMC,eAAe,SAASD,iBAAiB,CAAC;EAIrD;AACF;AACA;EACEE,WAAWA,CACTC,SAAiB,EACjBC,QAAgB,EAChBC,cAA8B,EAC9BC,KAAY,EACZC,SAAoB,EACpB;IACA,KAAK,CAACF,cAAc,EAAEC,KAAK,EAAEC,SAAS,CAAC;IACvC,IAAI,CAACJ,SAAS,GAAGA,SAAS;IAC1B,IAAI,CAACC,QAAQ,GAAGA,QAAQ;EAC1B;AACF","ignoreList":[]}
+{"version":3,"names":["ScreenlessPayment","TransferPayment","constructor","channelId","paymentDetails","payer","callbacks"],"sourceRoot":"../../../../src","sources":["model/screenless/transfer_payment.ts"],"mappings":";;AAGA,SAASA,iBAAiB,QAAQ,sBAAsB;;AAExD;AACA;AACA;AACA,OAAO,MAAMC,eAAe,SAASD,iBAAiB,CAAC;EAGrD;AACF;AACA;EACEE,WAAWA,CACTC,SAAiB,EACjBC,cAA8B,EAC9BC,KAAY,EACZC,SAAoB,EACpB;IACA,KAAK,CAACF,cAAc,EAAEC,KAAK,EAAEC,SAAS,CAAC;IACvC,IAAI,CAACH,SAAS,GAAGA,SAAS;EAC5B;AACF","ignoreList":[]}

package/lib/typescript/src/model/screenless/transfer_payment.d.ts

@@ -7,10 +7,9 @@ import { ScreenlessPayment } from "./screenless_payment";
  */
 export declare class TransferPayment extends ScreenlessPayment {
     channelId: number;
-    bankName: string;
     /**
      * @param channelId - channel id of a bank in Tpay system
      */
-    constructor(channelId: number, bankName: string, paymentDetails: PaymentDetails, payer: Payer, callbacks: Callbacks);
+    constructor(channelId: number, paymentDetails: PaymentDetails, payer: Payer, callbacks: Callbacks);
 }
 //# sourceMappingURL=transfer_payment.d.ts.map

package/lib/typescript/src/model/screenless/transfer_payment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transfer_payment.d.ts","sourceRoot":"","sources":["../../../../../src/model/screenless/transfer_payment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;gBAED,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS;CAMvB"}
+{"version":3,"file":"transfer_payment.d.ts","sourceRoot":"","sources":["../../../../../src/model/screenless/transfer_payment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;gBAED,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS;CAKvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tpay",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "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",
@@ -58,7 +58,7 @@
     "@react-native-community/cli": "15.0.0-alpha.2",
     "@react-native/babel-preset": "0.79.2",
     "@react-native/eslint-config": "^0.78.0",
-    "@release-it/conventional-changelog": "^9.0.2",
+    "@release-it/conventional-changelog": "^10.0.3",
     "@types/jest": "^29.5.5",
     "@types/react": "^19.0.0",
     "commitlint": "^19.6.1",
@@ -72,7 +72,7 @@
     "react": "19.0.0",
     "react-native": "0.79.2",
     "react-native-builder-bob": "^0.40.11",
-    "release-it": "^17.10.0",
+    "release-it": "^19.1.0",
     "turbo": "^1.10.7",
     "typescript": "^5.8.3"
   },

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.1"
+  s.dependency "Tpay-SDK", "1.3.6"
 end

package/src/model/screenless/transfer_payment.ts

@@ -8,20 +8,17 @@ import { ScreenlessPayment } from "./screenless_payment";
  */
 export class TransferPayment extends ScreenlessPayment {
   channelId: number;
-  bankName: string;
 
   /**
    * @param channelId - channel id of a bank in Tpay system
    */
   constructor(
     channelId: number,
-    bankName: string,
     paymentDetails: PaymentDetails,
     payer: Payer,
     callbacks: Callbacks
   ) {
     super(paymentDetails, payer, callbacks);
     this.channelId = channelId;
-    this.bankName = bankName;
   }
 }