Skip to content
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

Jump to bottom

fix(auth): sign out regardless of request success #375

Merged
merged 2 commits into from
May 10, 2024
Merged

fix(auth): sign out regardless of request success #375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c869307
Logout should always reset the session.
leoMehlig May 9, 2024
99a7780
Update Sources/Auth/AuthClient.swift
leoMehlig May 10, 2024
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
23 changes: 13 additions & 10 deletions Sources/Auth/AuthClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,15 +698,23 @@ public final class AuthClient: Sendable {
/// If using ``SignOutScope/others`` scope, no ``AuthChangeEvent/signedOut`` event is fired.
/// - Parameter scope: Specifies which sessions should be logged out.
public func signOut(scope: SignOutScope = .global) async throws {
do {
// Make sure we have a valid session.
_ = try await sessionManager.session()
guard let accessToken = currentSession?.accessToken else {
configuration.logger?.warning("signOut called without a session")
return
}

if scope != .others {
await sessionManager.remove()
eventEmitter.emit(.signedOut, session: nil)
}

try await api.authorizedExecute(
do {
_ = try await api.execute(
.init(
url: configuration.url.appendingPathComponent("logout"),
method: .post,
query: [URLQueryItem(name: "scope", value: scope.rawValue)]
query: [URLQueryItem(name: "scope", value: scope.rawValue)],
headers: [.init(name: "Authorization", value: "Bearer \(accessToken)")]
)
)
} catch {
Expand All @@ -720,11 +728,6 @@ public final class AuthClient: Sendable {
throw error
}
}

if scope != .others {
await sessionManager.remove()
eventEmitter.emit(.signedOut, session: nil)
}
}

/// Log in an user given a User supplied OTP received via email.
Expand Down
Loading