skipcash-reactnative 0.0.5 → 0.0.7

package/README.md

@@ -20,9 +20,10 @@ SkipCash React Native Package; This package facilitates SkipCash integration wit
 # Example
 
 ```jsx
+
 import { useEffect, useState } from 'react';
 
-import { StyleSheet, View, NativeEventEmitter, NativeModules, Platform, Alert } from 'react-native';
+import { StyleSheet, View, NativeEventEmitter, KeyboardAvoidingView, NativeModules, Platform, Alert } from 'react-native';
 import { initiateApplePay, PaymentData, PaymentResponse,
   isWalletHasCards, setupNewCard, initiatePaymentModel
 } from 'skipcash-reactnative';
@@ -43,29 +44,12 @@ export default function App() {
   /**********************************
   - THIS PACKAGE PROVIDES TWO PAYMENT OPTIONS FOR YOUR CUSTOMER -
     1. IN-APP APPLE PAY using 'initiateApplePay()' function.
-    2. IN-APP WEB VIEW (INCLUDES ALL PAYMENT OPTIONS THAT SKIPCASH OFFERS).
+    2. IN-APP WEB VIEW (INCLUDES ALL PAYMENT OPTIONS THAT SKIPCASH OFFERS (visa, master, amex, 
+    international cards, etc...) using 'initiatePaymentModel()' function.
   - THIS EXAMPLE APP, DEMONESTRATES HOW TO USE THE DIFFERENT OPTIONS MENTIONED ABOVE
   ***********************************/
 
-  /*
-    Here In case if you want to implement IN-APP Apple Pay
-    you have to  pass the name of the merchant identifier
-    (you need to create a new one from apple developer account of your app ). 
-    please reachout to https://dev.skipcash.app/ mobile apple pay section to
-    know how to generate your merchant identifier and setup Xcode.
-  */
-
-  paymentData.setMerchantIdentifier("");
-  /* 
-    Add your payment endpoint; You need to create an endpoint for your merchant account.
-    For more information on how to request a new payment, Please refer to https://dev.skipcash.app/doc/api-integration/.
-    
-    You will need to implement this functionality on your backend server to create an endpoint that requests a new payment and returns the details you receive from the SkipCash server to this package. Of course your endpoint will receive the customer's details from this package request, Upon receiving the details response from your server this package will use that details to process your customer's payment via Apple Pay.
 
-    Once you have completed setting up and testing your endpoint, please provide the link to the setPaymentLinkEndPoint below.
-  */
-  paymentData.setPaymentLinkEndPoint("")
-  paymentData.setAuthorizationHeader("");
   /* add authorizartion header; used to protect your endpoint from unathorized access */
 
   useEffect(() => {
@@ -92,7 +76,7 @@ export default function App() {
         }
       ));
 
-      // For In-App Apple Pay response
+      // For In-App Apple Pay
       subscriptions.push(new NativeEventEmitter(NativeModules.SkipcashReactnative).addListener(
         'applepay_response',
          (paymentResponse: any) => {
@@ -101,7 +85,7 @@ export default function App() {
           let response: PaymentResponse = PaymentResponse.fromJson(paymentResponse);
   
   
-          Alert.alert(`isSuccess: ${response.isSuccess} | transactionId: ${response.transactionId} | PaymentID: ${response.paymentId} 
+          Alert.alert(`isSuccess: ${response.isSuccess} | transactionId: ${response.transactionId}
             | returnCode: ${response.returnCode} | errorMessage: ${response.errorMessage}`);
   
           /* 
@@ -118,6 +102,9 @@ export default function App() {
 
     return () => {
       // cleaning up after leaving the current app view
+      // make sure to block leaving the current view until the payment is 
+      // finished or canceled by the client or you will not be able to 
+      // record the callback event for the payment status.
       new NativeEventEmitter().removeAllListeners("responseScPaymentData");
       if(Platform.OS === 'ios'){
         new NativeEventEmitter().removeAllListeners("applepay_response");
@@ -128,6 +115,34 @@ export default function App() {
   }, []);
 
   const initiateApplePayPayment = () => {
+    /*
+      you have to  pass the name of the merchant identifier
+      (you need to create a new one from apple developer account of your app ). 
+      please reachout to https://dev.skipcash.app/ mobile apple pay section to
+      know how to generate your merchant identifier and setup Xcode.
+    */
+    paymentData.setMerchantIdentifier("");
+
+    /* 
+      Apple Pay Payments Processing endpoint.
+
+      You need to setup an endpoint to create a new payments.
+      For more information on how to request a new payment, Please refer to https://dev.skipcash.app/doc/api-integration/.
+      
+      You will need to implement this functionality on your backend server to create an endpoint that requests and create new payment and process it 
+      and returns the details you receive from the SkipCash server to this package. 
+
+      Your endpoint will receive the customer's details and apple pay token once the customer authorizes the transaction after calling initiateApplePay()
+      then your endpoint should process the payment by calling skipcash API, once done your endpoint should return the response received from SkipCash API
+      you can find details about how to setup your endpoint at "https://dev.skipcash.app/" under applepay section "configure payment processing endpoint".
+
+      Once you have completed setting up and testing your endpoint, please provide the link to the setPaymentLinkEndPoint below.
+    */
+    paymentData.setPaymentLinkEndPoint("");
+
+    // if your endpoint requires authorization header you can pass it below
+    paymentData.setAuthorizationHeader(""); 
+
     paymentData.setSummaryItem('Tax', '0.0'); // set summary item
     paymentData.setSummaryItem('Total', amount); // set summary item
 
@@ -137,9 +152,10 @@ export default function App() {
     paymentData.setEmail(email); // required
     paymentData.setAmount(amount); // required
     paymentData.setTransactionId(""); // your internal order id, (Optional) - but very much recommended
-    paymentData.setWebhookUrl(""); // very much recommended
+    paymentData.setWebhookUrl(""); // very much recommended 
     // read about webhooks ->  https://dev.skipcash.app/doc/api-integration/web-hooks/
-    paymentData.setMerchantName(""); /* 
+    paymentData.setMerchantName("Your official business name in appstore"); 
+    /* 
       Required - (if using in-app apple-pay set your official merchant/business name for apple payment sheet) 
       this is required by apple, it must match your official name in appstore
     */
@@ -152,6 +168,7 @@ export default function App() {
     const paymentDataJson = JSON.stringify(paymentData); // convert paymentData to json string
 
     if(firstName && lastName && phone && email) {
+      console.log(paymentDataJson);
       initiateApplePay(paymentDataJson);
     }else{
       Alert.alert("please fill firstname, lastname, phone, email & amount");
@@ -159,6 +176,26 @@ export default function App() {
   }
 
   const startPaymentModel = () => {
+
+    /* 
+      Add your payment endpoint; You need to create an endpoint for your merchant account.
+      For more information on how to request a new payment, Please refer to https://dev.skipcash.app/doc/api-integration/.
+      
+      You will need to implement this functionality at your backend server. Create an endpoint that requests a new payment and returns the response 
+      received from the SkipCash API. 
+
+      Your endpoint will receive the customer's details from this package request, Upon receiving the details call SkipCash API to create a new payment
+      as mentioned in the above documentation then your endpoint should return the response received from SkipCash API this package will use the response
+      to open the new payment a webview to show the online payment options to customer.
+
+      Once you have completed setting up and testing your endpoint, please provide the link to the setPaymentLinkEndPoint below.
+    */
+    paymentData.setPaymentLinkEndPoint("");
+
+    // if your endpoint requires authorization header you can pass it below
+    paymentData.setAuthorizationHeader(""); 
+
+
     paymentData.setFirstName(firstName); // required
     paymentData.setLastName(lastName); // required
     paymentData.setPhone(phone); // required
@@ -194,7 +231,7 @@ export default function App() {
   }
 
   return (
-    <View style={styles.container}>
+    <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'} style={styles.container}>
       <Title style={styles.title}>Payment Details</Title>
       
       <TextInput
@@ -302,7 +339,7 @@ export default function App() {
       >
         Setup A Card
       </Button>
-    </View>
+    </KeyboardAvoidingView>
   );
 }
 

package/ios/SkipcashReactnative.swift

@@ -14,210 +14,9 @@ import Network
 import SystemConfiguration.CaptiveNetwork
 
 
-
- public struct ResultObject: Codable {
-     public var isSuccess: Bool
-     var data: String
- }
-
- public class ResponseData: NSObject, Codable {
-     public var transactionId: String?
-     public var paymentId: String?
-     public var resultObj: ResultObject
-     public var returnCode: Int
-     public var errorCode: Int
-     public var errorMessage: String?
-     public var error: String?
-     public var validationErrors: String?
-     public var hasError: Bool
-     public var hasValidationError: Bool
-    
-     // Initializer
-     public init(transactionId: String?, paymentId: String?, resultObj: ResultObject, returnCode: Int, errorCode: Int, errorMessage: String?, error: String?, validationErrors: String?, hasError: Bool, hasValidationError: Bool) {
-         self.transactionId = transactionId
-         self.paymentId = paymentId
-         self.resultObj = resultObj
-         self.returnCode = returnCode
-         self.errorCode = errorCode
-         self.errorMessage = errorMessage
-         self.error = error
-         self.validationErrors = validationErrors
-         self.hasError = hasError
-         self.hasValidationError = hasValidationError
-     }
-    
-    
-     public func getResultObjIsSuccess() -> Bool {
-         return resultObj.isSuccess;
-     }
-    
-     public func getPaymentId() -> String {
-         return paymentId ?? "No Payment ID";
-     }
-
-     public func getTransactionId() -> String {
-        return transactionId ?? "No Transaction ID";
-     }
-    
-     public func getErrorMessage() -> String {
-         return errorMessage ?? "Nothing to show";
-     }
- }
-
- @objc public protocol ApplePayReponseDelegate{
-     func applePayResponseData(transactionID: String, paymentID: String, isSuccess: Bool, token: String, returnCode: Int, errorMessage: String, completion: ((PKPaymentAuthorizationResult) -> Void)?)
- }
-
- public class SetupVC: UIViewController {
-     let production = "https://api.skipcash.app"
-     let sandboxUrl = "https://skipcashtest.azurewebsites.net"
-     let uat        = "https://skipcash-uat-api.azurewebsites.net"
-    
-     public var paymentToken: String  = ""
-     public var paymentID: String     = ""
-     public var transactionID: String = ""
-     public var delegate:ApplePayReponseDelegate?
-     public var completion: ((PKPaymentAuthorizationResult) -> Void)?
-    
-     override public func viewDidLoad() {
-        self.callApplePay(paymentId: self.paymentID, applePaymentToken: self.paymentToken)
-     }
-    
-     func callApplePay(paymentId: String, applePaymentToken: String) {
-        let request = "{\"token\": {\"paymentData\":\(applePaymentToken)}, \"ip\": \"178.152.136.90\"}"
-        //  let request             = "{\"token\": {\"paymentData\":\(applePaymentToken)}, \"ip\": ""}"
-         let postData            = request.data(using: .utf8)
-         let url                 = URL(string: production + "/api/v1/payments/apple/" + paymentId + "/pay-mc")!
-         var urlRequest          = URLRequest(url: url)
-         urlRequest.httpMethod   = "POST"
-         urlRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
-         urlRequest.httpBody     = postData
-        
-         let task: URLSessionDataTask
-
-         task = URLSession.shared.dataTask(with: urlRequest) { data, response, error in
-            
-             guard let data = data else {
-                 debugPrint(data ?? "NO DATA RECEIVED")
-                 let responseData = ResponseData(
-                     transactionId: self.transactionID,
-                     paymentId: self.paymentID,
-                     resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
-                     returnCode: 400,
-                     errorCode: 1001,
-                     errorMessage: "Sample error message",
-                     error: "No data received",
-                     validationErrors: "Sample validation errors",
-                     hasError: true,
-                     hasValidationError: true
-                 )
-                 
-                 DispatchQueue.main.async{
-                     self.dismiss(animated: true, completion: nil)
-                 }
-                
-                 DispatchQueue.main.asyncAfter(deadline: .now()){
-                     self.delegate?.applePayResponseData(transactionID: self.transactionID, paymentID: self.paymentID, isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: self.completion)
-                 }
-                
-                 return
-             }
-            
-             if let text =  String(data: data, encoding: .utf8) {
-                 if let jsonData = text.data(using: .utf8) {
-                     do {
-                         let decoder = JSONDecoder()
-                         var responseData = try decoder.decode(ResponseData.self, from: jsonData)
-                        
-                         responseData.paymentId = paymentId
-                         
-                         DispatchQueue.main.async{
-                             self.dismiss(animated: true, completion: nil)
-                         }
-                       
-                         DispatchQueue.main.asyncAfter(deadline: .now()){
-                             self.delegate?.applePayResponseData(transactionID: self.transactionID, paymentID: self.paymentID, isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: self.completion)
-                         }
-                        
-                     } catch {
-                         let responseData = ResponseData(
-                             transactionId: self.transactionID,
-                             paymentId: self.paymentID,
-                             resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
-                             returnCode: 400,
-                             errorCode: 1001,
-                             errorMessage: "Payment Failed!",
-                             error: "\(error)",
-                             validationErrors: "failed to decode json response for the payment",
-                             hasError: true,
-                             hasValidationError: true
-                         )
-
-                         
-                         DispatchQueue.main.async{
-                             self.dismiss(animated: true, completion: nil)
-                         }
-                        
-                         DispatchQueue.main.asyncAfter(deadline: .now()){
-
-                             self.delegate?.applePayResponseData(transactionID: self.transactionID, paymentID: self.paymentID, isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: self.completion)
-                         }
-                        
-                        
-                     }
-                 } 
-                     else {
-                     let responseData = ResponseData(
-                        transactionId: self.transactionID,
-                         paymentId: self.paymentID,
-                         resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
-                         returnCode: 400,
-                         errorCode: 1001,
-                         errorMessage: "Sample error message",
-                         error: "Failed to convert JSON text to data",
-                         validationErrors: "Sample validation errors",
-                         hasError: true,
-                         hasValidationError: true
-                     )
-                    
-                     DispatchQueue.main.async{
-                         self.dismiss(animated: true, completion: nil)
-                     }
-
-                     DispatchQueue.main.asyncAfter(deadline: .now()){
-                         self.delegate?.applePayResponseData(transactionID: self.transactionID, paymentID: self.paymentID, isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: self.completion)
-                     }
-                 }
-             } 
-             else {
-                 let responseData = ResponseData(
-                     transactionId: self.transactionID,
-                     paymentId: self.paymentID,
-                     resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
-                     returnCode: 400,
-                     errorCode: 1001,
-                     errorMessage: "Sample error message",
-                     error: "Failed to decode data as UTF-8 string",
-                     validationErrors: "Sample validation errors",
-                     hasError: true,
-                     hasValidationError: true
-                 )
-                 
-                 DispatchQueue.main.async{
-                     self.dismiss(animated: true, completion: nil)
-                 }
-                
-                 DispatchQueue.main.asyncAfter(deadline: .now()){
-                     self.delegate?.applePayResponseData(transactionID: self.transactionID, paymentID: self.paymentID, isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: self.completion)
-                 }
-             }
-         }
-         task.resume()
-     }
- }
-
 public class PaymentData: NSObject, Codable{
     let merchantIdentifier: String
+    var token: String
     let countryCode: String
     let currencyCode: String
     let createPaymentLinkEndPoint: String
@@ -244,8 +43,8 @@ public class PaymentData: NSObject, Codable{
     let custom9: String
     let custom10: String
 
-    let Description: String
-    let Subject: String
+    let paymentDescription: String
+    let paymentSubject: String
     let paymentModalTitle: String
 
     let merchantName: String
@@ -253,6 +52,7 @@ public class PaymentData: NSObject, Codable{
     init?(data: [String: Any]) {
         guard
             let merchantIdentifier = data["merchantIdentifier"] as? String,
+            var token = "" as? String,
             let countryCode = data["countryCode"] as? String,
             let currencyCode = data["currencyCode"] as? String,
             let createPaymentLinkEndPoint = data["createPaymentLinkEndPoint"] as? String,
@@ -273,8 +73,8 @@ public class PaymentData: NSObject, Codable{
             let custom5 = data["custom5"] as? String, let custom6 = data["custom6"] as? String,
             let custom7 = data["custom7"] as? String, let custom8 = data["custom8"] as? String,
             let custom9 = data["custom9"] as? String, let custom10 = data["custom10"] as? String,
-            let Description = data["description"] as? String,
-            let Subject = data["subject"] as? String,
+            let paymentDescription = data["description"] as? String,
+            let paymentSubject = data["subject"] as? String,
             let paymentModalTitle = data["paymentModalTitle"] as? String,
 
             let merchantName = data["merchantName"] as? String
@@ -283,6 +83,7 @@ public class PaymentData: NSObject, Codable{
         }
 
         self.merchantIdentifier = merchantIdentifier
+        self.token = token
         self.countryCode = countryCode
         self.currencyCode = currencyCode
         self.createPaymentLinkEndPoint = createPaymentLinkEndPoint
@@ -308,18 +109,78 @@ public class PaymentData: NSObject, Codable{
         self.custom9        = custom9
         self.custom10       = custom10
 
-        self.Subject        = Subject
-        self.Description    = Description
+        self.paymentSubject        = paymentSubject
+        self.paymentDescription    = paymentDescription
         self.paymentModalTitle = paymentModalTitle
         
         self.merchantName = merchantName
     }
+
+    func encodeToJSON() -> String? {
+        let encoder = JSONEncoder()
+        //encoder.keyEncodingStrategy = .convertToSnakeCase // Optional: Adjust key casing if needed
+        
+        do {
+            let jsonData = try encoder.encode(self)
+            // Convert to a string if needed (for the body of the POST request)
+            let jsonString = String(data: jsonData, encoding: .utf8)
+            return jsonString
+        } catch {
+            print("Error encoding PaymentData to JSON: \(error)")
+            return nil
+        }
+    }
+}
+
+public struct ResultObject: Codable {
+    public var isSuccess: Bool
+    var data: String
+}
+
+public class ResponseData: NSObject, Codable {
+    public var transactionId: String?
+    public var resultObj: ResultObject
+    public var returnCode: Int
+    public var errorCode: Int
+    public var errorMessage: String?
+    public var error: String?
+    public var validationErrors: String?
+    public var hasError: Bool
+    public var hasValidationError: Bool
+
+    // Initializer
+    public init(transactionId: String?, resultObj: ResultObject, returnCode: Int, errorCode: Int, errorMessage: String?, error: String?, validationErrors: String?, hasError: Bool, hasValidationError: Bool) {
+        self.transactionId = transactionId
+        self.resultObj = resultObj
+        self.returnCode = returnCode
+        self.errorCode = errorCode
+        self.errorMessage = errorMessage
+        self.error = error
+        self.validationErrors = validationErrors
+        self.hasError = hasError
+        self.hasValidationError = hasValidationError
+    }
+
+
+    public func getResultObjIsSuccess() -> Bool {
+        return resultObj.isSuccess;
+    }
+
+    public func getTransactionId() -> String {
+    return transactionId ?? "No Transaction ID";
+    }
+
+    public func getErrorMessage() -> String {
+        return errorMessage ?? "Nothing to show";
+    }
 }
 
 @objc(SkipcashReactnative)
-class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
+class SkipcashReactnative: RCTEventEmitter {
     private var paymentID: String = ""
     private var transactionID: String = ""
+    private var authorizationHeaderValue: String = ""
+    private var paymentData: PaymentData?
 
     var webView: WKWebView!
     var navigationController: UINavigationController?
@@ -332,10 +193,9 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
     }
 
 
-    public func applePayResponseData(transactionID: String, paymentID: String, isSuccess: Bool, token: String, returnCode: Int, errorMessage: String, completion: ((PKPaymentAuthorizationResult) -> Void)?) {
+    public func applePayResponseData(transactionID: String, isSuccess: Bool, token: String, returnCode: Int, errorMessage: String, completion: ((PKPaymentAuthorizationResult) -> Void)?) {
       let responseData: [String: Any] = [
           "transactionId": transactionID,
-          "paymentId": paymentID,
           "isSuccess": isSuccess,
           "token": token,
           "returnCode": returnCode,
@@ -370,6 +230,135 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
       .visa
     ]
 
+    func callApplePay(paymentData: PaymentData, applePaymentToken: String, completion: ((PKPaymentAuthorizationResult) -> Void)?) {
+        
+        guard let request = paymentData.encodeToJSON() else {
+            let responseData = ResponseData(
+                transactionId: paymentData.transactionId,
+                resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
+                returnCode: 400,
+                errorCode: 1001,
+                errorMessage: "Couldn't convert payment request data",
+                error: "Couldn't convert payment request data",
+                validationErrors: "Couldn't convert payment request data",
+                hasError: true,
+                hasValidationError: true
+            )
+            
+            DispatchQueue.main.asyncAfter(deadline: .now()){
+                self.applePayResponseData(transactionID: responseData.getTransactionId(), isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: completion)
+            }
+            
+            return
+        }
+
+        let postData            = request.data(using: .utf8)
+        let url                 = URL(string: paymentData.createPaymentLinkEndPoint)!
+        var urlRequest          = URLRequest(url: url)
+        urlRequest.httpMethod   = "POST"
+
+        if self.authorizationHeaderValue.count > 0 {
+            urlRequest.addValue(self.authorizationHeaderValue, forHTTPHeaderField: "Authorization")
+        }
+        urlRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        urlRequest.httpBody     = postData
+        
+        let task: URLSessionDataTask
+
+        task = URLSession.shared.dataTask(with: urlRequest) { data, response, error in
+            
+            guard let data = data else {
+                let responseData = ResponseData(
+                    transactionId: paymentData.transactionId,
+                    resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
+                    returnCode: 400,
+                    errorCode: 1001,
+                    errorMessage: "NO DATA RECEIVED",
+                    error: "No data received",
+                    validationErrors: "NO DATA RECEIVED",
+                    hasError: true,
+                    hasValidationError: true
+                )
+                
+
+                DispatchQueue.main.asyncAfter(deadline: .now()){
+                    self.applePayResponseData(transactionID: responseData.getTransactionId(), isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: completion)
+                }
+                
+                return
+            }
+            
+            if let text =  String(data: data, encoding: .utf8) {
+                if let jsonData = text.data(using: .utf8) {
+                    do {
+                        let decoder = JSONDecoder()
+                        
+                        var responseData = try decoder.decode(ResponseData.self, from: jsonData)
+                        
+                        responseData.transactionId = paymentData.transactionId
+              
+                        DispatchQueue.main.asyncAfter(deadline: .now()){
+                            // self.delegate?.
+                            self.applePayResponseData(
+                                transactionID: responseData.getTransactionId(), isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: completion)
+                        }
+                        
+                    } catch {
+                        let responseData = ResponseData(
+                            transactionId: paymentData.transactionId,
+                            resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
+                            returnCode: 400,
+                            errorCode: 1001,
+                            errorMessage: "failed to decode json response for the payment!",
+                            error: "\(error)",
+                            validationErrors: "failed to decode json response for the payment",
+                            hasError: true,
+                            hasValidationError: true
+                        )
+                        
+                        DispatchQueue.main.asyncAfter(deadline: .now()){
+                            self.applePayResponseData(transactionID: responseData.getTransactionId(), isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: completion)
+                        }   
+                    }
+                } 
+                    else {
+                    let responseData = ResponseData(
+                        transactionId: paymentData.transactionId,
+                        resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
+                        returnCode: 400,
+                        errorCode: 1001,
+                        errorMessage: "Failed to convert JSON text to data",
+                        error: "Failed to convert JSON text to data",
+                        validationErrors: "Failed to convert JSON text to data",
+                        hasError: true,
+                        hasValidationError: true
+                    )
+                        
+                    DispatchQueue.main.asyncAfter(deadline: .now()){
+                        self.applePayResponseData(transactionID: responseData.getTransactionId(), isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: completion)
+                    }
+                }
+            } else {
+                let responseData = ResponseData(
+                    transactionId: paymentData.transactionId,
+                    resultObj: ResultObject(isSuccess: false, data: "\(applePaymentToken)"),
+                    returnCode: 400,
+                    errorCode: 1001,
+                    errorMessage: "Failed to decode data as UTF-8 string",
+                    error: "Failed to decode data as UTF-8 string",
+                    validationErrors: "Failed to decode data as UTF-8 string",
+                    hasError: true,
+                    hasValidationError: true
+                )
+                
+                DispatchQueue.main.asyncAfter(deadline: .now()){
+                    self.applePayResponseData(transactionID: responseData.getTransactionId(), isSuccess: responseData.resultObj.isSuccess, token: responseData.resultObj.data, returnCode: responseData.returnCode, errorMessage: responseData.getErrorMessage(), completion: completion)
+                }
+            }
+        }
+        task.resume()
+    }
+
     @objc(isWalletHasCards:rejecter:)
     func isWalletHasCards (resolve:RCTPromiseResolveBlock,rejecter:RCTPromiseRejectBlock) -> Void {
       let result = SkipcashReactnative.applePayStatus();
@@ -405,29 +394,29 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
         
         var convertedData: [String: Any] = [:]
         
-        convertedData["Amount"]     = data.amount
-        convertedData["FirstName"]  = data.firstName
-        convertedData["LastName"]   = data.lastName
-        convertedData["Phone"]      = data.phone
-        convertedData["Email"]      = data.email
+        convertedData["amount"]     = data.amount
+        convertedData["firstName"]  = data.firstName
+        convertedData["lastName"]   = data.lastName
+        convertedData["phone"]      = data.phone
+        convertedData["email"]      = data.email
         
-        convertedData["ReturnUrl"]      = returnURL
-        convertedData["TransactionId"]  = data.transactionId
-        convertedData["WebhookUrl"]     = data.webhookUrl
+        convertedData["returnUrl"]      = returnURL
+        convertedData["transactionId"]  = data.transactionId
+        convertedData["webhookUrl"]     = data.webhookUrl
         
-        convertedData["Custom1"]        = data.custom1
-        convertedData["Custom2"]        = data.custom2
-        convertedData["Custom3"]        = data.custom3
-        convertedData["Custom4"]        = data.custom4
-        convertedData["Custom5"]        = data.custom5
-        convertedData["Custom6"]        = data.custom6
-        convertedData["Custom7"]        = data.custom7
-        convertedData["Custom8"]        = data.custom8
-        convertedData["Custom9"]        = data.custom9
-        convertedData["Custom10"]       = data.custom10
+        convertedData["custom1"]        = data.custom1
+        convertedData["custom2"]        = data.custom2
+        convertedData["custom3"]        = data.custom3
+        convertedData["custom4"]        = data.custom4
+        convertedData["custom5"]        = data.custom5
+        convertedData["custom6"]        = data.custom6
+        convertedData["custom7"]        = data.custom7
+        convertedData["custom8"]        = data.custom8
+        convertedData["custom9"]        = data.custom9
+        convertedData["custom10"]       = data.custom10
         
-        convertedData["Description"]    = data.Description
-        convertedData["Subject"]        = data.Subject
+        convertedData["description"]    = data.paymentDescription
+        convertedData["subject"]        = data.paymentSubject
         
         
         guard let jsonData = try? JSONSerialization.data(withJSONObject: convertedData) else {
@@ -499,7 +488,6 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
                 debugPrint("Error: \(error.localizedDescription) - endpoint response")
                 let responseData: [String: Any] = [
                     "transactionId": self.transactionID,
-                    "paymentId": self.paymentID,
                     "isSuccess": false,
                     "token": "",
                     "returnCode": 400,
@@ -522,37 +510,24 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
                // Convert JSON data to a dictionary
             if let paymentDictionary = try JSONSerialization.jsonObject(with: jsonData, options: []) as? [String: Any] {
               if let paymentData = PaymentData(data: paymentDictionary) {
-                  getPaymentID(authorizationHeader: paymentData.authorizationHeader, data: paymentData, createPaymentApi: paymentData.createPaymentLinkEndPoint, returnURL: paymentData.returnUrl) { result in
-                      if let result = result {
-                        let paymentID = result["paymentID"] as? String ?? ""
-                        
-                        if(paymentID.count == 0){
-                            debugPrint("new payment request failed!")
+                    self.startPayment(data: paymentData, authorizationHeader: paymentData.authorizationHeader) { success in
+                        if success {} else {
+                            let responseData: [String: Any] = [
+                                "transactionId": self.transactionID,
+                                "isSuccess": false,
+                                "token": "",
+                                "returnCode": 400,
+                                "errorMessage": "Payment failed!"
+                            ]
+                            
+                            self.sendEvent(withName: "applepay_response", body: responseData)
                             return
                         }
-                        
-                        self.startPayment(data: paymentData, paymentID: paymentID) { success in
-                            if success {} else {
-                                let responseData: [String: Any] = [
-                                    "transactionId": self.transactionID,
-                                    "paymentId": self.paymentID,
-                                    "isSuccess": false,
-                                    "token": "",
-                                    "returnCode": 400,
-                                    "errorMessage": "Payment failed!"
-                                ]
-                                
-                                self.sendEvent(withName: "applepay_response", body: responseData)
-                                return
-                            }
-                        }
-                      }
                     }
               } else {
                 debugPrint("Unable to convert jsonData(cross-platform passed data) to paymentDictionary")
                 let responseData: [String: Any] = [
                     "transactionId": self.transactionID,
-                    "paymentId": self.paymentID,
                     "isSuccess": false,
                     "token": "",
                     "returnCode": 400,
@@ -566,7 +541,6 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
               debugPrint("Error: Unable to convert JSON string to data")
               let responseData: [String: Any] = [
                   "transactionId": self.transactionID,
-                  "paymentId": self.paymentID,
                   "isSuccess": false,
                   "token": "",
                   "returnCode": 400,
@@ -579,7 +553,6 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
               debugPrint("Error: \(error)")
               let responseData: [String: Any] = [
                   "transactionId": self.transactionID,
-                  "paymentId": self.paymentID,
                   "isSuccess": false,
                   "token": "",
                   "returnCode": 400,
@@ -606,11 +579,14 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
       //  }
     }
 
-    func startPayment(data: PaymentData, paymentID: String, completion: @escaping PaymentCompletionHandler) {
+    func startPayment(data: PaymentData, authorizationHeader: String, completion: @escaping PaymentCompletionHandler) {
         
-        completionHandler = completion
-        self.paymentID = paymentID
+        completionHandler             = completion
+        self.transactionID            = data.transactionId
+        self.authorizationHeaderValue = authorizationHeader
+        self.paymentData              = data
 
+        // self.paymentID = paymentID
       
         var paymentSummaryItems = [PKPaymentSummaryItem]()
 
@@ -663,19 +639,18 @@ class SkipcashReactnative: RCTEventEmitter, ApplePayReponseDelegate {
               if let paymentDictionary = try JSONSerialization.jsonObject(with: jsonData, options: []) as? [String: Any] {
                   if let paymentData = PaymentData(data: paymentDictionary) {
                       self.getPaymentID(authorizationHeader: paymentData.authorizationHeader, data: paymentData, createPaymentApi: paymentData.createPaymentLinkEndPoint, returnURL: paymentData.returnUrl) { result in
-                          if let result = result {
-                              let paymentID        = result["paymentID"] as? String ?? ""
-                              let payUrl           = result["payUrl"] as? String ?? ""
-                              let transactionID    = result["transactionId"] as? String ?? ""
-                              
-                              if(paymentID.count == 0){
-                                  debugPrint("new payment request failed!")
-                                  return
-                              }
-                              
-                              self.showPaymentModal(url: payUrl, paymentTitle: paymentData.paymentModalTitle, returnURL: paymentData.returnUrl, paymentId: paymentID, transactionId: transactionID)
-                              
-                          }  
+                        if let result = result {
+                            let paymentID        = result["paymentID"] as? String ?? ""
+                            let payUrl           = result["payUrl"] as? String ?? ""
+                            let transactionID    = result["transactionId"] as? String ?? ""
+                            
+                            if(paymentID.count == 0){
+                                debugPrint("new payment request failed!")
+                                return
+                            }
+                            
+                            self.showPaymentModal(url: payUrl, paymentTitle: paymentData.paymentModalTitle, returnURL: paymentData.returnUrl, paymentId: paymentID, transactionId: transactionID)
+                        }
                       } 
                   } else {
                     debugPrint("Unable to convert jsonData(cross-platform passed data) to paymentDictionary")
@@ -759,20 +734,22 @@ extension SkipcashReactnative: PKPaymentAuthorizationControllerDelegate {
         return
     }
 
+    paymentData?.token = token
+    self.callApplePay(paymentData: self.paymentData!, applePaymentToken: token, completion: completion)
     //
-    let vc = SetupVC()
-
-    vc.modalPresentationStyle = .overCurrentContext
-    vc.delegate               = self
-    vc.transactionID          = self.transactionID
-    vc.paymentID              = self.paymentID
-    vc.completion             = completion
-    vc.paymentToken           = token
-
-    if let topViewController = UIApplication.shared.keyWindow?.rootViewController?.topMostViewController() {
-        topViewController.modalPresentationStyle = .overCurrentContext
-        topViewController.present(vc, animated: true, completion: nil)
-    }
+    // let vc = SetupVC()
+
+    // vc.modalPresentationStyle = .overCurrentContext
+    // vc.delegate               = self
+    // vc.transactionID          = self.transactionID
+    // vc.paymentID              = self.paymentID
+    // vc.completion             = completion
+    // vc.paymentToken           = token
+
+    // if let topViewController = UIApplication.shared.keyWindow?.rootViewController?.topMostViewController() {
+    //     topViewController.modalPresentationStyle = .overCurrentContext
+    //     topViewController.present(vc, animated: true, completion: nil)
+    // }
   }
 
   public func paymentAuthorizationControllerDidFinish(_ controller: PKPaymentAuthorizationController) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skipcash-reactnative",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "integrate skipcash in react native app.",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",