From 1fb273e69691b00812031eea4b121902647764d0 Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 19 Mar 2025 16:10:19 +0100 Subject: [PATCH] LeStorage refactoring --- PadelClub.xcodeproj/project.pbxproj | 8 ++++---- .../Views/Navigation/Toolbox/DebugSettingsView.swift | 5 +++-- PadelClub/Views/Navigation/Umpire/UmpireView.swift | 2 +- PadelClub/Views/Shared/SupportButtonView.swift | 3 ++- PadelClubTests/ServerDataTests.swift | 3 ++- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj index 85e8fa6..9083e8b 100644 --- a/PadelClub.xcodeproj/project.pbxproj +++ b/PadelClub.xcodeproj/project.pbxproj @@ -3879,7 +3879,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; @@ -3902,7 +3902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.22; + MARKETING_VERSION = 1.1.23; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3922,7 +3922,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_TEAM = BQ3Y44M3Q6; @@ -3944,7 +3944,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.22; + MARKETING_VERSION = 1.1.23; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift b/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift index 0fb469c..76716fb 100644 --- a/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift +++ b/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift @@ -35,11 +35,12 @@ struct DebugSettingsView: View { } fileprivate var _userName: String { - return StoreCenter.main.userName() ?? "" + return StoreCenter.main.userName ?? "" } fileprivate var _token: String { - return StoreCenter.main.token() ?? "" + let token = try? StoreCenter.main.token() + return token ?? "" } fileprivate var _apiURL: String { diff --git a/PadelClub/Views/Navigation/Umpire/UmpireView.swift b/PadelClub/Views/Navigation/Umpire/UmpireView.swift index 872be35..78adfb1 100644 --- a/PadelClub/Views/Navigation/Umpire/UmpireView.swift +++ b/PadelClub/Views/Navigation/Umpire/UmpireView.swift @@ -254,7 +254,7 @@ struct AccountRowView: View { LabeledContent { if isAuthenticated { Text(self.userName) - } else if StoreCenter.main.userName() != nil { + } else if StoreCenter.main.userName != nil { Image(systemName: "xmark.circle.fill") .foregroundStyle(.logoRed) } diff --git a/PadelClub/Views/Shared/SupportButtonView.swift b/PadelClub/Views/Shared/SupportButtonView.swift index 0586c88..b715356 100644 --- a/PadelClub/Views/Shared/SupportButtonView.swift +++ b/PadelClub/Views/Shared/SupportButtonView.swift @@ -79,7 +79,8 @@ struct SupportButtonView: View { private func _getBody() -> String { let separator = "---------------------------------------------" - return ["Décrivez votre problème", "\n\n\n", separator, "token", StoreCenter.main.token(), separator, "userId", StoreCenter.main.userId, separator, "dataStore userId", DataStore.shared.user.id].compacted().joined(separator: "\n") + let token = try? StoreCenter.main.token() + return ["Décrivez votre problème", "\n\n\n", separator, "token", token ?? "", separator, "userId", StoreCenter.main.userId, separator, "dataStore userId", DataStore.shared.user.id].compacted().joined(separator: "\n") } private func _getDeviceIdentifier() -> String { diff --git a/PadelClubTests/ServerDataTests.swift b/PadelClubTests/ServerDataTests.swift index 9fe95a4..0ef72d8 100644 --- a/PadelClubTests/ServerDataTests.swift +++ b/PadelClubTests/ServerDataTests.swift @@ -76,7 +76,8 @@ final class ServerDataTests: XCTestCase { } func testLogin() async throws { - let user: CustomUser = try await StoreCenter.main.service().login(username: self.username, password: self.password) + let service = try StoreCenter.main.service() + let user: CustomUser = try await service.login(username: self.username, password: self.password) assert(user.username == self.username) }