[V7] Add Encodable protocol for PayPal Vault
#1492
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -44,6 +44,9 @@ public enum BTPayPalError: Error, CustomNSError, LocalizedError, Equatable { | |||||
|
|
||||||
| /// 13. Missing PayPal Request | ||||||
| case missingPayPalRequest | ||||||
|
|
||||||
| /// 14. Unable to create Encodable | ||||||
| case failedToCreateEncodable | ||||||
|
|
||||||
| public static var errorDomain: String { | ||||||
| "com.braintreepayments.BTPayPalErrorDomain" | ||||||
|
|
@@ -79,6 +82,8 @@ public enum BTPayPalError: Error, CustomNSError, LocalizedError, Equatable { | |||||
| return 12 | ||||||
| case .missingPayPalRequest: | ||||||
| return 13 | ||||||
| case .failedToCreateEncodable: | ||||||
| return 14 | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -114,6 +119,8 @@ public enum BTPayPalError: Error, CustomNSError, LocalizedError, Equatable { | |||||
| return "Missing BA Token for PayPal App Switch." | ||||||
| case .missingPayPalRequest: | ||||||
| return "The PayPal Request was missing or invalid." | ||||||
| case .failedToCreateEncodable: | ||||||
| return "Unable to create Encodable object" | ||||||
|
There was a problem hiding this comment. This may make it a bit more clear, but take it or leave it:
Suggested change
|
||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ struct PayPalCheckoutPOSTBody: Encodable { | |
| private let userPhoneNumber: BTPayPalPhoneNumber? | ||
| private let returnURL: String | ||
| private let cancelURL: String | ||
| private let experienceProfile: PayPalExperienceProfile | ||
|
|
||
| private var billingAgreementDescription: BillingAgreemeentDescription? | ||
| private var currencyCode: String? | ||
|
|
@@ -84,7 +84,7 @@ struct PayPalCheckoutPOSTBody: Encodable { | |
| self.userPhoneNumber = payPalRequest.userPhoneNumber | ||
| self.returnURL = BTCoreConstants.callbackURLScheme + "://\(BTPayPalRequest.callbackURLHostAndPath)success" | ||
| self.cancelURL = BTCoreConstants.callbackURLScheme + "://\(BTPayPalRequest.callbackURLHostAndPath)cancel" | ||
| self.experienceProfile = PayPalExperienceProfile(payPalRequest: payPalRequest, configuration: configuration) | ||
| } | ||
|
|
||
| enum CodingKeys: String, CodingKey { | ||
|
|
@@ -128,48 +128,4 @@ extension PayPalCheckoutPOSTBody { | |
| self.description = description | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import Foundation | ||
|
|
||
| #if canImport(BraintreeCore) | ||
| import BraintreeCore | ||
| #endif | ||
|
|
||
| struct PayPalExperienceProfile: Encodable { | ||
|
|
||
| // MARK: - Private Properties | ||
|
|
||
| private let displayName: String? | ||
| private let isShippingAddressRequired: Bool | ||
| private let shippingAddressOverride: Bool | ||
|
|
||
| private var landingPageType: String? | ||
| private var localeCode: String? | ||
| private var userAction: String? | ||
|
|
||
| // MARK: - Initializer | ||
|
|
||
| init(payPalRequest: BTPayPalCheckoutRequest, configuration: BTConfiguration) { | ||
| self.displayName = payPalRequest.displayName != nil ? payPalRequest.displayName : configuration.displayName | ||
| self.isShippingAddressRequired = !payPalRequest.isShippingAddressRequired | ||
|
|
||
| if let landingPageType = payPalRequest.landingPageType?.stringValue { | ||
| self.landingPageType = landingPageType | ||
| } | ||
|
|
||
| if let localeCode = payPalRequest.localeCode?.stringValue { | ||
| self.localeCode = localeCode | ||
| } | ||
|
|
||
| self.shippingAddressOverride = payPalRequest.shippingAddressOverride != nil ? !payPalRequest.isShippingAddressEditable : false | ||
|
|
||
| if payPalRequest.userAction != .none { | ||
| self.userAction = payPalRequest.userAction.stringValue | ||
| } | ||
| } | ||
|
|
||
| init(payPalRequest: BTPayPalVaultRequest, configuration: BTConfiguration) { | ||
| self.displayName = payPalRequest.displayName != nil ? payPalRequest.displayName : configuration.displayName | ||
| self.isShippingAddressRequired = !payPalRequest.isShippingAddressRequired | ||
|
|
||
| if let landingPageType = payPalRequest.landingPageType?.stringValue { | ||
| self.landingPageType = landingPageType | ||
| } | ||
|
|
||
| if let localeCode = payPalRequest.localeCode?.stringValue { | ||
| self.localeCode = localeCode | ||
| } | ||
|
|
||
| self.shippingAddressOverride = payPalRequest.shippingAddressOverride != nil ? !payPalRequest.isShippingAddressEditable : false | ||
| } | ||
|
|
||
| enum CodingKeys: String, CodingKey { | ||
| case isShippingAddressRequired = "no_shipping" | ||
| case displayName = "brand_name" | ||
| case landingPageType = "landing_page_type" | ||
| case localeCode = "locale_code" | ||
| case shippingAddressOverride = "address_override" | ||
| case userAction = "user_action" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| import Foundation | ||
| import UIKit | ||
|
|
||
| #if canImport(BraintreeCore) | ||
| import BraintreeCore | ||
| #endif | ||
|
|
||
| /// The POST body for v1/paypal_hermes/setup_billing_agreement | ||
| struct PayPalVaultPOSTBody: Encodable { | ||
|
|
||
| // MARK: - Private Properties | ||
|
|
||
| private let userPhoneNumber: BTPayPalPhoneNumber? | ||
| private let returnURL: String | ||
| private let cancelURL: String | ||
| private let experienceProfile: PayPalExperienceProfile | ||
|
|
||
| private var billingAgreementDescription: String? | ||
| private var enablePayPalAppSwitch: Bool? | ||
| private var lineItems: [BTPayPalLineItem]? | ||
| private var merchantAccountID: String? | ||
| private var offerCredit = false | ||
| private var osType: String? | ||
| private var osVersion: String? | ||
| private var recurringBillingPlanType: BTPayPalRecurringBillingPlanType? | ||
| private var recurringBillingDetails: BTPayPalRecurringBillingDetails? | ||
| private var riskCorrelationID: String? | ||
| private var shippingAddressOverride: BTPostalAddress? | ||
| private var universalLink: String? | ||
| private var userAuthenticationEmail: String? | ||
|
|
||
| // MARK: - Initializer | ||
|
|
||
| init( | ||
| payPalRequest: BTPayPalVaultRequest, | ||
| configuration: BTConfiguration, | ||
| isPayPalAppInstalled: Bool, | ||
| universalLink: URL? | ||
| ) { | ||
| if let merchantAccountID = payPalRequest.merchantAccountID { | ||
| self.merchantAccountID = merchantAccountID | ||
| } | ||
|
|
||
| if let riskCorrelationID = payPalRequest.riskCorrelationID { | ||
| self.riskCorrelationID = riskCorrelationID | ||
| } | ||
|
|
||
| if let lineItems = payPalRequest.lineItems, !lineItems.isEmpty { | ||
| self.lineItems = lineItems | ||
| } | ||
|
|
||
| if let userAuthenticationEmail = payPalRequest.userAuthenticationEmail, !userAuthenticationEmail.isEmpty { | ||
| self.userAuthenticationEmail = userAuthenticationEmail | ||
| } | ||
|
|
||
| self.userPhoneNumber = payPalRequest.userPhoneNumber | ||
| self.returnURL = BTCoreConstants.callbackURLScheme + "://\(BTPayPalRequest.callbackURLHostAndPath)success" | ||
| self.cancelURL = BTCoreConstants.callbackURLScheme + "://\(BTPayPalRequest.callbackURLHostAndPath)cancel" | ||
| self.experienceProfile = PayPalExperienceProfile(payPalRequest: payPalRequest, configuration: configuration) | ||
|
|
||
| if let universalLink, payPalRequest.enablePayPalAppSwitch, isPayPalAppInstalled { | ||
| self.enablePayPalAppSwitch = payPalRequest.enablePayPalAppSwitch | ||
| self.osType = UIDevice.current.systemName | ||
| self.osVersion = UIDevice.current.systemVersion | ||
| self.universalLink = universalLink.absoluteString | ||
| return | ||
| } | ||
|
|
||
| if let recurringBillingPlanType = payPalRequest.recurringBillingPlanType { | ||
| self.recurringBillingPlanType = recurringBillingPlanType | ||
| } | ||
|
|
||
| if let recurringBillingDetails = payPalRequest.recurringBillingDetails { | ||
| self.recurringBillingDetails = recurringBillingDetails | ||
| } | ||
|
|
||
| self.offerCredit = payPalRequest.offerCredit | ||
|
|
||
| if let billingAgreementDescription = payPalRequest.billingAgreementDescription { | ||
| self.billingAgreementDescription = billingAgreementDescription | ||
| } | ||
|
|
||
| if let shippingAddressOverride = payPalRequest.shippingAddressOverride { | ||
| self.shippingAddressOverride = shippingAddressOverride | ||
| } | ||
| } | ||
|
|
||
| enum CodingKeys: String, CodingKey { | ||
| case billingAgreementDescription = "description" | ||
| case cancelURL = "cancel_url" | ||
| case enablePayPalAppSwitch = "launch_paypal_app" | ||
| case experienceProfile = "experience_profile" | ||
| case lineItems = "line_items" | ||
| case merchantAccountID = "merchant_account_id" | ||
| case offerCredit = "offer_paypal_credit" | ||
| case osType = "os_type" | ||
| case osVersion = "os_version" | ||
| case recurringBillingDetails = "plan_metadata" | ||
| case recurringBillingPlanType = "plan_type" | ||
| case returnURL = "return_url" | ||
| case riskCorrelationID = "correlation_id" | ||
| case shippingAddressOverride = "shipping_address" | ||
| case universalLink = "merchant_app_return_url" | ||
| case userAuthenticationEmail = "payer_email" | ||
| case userPhoneNumber = "phone_number" | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can also remove
let json = configuration.jsonabove on line 346