Skip to content

Commit

Permalink
Issue#15129 Feature Request Description (#16299)
Browse files Browse the repository at this point in the history
Co-authored-by: Aniruddh <[email protected]>
  • Loading branch information
wing328 and aniruddhJo committed Aug 11, 2023
1 parent 3ad3cf7 commit 590430c
Show file tree
Hide file tree
Showing 17 changed files with 340 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
var urlRequest = urlRequest
var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])
if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
} else if contentType.hasPrefix("application/x-www-form-urlencoded") {
encoding = FormURLEncoding()
} else if contentType.hasPrefix("application/octet-stream"){
encoding = OctetStreamEncoding()
} else {
fatalError("Unsupported Media Type - \(contentType)")
}
Expand Down Expand Up @@ -595,6 +597,24 @@ private class FormURLEncoding: ParameterEncoding {
}
}

private class OctetStreamEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {

var urlRequest = urlRequest

var requestBodyComponents = URLComponents()
requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:])

if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
urlRequest.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
}

urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8)

return urlRequest
}
}

private extension Data {
/// Append string to Data
///
Expand Down
Loading

0 comments on commit 590430c

Please sign in to comment.