Skip to content

Media: Use core REST API for self-hosted Jetpack sites #25588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crazytonyli wants to merge 3 commits into
base: trunk
Choose a base branch
from
+26 −10
Open

Media: Use core REST API for self-hosted Jetpack sites #25588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39a1ebf
Apply swift-format to MediaRepository.swift
crazytonyli May 28, 2026
3a1295d
Prefer application passwords over the WordPress.com proxy for media o…
crazytonyli May 28, 2026
bd39226
Add a release note
crazytonyli May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
27.0
-----

* [*] [internal] self-hosted Jetpack sites now use core REST API to access Media Library [#25588]

26.9
-----
Expand Down
34 changes: 25 additions & 9 deletions WordPress/Classes/Services/MediaRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ final class MediaRepository {
}

/// Get the Media object from the server using the blog and the mediaID as the identifier of the resource
func getMedia(withID mediaID: NSNumber, in blogID: TaggedManagedObjectID<Blog>) async throws -> TaggedManagedObjectID<Media> {
func getMedia(
withID mediaID: NSNumber,
in blogID: TaggedManagedObjectID<Blog>
) async throws -> TaggedManagedObjectID<Media> {
let remote = try await remote(for: blogID)
let remoteMedia: RemoteMedia? = try await withCheckedThrowingContinuation { continuation in
remote.getMediaWithID(mediaID) {
Expand All @@ -43,7 +46,8 @@ final class MediaRepository {
/// Deletes the Media object from the server. Note the Media is deleted, not trashed.
func delete(_ mediaID: TaggedManagedObjectID<Media>) async throws {
// Delete the media from WordPress Media Library
let queryResult: (MediaServiceRemote, RemoteMedia)? = try await coreDataStack.performQuery { [remoteFactory] context in
let queryResult: (MediaServiceRemote, RemoteMedia)? = try await coreDataStack.performQuery {
[remoteFactory] context in
guard let media = try? context.existingObject(with: mediaID) else {
return nil
}
Expand Down Expand Up @@ -88,17 +92,29 @@ private extension MediaRepository {

@objc public class MediaServiceRemoteFactory: NSObject {

/// Picks the media remote based on the site type and the credentials available:
///
/// Site API used
/// ----------------------------------------- --------------------------------------
/// WordPress.com Simple / Atomic WordPress.com REST (MediaServiceRemoteREST)
/// Self-hosted (incl. Jetpack), app password Site REST (MediaServiceRemoteCoreREST)
/// Self-hosted (incl. Jetpack), no app pw WordPress.com REST (MediaServiceRemoteREST)
/// Self-hosted, no WP.com account, no app pw XML-RPC (MediaServiceRemoteXMLRPC)
///
/// Self-hosted sites prefer their own REST API via an application password so media bypasses the
/// WordPress.com Jetpack proxy, which some hosts block. WordPress.com-managed sites (Simple and
/// Atomic) stay on the WordPress.com REST API, where WordPress.com-specific features such as video
/// upload restrictions and storage limits based on the site's plan are enforced.
@objc(remoteForBlog:error:)
public func remote(for blog: Blog) throws -> MediaServiceRemote {
if blog.supports(.wpComRESTAPI), let dotComID = blog.dotComID, let api = blog.wordPressComRestApi {
return MediaServiceRemoteREST(wordPressComRestApi: api, siteID: dotComID)
if !(blog.isHostedAtWPcom || blog.isAtomic),
let site = try? WordPressSite(blog: blog), case .selfHosted = site
{
return MediaServiceRemoteCoreREST(client: WordPressClientFactory.shared.instance(for: site))
}

// We use WordPress.com API for media management instead of WordPress core REST API to ensure
// compatibility with WordPress.com-specific features such as video upload restrictions
// and storage limits based on the site's plan.
if let site = try? WordPressSite(blog: blog) {
return MediaServiceRemoteCoreREST(client: WordPressClientFactory.shared.instance(for: site))
if blog.supports(.wpComRESTAPI), let dotComID = blog.dotComID, let api = blog.wordPressComRestApi {
return MediaServiceRemoteREST(wordPressComRestApi: api, siteID: dotComID)
}

if let username = blog.username, let password = blog.password, let api = blog.xmlrpcApi {
Expand Down