Switch /users to the derived endpoint & request builder implementation

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

@@ -20,7 +20,7 @@ public typealias UserUpdateParams = WordPressAPIInternal.UserUpdateParams
 public typealias UserCreateParams = WordPressAPIInternal.UserCreateParams
 public typealias UserDeleteParams = WordPressAPIInternal.UserDeleteParams
 public typealias UserDeleteResponse = WordPressAPIInternal.UserDeleteResponse
-public typealias UsersRequestBuilder = WordPressAPIInternal.UsersRequestBuilder
+public typealias UsersRequestExecutor = WordPressAPIInternal.UsersRequestExecutor
 
 // MARK: - Plugins
 

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

@@ -39,7 +39,7 @@ public struct WordPressAPI {
         )
     }
 
-    public var users: UsersRequestBuilder {
+    public var users: UsersRequestExecutor {
         self.requestBuilder.users()
     }
 

wp_api/src/lib.rs

@@ -5,11 +5,11 @@ use request::{
         application_passwords_endpoint::{
             ApplicationPasswordsRequestBuilder2, ApplicationPasswordsRequestExecutor,
         },
+        users_endpoint::{UsersRequestBuilder2, UsersRequestExecutor},
         ApiBaseUrl,
     },
     plugins_request_builder::PluginsRequestBuilder,
-    users_request_builder::UsersRequestBuilder,
-    RequestExecutor, UsersRequestBuilder2, WpNetworkResponse,
+    RequestExecutor, WpNetworkResponse,
 };
 use std::sync::Arc;
 
@@ -70,7 +70,7 @@ impl WpApiRequestBuilder {
 #[derive(Debug, uniffi::Object)]
 pub struct WpRequestBuilder {
     application_passwords: Arc<ApplicationPasswordsRequestExecutor>,
-    users: Arc<UsersRequestBuilder>,
+    users: Arc<UsersRequestExecutor>,
     plugins: Arc<PluginsRequestBuilder>,
 }
 
@@ -101,7 +101,11 @@ impl WpRequestBuilder {
                 request_executor.clone(),
             )
             .into(),
-            users: UsersRequestBuilder::new(api_base_url.clone(), request_builder.clone()).into(),
+            users: UsersRequestExecutor::new(
+                UsersRequestBuilder2::new(api_base_url.clone(), request_builder.clone()),
+                request_executor.clone(),
+            )
+            .into(),
             plugins: PluginsRequestBuilder::new(api_base_url.clone(), request_builder.clone())
                 .into(),
         })
@@ -111,7 +115,7 @@ impl WpRequestBuilder {
         self.application_passwords.clone()
     }
 
-    pub fn users(&self) -> Arc<UsersRequestBuilder> {
+    pub fn users(&self) -> Arc<UsersRequestExecutor> {
         self.users.clone()
     }
 

wp_api/src/request.rs

@@ -8,11 +8,8 @@ use crate::{api_error::RequestExecutionError, WpApiError, WpAuthentication};
 
 use self::endpoint::WpEndpointUrl;
 
-pub use endpoint::users_endpoint::generated::UsersRequestBuilder2;
-
 pub mod endpoint;
 pub mod plugins_request_builder;
-pub mod users_request_builder;
 
 const CONTENT_TYPE_JSON: &str = "application/json";
 const LINK_HEADER_KEY: &str = "Link";