Skip to content

add another expires date format #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2020
Merged

add another expires date format #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221a77b
add another expires date format
artemredkin Nov 11, 2020
011d744
Merge branch 'main' into update_expires_date_parsing
artemredkin Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion Sources/AsyncHTTPClient/HTTPClient+HTTPCookie.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,30 @@ extension HTTPClient {
case ("domain", .some(let value)):
self.domain = value
case ("expires", let value):
guard let value = value else {
continue
}

let formatter = DateFormatter()
formatter.locale = Locale(identifier: "en_US")
formatter.timeZone = TimeZone(identifier: "GMT")

formatter.dateFormat = "EEE, dd MMM yyyy HH:mm:ss z"
self.expires = value.flatMap { formatter.date(from: $0) }
if let date = formatter.date(from: value) {
self.expires = date
continue
}

formatter.dateFormat = "EEE, dd-MMM-yy HH:mm:ss z"
if let date = formatter.date(from: value) {
self.expires = date
continue
}

formatter.dateFormat = "EEE MMM d hh:mm:s yyyy"
if let date = formatter.date(from: value) {
self.expires = date
}
case ("max-age", let value):
self.maxAge = value.flatMap(Int.init)
case ("secure", nil):
Expand Down
1 change: 1 addition & 0 deletions Tests/AsyncHTTPClientTests/HTTPClientCookieTests+XCTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ extension HTTPClientCookieTests {
("testCookieDefaults", testCookieDefaults),
("testCookieInit", testCookieInit),
("testMalformedCookies", testMalformedCookies),
("testCookieExpiresDateParsing", testCookieExpiresDateParsing),
]
}
}
11 changes: 11 additions & 0 deletions Tests/AsyncHTTPClientTests/HTTPClientCookieTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,15 @@ class HTTPClientCookieTests: XCTestCase {
XCTAssertNil(HTTPClient.Cookie(header: "=;", defaultDomain: "exampe.org"))
XCTAssertNil(HTTPClient.Cookie(header: "=value;", defaultDomain: "exampe.org"))
}

func testCookieExpiresDateParsing() {
var c = HTTPClient.Cookie(header: "key=value; eXpIRes=Sun, 06 Nov 1994 08:49:37 GMT;", defaultDomain: "example.org")!
XCTAssertEqual(Date(timeIntervalSince1970: 784_111_777), c.expires)

c = HTTPClient.Cookie(header: "key=value; eXpIRes=Sunday, 06-Nov-94 08:49:37 GMT;", defaultDomain: "example.org")!
XCTAssertEqual(Date(timeIntervalSince1970: 784_111_777), c.expires)

c = HTTPClient.Cookie(header: "key=value; eXpIRes=Sun Nov 6 08:49:37 1994;", defaultDomain: "example.org")!
XCTAssertEqual(Date(timeIntervalSince1970: 784_111_777), c.expires)
}
}