Implement wp-login.php based cookie authentication

Cargo.toml

@@ -34,6 +34,7 @@ rstest = "0.21"
 rstest_reuse = "0.7.0"
 serde = "1.0"
 serde_json = "1.0"
+serde_urlencoded = "0.7"
 serial_test = "3.1"
 strum = "0.26"
 strum_macros = "0.26"

scripts/setup-test-site.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-# This script sets up a WordPress test site on the `wordpress` docker image. 
+# This script sets up a WordPress test site on the `wordpress` docker image.
 # You might wonder "why not do this work once, then just import the database for each run?"
 # We do each step each time for each build because we're trying to get a "mint" condition site
 # for each WordPress version – if there are issues with DB migrations, different default themes
@@ -41,13 +41,16 @@ echo "--- :wordpress: Setting up WordPress"
 wp core version --extra
 wp --info
 
+ADMIN_USERNAME="[email protected]"
+ADMIN_ACCOUNT_PASSWORD="strongpassword"
+
 ## Install WordPress
 wp core install \
 	--url=localhost \
 	--title=my-test-site \
-	--admin_user=[email protected] \
-	--admin_email=[email protected] \
-	--admin_password=strongpassword \
+	--admin_user=$ADMIN_USERNAME \
+	--admin_email=$ADMIN_USERNAME \
+	--admin_password=$ADMIN_ACCOUNT_PASSWORD \
 	--skip-email
 
 ## Ensure URLs work as expected
@@ -76,7 +79,6 @@ wp user create test_author [email protected] --role=author
 
 create_test_credentials () {
   local SITE_URL
-  local ADMIN_USERNAME
   local ADMIN_PASSWORD_UUID
   local ADMIN_PASSWORD
   local SUBSCRIBER_USERNAME
@@ -85,9 +87,8 @@ create_test_credentials () {
   local TRASHED_POST_ID
   local PASSWORD_PROTECTED_POST_ID
   SITE_URL="http://localhost"
-  ADMIN_USERNAME="[email protected]"
-  ADMIN_PASSWORD="$(wp user application-password create [email protected] test --porcelain)"
-  ADMIN_PASSWORD_UUID="$(wp user application-password list [email protected] --fields=uuid --format=csv | sed -n '2 p')"
+  ADMIN_PASSWORD="$(wp user application-password create $ADMIN_USERNAME test --porcelain)"
+  ADMIN_PASSWORD_UUID="$(wp user application-password list $ADMIN_USERNAME --fields=uuid --format=csv | sed -n '2 p')"
   SUBSCRIBER_USERNAME="themedemos"
   SUBSCRIBER_PASSWORD="$(wp user application-password create themedemos test --porcelain)"
   SUBSCRIBER_PASSWORD_UUID="$(wp user application-password list themedemos --fields=uuid --format=csv | sed -n '2 p')"
@@ -104,6 +105,7 @@ create_test_credentials () {
   jo -p \
     site_url="$SITE_URL" \
     admin_username="$ADMIN_USERNAME" \
+    admin_account_password="$ADMIN_ACCOUNT_PASSWORD" \
     admin_password="$ADMIN_PASSWORD" \
     admin_password_uuid="$ADMIN_PASSWORD_UUID" \
     subscriber_username="$SUBSCRIBER_USERNAME" \
@@ -131,4 +133,3 @@ wp option update timezone_string "America/New_York"
 cp -rp wp-content/plugins wp-content/plugins-backup
 
 wp db export --add-drop-table wp-content/dump.sql
-

wp_api/Cargo.toml

@@ -22,6 +22,7 @@ paste = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true, features = [ "derive" ] }
 serde_json = { workspace = true }
+serde_urlencoded = { workspace = true }
 thiserror = { workspace = true }
 uniffi = { workspace = true }
 uuid = { workspace = true, features = [ "v4" ] }

wp_api/src/api_client.rs

@@ -1,24 +1,30 @@
-use crate::request::{
-    endpoint::{
-        application_passwords_endpoint::{
-            ApplicationPasswordsRequestBuilder, ApplicationPasswordsRequestExecutor,
-        },
-        plugins_endpoint::{PluginsRequestBuilder, PluginsRequestExecutor},
-        post_types_endpoint::{PostTypesRequestBuilder, PostTypesRequestExecutor},
-        posts_endpoint::{PostsRequestBuilder, PostsRequestExecutor},
-        site_settings_endpoint::{SiteSettingsRequestBuilder, SiteSettingsRequestExecutor},
-        users_endpoint::{UsersRequestBuilder, UsersRequestExecutor},
-        wp_site_health_tests_endpoint::{
-            WpSiteHealthTestsRequestBuilder, WpSiteHealthTestsRequestExecutor,
-        },
-        ApiBaseUrl,
-    },
-    RequestExecutor,
-};
 use crate::{
     api_client_generate_api_client, api_client_generate_endpoint_impl,
     api_client_generate_request_builder, ParsedUrl, WpAuthentication,
 };
+use crate::{
+    authenticator::{
+        ApplicationPasswordAuthenticator, AuthenticatedRequestExecutor, Authenticator,
+        CookieAuthenticator, NilAuthenticator,
+    },
+    request::{
+        endpoint::{
+            application_passwords_endpoint::{
+                ApplicationPasswordsRequestBuilder, ApplicationPasswordsRequestExecutor,
+            },
+            plugins_endpoint::{PluginsRequestBuilder, PluginsRequestExecutor},
+            post_types_endpoint::{PostTypesRequestBuilder, PostTypesRequestExecutor},
+            posts_endpoint::{PostsRequestBuilder, PostsRequestExecutor},
+            site_settings_endpoint::{SiteSettingsRequestBuilder, SiteSettingsRequestExecutor},
+            users_endpoint::{UsersRequestBuilder, UsersRequestExecutor},
+            wp_site_health_tests_endpoint::{
+                WpSiteHealthTestsRequestBuilder, WpSiteHealthTestsRequestExecutor,
+            },
+            ApiBaseUrl,
+        },
+        RequestExecutor,
+    },
+};
 use std::sync::Arc;
 
 #[derive(Debug, uniffi::Object)]
@@ -29,9 +35,9 @@ struct UniffiWpApiRequestBuilder {
 #[uniffi::export]
 impl UniffiWpApiRequestBuilder {
     #[uniffi::constructor]
-    pub fn new(site_url: Arc<ParsedUrl>, authentication: WpAuthentication) -> Self {
+    pub fn new(site_url: Arc<ParsedUrl>) -> Self {
         Self {
-            inner: WpApiRequestBuilder::new(site_url, authentication),
+            inner: WpApiRequestBuilder::new(site_url),
         }
     }
 }
@@ -48,11 +54,10 @@ pub struct WpApiRequestBuilder {
 }
 
 impl WpApiRequestBuilder {
-    pub fn new(site_url: Arc<ParsedUrl>, authentication: WpAuthentication) -> Self {
+    pub fn new(site_url: Arc<ParsedUrl>) -> Self {
         let api_base_url: Arc<ApiBaseUrl> = Arc::new(site_url.inner.clone().into());
         api_client_generate_request_builder!(
-            api_base_url,
-            authentication;
+            api_base_url;
             application_passwords,
             plugins,
             post_types,
@@ -102,9 +107,25 @@ impl WpApiClient {
     ) -> Self {
         let api_base_url: Arc<ApiBaseUrl> = Arc::new(site_url.inner.clone().into());
 
+        let authenticator: Arc<dyn Authenticator> = match &authentication {
+            WpAuthentication::AuthorizationHeader { token } => {
+                Arc::new(ApplicationPasswordAuthenticator::new(token.clone()))
+            }
+            WpAuthentication::UserAccount { login } => Arc::new(CookieAuthenticator::new(
+                site_url.inner.clone().into(),
+                login.clone(),
+                request_executor.clone(),
+            )),
+            WpAuthentication::None => Arc::new(NilAuthenticator {}),
+        };
+
+        let request_executor = Arc::new(AuthenticatedRequestExecutor::new(
+            authenticator,
+            request_executor,
+        ));
+
         api_client_generate_api_client!(
             api_base_url,
-            authentication,
             request_executor;
             application_passwords,
             plugins,
@@ -161,12 +182,11 @@ macro_rules! api_client_generate_endpoint_impl {
 
 #[macro_export]
 macro_rules! api_client_generate_request_builder {
-    ($api_base_url:ident, $authentication:ident; $($element:expr),*) => {
+    ($api_base_url:ident; $($element:expr),*) => {
         paste::paste! {
             Self {
                 $($element: [<$element:camel RequestBuilder>]::new(
                     $api_base_url.clone(),
-                    $authentication.clone(),
                 )
                 .into(),)*
             }
@@ -176,12 +196,11 @@ macro_rules! api_client_generate_request_builder {
 
 #[macro_export]
 macro_rules! api_client_generate_api_client {
-    ($api_base_url:ident, $authentication:ident, $request_executor:ident; $($element:expr),*) => {
+    ($api_base_url:ident, $request_executor:ident; $($element:expr),*) => {
         paste::paste! {
             Self {
                 $($element: [<$element:camel RequestExecutor>]::new(
                     $api_base_url.clone(),
-                    $authentication.clone(),
                     $request_executor.clone(),
                 )
                 .into(),)*