Ensure that test secure storage access impl shares and returns token data (#415)

Author: Julian Locke

TestSwiftyDropbox/TestSwiftyDropbox_iOSTests/SwiftyDropboxTestExtensions.swift

@@ -30,23 +30,23 @@ public class DBXSecureStorageAccessTestImpl: DBXSecureStorageAccessImpl {
 }
 
 public class SecureStorageAccessTestImpl: SecureStorageAccess {
-    private var accessTokenData: Data?
+    private static var accessTokenData: Data?
 
     public init() {}
 
     public func checkAccessibilityMigrationOneTime() {}
 
     public func setAccessTokenData(for userId: String, data: Data) -> Bool {
-        accessTokenData = data
+        Self.accessTokenData = data
         return true
     }
 
     public func getAllUserIds() -> [String] {
-        []
+        [TestAuthTokenGenerator.testUid]
     }
 
     public func getDropboxAccessToken(for key: String) -> DropboxAccessToken? {
-        guard let accessTokenData = accessTokenData else {
+        guard let accessTokenData = Self.accessTokenData else {
             return nil
         }
 

TestSwiftyDropbox/TestSwiftyDropbox_iOSTests/TeamRoutesTests.swift

@@ -56,14 +56,14 @@ class TeamRoutesTests: XCTestCase {
             apiAppKey,
             transportClient: transportClient,
             secureStorageAccess: SecureStorageAccessTestImpl(),
-            tokenUid: TestUid
+            tokenUid: TestAuthTokenGenerator.testUid
         )
         #elseif os(iOS)
         DropboxClientsManager.setupWithTeamAppKeyMultiUser(
             apiAppKey,
             transportClient: transportClient,
             secureStorageAccess: SecureStorageAccessTestImpl(),
-            tokenUid: TestUid
+            tokenUid: TestAuthTokenGenerator.testUid
         )
         #endif
 

TestSwiftyDropbox/TestUtils/TestTokenAuthGenerator.swift

@@ -1,14 +1,15 @@
 @testable import SwiftyDropbox
 import XCTest
 
-let TestUid = "test" // non-empty string needed here as subsequent tokens will share the uid and macOS keychain drops the attribute if empty
 enum TestAuthTokenGenerator {
+    static let testUid = "test" // non-empty string needed here as subsequent tokens will share the uid and macOS keychain drops the attribute if empty
+
     static func transportClient(with refreshToken: String, apiKey: String, scopes: [String]) -> DropboxTransportClient? {
         let manager = SwiftyDropbox.DropboxOAuthManager(appKey: apiKey, secureStorageAccess: SecureStorageAccessTestImpl())
 
         let defaultToken = DropboxAccessToken(
             accessToken: "",
-            uid: TestUid,
+            uid: Self.testUid,
             refreshToken: refreshToken,
             tokenExpirationTimestamp: 0
         )