simonfranken/timetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Simon Franken
2026-02-18 21:51:43 +01:00
parent b66b433c08
commit 4c0d8be018
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ios/TimeTracker/TimeTracker/Core/Auth/AuthService.swift
View File

@@ -12,7 +12,7 @@ final class AuthService: NSObject {
super.init() super.init()
} }
func login(presentationAnchor: ASPresentationAnchor) async throws -> URL? { func login(presentationAnchor: ASPresentationAnchor) async throws {
self.presentationAnchor = presentationAnchor self.presentationAnchor = presentationAnchor
let codeVerifier = generateCodeVerifier() let codeVerifier = generateCodeVerifier()
@@ -44,14 +44,31 @@ final class AuthService: NSObject {
callbackURLScheme: callbackScheme callbackURLScheme: callbackScheme
) { [weak self] callbackURL, error in ) { [weak self] callbackURL, error in
if let error = error { if let error = error {
let authError: AuthError
if (error as? ASWebAuthenticationSessionError)?.code == .canceledLogin { if (error as? ASWebAuthenticationSessionError)?.code == .canceledLogin {
throw AuthError.cancelled authError = .cancelled
} else {
authError = .failed(error.localizedDescription)
} }
throw AuthError.failed(error.localizedDescription) DispatchQueue.main.async {
NotificationCenter.default.post(
name: .authError,
object: nil,
userInfo: ["error": authError]
)
}
return
} }
guard let callbackURL = callbackURL else { guard let callbackURL = callbackURL else {
throw AuthError.noCallback DispatchQueue.main.async {
NotificationCenter.default.post(
name: .authError,
object: nil,
userInfo: ["error": AuthError.noCallback]
)
}
return
} }
self?.handleCallback(url: callbackURL, session: session) self?.handleCallback(url: callbackURL, session: session)
@@ -62,10 +79,14 @@ final class AuthService: NSObject {
self.authSession = webAuthSession self.authSession = webAuthSession
return await withCheckedContinuation { continuation in webAuthSession.start { started in
webAuthSession.start { started in if !started {
if !started { DispatchQueue.main.async {
continuation.resume(returning: nil) NotificationCenter.default.post(
name: .authError,
object: nil,
userInfo: ["error": AuthError.failed("Failed to start auth session")]
)
} }
} }
} }
@@ -138,4 +159,5 @@ enum AuthError: LocalizedError {
extension Notification.Name { extension Notification.Name {
static let authCallbackReceived = Notification.Name("authCallbackReceived") static let authCallbackReceived = Notification.Name("authCallbackReceived")
static let authError = Notification.Name("authError")
} }