make changes to launch pp app for checkout flow

braintree · Jan 17, 2025 · 67e0b5d · 67e0b5d
1 parent daaebca
commit 67e0b5d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/Sources/BraintreePayPal/BTPayPalClient.swift b/Sources/BraintreePayPal/BTPayPalClient.swift
@@ -366,12 +366,14 @@ import BraintreeDataCollector
 
                 switch approvalURL.redirectType {
                 case .payPalApp(let url):
-                    guard let baToken = approvalURL.baToken else {
-                        self.notifyFailure(with: BTPayPalError.missingBAToken, completion: completion)
+                    guard let token = approvalURL.baToken ?? approvalURL.ecToken else {
+                        self.notifyFailure(
+                            with: self.isVaultRequest ? BTPayPalError.missingBAToken : BTPayPalError.missingECToken,
+                            completion: completion
+                        )
                         return
                     }
-
-                    self.launchPayPalApp(with: url, baToken: baToken, completion: completion)
+                    self.launchPayPalApp(with: url, token: token, completion: completion)
                 case .webBrowser(let url):
                     self.handlePayPalRequest(with: url, paymentType: request.paymentType, completion: completion)
                 }
@@ -381,7 +383,7 @@ import BraintreeDataCollector
 
     private func launchPayPalApp(
         with payPalAppRedirectURL: URL,
-        baToken: String,
+        token: String? = nil,
         completion: @escaping (BTPayPalAccountNonce?, Error?) -> Void
     ) {
         apiClient.sendAnalyticsEvent(
@@ -393,7 +395,7 @@ import BraintreeDataCollector
 
         var urlComponents = URLComponents(url: payPalAppRedirectURL, resolvingAgainstBaseURL: true)
         urlComponents?.queryItems = [
-            URLQueryItem(name: "ba_token", value: baToken),
+            URLQueryItem(name: isVaultRequest ? "ba_token" : "token", value: token),
             URLQueryItem(name: "source", value: "braintree_sdk"),
             URLQueryItem(name: "switch_initiated_time", value: String(Int(round(Date().timeIntervalSince1970 * 1000))))
         ]

diff --git a/Sources/BraintreePayPal/BTPayPalError.swift b/Sources/BraintreePayPal/BTPayPalError.swift
@@ -41,6 +41,9 @@ public enum BTPayPalError: Error, CustomNSError, LocalizedError, Equatable {
 
     /// 12. Missing BA Token for App Switch
     case missingBAToken
+
+    /// 13. Missing EC Token for App Switch
+    case missingECToken
 
     /// 13. Missing PayPal Request
     case missingPayPalRequest
@@ -77,8 +80,10 @@ public enum BTPayPalError: Error, CustomNSError, LocalizedError, Equatable {
             return 11
         case .missingBAToken:
             return 12
-        case .missingPayPalRequest:
+        case .missingECToken:
             return 13
+        case .missingPayPalRequest:
+            return 14
         }
     }
 
@@ -112,6 +117,8 @@ public enum BTPayPalError: Error, CustomNSError, LocalizedError, Equatable {
             return "UIApplication failed to perform app switch to PayPal."
         case .missingBAToken:
             return "Missing BA Token for PayPal App Switch."
+        case .missingECToken:
+            return "Missing EC Token for PayPal App Switch."
         case .missingPayPalRequest:
             return "The PayPal Request was missing or invalid."
         }