Make WordPressAPI supports WP.com (#742)

* Add an initialiser to accept any `ApiUrlResolver`

* Export `WpComDotOrgApiUrlResolver`'s `ApiUrlResolver` implementation

So that the Swift bindings `WpComDotOrgApiUrlResolver` conforms to the
`ApiUrlResolver` protocol.

Author: crazytonyli

native/swift/Sources/wordpress-api/WordPressAPI.swift

@@ -19,6 +19,7 @@ public actor WordPressAPI {
         case unableToParseResponse
     }
 
+    private let apiUrlResolver: ApiUrlResolver
     private let requestExecutor: SafeRequestExecutor
     private let apiClientDelegate: WpApiClientDelegate
     package let requestBuilder: UniffiWpApiClient
@@ -31,7 +32,7 @@ public actor WordPressAPI {
         appNotifier: WpAppNotifier? = nil
     ) {
         self.init(
-            apiRootUrl: apiRootUrl,
+            apiUrlResolver: WpOrgSiteApiUrlResolver(apiRootUrl: apiRootUrl),
             authenticationProvider: .staticWithAuth(auth: authentication),
             executor: WpRequestExecutor(urlSession: urlSession),
             middlewarePipeline: middlewarePipeline,
@@ -47,7 +48,23 @@ public actor WordPressAPI {
         appNotifier: WpAppNotifier? = nil
     ) {
         self.init(
-            apiRootUrl: apiRootUrl,
+            apiUrlResolver: WpOrgSiteApiUrlResolver(apiRootUrl: apiRootUrl),
+            authenticationProvider: authenticationProvider,
+            executor: WpRequestExecutor(urlSession: urlSession),
+            middlewarePipeline: middlewarePipeline,
+            appNotifier: appNotifier
+        )
+    }
+
+    public init(
+        urlSession: URLSession,
+        apiUrlResolver: ApiUrlResolver,
+        authenticationProvider: WpAuthenticationProvider,
+        middlewarePipeline: MiddlewarePipeline = .default,
+        appNotifier: WpAppNotifier? = nil
+    ) {
+        self.init(
+            apiUrlResolver: apiUrlResolver,
             authenticationProvider: authenticationProvider,
             executor: WpRequestExecutor(urlSession: urlSession),
             middlewarePipeline: middlewarePipeline,
@@ -56,20 +73,21 @@ public actor WordPressAPI {
     }
 
     init(
-        apiRootUrl: ParsedUrl,
+        apiUrlResolver: ApiUrlResolver,
         authenticationProvider: WpAuthenticationProvider,
         executor: SafeRequestExecutor,
         middlewarePipeline: MiddlewarePipeline,
         appNotifier: WpAppNotifier?
     ) {
+        self.apiUrlResolver = apiUrlResolver
         self.apiClientDelegate = WpApiClientDelegate(
             authProvider: authenticationProvider,
             requestExecutor: executor,
             middlewarePipeline: middlewarePipeline,
             appNotifier: appNotifier ?? EmptyAppNotifier()
         )
         self.requestBuilder = UniffiWpApiClient(
-            apiUrlResolver: WpOrgSiteApiUrlResolver(apiRootUrl: apiRootUrl),
+            apiUrlResolver: self.apiUrlResolver,
             delegate: self.apiClientDelegate
         )
         self.requestExecutor = executor

native/swift/Tests/wordpress-api/Endpoints/Users.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Testing
 @testable import WordPressAPI
+@testable import WordPressAPIInternal
 
 struct UsersTests {
 
@@ -39,7 +40,9 @@ struct UsersTests {
         ])
 
         let api = try WordPressAPI(
-            apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json"),
+            apiUrlResolver: WpOrgSiteApiUrlResolver(
+                apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json")
+            ),
             authenticationProvider: .none(),
             executor: stubs,
             middlewarePipeline: .default,

native/swift/Tests/wordpress-api/HttpTests.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Testing
 @testable import WordPressAPI
+@testable import WordPressAPIInternal
 
 class HTTPErrorTests {
 
@@ -9,7 +10,9 @@ class HTTPErrorTests {
         let stubs = HTTPStubs(stubs: [], missingStub: .failure(URLError(.timedOut)))
 
         let api = try WordPressAPI(
-            apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json"),
+            apiUrlResolver: WpOrgSiteApiUrlResolver(
+                apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json")
+            ),
             authenticationProvider: .none(),
             executor: stubs,
             middlewarePipeline: .default,

native/swift/Tests/wordpress-api/WordPressAPITests.swift

@@ -43,7 +43,9 @@ struct WordPressAPITests {
     func testExample() async throws {
         let stubs = try createStubs()
         let api = try WordPressAPI(
-            apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json"),
+            apiUrlResolver: WpOrgSiteApiUrlResolver(
+                apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json")
+            ),
             authenticationProvider: .none(),
             executor: stubs,
             middlewarePipeline: .default,
@@ -58,7 +60,9 @@ struct WordPressAPITests {
         let stubs = try createStubs()
         let counter = CounterMiddleware()
         let api = try WordPressAPI(
-            apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json"),
+            apiUrlResolver: WpOrgSiteApiUrlResolver(
+                apiRootUrl: ParsedUrl.parse(input: "https://wordpress.org/wp-json")
+            ),
             authenticationProvider: .none(),
             executor: stubs,
             middlewarePipeline: .init(middlewares: [counter]),

wp_api/src/wp_com/endpoint.rs

@@ -28,6 +28,7 @@ impl WpComDotOrgApiUrlResolver {
     }
 }
 
+#[uniffi::export]
 impl ApiUrlResolver for WpComDotOrgApiUrlResolver {
     fn resolve(&self, namespace: String, endpoint_segments: Vec<String>) -> Arc<ParsedUrl> {
         {