From 96acd67a356d86f0fcd6f45fff035438b149e334 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 27 Mar 2025 20:38:23 +1100
Subject: [PATCH 1/4] Inject user agent in `WordPressOrgRestApi` in convenience
 init

---
 .../Networking/WordPressOrgRestApi+WordPress.swift       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
index 9c22c74b2086..21d1abcf173a 100644
--- a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
+++ b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
@@ -12,14 +12,17 @@ private func apiBase(blog: Blog) -> URL? {
 
 extension WordPressOrgRestApi {
     @objc
-    convenience init?(blog: Blog) {
+    convenience init?(
+        blog: Blog,
+        userAgent: String = WPUserAgent.wordPress()
+    ) {
         if let dotComID = blog.dotComID?.uint64Value,
            let token = blog.account?.authToken,
            token.count > 0 {
             self.init(
                 dotComSiteID: dotComID,
                 bearerToken: token,
-                userAgent: WPUserAgent.wordPress(),
+                userAgent: userAgent,
                 apiURL: AppEnvironment.current.wordPressComApiBase
             )
         } else if let apiBase = apiBase(blog: blog),
@@ -35,7 +38,7 @@ extension WordPressOrgRestApi {
                     password: password,
                     adminURL: adminURL
                 ),
-                userAgent: WPUserAgent.wordPress()
+                userAgent: userAgent
             )
         } else {
             return nil

From ce9bfde9e3484bb2771bee011a4e31abea13c445 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 27 Mar 2025 20:43:43 +1100
Subject: [PATCH 2/4] Inject `wordPressComApiURL` in `WordPressOrgRestApi`
 conv. init

---
 .../Classes/Networking/WordPressOrgRestApi+WordPress.swift   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
index 21d1abcf173a..3b79207f6f16 100644
--- a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
+++ b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
@@ -14,7 +14,8 @@ extension WordPressOrgRestApi {
     @objc
     convenience init?(
         blog: Blog,
-        userAgent: String = WPUserAgent.wordPress()
+        userAgent: String = WPUserAgent.wordPress(),
+        wordPressComApiURL: URL = AppEnvironment.current.wordPressComApiBase
     ) {
         if let dotComID = blog.dotComID?.uint64Value,
            let token = blog.account?.authToken,
@@ -23,7 +24,7 @@ extension WordPressOrgRestApi {
                 dotComSiteID: dotComID,
                 bearerToken: token,
                 userAgent: userAgent,
-                apiURL: AppEnvironment.current.wordPressComApiBase
+                apiURL: wordPressComApiURL
             )
         } else if let apiBase = apiBase(blog: blog),
                   let loginURL = try? blog.loginUrl().asURL(),

From 4f7f15d03ee838ca74d430847087b6a49509801c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 27 Mar 2025 20:47:35 +1100
Subject: [PATCH 3/4] Use WordPress.com URL from WordPressKit in
 `WordPressOrgRestApi`

---
 .../Classes/Networking/WordPressOrgRestApi+WordPress.swift      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
index 3b79207f6f16..d16c2c56bb72 100644
--- a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
+++ b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
@@ -15,7 +15,7 @@ extension WordPressOrgRestApi {
     convenience init?(
         blog: Blog,
         userAgent: String = WPUserAgent.wordPress(),
-        wordPressComApiURL: URL = AppEnvironment.current.wordPressComApiBase
+        wordPressComApiURL: URL = WordPressComRestApi.apiBaseURL
     ) {
         if let dotComID = blog.dotComID?.uint64Value,
            let token = blog.account?.authToken,

From 49a26df5d343dcb9314f8aba673e5ec6666b9a3a Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 28 Mar 2025 14:12:13 +1100
Subject: [PATCH 4/4] Fix Objective-C interface for convenience init on
 `WordPressOrgRestApi`

---
 .../Networking/WordPressOrgRestApi+WordPress.swift        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
index d16c2c56bb72..8a33550c8e39 100644
--- a/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
+++ b/WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
@@ -12,6 +12,14 @@ private func apiBase(blog: Blog) -> URL? {
 
 extension WordPressOrgRestApi {
     @objc
+    convenience init?(blog: Blog) {
+        self.init(
+            blog: blog,
+            userAgent: WPUserAgent.wordPress(),
+            wordPressComApiURL: WordPressComRestApi.apiBaseURL
+        )
+    }
+
     convenience init?(
         blog: Blog,
         userAgent: String = WPUserAgent.wordPress(),