Merge pull request #567 from wordpress-mobile/task/add-settings-two-step-enabled

Add twoStepEnabled property to AccountSettings

Author: salimbraksa

CHANGELOG.md

@@ -39,7 +39,7 @@ _None._
 
 ### New Features
 
-_None._
+- Add `twoStepEnabled` property to `AccountSettings` model. [#567]
 
 ### Bug Fixes
 

WordPressKit/AccountSettings.swift

@@ -18,6 +18,7 @@ public struct AccountSettings {
     public let language: String    // language
     public let tracksOptOut: Bool
     public let blockEmailNotifications: Bool
+    public let twoStepEnabled: Bool // two_step_enabled
 
     public init(firstName: String,
                 lastName: String,
@@ -32,7 +33,8 @@ public struct AccountSettings {
                 webAddress: String,
                 language: String,
                 tracksOptOut: Bool,
-                blockEmailNotifications: Bool) {
+                blockEmailNotifications: Bool,
+                twoStepEnabled: Bool) {
         self.firstName = firstName
         self.lastName = lastName
         self.displayName = displayName
@@ -47,6 +49,7 @@ public struct AccountSettings {
         self.language = language
         self.tracksOptOut = tracksOptOut
         self.blockEmailNotifications = blockEmailNotifications
+        self.twoStepEnabled = twoStepEnabled
     }
 }
 

WordPressKit/AccountSettingsRemote.swift

@@ -157,8 +157,7 @@ public class AccountSettingsRemote: ServiceRemoteWordPressComREST {
     }
 
     private func settingsFromResponse(_ responseObject: AnyObject) throws -> AccountSettings {
-        guard let
-            response = responseObject as? [String: AnyObject],
+        guard let response = responseObject as? [String: AnyObject],
             let firstName = response["first_name"] as? String,
             let lastName = response["last_name"] as? String,
             let displayName = response["display_name"] as? String,
@@ -172,10 +171,12 @@ public class AccountSettingsRemote: ServiceRemoteWordPressComREST {
             let webAddress = response["user_URL"] as? String,
             let language = response["language"] as? String,
             let tracksOptOut = response["tracks_opt_out"] as? Bool,
-            let blockEmailNotifications = response["subscription_delivery_email_blocked"] as? Bool else {
-                WPKitLogError("Error decoding me/settings response: \(responseObject)")
-                throw ResponseError.decodingFailure
-            }
+            let blockEmailNotifications = response["subscription_delivery_email_blocked"] as? Bool,
+            let twoStepEnabled = response["two_step_enabled"] as? Bool
+        else {
+            WPKitLogError("Error decoding me/settings response: \(responseObject)")
+            throw ResponseError.decodingFailure
+        }
 
         let aboutMeText = aboutMe.decodingXMLCharacters()
 
@@ -192,7 +193,8 @@ public class AccountSettingsRemote: ServiceRemoteWordPressComREST {
                                webAddress: webAddress,
                                language: language,
                                tracksOptOut: tracksOptOut,
-                               blockEmailNotifications: blockEmailNotifications)
+                               blockEmailNotifications: blockEmailNotifications,
+                               twoStepEnabled: twoStepEnabled)
     }
 
     private func fieldNameForChange(_ change: AccountSettingsChange) -> String {