remove some direct references to the Keychain

Sources/ParseSwift/Objects/ParseInstallation.swift

@@ -94,26 +94,22 @@ struct CurrentInstallationContainer<T: ParseInstallation>: Codable {
 extension ParseInstallation {
     static var currentInstallationContainer: CurrentInstallationContainer<Self> {
         get {
-            guard let installationInMemory: CurrentInstallationContainer<Self> =
-                try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentInstallation) else {
-                    guard let installationFromKeyChain: CurrentInstallationContainer<Self> =
-                        try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentInstallation)
-                         else {
-                            var newInstallation = CurrentInstallationContainer<Self>()
-                            let newInstallationId = UUID().uuidString.lowercased()
-                            newInstallation.installationId = newInstallationId
-                            newInstallation.currentInstallation?.createInstallationId(newId: newInstallationId)
-                            newInstallation.currentInstallation?.updateAutomaticInfo()
-                            try? KeychainStore.shared.set(newInstallation, for: ParseStorage.Keys.currentInstallation)
-                            try? ParseStorage.shared.set(newInstallation, for: ParseStorage.Keys.currentInstallation)
-                        return newInstallation
-                    }
-                    return installationFromKeyChain
+            if let installation: CurrentInstallationContainer<Self> =
+                try? ParseStorage.shared.secureStore.get(valueFor: ParseStorage.Keys.currentInstallation) {
+                return installation
+            } else {
+                var newInstallation = CurrentInstallationContainer<Self>()
+                let newInstallationId = UUID().uuidString.lowercased()
+                newInstallation.installationId = newInstallationId
+                newInstallation.currentInstallation?.createInstallationId(newId: newInstallationId)
+                newInstallation.currentInstallation?.updateAutomaticInfo()
+                try? ParseStorage.shared.secureStore.set(newInstallation, for: ParseStorage.Keys.currentInstallation)
+                return newInstallation
             }
-            return installationInMemory
         }
+
         set {
-            try? ParseStorage.shared.set(newValue, for: ParseStorage.Keys.currentInstallation)
+            try? ParseStorage.shared.secureStore.set(newValue, for: ParseStorage.Keys.currentInstallation)
         }
     }
 
@@ -128,17 +124,18 @@ extension ParseInstallation {
         Self.currentInstallationContainer.currentInstallation?.updateAutomaticInfo()
     }
 
-    internal static func saveCurrentContainerToKeychain() {
-        //Only save the BaseParseInstallation to keep Keychain footprint finite
-        guard let currentInstallationInMemory: CurrentInstallationContainer<BaseParseInstallation>
-            = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentInstallation) else {
+    internal static func saveCurrentContainer() {
+        //Only save the BaseParseInstallation to keep memory footprint finite
+        guard let currentInstallation: CurrentInstallationContainer<BaseParseInstallation>
+                = try? ParseStorage.shared.secureStore.get(valueFor: ParseStorage.Keys.currentInstallation) else {
             return
         }
-        try? KeychainStore.shared.set(currentInstallationInMemory, for: ParseStorage.Keys.currentInstallation)
+
+        try? ParseStorage.shared.secureStore.set(currentInstallation, for: ParseStorage.Keys.currentInstallation)
     }
 
     /**
-     Gets/Sets properties of the current installation in the Keychain.
+     Gets/Sets properties of the current installation in the shared secure store.
 
      - returns: Returns a `ParseInstallation` that is the current device. If there is none, returns `nil`.
     */
@@ -202,8 +199,8 @@ extension ParseInstallation {
 
         if badge != applicationBadge {
             badge = applicationBadge
-            //Since this changes, update the Keychain whenever it changes
-            Self.saveCurrentContainerToKeychain()
+            //Since this changes, update secure storage whenever it changes
+            Self.saveCurrentContainer()
         }
     }
 

Sources/ParseSwift/Objects/ParseObject.swift

@@ -135,7 +135,7 @@ extension ParseObject {
 
 // MARK: Fetchable
 extension ParseObject {
-    internal static func updateKeychainIfNeeded(_ results: [Self], saving: Bool = false) throws {
+    internal static func updateSecureStorageIfNeeded(_ results: [Self], saving: Bool = false) throws {
         guard let currentUser = BaseParseUser.current else {
             return
         }
@@ -152,7 +152,7 @@ extension ParseObject {
             let encoded = try ParseCoding.parseEncoder(skipKeys: false).encode(foundCurrentUser)
             let updatedCurrentUser = try ParseCoding.jsonDecoder().decode(BaseParseUser.self, from: encoded)
             BaseParseUser.current = updatedCurrentUser
-            BaseParseUser.saveCurrentContainerToKeychain()
+            BaseParseUser.saveCurrentUserContainer()
         } else if results.first?.className == BaseParseInstallation.className {
             guard let currentInstallation = BaseParseInstallation.current else {
                 return
@@ -169,7 +169,7 @@ extension ParseObject {
                 let updatedCurrentInstallation =
                     try ParseCoding.jsonDecoder().decode(BaseParseInstallation.self, from: encoded)
                 BaseParseInstallation.current = updatedCurrentInstallation
-                BaseParseInstallation.saveCurrentContainerToKeychain()
+                BaseParseInstallation.saveCurrentContainer()
             }
         }
     }
@@ -182,7 +182,7 @@ extension ParseObject {
     */
     public func fetch(options: API.Options = []) throws -> Self {
         let result: Self = try fetchCommand().execute(options: options)
-        try? Self.updateKeychainIfNeeded([result])
+        try? Self.updateSecureStorageIfNeeded([result])
         return result
     }
 
@@ -203,7 +203,7 @@ extension ParseObject {
          do {
             try fetchCommand().executeAsync(options: options, callbackQueue: callbackQueue) { result in
                 if case .success(let foundResult) = result {
-                    try? Self.updateKeychainIfNeeded([foundResult])
+                    try? Self.updateSecureStorageIfNeeded([foundResult])
                 }
                 completion(result)
             }
@@ -255,7 +255,7 @@ extension ParseObject {
     */
     public func save(options: API.Options = []) throws -> Self {
         let result: Self = try saveCommand().execute(options: options)
-        try? Self.updateKeychainIfNeeded([result], saving: true)
+        try? Self.updateSecureStorageIfNeeded([result], saving: true)
         return result
     }
 
@@ -274,7 +274,7 @@ extension ParseObject {
     ) {
         saveCommand().executeAsync(options: options, callbackQueue: callbackQueue) { result in
             if case .success(let foundResults) = result {
-                try? Self.updateKeychainIfNeeded([foundResults], saving: true)
+                try? Self.updateSecureStorageIfNeeded([foundResults], saving: true)
             }
             completion(result)
         }

Sources/ParseSwift/Objects/ParseUser.swift

@@ -41,27 +41,22 @@ struct CurrentUserContainer<T: ParseUser>: Codable {
 // MARK: Current User Support
 extension ParseUser {
     static var currentUserContainer: CurrentUserContainer<Self>? {
-        get {
-            guard let currentUserInMemory: CurrentUserContainer<Self>
-                = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentUser) else {
-                return try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentUser)
-            }
-            return currentUserInMemory
-        }
-        set { try? ParseStorage.shared.set(newValue, for: ParseStorage.Keys.currentUser) }
+        get { try? ParseStorage.shared.secureStore.get(valueFor: ParseStorage.Keys.currentUser) }
+        set { try? ParseStorage.shared.secureStore.set(newValue, for: ParseStorage.Keys.currentUser)}
     }
 
-    internal static func saveCurrentContainerToKeychain() {
-        //Only save the BaseParseUser to keep Keychain footprint finite
-        guard let currentUserInMemory: CurrentUserContainer<BaseParseUser>
-            = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentUser) else {
+    internal static func saveCurrentUserContainer() {
+        //Only save the BaseParseUser to keep memory footprint finite
+        guard let currentUser: CurrentUserContainer<BaseParseUser> =
+                try? ParseStorage.shared.secureStore.get(valueFor: ParseStorage.Keys.currentUser) else {
             return
         }
-        try? KeychainStore.shared.set(currentUserInMemory, for: ParseStorage.Keys.currentUser)
+
+        try? ParseStorage.shared.secureStore.set(currentUser, for: ParseStorage.Keys.currentUser)
     }
 
     /**
-     Gets the currently logged in user from the Keychain and returns an instance of it.
+     Gets the currently logged in user from the shared secure store and returns an instance of it.
 
      - returns: Returns a `ParseUser` that is the currently logged in user. If there is none, returns `nil`.
     */
@@ -140,7 +135,7 @@ extension ParseUser {
                 currentUser: user,
                 sessionToken: response.sessionToken
             )
-            Self.saveCurrentContainerToKeychain()
+            Self.saveCurrentUserContainer()
             return user
         }
     }
@@ -150,7 +145,7 @@ extension ParseUser {
 extension ParseUser {
 
     /**
-    Logs out the currently logged in user in Keychain *synchronously*.
+    Logs out the currently logged in user in the shared secure store *synchronously*.
     */
     public static func logout() throws {
         _ = try logoutCommand().execute(options: [])
@@ -159,7 +154,7 @@ extension ParseUser {
     /**
      Logs out the currently logged in user *asynchronously*.
 
-     This will also remove the session from the Keychain, log out of linked services
+     This will also remove the session from the shared secure store, log out of linked services
      and all future calls to `current` will return `nil`. This is preferable to using `logout`,
      unless your code is already running from a background thread.
 
@@ -176,7 +171,7 @@ extension ParseUser {
     private static func logoutCommand() -> API.Command<NoBody, Void> {
        return API.Command(method: .POST, path: .logout) { (_) -> Void in
             currentUserContainer = nil
-            try? KeychainStore.shared.delete(valueFor: ParseStorage.Keys.currentUser)
+            try? ParseStorage.shared.secureStore.delete(valueFor: ParseStorage.Keys.currentUser)
        }
     }
 }
@@ -263,7 +258,7 @@ extension ParseUser {
                 currentUser: user,
                 sessionToken: response.sessionToken
             )
-            Self.saveCurrentContainerToKeychain()
+            Self.saveCurrentUserContainer()
             return user
         }
     }
@@ -279,7 +274,7 @@ extension ParseUser {
                 currentUser: user,
                 sessionToken: response.sessionToken
             )
-            Self.saveCurrentContainerToKeychain()
+            Self.saveCurrentUserContainer()
             return user
         }
     }

Sources/ParseSwift/Parse Types/ACL.swift

@@ -194,15 +194,15 @@ public struct ParseACL: Codable, Equatable {
 // Default ACL
 extension ParseACL {
     /**
-     Get the default ACL from the Keychain.
+     Get the default ACL from the shared secure store.
 
      - returns: Returns the default ACL.
     */
     public static func defaultACL() throws -> Self {
 
         let currentUser = BaseParseUser.current
         let aclController: DefaultACL? =
-            try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.defaultACL)
+            try? ParseStorage.shared.secureStore.get(valueFor: ParseStorage.Keys.defaultACL)
 
         if aclController != nil {
             if !aclController!.useCurrentUser {
@@ -261,7 +261,7 @@ extension ParseACL {
                 DefaultACL(defaultACL: acl, lastCurrentUser: currentUser, useCurrentUser: withAccessForCurrentUser)
         }
 
-        try? KeychainStore.shared.set(aclController, for: ParseStorage.Keys.defaultACL)
+        try? ParseStorage.shared.secureStore.set(aclController, for: ParseStorage.Keys.defaultACL)
 
         return aclController.defaultACL
     }

Sources/ParseSwift/Parse Types/Internal/BaseParseInstallation.swift

@@ -26,7 +26,7 @@ internal struct BaseParseInstallation: ParseInstallation {
     var ACL: ParseACL?
 
     init() {
-        //Force installation in keychain to be created if it hasn't already
+        //Force installation in secure store to be created if it hasn't already
         Self.current = self
     }
 }

Sources/ParseSwift/Parse Types/Query.swift

@@ -238,7 +238,7 @@ extension Query: Queryable {
     */
     public func find(options: API.Options = []) throws -> [ResultType] {
         let foundResults = try findCommand().execute(options: options)
-        try? ResultType.updateKeychainIfNeeded(foundResults)
+        try? ResultType.updateSecureStorageIfNeeded(foundResults)
         return foundResults
     }
 
@@ -254,7 +254,7 @@ extension Query: Queryable {
                      completion: @escaping (Result<[ResultType], ParseError>) -> Void) {
         findCommand().executeAsync(options: options, callbackQueue: callbackQueue) { results in
             if case .success(let foundResults) = results {
-                try? ResultType.updateKeychainIfNeeded(foundResults)
+                try? ResultType.updateSecureStorageIfNeeded(foundResults)
             }
             completion(results)
         }
@@ -273,7 +273,7 @@ extension Query: Queryable {
     public func first(options: API.Options = []) throws -> ResultType? {
         let result = try firstCommand().execute(options: options)
         if let foundResult = result {
-            try? ResultType.updateKeychainIfNeeded([foundResult])
+            try? ResultType.updateSecureStorageIfNeeded([foundResult])
         }
         return result
     }
@@ -300,7 +300,7 @@ extension Query: Queryable {
                     completion(.failure(ParseError(code: .unknownError, message: "unable to unwrap data") ))
                     return
                 }
-                try? ResultType.updateKeychainIfNeeded([first])
+                try? ResultType.updateSecureStorageIfNeeded([first])
                 completion(.success(first))
             case .failure(let error):
                 completion(.failure(error))

Sources/ParseSwift/Parse.swift

@@ -13,7 +13,8 @@ public func initialize(
     clientKey: String? = nil,
     masterKey: String? = nil,
     serverURL: URL,
-    primitiveObjectStore: PrimitiveObjectStore? = nil
+    primitiveObjectStore: PrimitiveObjectStore? = nil,
+    secureStore: PrimitiveObjectStore? = nil
 ) {
     ParseConfiguration.applicationId = applicationId
     ParseConfiguration.clientKey = clientKey
@@ -23,7 +24,9 @@ public func initialize(
                                             .filter { $0 != "/" }
                                             .joined(separator: "/")
 
-    ParseStorage.shared.use(primitiveObjectStore ?? CodableInMemoryPrimitiveObjectStore())
+    ParseStorage.shared.secureStore = secureStore ?? KeychainStore.shared
+    ParseStorage.shared.primitiveStore = primitiveObjectStore ?? CodableInMemoryPrimitiveObjectStore()
+
     DispatchQueue.main.async {
         _ = BaseParseInstallation()
     }

Sources/ParseSwift/Storage/ParseStorage.swift

@@ -9,44 +9,12 @@
 public struct ParseStorage {
     public static var shared = ParseStorage()
 
-    private var backingStore: PrimitiveObjectStore!
-
-    mutating func use(_ store: PrimitiveObjectStore) {
-        self.backingStore = store
-    }
-
-    private mutating func requireBackingStore() {
-        guard backingStore != nil else {
-            print("You can't use ParseStorage without a backing store. An in-memory store is being used as a fallback.")
-            return
-        }
-    }
+    var primitiveStore: PrimitiveObjectStore = CodableInMemoryPrimitiveObjectStore()
+    var secureStore: PrimitiveObjectStore = KeychainStore.shared
 
     enum Keys {
         static let currentUser = "_currentUser"
         static let currentInstallation = "_currentInstallation"
         static let defaultACL = "_defaultACL"
     }
 }
-
-// MARK: PrimitiveObjectStore
-extension ParseStorage: PrimitiveObjectStore {
-    public mutating func delete(valueFor key: String) throws {
-        requireBackingStore()
-        return try backingStore.delete(valueFor: key)
-    }
-
-    public mutating func deleteAll() throws {
-        requireBackingStore()
-        return try backingStore.deleteAll()
-    }
-    public mutating func get<T>(valueFor key: String) throws -> T? where T: Decodable {
-        requireBackingStore()
-        return try backingStore.get(valueFor: key)
-    }
-
-    public mutating func set<T>(_ object: T, for key: String) throws where T: Encodable {
-        requireBackingStore()
-        return try backingStore.set(object, for: key)
-    }
-}

Tests/ParseSwiftTests/ACLTests.swift

@@ -26,8 +26,7 @@ class ACLTests: XCTestCase {
 
     override func tearDown() {
         super.tearDown()
-        try? KeychainStore.shared.deleteAll()
-        try? ParseStorage.shared.deleteAll()
+        try? ParseStorage.shared.secureStore.deleteAll()
     }
 
     struct User: ParseUser {

Tests/ParseSwiftTests/APICommandTests.swift

@@ -27,8 +27,7 @@ class APICommandTests: XCTestCase {
     override func tearDown() {
         super.tearDown()
         MockURLProtocol.removeAll()
-        try? KeychainStore.shared.deleteAll()
-        try? ParseStorage.shared.deleteAll()
+        try? ParseStorage.shared.secureStore.deleteAll()
     }
 
     func testExecuteCorrectly() {