From fc05ee25ed5ae0f576773fb164c2b25ba27ad0ef Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 11 Mar 2025 17:11:56 +0100 Subject: [PATCH] Fix sync issues when login in --- LeStorage/Services.swift | 4 +--- LeStorage/StoreCenter.swift | 11 ++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/LeStorage/Services.swift b/LeStorage/Services.swift index 560fc5e..009788d 100644 --- a/LeStorage/Services.swift +++ b/LeStorage/Services.swift @@ -641,10 +641,8 @@ public class Services { public func login(username: String, password: String) async throws -> U { _ = try await requestToken(username: username, password: password) let postRequest = try self._baseRequest(call: getUserCall) - let loggingDate = Date() + let loggingDate = Date() // ideally we want the date of the latest retrieved object when loading collection objects let user: U = try await self._runRequest(postRequest) - // StoreCenter.main.setUserUUID(uuidString: user.id) - // StoreCenter.main.setUserName(user.username) StoreCenter.main.userDidLogIn(user: user, at: loggingDate) return user } diff --git a/LeStorage/StoreCenter.swift b/LeStorage/StoreCenter.swift index 1ba6628..3cd0bba 100644 --- a/LeStorage/StoreCenter.swift +++ b/LeStorage/StoreCenter.swift @@ -181,10 +181,10 @@ public class StoreCenter { settings.userId = user.id settings.username = user.username - let date = Date.microSecondFormatter.string(from: date) - Logger.log("LOG date = \(date)") +// let date = Date.microSecondFormatter.string(from: date) +// Logger.log("LOG date = \(date)") - settings.lastSynchronization = Date.microSecondFormatter.string(from: Date.distantPast) + settings.lastSynchronization = Date.microSecondFormatter.string(from: date) self._configureWebSocket() } } @@ -467,6 +467,11 @@ public class StoreCenter { /// Basically asks the server for new content public func synchronizeLastUpdates() async throws { + let hasToken = try? self.service().hasToken() + guard hasToken == true else { + return + } + let lastSync = self._settingsStorage.item.lastSynchronization let syncGetCollection: ApiCallCollection = try self.apiCallCollection()