Fix an issue with RemoteBlog failing to parse non-standard capabilities (#25474)

* Fix an issue with RemoteBlog failing to parse non-standard capabilities

* Revert me-site-success change

* Update unit tests

Author: kean

Modules/Sources/WordPressKitModels/RemoteBlog.swift

@@ -52,7 +52,7 @@ import Foundation
     public var options: NSDictionary
 
     /// Blog's capabilities: Indicate which actions are allowed / not allowed, for the current user.
-    public var capabilities: [String: Bool]
+    public var capabilities: [String: Any]
 
     /// Blog's total disk quota space.
     public var quotaSpaceAllowed: NSNumber?
@@ -74,7 +74,7 @@ import Foundation
         self.jetpack = json.number(forKey: "jetpack")?.boolValue ?? false
         self.jetpackConnection = json.number(forKey: "jetpack_connection")?.boolValue ?? false
         self.icon = json.string(forKeyPath: "icon.img")
-        self.capabilities = json.object(forKey: "capabilities") as? [String: Bool] ?? [:]
+        self.capabilities = json.object(forKey: "capabilities") as? [String: Any] ?? [:]
         self.isAdmin = json.number(forKeyPath: "capabilities.manage_options")?.boolValue ?? false
         self.visible = json.number(forKey: "visible")?.boolValue ?? false
         self.options = RemoteBlogOptionsHelper.mapOptions(fromResponse: json)

Tests/KeystoneTests/Tests/Services/JetpackCapabilitiesServiceTests.swift

@@ -24,8 +24,8 @@ class JetpackCapabilitiesServiceTests: CoreDataTestCase {
         let service = JetpackCapabilitiesService(coreDataStack: contextManager, capabilitiesServiceRemote: remoteMock)
 
         service.sync(blogs: [RemoteBlog.mock()], success: { blogs in
-            XCTAssertTrue(blogs.first!.capabilities["backup"]!)
-            XCTAssertTrue(blogs.first!.capabilities["scan"]!)
+            XCTAssertTrue(blogs.first!.capabilities["backup"]! as! Bool)
+            XCTAssertTrue(blogs.first!.capabilities["scan"]! as! Bool)
             expect.fulfill()
         })
 

Tests/WordPressKitTests/WordPressKitTests/Mock Data/me-sites-success.json

@@ -7,6 +7,7 @@
               "URL": "https:\/\/test1.wordpress.com",
               "user_can_manage": false,
               "capabilities": {
+              "vc_access_rules_post_types": "custom",
               "edit_pages": true,
               "edit_posts": true,
               "edit_others_posts": true,

Tests/WordPressKitTests/WordPressKitTests/Tests/AccountServiceRemoteRESTTests.swift

@@ -143,6 +143,23 @@ class AccountServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
         stubRemoteResponse(meSitesEndpoint, filename: getBlogsSuccessMockFilename, contentType: .ApplicationJSON)
         remote.getBlogsWithSuccess({ blogs in
             XCTAssertEqual(blogs?.count, 3, "There should be 3 blogs here")
+
+            guard let blog = blogs?.first as? RemoteBlog else {
+                XCTFail("Blogs should not be empty")
+                expect.fulfill()
+                return
+            }
+
+            XCTAssertEqual(blog.blogID, NSNumber(value: 55555551))
+            XCTAssertEqual(blog.name, "Public Test Blog")
+            XCTAssertEqual(blog.url, "https://test1.wordpress.com")
+
+            // Check some capabilities
+            XCTAssertTrue(blog.capabilities["edit_pages"] as? Bool ?? false)
+            XCTAssertTrue(blog.capabilities["edit_posts"] as? Bool ?? false)
+            XCTAssertTrue(blog.capabilities["publish_posts"] as? Bool ?? false)
+            XCTAssertEqual(blog.capabilities["vc_access_rules_post_types"] as? String, "custom", "Non-boolean capabilities are preserved and parsed correctly")
+
             expect.fulfill()
         }, failure: { _ in
             XCTFail("This callback shouldn't get called")

WordPress/WordPressShareExtension/Sources/Extensions/RemoteBlog+Capabilities.swift

@@ -25,7 +25,7 @@ extension RemoteBlog {
     /// Returns true if a given capability is enabled. False otherwise
     ///
     public func isUserCapableOf(_ capability: Capability) -> Bool {
-        return capabilities[capability.rawValue, default: false]
+        return capabilities[capability.rawValue] as? Bool ?? false
     }
 
     /// Returns true if the current user is allowed to publish to the Blog