Skip to content
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

Jump to bottom

Fix: URLEncodedFormDecoder ignores empty value when decoding Array #2584

Merged
merged 6 commits into from
Mar 31, 2021
Merged

Fix: URLEncodedFormDecoder ignores empty value when decoding Array #2584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b10702f
Add test case
t-ae Mar 17, 2021
2cff9e4
Don't omit empty string when parsing unindexed array
t-ae Mar 17, 2021
a14d8fb
Refactor unindexed array parsing
t-ae Mar 18, 2021
e1d1e9c
Reduce closure usage
t-ae Mar 22, 2021
3390d7c
Merge branch 'main' into fix-url-encoded-form-array
t-ae Mar 23, 2021
778b1b4
Merge branch 'main' into fix-url-encoded-form-array
0xTim Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 8 additions & 9 deletions Sources/Vapor/URLEncodedForm/URLEncodedFormDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,17 +286,16 @@ private struct _Decoder: Decoder {
if let valuesInBracket = data.children[""] {
values = values + valuesInBracket.values
}

// parse out any character separated array values
for explodeArraysOn in configuration.arraySeparators {
var explodedValues: [URLQueryFragment] = []
for value in values {
explodedValues = try explodedValues + value.asUrlEncoded().split(separator: explodeArraysOn).map({ (ss: Substring) -> URLQueryFragment in
return .urlEncoded(String(ss))
})
}
values = explodedValues
self.values = try values.flatMap { value in
try value.asUrlEncoded()
.split(omittingEmptySubsequences: false,
whereSeparator: configuration.arraySeparators.contains)
.map { (ss: Substring) in
URLQueryFragment.urlEncoded(String(ss))
}
}
self.values = values
}
}

Expand Down
21 changes: 19 additions & 2 deletions Tests/VaporTests/URLEncodedFormTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,28 @@ final class URLEncodedFormTests: XCTestCase {
}

let data = """
array[0]=a&array[1]=b
array[0]=a&array[1]=&array[2]=b&array[3]=
"""
let test = try URLEncodedFormDecoder().decode(Test.self, from: data)
XCTAssertEqual(test.array[0], "a")
XCTAssertEqual(test.array[1], "b")
XCTAssertEqual(test.array[1], "")
XCTAssertEqual(test.array[2], "b")
XCTAssertEqual(test.array[3], "")
}

func testDecodeUnindexedArray() throws {
struct Test: Decodable {
let array: [String]
}

let data = """
array[]=a&array[]=&array[]=b&array[]=
"""
let test = try URLEncodedFormDecoder().decode(Test.self, from: data)
XCTAssertEqual(test.array[0], "a")
XCTAssertEqual(test.array[1], "")
XCTAssertEqual(test.array[2], "b")
XCTAssertEqual(test.array[3], "")
}

func testDecodeIndexedArray_dictionary() throws {
Expand Down