Skip to content

fix(Auth): Signout will completely delete the session in webui #542

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 3 commits into from
Jun 15, 2020
Merged

fix(Auth): Signout will completely delete the session in webui #542

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1506b1a
chore(release): Prep 1.0.1 release
royjit Jun 5, 2020
24e935d
Removed pod file updates
royjit Jun 5, 2020
bbf6739
fix(Auth): Signout will completely delete the session in webui
royjit Jun 12, 2020
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
20 changes: 8 additions & 12 deletions ...yPlugins/Auth/AWSCognitoAuthPlugin/Dependency/AuthenticationProviderAdapter+SignOut.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,24 @@ extension AuthenticationProviderAdapter {

func signOut(request: AuthSignOutRequest, completionHandler: @escaping (Result<Void, AuthError>) -> Void) {

if request.options.globalSignOut {
// If user is signed in through HostedUI the signout require UI to complete. So calling this in main thread.
DispatchQueue.main.async { [weak self] in
guard let self = self else {
return
}
self.signOutWithUI(completionHandler)
// If user is signed in through HostedUI the signout require UI to complete. So calling this in main thread.
DispatchQueue.main.async { [weak self] in
guard let self = self else {
return
}
} else {
awsMobileClient.signOutLocally()
completionHandler(.success(()))
self.signOutWithUI(isGlobalSignout: request.options.globalSignOut,
completionHandler: completionHandler)
}
}

private func signOutWithUI(_ completionHandler: @escaping (Result<Void, AuthError>) -> Void) {
private func signOutWithUI(isGlobalSignout: Bool, completionHandler: @escaping (Result<Void, AuthError>) -> Void) {

// Stop the execution here if we are not running on the main thread.
// There is no point on returning an error back to the developer, because
// they do not control how the UI is presented.
dispatchPrecondition(condition: .onQueue(DispatchQueue.main))

let signOutOptions = SignOutOptions(signOutGlobally: true, invalidateTokens: true)
let signOutOptions = SignOutOptions(signOutGlobally: isGlobalSignout, invalidateTokens: true)
awsMobileClient.signOut(options: signOutOptions) { [weak self] error in
guard error == nil else {
let authError = AuthErrorHelper.toAuthError(error!)
Expand Down