SessionManager: defaultAccount / defaultAccountID Fields

Author: jleandroperez

WooCommerce/Classes/System/SessionManager.swift

@@ -22,13 +22,17 @@ struct SessionManager {
     ///
     private let keychain: Keychain
 
-    /// Active Credentials.
+    /// Default Credentials.
     ///
-    var credentials: Credentials? {
+    var defaultCredentials: Credentials? {
         get {
             return loadCredentials()
         }
         set {
+            guard newValue != defaultCredentials else {
+                return
+            }
+
             guard let credentials = newValue else {
                 removeCredentials()
                 return
@@ -38,14 +42,28 @@ struct SessionManager {
         }
     }
 
-    /// Active Store's Site ID.
+    /// Ephemeral: Default Account.
+    ///√
+    var defaultAccount: Yosemite.Account? {
+        didSet {
+            defaults[.defaultAccountID] = defaultAccount?.userID
+        }
+    }
+
+    /// Default AccountID: Returns the last known Account's User ID.
+    ///
+    var defaultAccountID: Int? {
+        return defaults[.defaultAccountID]
+    }
+
+    /// Default StoreID.
     ///
-    var storeID: Int? {
+    var defaultStoreID: Int? {
         get {
             return defaults[.defaultStoreID]
         }
         set {
-            defaults[.defaultStoreID] = storeID
+            defaults[.defaultStoreID] = defaultStoreID
         }
     }
 
@@ -60,8 +78,9 @@ struct SessionManager {
     /// Nukes all of the known Session's properties.
     ///
     mutating func reset() {
-        credentials = nil
-        storeID = nil
+        defaultAccount = nil
+        defaultCredentials = nil
+        defaultStoreID = nil
     }
 }
 

WooCommerce/WooCommerceTests/System/SessionManagerTests.swift

@@ -16,23 +16,23 @@ class SessionManagerTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        manager.credentials = nil
+        manager.defaultCredentials = nil
     }
 
 
     /// Verifies that `loadDefaultCredentials` returns nil whenever there are no default credentials stored.
     ///
     func testLoadDefaultCredentialsReturnsNilWhenThereAreNoDefaultCredentials() {
-        XCTAssertNil(manager.credentials)
+        XCTAssertNil(manager.defaultCredentials)
     }
 
 
     /// Verifies that `loadDefaultCredentials` effectively returns the last stored credentials
     ///
     func testDefaultCredentialsAreProperlyPersisted() {
-        manager.credentials = Settings.credentials1
+        manager.defaultCredentials = Settings.credentials1
 
-        let retrieved = manager.credentials
+        let retrieved = manager.defaultCredentials
         XCTAssertEqual(retrieved?.authToken, Settings.credentials1.authToken)
         XCTAssertEqual(retrieved?.username, Settings.credentials1.username)
     }
@@ -41,21 +41,21 @@ class SessionManagerTests: XCTestCase {
     /// Verifies that `removeDefaultCredentials` effectively nukes everything from the keychain
     ///
     func testDefaultCredentialsAreEffectivelyNuked() {
-        manager.credentials = Settings.credentials1
-        manager.credentials = nil
+        manager.defaultCredentials = Settings.credentials1
+        manager.defaultCredentials = nil
 
-        XCTAssertNil(manager.credentials)
+        XCTAssertNil(manager.defaultCredentials)
     }
 
 
     /// Verifies that `saveDefaultCredentials` overrides previous stored credentials
     ///
     func testDefaultCredentialsCanBeUpdated() {
-        manager.credentials = Settings.credentials1
-        XCTAssertEqual(manager.credentials, Settings.credentials1)
+        manager.defaultCredentials = Settings.credentials1
+        XCTAssertEqual(manager.defaultCredentials, Settings.credentials1)
 
-        manager.credentials = Settings.credentials2
-        XCTAssertEqual(manager.credentials, Settings.credentials2)
+        manager.defaultCredentials = Settings.credentials2
+        XCTAssertEqual(manager.defaultCredentials, Settings.credentials2)
     }
 }