Skip to content

Delete current Installation when user logs out #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 14, 2021
Merged

Delete current Installation when user logs out #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b480902
Remove current Installation when user logs out
cbaker6 Jan 14, 2021
8db0ab8
Fix broken User.current fetch and installation
cbaker6 Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ParseSwift.playground/contents.xcplayground
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
<page name='10 - Cloud Code'/>
<page name='11 - LiveQuery'/>
</pages>
</playground>
</playground>
56 changes: 30 additions & 26 deletions Sources/ParseSwift/Objects/ParseUser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ extension ParseUser {
internal static func deleteCurrentContainerFromKeychain() {
try? ParseStorage.shared.delete(valueFor: ParseStorage.Keys.currentUser)
try? KeychainStore.shared.delete(valueFor: ParseStorage.Keys.currentUser)
BaseParseUser.currentUserContainer = nil
}

/**
Expand Down Expand Up @@ -200,8 +201,9 @@ extension ParseUser {
*/
public static func logout(options: API.Options = [], callbackQueue: DispatchQueue = .main,
completion: @escaping (ParseError?) -> Void) {
logoutCommand().executeAsync(options: options) { result in
callbackQueue.async {
callbackQueue.async {
logoutCommand().executeAsync(options: options) { result in

switch result {

case .success:
Expand All @@ -228,7 +230,7 @@ extension ParseUser {
}
//Always let user logout locally, no matter the error.
deleteCurrentContainerFromKeychain()
currentUserContainer = nil
BaseParseInstallation.deleteCurrentContainerFromKeychain()
guard let error = parseError else {
return serverResponse
}
Expand Down Expand Up @@ -517,22 +519,24 @@ extension ParseUser {
.executeAsync(options: options,
callbackQueue: callbackQueue) { result in
if case .success(let foundResult) = result {
do {
try Self.updateKeychainIfNeeded([foundResult])
} catch let error {
let returnError: ParseError!
if let parseError = error as? ParseError {
returnError = parseError
} else {
returnError = ParseError(code: .unknownError, message: error.localizedDescription)
}
callbackQueue.async {
callbackQueue.async {
do {
try Self.updateKeychainIfNeeded([foundResult])
completion(.success(foundResult))
} catch let error {
let returnError: ParseError!
if let parseError = error as? ParseError {
returnError = parseError
} else {
returnError = ParseError(code: .unknownError, message: error.localizedDescription)
}
completion(.failure(returnError))
}
}
}
callbackQueue.async {
completion(result)
} else {
callbackQueue.async {
completion(result)
}
}
}
} catch let error as ParseError {
Expand Down Expand Up @@ -617,12 +621,12 @@ extension ParseUser {
callbackQueue: callbackQueue,
childObjects: savedChildObjects,
childFiles: savedChildFiles) { result in
if case .success(let foundResults) = result {
try? Self.updateKeychainIfNeeded([foundResults])
}
callbackQueue.async {
completion(result)
}
callbackQueue.async {
if case .success(let foundResults) = result {
try? Self.updateKeychainIfNeeded([foundResults])
}
completion(result)
}
}
return
}
Expand Down Expand Up @@ -695,8 +699,8 @@ extension ParseUser {
switch result {

case .success(let error):
try? Self.updateKeychainIfNeeded([self], deleting: true)
callbackQueue.async {
try? Self.updateKeychainIfNeeded([self], deleting: true)
completion(error)
}
case .failure(let error):
Expand Down Expand Up @@ -888,8 +892,8 @@ public extension Sequence where Element: ParseUser {
case .success(let saved):
returnBatch.append(contentsOf: saved)
if completed == (batches.count - 1) {
try? Self.Element.updateKeychainIfNeeded(returnBatch.compactMap {try? $0.get()})
callbackQueue.async {
try? Self.Element.updateKeychainIfNeeded(returnBatch.compactMap {try? $0.get()})
completion(.success(returnBatch))
}
}
Expand Down Expand Up @@ -976,8 +980,8 @@ public extension Sequence where Element: ParseUser {
message: "objectId \"\(uniqueObjectId)\" was not found in className \"\(Self.Element.className)\"")))
}
}
try? Self.Element.updateKeychainIfNeeded(fetchedObjects)
callbackQueue.async {
try? Self.Element.updateKeychainIfNeeded(fetchedObjects)
completion(.success(fetchedObjectsToReturn))
}
case .failure(let error):
Expand Down Expand Up @@ -1068,8 +1072,8 @@ public extension Sequence where Element: ParseUser {
case .success(let saved):
returnBatch.append(contentsOf: saved)
if completed == (batches.count - 1) {
try? Self.Element.updateKeychainIfNeeded(self.compactMap {$0})
callbackQueue.async {
try? Self.Element.updateKeychainIfNeeded(self.compactMap {$0})
completion(.success(returnBatch))
}
}
Expand Down
14 changes: 13 additions & 1 deletion Tests/ParseSwiftTests/ParseUserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,9 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
}

func testLogout() {
testLogin()
MockURLProtocol.removeAll()

let logoutResponse = NoBody()

MockURLProtocol.mockRequests { _ in
Expand All @@ -935,9 +938,11 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
try User.logout()
if let userFromKeychain = BaseParseUser.current {
XCTFail("\(userFromKeychain) wasn't deleted from Keychain during logout")
return
}

if let installationFromKeychain = BaseParseInstallation.current {
XCTFail("\(installationFromKeychain) wasn't deleted from Keychain during logout")
}
} catch {
XCTFail(error.localizedDescription)
}
Expand All @@ -952,6 +957,10 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
if let userFromKeychain = BaseParseUser.current {
XCTFail("\(userFromKeychain) wasn't deleted from Keychain during logout")
}

if let installationFromKeychain = BaseParseInstallation.current {
XCTFail("\(installationFromKeychain) wasn't deleted from Keychain during logout")
}
expectation1.fulfill()
return
}
Expand All @@ -962,6 +971,9 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length
}

func testLogoutAsyncMainQueue() {
testLogin()
MockURLProtocol.removeAll()

let logoutResponse = NoBody()

MockURLProtocol.mockRequests { _ in
Expand Down