From e89eaeec09f1be541758be9bf89f006cc329ef3e Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Thu, 8 Aug 2024 22:23:11 -0600 Subject: [PATCH] Fix UserSession Resolution (#1175) * fix and clean * fix --- .../Coordinators/MainCoordinator/iOSMainCoordinator.swift | 7 ++----- Swiftfin/App/SwiftfinApp.swift | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Shared/Coordinators/MainCoordinator/iOSMainCoordinator.swift b/Shared/Coordinators/MainCoordinator/iOSMainCoordinator.swift index e60781ad..71c868c7 100644 --- a/Shared/Coordinators/MainCoordinator/iOSMainCoordinator.swift +++ b/Shared/Coordinators/MainCoordinator/iOSMainCoordinator.swift @@ -24,9 +24,6 @@ final class MainCoordinator: NavigationCoordinatable { @Injected(\.logService) private var logger - @Injected(\.currentUserSession) - private var userSession - var stack: Stinsen.NavigationStack @Root @@ -53,7 +50,7 @@ final class MainCoordinator: NavigationCoordinatable { do { try await SwiftfinStore.setupDataStack() - if userSession != nil, !Defaults[.signOutOnClose] { + if Container.shared.currentUserSession() != nil, !Defaults[.signOutOnClose] { await MainActor.run { withAnimation(.linear(duration: 0.1)) { let _ = root(\.serverCheck) @@ -121,7 +118,7 @@ final class MainCoordinator: NavigationCoordinatable { @objc func didChangeCurrentServerURL(_ notification: Notification) { - guard userSession != nil else { return } + guard Container.shared.currentUserSession() != nil else { return } Container.shared.currentUserSession.reset() Notifications[.didSignIn].post() diff --git a/Swiftfin/App/SwiftfinApp.swift b/Swiftfin/App/SwiftfinApp.swift index eabd79dd..1e200a5d 100644 --- a/Swiftfin/App/SwiftfinApp.swift +++ b/Swiftfin/App/SwiftfinApp.swift @@ -66,7 +66,7 @@ struct SwiftfinApp: App { // Swiftfin // don't keep last user id - if Defaults[.signOutOnClose] || Container.shared.currentUserSession() == nil { + if Defaults[.signOutOnClose] { Defaults[.lastSignedInUserID] = nil } }