Add WP.com simple site and Jetpack site routing to WpApiClient by jkmassel · Pull Request #22765 · wordpress-mobile/WordPress-Android

jkmassel · 2026-04-03T20:44:39Z

Summary

WP.com simple site URL routing: Add isWPComSimpleSite() to SiteModel and override getWpApiRestUrl() to return the public-api.wordpress.com proxy URL for simple (non-Atomic) WP.com sites
Jetpack site routing: Route sites using the WP.com REST API (isUsingWpComRestApi) through the WP.com API client alongside pure WP.com sites
Migrate to new apiUrlResolver constructor: Update createSelfHostedClient to use WpOrgSiteApiUrlResolver instead of the old wpOrgSiteApiRootUrl parameter

Test plan

Verify self-hosted sites continue to use application password auth and WpOrgSiteApiUrlResolver

dangermattic · 2026-04-03T20:45:27Z

	1 Warning
⚠️	This PR is assigned to the milestone 26.8. This milestone is due in less than 4 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

wpmobilebot · 2026-04-03T21:06:50Z

📲 You can test the changes from this Pull Request in Jetpack Android by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Android
	Build Type	Debug
	Version	pr22765-c8548b8
	Build Number	`1488`
	Application ID	`com.jetpack.android.prealpha`
	Commit	`c8548b8`
	Installation URL	6i94a9nk16acg

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2026-04-03T21:07:16Z

📲 You can test the changes from this Pull Request in WordPress Android by scanning the QR code below to install the corresponding build.

	App Name	WordPress Android
	Build Type	Debug
	Version	pr22765-c8548b8
	Build Number	`1488`
	Application ID	`org.wordpress.android.prealpha`
	Commit	`c8548b8`
	Installation URL	4p235fqumeevg

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2026-04-03T21:21:09Z

🤖 Build Failure Analysis

This build has failures. Claude has analyzed them - check the build annotations for details.

nbradbury · 2026-04-04T13:20:50Z

@jkmassel There are multiple conflicts and CI failures in this PR. Probably best to address that before I do a review.

jkmassel · 2026-04-06T04:27:48Z

@nbradbury – sorry, this was supposed to be a draft still!

Add `isWPComSimpleSite()` to SiteModel and use it to route WP.com simple sites through the public-api.wordpress.com proxy with bearer token authentication. This enables the Rust WP API client to make authenticated requests for WPCom sites that don't use application passwords. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Route sites using WP.com REST API (isUsingWpComRestApi) through the WP.com API client, alongside pure WP.com sites. This enables Jetpack- connected sites to use the correct authentication and URL resolution. Add manifest route fetching methods (fetchWpComManifestRoutes, fetchSiteManifestRoutes) that retrieve the API root index to discover available REST routes for a site.

codecov · 2026-04-09T21:22:45Z

Codecov Report

❌ Patch coverage is 37.50000% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 37.34%. Comparing base (7b391e8) to head (c8548b8).
⚠️ Report is 9 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...fluxc/network/rest/wpapi/rs/WpApiClientProvider.kt	0.00%	5 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##            trunk   #22765   +/-   ##
=======================================
  Coverage   37.34%   37.34%           
=======================================
  Files        2327     2327           
  Lines      124639   124645    +6     
  Branches    16892    16894    +2     
=======================================
+ Hits        46551    46554    +3     
- Misses      74351    74354    +3     
  Partials     3737     3737

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Cover isWPComSimpleSite() and the getWpApiRestUrl() proxy URL override introduced in #22765, including the boundary between Jetpack REST sites (routed via WP.com client) and WP.com simple sites (get the proxy URL).

nbradbury · 2026-04-15T11:27:54Z

@jkmassel This looks and works fine, but Claude found some potential issues.

review-pr22765-wpcom-routing-2026-04-15.pdf

jkmassel · 2026-04-15T17:41:19Z

@nbradbury

Getter/setter asymmetry — potential bug in ReactNativeStore and
CookieNonceAuthenticator
There's no case where it should be possible to overwrite the API root for a simple site.

Incomplete constructor migration

I saw this – getWpApiClientCookiesNonceAuthentication is a transitional class – once everyone is on Application Passwords we don't need it anymore, so I left it alone to keep the changeset small.

Redundant routing condition

I'm aware of this one as well – if isUsingWpComRestApi changes (which it may down the road, particularly for Jetpack sites) I don't want anything else to break.

These new methods don't really benefit from test coverage, because it'd be a "test that the code does what the code does" situation.

The trailing slash thing isn't relevant to this PR because this URL is only used to build the URL resolver. Semi-related, any path building that relies on concatenation instead of a path builder is probably buggy anyway 😅

nbradbury

Looks good!

jkmassel force-pushed the jkmassel/gutenbergkit-settings-refactor branch from d538543 to 865899d Compare April 3, 2026 21:25

jkmassel requested a review from a team as a code owner April 3, 2026 21:25

jkmassel requested review from nbradbury and removed request for a team April 3, 2026 21:25

jkmassel force-pushed the jkmassel/gutenbergkit-settings-refactor branch 4 times, most recently from f861ada to 6cfa2a2 Compare April 4, 2026 03:47

jkmassel marked this pull request as draft April 6, 2026 04:27

Base automatically changed from jkmassel/gutenbergkit-settings-refactor to trunk April 9, 2026 19:17

jkmassel force-pushed the jkmassel/wpapiclient-wpcom-support branch from bae20e0 to bfebb4a Compare April 9, 2026 19:47

jkmassel and others added 2 commits April 9, 2026 14:24

jkmassel force-pushed the jkmassel/wpapiclient-wpcom-support branch from bfebb4a to e9eba85 Compare April 9, 2026 20:51

jkmassel changed the title ~~Add WordPress.com simple site and Jetpack site support to WpApiClient~~ Add WP.com simple site and Jetpack site routing to WpApiClient Apr 9, 2026

jkmassel mentioned this pull request Apr 9, 2026

Add site settings for third-party blocks and theme style gating #22785

Draft

2 tasks

Add tests for WP.com simple site detection and proxy URL routing

c8548b8

Cover isWPComSimpleSite() and the getWpApiRestUrl() proxy URL override introduced in #22765, including the boundary between Jetpack REST sites (routed via WP.com client) and WP.com simple sites (get the proxy URL).

jkmassel self-assigned this Apr 13, 2026

jkmassel added this to the 26.8 milestone Apr 13, 2026

jkmassel added [Type] Enhancement Core labels Apr 13, 2026

jkmassel marked this pull request as ready for review April 13, 2026 20:16

nbradbury approved these changes Apr 15, 2026

View reviewed changes

jkmassel merged commit 24c17ab into trunk Apr 15, 2026
25 checks passed

jkmassel deleted the jkmassel/wpapiclient-wpcom-support branch April 15, 2026 18:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add WP.com simple site and Jetpack site routing to WpApiClient#22765

Add WP.com simple site and Jetpack site routing to WpApiClient#22765
jkmassel merged 3 commits intotrunkfrom
jkmassel/wpapiclient-wpcom-support

jkmassel commented Apr 3, 2026 •

edited

Loading

Uh oh!

dangermattic commented Apr 3, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 3, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 3, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 3, 2026 •

edited

Loading

Uh oh!

nbradbury commented Apr 4, 2026

Uh oh!

jkmassel commented Apr 6, 2026

Uh oh!

codecov bot commented Apr 9, 2026 •

edited

Loading

Uh oh!

nbradbury commented Apr 15, 2026

Uh oh!

jkmassel commented Apr 15, 2026

Uh oh!

nbradbury left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

jkmassel commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

dangermattic commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Build Failure Analysis

Uh oh!

nbradbury commented Apr 4, 2026

Uh oh!

jkmassel commented Apr 6, 2026

Uh oh!

codecov bot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

nbradbury commented Apr 15, 2026

Uh oh!

jkmassel commented Apr 15, 2026

Uh oh!

nbradbury left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jkmassel commented Apr 3, 2026 •

edited

Loading

dangermattic commented Apr 3, 2026 •

edited

Loading

wpmobilebot commented Apr 3, 2026 •

edited

Loading

wpmobilebot commented Apr 3, 2026 •

edited

Loading

wpmobilebot commented Apr 3, 2026 •

edited

Loading

codecov bot commented Apr 9, 2026 •

edited

Loading