LeStorage refactoring

sync
Laurent 8 months ago
parent e9aba1bd50
commit 1fb273e696
  1. 8
      PadelClub.xcodeproj/project.pbxproj
  2. 5
      PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift
  3. 2
      PadelClub/Views/Navigation/Umpire/UmpireView.swift
  4. 3
      PadelClub/Views/Shared/SupportButtonView.swift
  5. 3
      PadelClubTests/ServerDataTests.swift

@ -3879,7 +3879,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@ -3902,7 +3902,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.22; MARKETING_VERSION = 1.1.23;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -3922,7 +3922,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6; DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@ -3944,7 +3944,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.22; MARKETING_VERSION = 1.1.23;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

@ -35,11 +35,12 @@ struct DebugSettingsView: View {
} }
fileprivate var _userName: String { fileprivate var _userName: String {
return StoreCenter.main.userName() ?? "" return StoreCenter.main.userName ?? ""
} }
fileprivate var _token: String { fileprivate var _token: String {
return StoreCenter.main.token() ?? "" let token = try? StoreCenter.main.token()
return token ?? ""
} }
fileprivate var _apiURL: String { fileprivate var _apiURL: String {

@ -254,7 +254,7 @@ struct AccountRowView: View {
LabeledContent { LabeledContent {
if isAuthenticated { if isAuthenticated {
Text(self.userName) Text(self.userName)
} else if StoreCenter.main.userName() != nil { } else if StoreCenter.main.userName != nil {
Image(systemName: "xmark.circle.fill") Image(systemName: "xmark.circle.fill")
.foregroundStyle(.logoRed) .foregroundStyle(.logoRed)
} }

@ -79,7 +79,8 @@ struct SupportButtonView: View {
private func _getBody() -> String { private func _getBody() -> String {
let separator = "---------------------------------------------" 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 { private func _getDeviceIdentifier() -> String {

@ -76,7 +76,8 @@ final class ServerDataTests: XCTestCase {
} }
func testLogin() async throws { 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) assert(user.username == self.username)
} }

Loading…
Cancel
Save