ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UserSession Resolution (#1175) 

* fix and clean

* fix
This commit is contained in:
Ethan Pippin 2024-08-08 22:23:11 -06:00 committed by GitHub
parent d85ffb4156
commit e89eaeec09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shared/Coordinators/MainCoordinator/iOSMainCoordinator.swift
View File

@ -24,9 +24,6 @@ final class MainCoordinator: NavigationCoordinatable {
@Injected(\.logService) @Injected(\.logService)
private var logger private var logger
@Injected(\.currentUserSession)
private var userSession
var stack: Stinsen.NavigationStack<MainCoordinator> var stack: Stinsen.NavigationStack<MainCoordinator>
@Root @Root
@ -53,7 +50,7 @@ final class MainCoordinator: NavigationCoordinatable {
do { do {
try await SwiftfinStore.setupDataStack() try await SwiftfinStore.setupDataStack()
if userSession != nil, !Defaults[.signOutOnClose] { if Container.shared.currentUserSession() != nil, !Defaults[.signOutOnClose] {
await MainActor.run { await MainActor.run {
withAnimation(.linear(duration: 0.1)) { withAnimation(.linear(duration: 0.1)) {
let _ = root(\.serverCheck) let _ = root(\.serverCheck)
@ -121,7 +118,7 @@ final class MainCoordinator: NavigationCoordinatable {
@objc @objc
func didChangeCurrentServerURL(_ notification: Notification) { func didChangeCurrentServerURL(_ notification: Notification) {
guard userSession != nil else { return } guard Container.shared.currentUserSession() != nil else { return }
Container.shared.currentUserSession.reset() Container.shared.currentUserSession.reset()
Notifications[.didSignIn].post() Notifications[.didSignIn].post()

2
Swiftfin/App/SwiftfinApp.swift
View File

@ -66,7 +66,7 @@ struct SwiftfinApp: App {
// Swiftfin // Swiftfin
// don't keep last user id // don't keep last user id
if Defaults[.signOutOnClose] || Container.shared.currentUserSession() == nil { if Defaults[.signOutOnClose] {
Defaults[.lastSignedInUserID] = nil Defaults[.lastSignedInUserID] = nil
} }
} }