This update contains bug fixes and improvements

Author: texyz

Example/FlutterwaveSDK.xcodeproj/project.pbxproj

@@ -532,7 +532,7 @@
 				INFOPLIST_FILE = FlutterwaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.6;
+				MARKETING_VERSION = 1.3.8;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.demo.paypal.flutterwave;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -555,7 +555,7 @@
 				INFOPLIST_FILE = FlutterwaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.6;
+				MARKETING_VERSION = 1.3.8;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.demo.paypal.flutterwave;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Example/FlutterwaveSDK/ViewController.swift

@@ -56,6 +56,7 @@ class ViewController: UIViewController, FlutterwavePayProtocol {
                    self.present(nav, animated: true)
 
                }
+    
 
 
 

FlutterwaveSDK.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'FlutterwaveSDK'
-    s.version          = '1.3.7'
+    s.version          = '1.3.8'
     s.summary          = 'FlutterwaveSDK'
 
     # This description is used to generate tags and improve search results.

FlutterwaveSDK/Classes/App/RaveAccountClient.swift

@@ -164,9 +164,9 @@ class FlutterwaveAccountClient {
             if let narrate = FlutterwaveConfig.sharedConfig().narration{
                 param.merge(["narration":narrate])
             }
-            if let meta = FlutterwaveConfig.sharedConfig().meta{
-                param.merge(["meta":meta])
-            }
+//            if let meta = FlutterwaveConfig.sharedConfig().meta{
+//                param.merge(["meta":meta])
+//            }
             if isUSBankAccount{
                 param.merge(["is_us_bank_charge" : "\(isUSBankAccount)"])
             }

FlutterwaveSDK/Classes/App/RaveCardClient.swift

@@ -192,7 +192,7 @@ class FlutterwaveCardClient{
                 "currency": FlutterwaveConfig.sharedConfig().currencyCode,
                 "country":country,
                 "payment_plan":FlutterwaveConfig.sharedConfig().paymentPlan ?? 0,
-                //                                      "IP": getIFAddresses().first!,
+                "IP": getIFAddresses().first!,
                 "tx_ref": FlutterwaveConfig.sharedConfig().transcationRef!,
                 "device_fingerprint": (UIDevice.current.identifierForVendor?.uuidString)!]
             if let narrate = FlutterwaveConfig.sharedConfig().narration{
@@ -248,7 +248,7 @@ class FlutterwaveCardClient{
 
 
             let jsonString  = bodyParam?.jsonStringify()
-//                        print("JSON SENT \(jsonString)")
+//            print("JSON SENT \(jsonString)")
             let secret = FlutterwaveConfig.sharedConfig().encryptionKey!
             let data =  TripleDES.encrypt(string: jsonString ?? "", key:secret)
             let base64String = data?.base64EncodedString()
@@ -272,56 +272,7 @@ class FlutterwaveCardClient{
 
     }
 
-    //MARK: Fetch saved card
-//    func fetchSavedCards(){
-//        if let pubkey = FlutterwaveConfig.sharedConfig().publicKey{
-//            if let deviceNumber = FlutterwaveConfig.sharedConfig().phoneNumber {
-//                let param = ["public_key":pubkey, "device_key":deviceNumber]
-//                
-//                FlutterwavePayService.getSavedCards(param, resultCallback: {[weak self] (cardResponse) in
-//                    guard let  strongSelf = self else{ return}
-//                    strongSelf.saveCardSuccess?(cardResponse.cards)
-//                })  {[weak self] (err) in
-//                    guard let  strongSelf = self else{ return}
-//                    strongSelf.saveCardError?(err)
-//                }
-//            }
-//            
-//        }
-//    }
-    //MARK: Transaction Fee
-//    public func removeSavedCard(){
-//        if let pubkey = FlutterwaveConfig.sharedConfig().publicKey{
-//            let param = [
-//                "public_key": pubkey,
-//                "card_hash": savedCardHash!,
-//                "mobile_number": savedCardMobileNumber!]
-//            FlutterwavePayService.removeSavedCard(param, resultCallback: {[weak self] (result) in
-//                guard let strongSelf = self else {return}
-//                strongSelf.removesavedCardSuccess?()
-//                }, errorCallback: {[weak self] (err) in
-//                    guard let strongSelf = self else {return}
-//                    strongSelf.removesavedCardError?(err)
-//            })
-//        }else{
-//            self.removesavedCardError?("Public Key is not specified")
-//        }
-//    }
-    
-    //MARK: Send OTP
-//    func sendOTP(card: SavedCard){
-//        if let pubkey = FlutterwaveConfig.sharedConfig().publicKey{
-//            let param = ["public_key":pubkey,"card_hash":card.cardHash ?? "","device_key":card.mobileNumber ?? ""]
-//            FlutterwavePayService.sendOTP(param, resultCallback: {[weak self] (message) in
-//                guard let  strongSelf = self else{ return}
-//                strongSelf.sendOTPSuccess?(message)
-//            }) {[weak self] (err) in
-//                guard let  strongSelf = self else{ return}
-//                strongSelf.sendOTPError?(err)
-//            }
-//        }
-//    }
-    
+
     func isMasterCard() -> Bool{
         if let cardNumber = self.cardNumber{
             if cardNumber.hasPrefix("5"){

FlutterwaveSDK/Classes/Config/RaveConfig.swift

@@ -30,7 +30,7 @@ public class FlutterwaveConfig {
     public var paymentPlan:Int?
     public var isPreAuth:Bool = false
     public var isPermanent:Bool = true
-    public var meta:[[String:Any]]?
+    public var meta:[[String:String]]?
     public var subAccounts:[SubAccount]?
     public var whiteListedBanksOnly:[String]?
     public var paymentOptionsToExclude:[PaymentOption] = []

FlutterwaveSDK/Classes/Model/ChargeCardModel.swift

@@ -22,8 +22,36 @@ struct ChargeCardResponse:Codable,FlutterChargeResponse {
 
 // MARK: - DataClass
 struct ChargeData:Codable {
+//    let id: Int
+//        let txRef, orderRef, flwRef, redirectURL: String
+//        let deviceFingerprint: String
+//        let settlementToken: JSONNull?
+//        let cycle: String
+//        let amount: Int
+//        let chargedAmount, appfee: Double
+//        let merchantfee, merchantbearsfee: Int
+//        let chargeResponseCode, raveRef, chargeResponseMessage, authModelUsed: String
+//        let currency, ip, narration, status: String
+//        let modalauditid, vbvrespmessage, authurl, vbvrespcode: String
+//        let acctvalrespmsg, acctvalrespcode: JSONNull?
+//        let paymentType: String
+//        let paymentPlan, paymentPage: JSONNull?
+//        let paymentID, fraudStatus, chargeType: String
+//        let isLive: Int
+//        let retryAttempt, getpaidBatchID: JSONNull?
+//        let createdAt, updatedAt: String
+//        let deletedAt: JSONNull?
+//        let customerID, accountID: Int
+//        let chargeToken: ChargeToken
+//        let customercandosubsequentnoauth: Bool
+//        let customer: Customer
+//        let card: Card
+//
+    
     let id: Int?
-    let txRef, flwRef, deviceFingerprint: String?
+    let txRef: String?
+    let flwRef:String?
+    let deviceFingerprint: String?
     let amount, chargedAmount, appFee, merchantFee: Double?
     let processorResponse, authModel, currency, ip: String?
     let narration, status, authURL, paymentType: String?
@@ -54,6 +82,28 @@ struct ChargeData:Codable {
          case accountID = "account_id"
          case customer, card
      }
+    
+//    enum CodingKeys: String, CodingKey {
+//           case id, txRef, orderRef, flwRef
+//           case redirectURL = "redirectUrl"
+//           case deviceFingerprint = "device_fingerprint"
+//           case settlementToken = "settlement_token"
+//           case cycle, amount
+//           case chargedAmount = "charged_amount"
+//           case appfee, merchantfee, merchantbearsfee, chargeResponseCode, raveRef, chargeResponseMessage, authModelUsed, currency
+//           case ip = "IP"
+//           case narration, status, modalauditid, vbvrespmessage, authurl, vbvrespcode, acctvalrespmsg, acctvalrespcode, paymentType, paymentPlan, paymentPage
+//           case paymentID = "paymentId"
+//           case fraudStatus = "fraud_status"
+//           case chargeType = "charge_type"
+//           case isLive = "is_live"
+//           case retryAttempt = "retry_attempt"
+//           case getpaidBatchID = "getpaidBatchId"
+//           case createdAt, updatedAt, deletedAt
+//           case customerID = "customerId"
+//           case accountID = "AccountId"
+//           case chargeToken, customercandosubsequentnoauth, customer, card
+//       }
 }
 
 // MARK: - Card
@@ -68,6 +118,16 @@ public struct CardData:Codable {
        }
 }
 
+// MARK: - ChargeToken
+struct ChargeToken: Codable {
+    let userToken, embedToken: String
+
+    enum CodingKeys: String, CodingKey {
+        case userToken = "user_token"
+        case embedToken = "embed_token"
+    }
+}
+
 // MARK: - Customer
 public struct Customer:Codable {
     let id: Int?

FlutterwaveSDK/Classes/Utils/RaveConstants.swift

@@ -25,7 +25,7 @@ class RaveConstants: NSObject {
 
     }
 
-    static let flutterWaveVersion = "1.3.7"
+    static let flutterWaveVersion = "1.3.8"
     static let flutterColor = UIColor(hex: "#F5A623")
 
     static let bankStyle = [(code:"044",color:"#143f89",image:"rave_access2"),

FlutterwaveSDK/Classes/ViewModel/PaymentServicesViewModel.swift

@@ -36,8 +36,10 @@ class PaymentServicesViewModel: BaseViewModel{
 
 
     func chargeCard(client: String) {
+//        print("This logged\(client)")
         let request = ChargeCardRequest(client: client)
         makeAPICallRx(request: request, apiRequest: paymentServicesRepository.chargeCard(request:), successHandler: chargeCardResponse,onSuccessOperation: {response in
+//            print("Logging new response\(response)")
             let authMode = response.meta?.authorization?.mode ?? ""
             switch authMode{
             case "pin":