Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.
anisette: fix crash in date formatter (#422)
Matt Van Horn4ec0e9626400
diff --git a/Sources/XKit/GrandSlam/Anisette/AnisetteData.swift b/Sources/XKit/GrandSlam/Anisette/AnisetteData.swiftindex 0352e23..7bed7bc 100644--- a/Sources/XKit/GrandSlam/Anisette/AnisetteData.swift+++ b/Sources/XKit/GrandSlam/Anisette/AnisetteData.swift@@ -10,14 +10,14 @@ import Foundationpublic struct AnisetteData {- private static let dateFormatter: DateFormatter = {- let dateFormatter = DateFormatter()- dateFormatter.locale = Locale(identifier: "en_US_POSIX")- dateFormatter.calendar = Calendar(identifier: .gregorian)- dateFormatter.timeZone = TimeZone(abbreviation: "UTC")- dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"- return dateFormatter- }()+ private static let clientTimeFormat = Date.ISO8601FormatStyle(+ dateSeparator: .dash,+ dateTimeSeparator: .standard,+ timeSeparator: .colon,+ timeZoneSeparator: .omitted,+ includingFractionalSeconds: false,+ timeZone: .gmt+ )/// `X-Apple-I-Locale`static let iLocaleKey = "X-Apple-I-Locale"@@ -62,7 +62,7 @@ public struct AnisetteData {return [Self.localeKey: localeIdentifier,Self.timeZoneKey: timeZone.abbreviation() ?? "UTC",- Self.clientTimeKey: Self.dateFormatter.string(from: clientTime),+ Self.clientTimeKey: clientTime.formatted(Self.clientTimeFormat),Self.routingInfoKey: "\(routingInfo)",Self.machineIDKey: machineID,Self.localUserIDKey: localUserID,diff --git a/Tests/XToolTests/AnisetteDataTests.swift b/Tests/XToolTests/AnisetteDataTests.swiftnew file mode 100644index 0000000..d392472--- /dev/null+++ b/Tests/XToolTests/AnisetteDataTests.swift@@ -0,0 +1,27 @@+import Foundation+import Testing+@testable import XKit++struct AnisetteDataTests {+ @Test(arguments: [+ (0.0, "1970-01-01T00:00:00Z"),+ (1_609_459_200.0, "2021-01-01T00:00:00Z"),+ (1_582_934_400.0, "2020-02-29T00:00:00Z"),+ (1_704_164_645.75, "2024-01-02T03:04:05Z"),+ ])+ func dictionaryFormatsClientTime(timestamp: TimeInterval, expected: String) {+ let data = AnisetteData(+ clientTime: Date(timeIntervalSince1970: timestamp),+ routingInfo: 123,+ machineID: "machine",+ localUserID: "user",+ oneTimePassword: "password",+ deviceInfo: DeviceInfo(+ deviceID: "device",+ clientInfo: "client",+ akdUserAgent: "agent"+ )+ )+ #expect(data.dictionary["X-Apple-I-Client-Time"] == expected)+ }+}