Make RawBlockEditorSettingsService accept RawBlockEditorSettingsService as non-optional

Author: kean

WordPress/Classes/Services/RawBlockEditorSettingsService.swift

@@ -7,19 +7,16 @@ final class RawBlockEditorSettingsService {
 
     private let blogID: String
     private var refreshTask: Task<Data, Error>?
-    private let dotOrgRestAPI: WordPressOrgRestApi?
+    private let dotOrgRestAPI: WordPressOrgRestApi
     private var prefetchTask: Task<Void, Never>?
 
     @MainActor
-    init(blog: Blog) {
-        self.dotOrgRestAPI = WordPressOrgRestApi(blog: blog)
+    init(dotOrgRestAPI: WordPressOrgRestApi, blog: Blog) {
+        self.dotOrgRestAPI = dotOrgRestAPI
         self.blogID = blog.locallyUniqueID
     }
 
     private func fetchSettingsFromAPI() async throws -> Data {
-        guard let dotOrgRestAPI else {
-            throw URLError(.unknown)
-        }
         let response: WordPressAPIResult<Data, WordPressOrgRestApiError> = await dotOrgRestAPI.get(
             path: "/wp-block-editor/v1/settings"
         )

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -358,7 +358,10 @@ final class MySiteViewController: UIViewController, UIScrollViewDelegate, NoSite
         let configuration = EditorConfiguration(blog: blog)
         GutenbergKit.EditorViewController.warmup(configuration: configuration)
 
-        RawBlockEditorSettingsService(blog: blog).prefetchSettings()
+        if let dotOrgRestAPI = WordPressOrgRestApi(blog: blog) {
+            RawBlockEditorSettingsService(dotOrgRestAPI: dotOrgRestAPI, blog: blog)
+                .prefetchSettings()
+        }
     }
 
     // MARK: - Main Blog

WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift

@@ -145,7 +145,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     func setHTML(_ html: String) {}
     func getHTML() -> String { post.content ?? "" }
 
-    private let blockEditorSettingsService: RawBlockEditorSettingsService
+    private let blockEditorSettingsService: RawBlockEditorSettingsService?
 
     // MARK: - Initializers
     required convenience init(
@@ -183,7 +183,12 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
         let editorConfiguration = EditorConfiguration(blog: post.blog)
         self.editorViewController = GutenbergKit.EditorViewController(configuration: editorConfiguration)
 
-        self.blockEditorSettingsService = RawBlockEditorSettingsService(blog: post.blog)
+        if let dotOrgRestAPI = WordPressOrgRestApi(blog: blog) {
+            self.blockEditorSettingsService = RawBlockEditorSettingsService(dotOrgRestAPI: dotOrgRestAPI, blog: blog)
+                .prefetchSettings()
+        } else {
+            self.blockEditorSettingsService = nil
+        }
 
         super.init(nibName: nil, bundle: nil)
 
@@ -475,11 +480,13 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     // MARK: - Editor Setup
     private func fetchEditorDependencies() async throws -> EditorDependencies {
         let settings: String?
-        do {
-            settings = try await blockEditorSettingsService.getSettingsString(allowingCachedResponse: true)
-        } catch {
-            DDLogError("Failed to fetch editor settings: \(error)")
-            settings = nil
+        if let blockEditorSettingsService {
+            do {
+                settings = try await blockEditorSettingsService.getSettingsString(allowingCachedResponse: true)
+            } catch {
+                DDLogError("Failed to fetch editor settings: \(error)")
+                settings = nil
+            }
         }
 
         let loaded = await loadAuthenticationCookiesAsync()