Remove the 'nativeJetpackConnection' feature flag (#24731)

* Remove the 'nativeJetpackConnection' feature flag

* Sync blog options after connected

* Fix a typo

Co-authored-by: Oguz Kocer <[email protected]>

---------

Co-authored-by: Oguz Kocer <[email protected]>

Author: crazytonyli

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -24,7 +24,6 @@ public enum FeatureFlag: Int, CaseIterable {
     case selfHostedSiteUserManagement
     case readerGutenbergCommentComposer
     case pluginManagementOverhaul
-    case nativeJetpackConnection
     case newsletterSubscribers
     case newStats
 
@@ -79,8 +78,6 @@ public enum FeatureFlag: Int, CaseIterable {
             return false
         case .pluginManagementOverhaul:
             return false
-        case .nativeJetpackConnection:
-            return BuildConfiguration.current == .debug
         case .newsletterSubscribers:
             return true
         case .newStats:
@@ -126,7 +123,6 @@ extension FeatureFlag {
         case .selfHostedSiteUserManagement: "Self-hosted Site User Management"
         case .pluginManagementOverhaul: "Plugin Management Overhaul"
         case .readerGutenbergCommentComposer: "Gutenberg Comment Composer"
-        case .nativeJetpackConnection: "Native Jetpack Connection"
         case .newsletterSubscribers: "Newsletter Subscribers"
         case .newStats: "New Stats"
         }

WordPress/Classes/ViewRelated/Jetpack/Login/JetpackConnectionViewModel.swift

@@ -170,6 +170,7 @@ private enum JetpackConnectionError: LocalizedError {
 }
 
 class JetpackConnectionService {
+    private let blogId: TaggedManagedObjectID<Blog>
     private let client: WordPressClient
     private let jetpackConnectionClient: JetpackConnectionClient
 
@@ -179,12 +180,8 @@ class JetpackConnectionService {
         // - The site is authenticated with application password, and
         // - Jetpack is not installed, or the installed jetpack version is 14.2 or above.
 
-        guard FeatureFlag.nativeJetpackConnection.enabled else { return nil }
-
         guard blog.account == nil else { return nil }
 
-        guard (try? blog.getApplicationToken()) != nil else { return nil }
-
         if let jetpack = blog.jetpack, jetpack.isInstalled, let version = jetpack.version,
            // The `version` value is not a strict semantic version number.
            version.compare("14.2", options: .numeric) == .orderedAscending {
@@ -197,6 +194,7 @@ class JetpackConnectionService {
             return nil
         }
 
+        self.blogId = TaggedManagedObjectID(blog)
         self.client = .init(site: site)
         self.jetpackConnectionClient = .init(
             apiRootUrl: apiRootURL,
@@ -272,6 +270,26 @@ class JetpackConnectionService {
                 )
             }
         }
+
+        // Refresh the blog options, so that we can get the latest Jetpack related status.
+        try await withCheckedThrowingContinuation { [blogId] (continuation: CheckedContinuation<Void, Error>) in
+            DispatchQueue.main.async {
+                let blog: Blog
+                do {
+                    blog = try ContextManager.shared.mainContext.existingObject(with: blogId)
+                } catch {
+                    continuation.resume(throwing: error)
+                    return
+                }
+
+                let service = BlogService(coreDataStack: ContextManager.shared)
+                service.syncBlog(
+                    blog,
+                    success: { continuation.resume(returning: ()) },
+                    failure: { continuation.resume(throwing: $0) }
+                )
+            }
+        }
     }
 }