Merge pull request #260 from mvanhorn/fix/256-fix-percent-encode--in-setqueryitems-so-

fix: percent-encode `+` in setQueryItems so cursor pagination works

Author: MasterJ93

Package.swift

@@ -40,9 +40,9 @@ let package = Package(
 //            dependencies: ["VersionNumberPluginExec"]
 //        )
 
-//        .testTarget(
-//            name: "ATProtoKitTests",
-//            dependencies: ["ATProtoKit"]),
+        .testTarget(
+            name: "ATProtoKitTests",
+            dependencies: ["ATProtoKit"]),
     ]
 )
 

Sources/ATProtoKit/Utilities/APIClientService.swift

@@ -170,6 +170,9 @@ public struct APIClientService: Sendable {
 
         // Map out each URLQueryItem with the key ($0.0) and value ($0.1) of the item.
         components?.queryItems = queryItems.map { URLQueryItem(name: $0.0, value: $0.1) }
+        if let percentEncodedQuery = components?.percentEncodedQuery {
+            components?.percentEncodedQuery = percentEncodedQuery.replacingOccurrences(of: "+", with: "%2B")
+        }
 
         guard let finalURL = components?.url else {
             throw ATHTTPRequestError.failedToConstructURLWithParameters

Tests/ATProtoKitTests/ATProtoKitTests.swift

@@ -2,11 +2,27 @@ import XCTest
 @testable import ATProtoKit
 
 final class ATProtoKitTests: XCTestCase {
-    func testExample() throws {
-        // XCTest Documentation
-        // https://developer.apple.com/documentation/xctest
+    func testSetQueryItemsPercentEncodesPlusSigns() throws {
+        let apiClientService = APIClientService(with: APIClientConfiguration())
+        let requestURL = try XCTUnwrap(URL(string: "https://example.com/xrpc/app.bsky.feed.getFeed"))
 
-        // Defining Test Cases and Test Methods
-        // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
+        let urlWithPlus = try apiClientService.setQueryItems(for: requestURL, with: [
+            ("cursor", "abc+def")
+        ])
+        XCTAssertEqual(urlWithPlus.absoluteString, "https://example.com/xrpc/app.bsky.feed.getFeed?cursor=abc%2Bdef")
+        XCTAssertFalse(urlWithPlus.absoluteString.contains("+"))
+
+        let urlWithoutPlus = try apiClientService.setQueryItems(for: requestURL, with: [
+            ("cursor", "abcdef")
+        ])
+        XCTAssertEqual(urlWithoutPlus.absoluteString, "https://example.com/xrpc/app.bsky.feed.getFeed?cursor=abcdef")
+        XCTAssertFalse(urlWithoutPlus.absoluteString.contains("+"))
+
+        let urlWithMultipleItems = try apiClientService.setQueryItems(for: requestURL, with: [
+            ("cursor", "abc+def"),
+            ("limit", "50")
+        ])
+        XCTAssertEqual(urlWithMultipleItems.absoluteString, "https://example.com/xrpc/app.bsky.feed.getFeed?cursor=abc%2Bdef&limit=50")
+        XCTAssertFalse(urlWithMultipleItems.absoluteString.contains("+"))
     }
 }