Skip to content

Remove AppEnvironment from WordPressOrgRestApi #24351

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

Merged
mokagio merged 4 commits into from
Mar 28, 2025
+15 −3
Merged

Remove AppEnvironment from WordPressOrgRestApi #24351

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96acd67
Inject user agent in `WordPressOrgRestApi` in convenience init
mokagio Mar 27, 2025
ce9bfde
Inject `wordPressComApiURL` in `WordPressOrgRestApi` conv. init
mokagio Mar 27, 2025
4f7f15d
Use WordPress.com URL from WordPressKit in `WordPressOrgRestApi`
mokagio Mar 27, 2025
49a26df
Fix Objective-C interface for convenience init on `WordPressOrgRestApi`
mokagio Mar 28, 2025
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
18 changes: 15 additions & 3 deletions WordPress/Classes/Networking/WordPressOrgRestApi+WordPress.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,26 @@ 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(),
wordPressComApiURL: URL = WordPressComRestApi.apiBaseURL
) {
if let dotComID = blog.dotComID?.uint64Value,
let token = blog.account?.authToken,
token.count > 0 {
self.init(
dotComSiteID: dotComID,
bearerToken: token,
userAgent: WPUserAgent.wordPress(),
apiURL: AppEnvironment.current.wordPressComApiBase
userAgent: userAgent,
apiURL: wordPressComApiURL
)
} else if let apiBase = apiBase(blog: blog),
let loginURL = try? blog.loginUrl().asURL(),
Expand All @@ -35,7 +47,7 @@ extension WordPressOrgRestApi {
password: password,
adminURL: adminURL
),
userAgent: WPUserAgent.wordPress()
userAgent: userAgent
)
} else {
return nil
Expand Down