fix: SDK does not properly wait for initialization (#168)

* fix: SDK does not properly wait for initialization * add a change log entry * lint
netreconlab · Apr 1, 2024 · 9b7a960 · 9b7a960
1 parent 702ca34
commit 9b7a960
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,16 @@
 # Parse-Swift Changelog
 
 ### main
-[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.2...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift)
+[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.3...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift)
 * _Contributing to this repo? Add info about your change here to be included in the next release_
 
 
+### 5.9.3
+[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.2...5.9.3), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.3/documentation/parseswift)
+
+__Fixes__
+* Certain calls to the user or installation did not wait for the SDK to initialize causing a crash ([#163](https://github.com/netreconlab/Parse-Swift/pull/163)), thanks to [Corey Baker](https://github.com/cbaker6).
+
 ### 5.9.2
 [Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.1...5.9.2), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.2/documentation/parseswift)
 

diff --git a/Sources/ParseSwift/Authentication/Protocols/ParseAuthentication.swift b/Sources/ParseSwift/Authentication/Protocols/ParseAuthentication.swift
@@ -420,6 +420,7 @@ public extension ParseUser {
     }
 
     internal func linkCommand(body: SignupLoginBody) async throws -> API.Command<SignupLoginBody, Self> {
+        try await yieldIfNotInitialized()
         let currentStrippedUser = try await self.anonymous.strip()
         var body = body
         if var currentAuthData = currentStrippedUser.authData {

diff --git a/Sources/ParseSwift/Objects/ParseInstallation.swift b/Sources/ParseSwift/Objects/ParseInstallation.swift
@@ -1230,10 +1230,25 @@ public extension ParseInstallation {
      - note: The default cache policy for this method is `.reloadIgnoringLocalCacheData`. If a developer
      desires a different policy, it should be inserted in `options`.
     */
-    static func deleteObjCKeychain(options: API.Options = [],
-                                   callbackQueue: DispatchQueue = .main,
-                                   completion: @escaping (Result<Void, ParseError>) -> Void) {
+    static func deleteObjCKeychain( // swiftlint:disable:this function_body_length
+        options: API.Options = [],
+        callbackQueue: DispatchQueue = .main,
+        completion: @escaping (Result<Void, ParseError>) -> Void
+    ) {
         Task {
+            do {
+                try await yieldIfNotInitialized()
+            } catch {
+                let defaultError = ParseError(
+                    code: .otherCause,
+                    swift: error
+                )
+                let parseError = error as? ParseError ?? defaultError
+                callbackQueue.async {
+                    completion(.failure(parseError))
+                }
+                return
+            }
             guard let objcParseKeychain = KeychainStore.objectiveC,
                   // swiftlint:disable:next line_length
                   let oldInstallationId: String = await objcParseKeychain.objectObjectiveC(forKey: "installationId") else {

diff --git a/Sources/ParseSwift/Objects/ParseUser.swift b/Sources/ParseSwift/Objects/ParseUser.swift
@@ -186,6 +186,7 @@ public extension ParseUser {
     }
 
     internal static func setCurrent(_ newValue: Self?) async throws {
+        try await yieldIfNotInitialized()
         var currentContainer = await Self.currentContainer()
         if let newValue = newValue,
             let currentUser = currentContainer?.currentUser {
@@ -438,6 +439,19 @@ extension ParseUser {
                                               callbackQueue: DispatchQueue = .main,
                                               completion: @escaping (Result<Self, ParseError>) -> Void) {
         Task {
+            do {
+                try await yieldIfNotInitialized()
+            } catch {
+                let defaultError = ParseError(
+                    code: .otherCause,
+                    swift: error
+                )
+                let parseError = error as? ParseError ?? defaultError
+                callbackQueue.async {
+                    completion(.failure(parseError))
+                }
+                return
+            }
             let objcParseKeychain = KeychainStore.objectiveC
             // swiftlint:disable:next line_length
             guard let objcParseUser: [String: String] = await objcParseKeychain?.objectObjectiveC(forKey: "currentUser"),

diff --git a/Sources/ParseSwift/ParseConstants.swift b/Sources/ParseSwift/ParseConstants.swift
@@ -10,7 +10,7 @@ import Foundation
 
 enum ParseConstants {
     static let sdk = "swift"
-    static let version = "5.9.2"
+    static let version = "5.9.3"
     static let fileManagementDirectory = "parse/"
     static let fileManagementPrivateDocumentsDirectory = "Private Documents/"
     static let fileManagementLibraryDirectory = "Library/"