StoresManager: Updating initializer

Author: jleandroperez

WooCommerce/Classes/System/SessionManager.swift

@@ -8,6 +8,12 @@ import KeychainAccess
 ///
 struct SessionManager {
 
+    /// Standard Session Manager
+    ///
+    static var standard: SessionManager {
+        return SessionManager(defaults: .standard, keychainServiceName: WooConstants.keychainServiceName)
+    }
+
     /// Reference to the UserDefaults Instance that should be used.
     ///
     private let defaults: UserDefaults

WooCommerce/Classes/Yosemite/StoresManager.swift

@@ -9,7 +9,7 @@ class StoresManager {
 
     /// Shared Instance
     ///
-    static var shared = StoresManager(defaults: .standard, keychainServiceName: WooConstants.keychainServiceName)
+    static var shared = StoresManager(sessionManager: .standard)
 
     /// SessionManager: Persistent Storage for Session-Y Properties.
     ///
@@ -32,9 +32,8 @@ class StoresManager {
 
     /// Designated Initializer
     ///
-    init(defaults: UserDefaults, keychainServiceName: String) {
-        sessionManager = SessionManager(defaults: defaults, keychainServiceName: keychainServiceName)
-
+    init(sessionManager: SessionManager) {
+        self.sessionManager = sessionManager
         authenticateIfPossible()
     }
 
@@ -72,7 +71,7 @@ private extension StoresManager {
     /// Switches over to the AuthenticatedState whenever needed / possible!.
     ///
     func authenticateIfPossible() {
-        guard !isAuthenticated, let credentials = sessionManager.credentials else {
+        guard let credentials = sessionManager.credentials else {
             return
         }
 

WooCommerce/WooCommerceTests/System/SessionManagerTests.swift

@@ -9,7 +9,7 @@ class SessionManagerTests: XCTestCase {
 
     /// CredentialsStorage Unit-Testing Instance
     ///
-    private var manager = SessionManager(defaults: .standard, keychainServiceName: Settings.keychainServiceName)
+    private var manager = SessionManager(defaults: Settings.defaults, keychainServiceName: Settings.keychainServiceName)
 
 
     // MARK: - Overridden Methods

WooCommerce/WooCommerceTests/Yosemite/StoresManagerTests.swift

@@ -87,7 +87,7 @@ private extension StoresManager {
     /// Returns a StoresManager instance with testing Keychain/UserDefaults
     ///
     static var testingInstance: StoresManager {
-        return StoresManager(defaults: Settings.defaults, keychainServiceName: Settings.keychainServiceName)
+        return StoresManager(sessionManager: .testingInstance)
     }
 }