Skip to content

Fix URLSessionImplementations file upload #6043

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
wing328 merged 3 commits into from
Apr 27, 2020
Merged

Fix URLSessionImplementations file upload #6043

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f3e68b
Fix URLSessionImplementations file upload
jerbob92 Apr 6, 2020
c648888
Merge remote-tracking branch 'original/master' into feature/swift-url…
jerbob92 Apr 24, 2020
14a2ae6
Generated petstore
jerbob92 Apr 24, 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
Next Next commit
Fix URLSessionImplementations file upload
  • Loading branch information
@jerbob92
jerbob92 committed Apr 6, 2020
commit 7f3e68bc9c1eba631499ae09ab8140fdffdb2e81
43 changes: 31 additions & 12 deletions ...nerator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
}

var body = urlRequest.httpBody.orEmpty
body.append("--\(boundary)--")

body.append("\r\n--\(boundary)--\r\n")

urlRequest.httpBody = body

Expand All @@ -507,15 +507,24 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)

let fileName = fileURL.lastPathComponent


// If we already added something then we need an additional newline.
if (body.count > 0) {
body.append("\r\n")
}

// Value boundary.
body.append("--\(boundary)\r\n")
body.append("Content-Disposition: form-data; name=\"\(name)\"; filename=\"\(fileName)\"\r\n\r\n")

body.append("Content-Type: \(mimetype)\r\n\r\n")
// Value headers.
body.append("Content-Disposition: form-data; name=\"\(name)\"; filename=\"\(fileName)\"\r\n")
body.append("Content-Type: \(mimetype)\r\n")

body.append(fileData)
// Separate headers and body.
body.append("\r\n")

body.append("\r\n\r\n")
// The value data.
body.append(fileData)

urlRequest.httpBody = body

Expand All @@ -527,14 +536,24 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
var urlRequest = urlRequest

var body = urlRequest.httpBody.orEmpty


// If we already added something then we need an additional newline.
if (body.count > 0) {
body.append("\r\n")
}

// Value boundary.
body.append("--\(boundary)\r\n")
body.append("Content-Disposition: form-data; name=\"\(name)\"\r\n\r\n")

// Value headers.
body.append("Content-Disposition: form-data; name=\"\(name)\"\r\n")

// Separate headers and body.
body.append("\r\n")

// The value data.
body.append(data)

body.append("\r\n\r\n")


urlRequest.httpBody = body

return urlRequest
Expand Down