Merge branch 'main' into replicate-main-analytics-issue

Braintree.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Braintree"
-  s.version          = "6.23.0"
+  s.version          = "6.23.1"
   s.summary          = "Braintree iOS SDK: Helps you accept card and alternative payments in your iOS app."
   s.description      = <<-DESC
                        Braintree is a full-stack payments platform for developers

Demo/Application/Supporting Files/Braintree-Demo-Info.plist

@@ -41,7 +41,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.23.0</string>
+	<string>6.23.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -56,7 +56,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6.23.0</string>
+	<string>6.23.1</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>com.braintreepayments.Demo.payments</string>

Sources/BraintreeCore/BTAPIClient.swift

@@ -394,7 +394,12 @@ import Foundation
     // MARK: BTAPITimingDelegate conformance
 
     func fetchAPITiming(path: String, connectionStartTime: Int?, requestStartTime: Int?, startTime: Int, endTime: Int) {
-        let cleanedPath = path.replacingOccurrences(of: "/merchants/([A-Za-z0-9]+)/client_api", with: "", options: .regularExpression)
+        var cleanedPath = path.replacingOccurrences(of: "/merchants/([A-Za-z0-9]+)/client_api", with: "", options: .regularExpression)
+        cleanedPath = cleanedPath.replacingOccurrences(
+            of: "payment_methods/.*/three_d_secure",
+            with: "payment_methods/three_d_secure",
+            options: .regularExpression
+        )
 
         if cleanedPath != "/v1/tracking/batch/events" {
             analyticsService?.sendAnalyticsEvent(FPTIBatchData.Event(

Sources/BraintreeCore/BTCoreConstants.swift

@@ -5,7 +5,7 @@ import Foundation
 @objcMembers public class BTCoreConstants: NSObject {
 
     /// :nodoc: This property is exposed for internal Braintree use only. Do not use. It is not covered by Semantic Versioning and may change or be removed at any time.
-    public static var braintreeSDKVersion: String = "6.23.0"
+    public static var braintreeSDKVersion: String = "6.23.1"
 
     /// :nodoc: This property is exposed for internal Braintree use only. Do not use. It is not covered by Semantic Versioning and may change or be removed at any time.
     public static let callbackURLScheme: String = "sdk.ios.braintree"

Sources/BraintreeCore/BTHTTP.swift

@@ -446,8 +446,12 @@ class BTHTTP: NSObject, URLSessionTaskDelegate {
         let json = try? JSONSerialization.jsonObject(with: data)
         let body = BTJSON(value: json)
 
-        guard let mutationName = body["operationName"].asString() else { return nil }
-
-        return "mutation \(mutationName)"
+        guard let query = body["query"].asString() else {
+            return nil
+        }
+
+        let queryDiscardHolder = query.replacingOccurrences(of: #"^[^\(]*"#, with: "", options: .regularExpression)
+        let finalQuery = query.replacingOccurrences(of: queryDiscardHolder, with: "")
+        return finalQuery
     }
 }

Sources/BraintreeCore/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.23.0</string>
+	<string>6.23.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.23.0</string>
+	<string>6.23.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

UnitTests/BraintreeCoreTests/BTHTTP_Tests.swift

@@ -757,7 +757,8 @@ final class BTHTTP_Tests: XCTestCase {
         var originalRequest = URLRequest(url: URL(string: "https://example.com/graphql")!)
         originalRequest.httpBody = """
             {
-                "operationName": "TestMutation"
+                "operationName": "TestMutation",
+                "query": "mutation TestMutation()"
             }
             """.data(using: .utf8)
         let task = testURLSession.dataTask(with: originalRequest)