loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[swift][client] validate http status code (#5226)

Browse Source 
* [swift][client] validate http status code

* [swift][client] remove spaces in empty lines
This commit is contained in:
Bruno Coelho
2020-02-08 16:33:36 +00:00
committed by GitHub
parent 9126a5636f
commit 4208f3da82
32 changed files with 280 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/client/test/swift5/default/TestClient/Classes/OpenAPIs/Extensions.swift
View File

@@ -171,3 +171,9 @@ extension KeyedDecodingContainerProtocol {
}
}
extension HTTPURLResponse {
var isStatusCodeSuccessful: Bool {
return Array(200 ..< 300).contains(statusCode)
}
}

1
samples/client/test/swift5/default/TestClient/Classes/OpenAPIs/Models.swift
View File

@@ -25,6 +25,7 @@ public enum DownloadException: Error {
public enum DecodableRequestBuilderError: Error {
case emptyDataResponse
case nilHTTPResponse
case unsuccessfulHTTPStatusCode(Error?)
case jsonDecoding(DecodingError)
case generalError(Error)
}

55
samples/client/test/swift5/default/TestClient/Classes/OpenAPIs/URLSessionImplementations.swift
View File

@@ -187,14 +187,19 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
return
}
guard httpResponse.isStatusCodeSuccessful else {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, DecodableRequestBuilderError.unsuccessfulHTTPStatusCode(error))))
return
}
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
switch T.self {
case is String.Type:
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
completion(.success(Response<T>(response: httpResponse, body: body as? T)))
@@ -236,20 +241,10 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
case is Void.Type:
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
completion(.success(Response(response: httpResponse, body: nil)))
default:
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
completion(.success(Response(response: httpResponse, body: data as? T)))
}
@@ -324,43 +319,33 @@ open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBui
return
}
guard httpResponse.isStatusCodeSuccessful else {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, DecodableRequestBuilderError.unsuccessfulHTTPStatusCode(error))))
return
}
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
switch T.self {
case is String.Type:
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
completion(.success(Response<T>(response: httpResponse, body: body as? T)))
case is Void.Type:
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
completion(.success(Response(response: httpResponse, body: nil)))
case is Data.Type:
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
completion(.success(Response(response: httpResponse, body: data as? T)))
default:
if let error = error {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
return
}
guard let data = data, !data.isEmpty else {
completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
return