Skip to content

Commit 92a7097

Browse files
authored
fix multipart/form-data in Swift (#231)
## 🧰 Changes - fix argument name ## 🧬 QA & Testing I fixed test code in `/httpsnippet/src/targets/swift/urlsession/fixtures/` `npm run test`
1 parent edf00ff commit 92a7097

24 files changed

+33
-33
lines changed

src/targets/swift/urlsession/client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export const urlsession: Client<UrlsessionOptions> = {
6363

6464
case 'application/json':
6565
if (postData.jsonObj) {
66-
push(`${literalDeclaration('parameters', postData.jsonObj, opts)} as [String : Any]`);
66+
push(`${literalDeclaration('parameters', postData.jsonObj, opts)} as [String : Any?]`);
6767
blank();
6868
push('let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])');
6969
blank();
@@ -87,7 +87,7 @@ export const urlsession: Client<UrlsessionOptions> = {
8787
push('body += "--\\(boundary)\\r\\n"', 1);
8888
push('body += "Content-Disposition:form-data; name=\\"\\(paramName)\\""', 1);
8989
push('if let filename = param["fileName"] {', 1);
90-
push('let contentType = param["content-type"]!', 2);
90+
push('let contentType = param["contentType"]!', 2);
9191
push('let fileContent = try String(contentsOfFile: filename, encoding: .utf8)', 2);
9292
push('body += "; filename=\\"\\(filename)\\"\\r\\n"', 2);
9393
push('body += "Content-Type: \\(contentType)\\r\\n\\r\\n"', 2);
@@ -150,7 +150,7 @@ export const urlsession: Client<UrlsessionOptions> = {
150150

151151
blank();
152152

153-
push('let (data, response) = try await URLSession.shared.data(for: request)');
153+
push('let (data, _) = try await URLSession.shared.data(for: request)');
154154
push('print(String(decoding: data, as: UTF8.self))');
155155

156156
return join();

src/targets/swift/urlsession/fixtures/application-form-encoded.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ request.timeoutInterval = 10
1414
request.allHTTPHeaderFields = ["content-type": "application/x-www-form-urlencoded"]
1515
request.httpBody = postData
1616

17-
let (data, response) = try await URLSession.shared.data(for: request)
17+
let (data, _) = try await URLSession.shared.data(for: request)
1818
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/application-json.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let parameters = [
77
"nested": ["a": "b"],
88
"arr_mix": [1, "a", ["arr_mix_nested": []]],
99
"boolean": false
10-
] as [String : Any]
10+
] as [String : Any?]
1111

1212
let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
1313

@@ -18,5 +18,5 @@ request.timeoutInterval = 10
1818
request.allHTTPHeaderFields = ["content-type": "application/json"]
1919
request.httpBody = postData
2020

21-
let (data, response) = try await URLSession.shared.data(for: request)
21+
let (data, _) = try await URLSession.shared.data(for: request)
2222
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/cookies.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ request.httpMethod = "GET"
66
request.timeoutInterval = 10
77
request.allHTTPHeaderFields = ["cookie": "foo=bar; bar=baz"]
88

9-
let (data, response) = try await URLSession.shared.data(for: request)
9+
let (data, _) = try await URLSession.shared.data(for: request)
1010
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/custom-method.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
55
request.httpMethod = "PROPFIND"
66
request.timeoutInterval = 10
77

8-
let (data, response) = try await URLSession.shared.data(for: request)
8+
let (data, _) = try await URLSession.shared.data(for: request)
99
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/full.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ request.allHTTPHeaderFields = [
2626
]
2727
request.httpBody = postData
2828

29-
let (data, response) = try await URLSession.shared.data(for: request)
29+
let (data, _) = try await URLSession.shared.data(for: request)
3030
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/headers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ request.allHTTPHeaderFields = [
1111
"quoted-value": "\"quoted\" 'string'"
1212
]
1313

14-
let (data, response) = try await URLSession.shared.data(for: request)
14+
let (data, _) = try await URLSession.shared.data(for: request)
1515
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/http-insecure.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
55
request.httpMethod = "GET"
66
request.timeoutInterval = 10
77

8-
let (data, response) = try await URLSession.shared.data(for: request)
8+
let (data, _) = try await URLSession.shared.data(for: request)
99
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/indent-option.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
55
request.httpMethod = "GET"
66
request.timeoutInterval = 10
77

8-
let (data, response) = try await URLSession.shared.data(for: request)
8+
let (data, _) = try await URLSession.shared.data(for: request)
99
print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/json-null-value.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22

3-
let parameters = ["foo": nil] as [String : Any]
3+
let parameters = ["foo": nil] as [String : Any?]
44

55
let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
66

@@ -11,5 +11,5 @@ request.timeoutInterval = 10
1111
request.allHTTPHeaderFields = ["content-type": "application/json"]
1212
request.httpBody = postData
1313

14-
let (data, response) = try await URLSession.shared.data(for: request)
14+
let (data, _) = try await URLSession.shared.data(for: request)
1515
print(String(decoding: data, as: UTF8.self))

0 commit comments

Comments
 (0)