Network Layer and Models Refactoring (v5)

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
  lint:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Run linting
  uses: norio-nomura/[email protected]
  with:
@@ -21,7 +21,7 @@ jobs:
  env:
  BUILD_WRAPPER_OUT_DIR: buildwrapper # Directory where build-wrapper output will be placed
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - name: Run xcodebuild with tests
  run: xcodebuild -project dev.xcodeproj/ -scheme OmiseSDK -derivedDataPath Build/ -destination 'platform=iOS Simulator,name=iPhone 11,OS=16.2' -enableCodeCoverage YES clean build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
@@ -33,7 +33,7 @@ jobs:
  run: xattr -w com.apple.xcode.CreatedByBuildSystem true ./build
 
  - name: Upload coverage report
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  with:
  path: sonarqube-generic-coverage.xml
  retention-days: 5 # Artifact will be available only for 5 days.
@@ -51,7 +51,7 @@ jobs:
  needs: test
  steps:
  - name: Checkout repository on branch
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  ref: ${{ github.HEAD_REF }}
  fetch-depth: 0

ExampleApp.xcodeproj/project.pbxproj

@@ -453,7 +453,7 @@
  isa = XCRemoteSwiftPackageReference;
  repositoryURL = "https://github.com/omise/omise-ios.git";
  requirement = {
- branch = feature/v5.0.0_improvements;
+ branch = feature/v5.0.1_improvements;
  kind = branch;
  };
  };

ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,8 +5,8 @@
  "kind" : "remoteSourceControl",
  "location" : "https://github.com/omise/omise-ios.git",
  "state" : {
- "branch" : "feature/v5.0.0_improvements",
- "revision" : "6ff5a91c43fb163949ffc0369eb4a471fe0edba6"
+ "branch" : "feature/v5.0.1_improvements",
+ "revision" : "4d54f2187b9a7c9261563cb9b1acfe830fc5aab0"
  }
  }
  ],

ExampleApp/Models/Tools.swift

@@ -4,7 +4,7 @@ import OmiseSDK
 struct PaymentPreset {
  var paymentAmount: Int64
  var paymentCurrency: Currency
- var allowedPaymentMethods: [SourceTypeValue]
+ var allowedPaymentMethods: [SourceType]
 
  static let thailandPreset = PaymentPreset(
  paymentAmount: 5_000_00,
@@ -35,19 +35,19 @@ class Tool: NSObject {
 
  static let thailandPaymentAmount: Int64 = PaymentPreset.thailandPreset.paymentAmount
  static let thailandPaymentCurrency: String = PaymentPreset.thailandPreset.paymentCurrency.code
- static let thailandAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.thailandPreset.allowedPaymentMethods
+ static let thailandAllowedPaymentMethods: [SourceType] = PaymentPreset.thailandPreset.allowedPaymentMethods
 
  static let japanPaymentAmount: Int64 = PaymentPreset.japanPreset.paymentAmount
  static let japanPaymentCurrency: String = PaymentPreset.japanPreset.paymentCurrency.code
- static let japanAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.japanPreset.allowedPaymentMethods
+ static let japanAllowedPaymentMethods: [SourceType] = PaymentPreset.japanPreset.allowedPaymentMethods
 
  static let singaporePaymentAmount: Int64 = PaymentPreset.singaporePreset.paymentAmount
  static let singaporePaymentCurrency: String = PaymentPreset.singaporePreset.paymentCurrency.code
- static let singaporeAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.singaporePreset.allowedPaymentMethods
+ static let singaporeAllowedPaymentMethods: [SourceType] = PaymentPreset.singaporePreset.allowedPaymentMethods
 
  static let malaysiaPaymentAmount: Int64 = PaymentPreset.malaysiaPreset.paymentAmount
  static let malaysiaPaymentCurrency: String = PaymentPreset.malaysiaPreset.paymentCurrency.code
- static let malaysiaAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.malaysiaPreset.allowedPaymentMethods
+ static let malaysiaAllowedPaymentMethods: [SourceType] = PaymentPreset.malaysiaPreset.allowedPaymentMethods
 
  static func imageWith(size: CGSize, color: UIColor) -> UIImage? {
  return Tool.imageWith(size: size) { (context) in

ExampleApp/Views/BaseViewController.swift

@@ -22,7 +22,7 @@ class BaseViewController: UIViewController {
  var paymentAmount: Int64 = 0
  var paymentCurrencyCode: String = ""
  var usesCapabilityDataForPaymentMethods = false
- var allowedPaymentMethods: [SourceTypeValue] = []
+ var allowedPaymentMethods: [SourceType] = []
 
  required init?(coder: NSCoder) {
  self.usesCapabilityDataForPaymentMethods = true

ExampleApp/Views/CustomCreditCardFormViewController.swift

@@ -158,25 +158,29 @@ class CustomCreditCardFormViewController: UIViewController {
  @IBAction private func proceed(_ sender: UIBarButtonItem) {
  guard let name = cardNameField.text, cardNumberField.isValid,
  let expiryMonth = cardExpiryField.selectedMonth, let expiryYear = cardExpiryField.selectedYear,
- let cvv = cardCVVField.text else {
+ let cvv = cardCVVField.text, let number = cardNumberField.text else {
  return
  }
- let tokenRequest = Request<Token>(
+
+ let payload = CreateTokenPayload.Card(
  name: name,
- pan: cardNumberField.pan,
+ number: number,
  expirationMonth: expiryMonth,
  expirationYear: expiryYear,
  securityCode: cvv,
- countryCode: countryCodeField.text ?? "",
- city: cityField.text ?? "",
- state: stateField.text ?? "",
- street1: street1Field.text ?? "",
- street2: street2Field.text ?? "",
- postalCode: postalCodeField.text ?? ""
+ phoneNumber: nil,
+ address: PaymentInformation.Address(
+ countryCode: countryCodeField.text ?? "",
+ city: cityField.text ?? "",
+ state: stateField.text ?? "",
+ street1: street1Field.text ?? "",
+ street2: street2Field.text ?? "",
+ postalCode: postalCodeField.text ?? ""
+ )
  )
 
  doneButton.isEnabled = false
- omiseClient.send(tokenRequest) { [weak self] (result) in
+ omiseClient.createToken(payload: payload) { [weak self] (result) in
  guard let self = self else { return }
  self.doneButton.isEnabled = false
  switch result {

ExampleApp/Views/PaymentSettingTableViewController.swift

@@ -54,7 +54,7 @@ class PaymentSettingTableViewController: UITableViewController {
  }
  }
 
- var allowedPaymentMethods: Set<SourceTypeValue> = [] {
+ var allowedPaymentMethods: Set<SourceType> = [] {
  willSet {
  guard isViewLoaded else {
  return
@@ -122,6 +122,7 @@ class PaymentSettingTableViewController: UITableViewController {
  @IBOutlet private var grabPayPaymentCell: UITableViewCell!
  @IBOutlet private var boostPaymentCell: UITableViewCell!
  @IBOutlet private var shopeePayPaymentCell: UITableViewCell!
+ @IBOutlet private var shopeePayJumpAppPaymentCell: UITableViewCell!
  @IBOutlet private var maybankQRPayPaymentCell: UITableViewCell!
  @IBOutlet private var duitNowQRPaymentCell: UITableViewCell!
  @IBOutlet private var duitNowOBWPaymentCell: UITableViewCell!
@@ -264,7 +265,7 @@ extension PaymentSettingTableViewController {
  }
 
  // swiftlint:disable:next function_body_length
- func paymentSource(for cell: UITableViewCell) -> SourceTypeValue? {
+ func paymentSource(for cell: UITableViewCell) -> SourceType? {
  switch cell {
  case internetBankingBAYPaymentCell:
  return .internetBankingBAY
@@ -325,7 +326,7 @@ extension PaymentSettingTableViewController {
  case paynowPaymentCell:
  return .payNow
  case truemoneyPaymentCell:
- return .trueMoney
+ return .trueMoneyWallet
  case truemoneyJumpAppPaymentCell:
  return .trueMoneyJumpApp
  case pointsCitiCell:
@@ -335,13 +336,15 @@ extension PaymentSettingTableViewController {
  case rabbitLinepayCell:
  return .rabbitLinepay
  case OCBCDigitalPaymentCell:
- return .mobileBankingOCBC
+ return .ocbcDigital
  case grabPayPaymentCell:
  return .grabPay
  case boostPaymentCell:
  return .boost
  case shopeePayPaymentCell:
  return .shopeePay
+ case shopeePayJumpAppPaymentCell:
+ return .shopeePayJumpApp
  case maybankQRPayPaymentCell:
  return .maybankQRPay
  case duitNowQRPaymentCell:
@@ -356,7 +359,7 @@ extension PaymentSettingTableViewController {
  }
 
  // swiftlint:disable:next function_body_length
- func cell(for paymentSource: SourceTypeValue) -> UITableViewCell? {
+ func cell(for paymentSource: SourceType) -> UITableViewCell? {
  switch paymentSource {
  case .internetBankingBAY:
  return internetBankingBAYPaymentCell
@@ -400,7 +403,7 @@ extension PaymentSettingTableViewController {
  return installmentUOBPaymentCell
  case .mobileBankingSCB:
  return mobileBankingSCBPaymentCell
- case .mobileBankingOCBC:
+ case .ocbcDigital:
  return OCBCDigitalPaymentCell
  case .mobileBankingKBank:
  return mobileBankingKBankPaymentCell
@@ -418,7 +421,7 @@ extension PaymentSettingTableViewController {
  return paynowPaymentCell
  case .payPay:
  return payPayPaymentCell
- case .trueMoney:
+ case .trueMoneyWallet:
  return truemoneyPaymentCell
  case .trueMoneyJumpApp:
  return truemoneyJumpAppPaymentCell
@@ -434,6 +437,8 @@ extension PaymentSettingTableViewController {
  return boostPaymentCell
  case .shopeePay:
  return shopeePayPaymentCell
+ case .shopeePayJumpApp:
+ return shopeePayJumpAppPaymentCell
  case .maybankQRPay:
  return maybankQRPayPaymentCell
  case .duitNowQR:

ExampleApp/Views/ProductDetailViewController.swift

@@ -13,11 +13,11 @@ class ProductDetailViewController: BaseViewController {
 
  private func setupClient() {
  // Setup dev environment for staging
- Configuration.setDefault(Configuration(environment: LocalConfig.default.env))
+ Configuration.setShared(Configuration(environment: LocalConfig.default.env))
 
  let client = Client(publicKey: publicKey)
 
- client.capabilityDataWithCompletionHandler { (result) in
+ client.capability { (result) in
  if case .success(let capability) = result {
  self.capability = capability
  print("Capability Country: \(capability.countryCode)")

OmiseSDK/AtomeFormViewModel.swift

@@ -22,16 +22,16 @@ class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtoc
  ]
 
  // MARK: CountryListViewModelProtocol
- lazy var countries: [CountryInfo] = CountryInfo.sortedAll
+ lazy var countries: [Country] = Country.sortedAll
 
- lazy var selectedCountry: CountryInfo? = CountryInfo.default {
+ lazy var selectedCountry: Country? = OmiseSDK.shared.country {
  didSet {
  if let selectedCountry = selectedCountry {
  onSelectCountry(selectedCountry)
  }
  }
  }
- var onSelectCountry: (CountryInfo) -> Void = { _ in }
+ var onSelectCountry: (Country) -> Void = { _ in }
 
  var countryListViewModel: CountryListViewModelProtocol { return self }
 
@@ -79,17 +79,17 @@ class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtoc
  onComplete()
  return
  }
-
- let shippingAddress: PaymentInformation.Atome.ShippingAddress =
- .init(country: viewContext[.country],
-  city: viewContext[.city],
-  postalCode: viewContext[.postalCode],
-  state: viewContext[.state],
-  street1: viewContext[.street1],
-  street2: viewContext[.street2])
-
- let items: [PaymentInformation.Atome.Item] = [
- .init(
+ let shippingAddress = PaymentInformation.Address(
+  countryCode: viewContext[.country],
+ city: viewContext[.city],
+ state: viewContext[.state],
+ street1: viewContext[.street1],
+ street2: viewContext[.street2],
+ postalCode: viewContext[.postalCode]
+ )
+
+ let items: [PaymentInformation.Item] = [
+ PaymentInformation.Item(
  sku: "3427842",
  category: "Shoes",
  name: "Prada shoes",
@@ -101,15 +101,17 @@ class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtoc
  )
  ]
 
- let atomeData = PaymentInformation.Atome(phoneNumber: viewContext[.phoneNumber],
- name: viewContext[.name],
- email: viewContext[.email],
- shippingAddress: shippingAddress,
- items: items)
+ let paymentInformation = PaymentInformation.atome(
+ PaymentInformation.Atome(
+ phoneNumber: viewContext[.phoneNumber],
+ shipping: shippingAddress,
+ billing: nil,
+ items: items
+ )
+ )
 
- flowSession.requestCreateSource(.atome(atomeData)) { _ in
+ flowSession.requestCreateSource(paymentInformation) { _ in
  onComplete()
  }
-
  }
 }