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

Pass HTTP response object even if the request fails #12447

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pass HTTP response object even if the request fails #12447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60e31da
Pass HTTP response object even if the request fails
Aug 14, 2024
792b3e4
Fix indentation
Aug 14, 2024
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
170 changes: 71 additions & 99 deletions modules/swagger-codegen/src/main/resources/swift5/AlamofireImplementations.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,32 +118,27 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {

let cleanupRequest = {
syncQueue.async(flags: .barrier) {
_ = managerStore.removeValue(forKey: managerId)
_ = managerStore.removeValue(forKey: managerId)
}
}

let validatedRequest = request.validate()
var responseObj: Response<T>?
var error: Error?

switch T.self {
case is String.Type:
validatedRequest.responseString(completionHandler: { (stringResponse) in
cleanupRequest()

if stringResponse.result.isFailure {
completion(
nil,
ErrorResponse.error(stringResponse.response?.statusCode ?? 500, stringResponse.data, stringResponse.result.error!)
)
return
}

completion(
Response(
error = ErrorResponse.error(stringResponse.response?.statusCode ?? 500, stringResponse.data, stringResponse.result.error!)
} else {
responseObj = Response(
response: stringResponse.response!,
body: ((stringResponse.result.value ?? "") as! T)
),
nil
)
)
}
})
case is URL.Type:
validatedRequest.responseData(completionHandler: { (dataResponse) in
Expand Down Expand Up @@ -180,18 +175,15 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
try data.write(to: filePath, options: .atomic)

completion(
Response(
response: dataResponse.response!,
body: (filePath as! T)
),
nil
responseObj = Response(
response: dataResponse.response!,
body: (filePath as! T)
)

} catch let requestParserError as DownloadException {
completion(nil, ErrorResponse.error(400, dataResponse.data, requestParserError))
} catch let error {
completion(nil, ErrorResponse.error(400, dataResponse.data, error))
error = ErrorResponse.error(400, dataResponse.data, requestParserError)
} catch let _error {
error = ErrorResponse.error(400, dataResponse.data, _error)
}
return
})
Expand All @@ -200,41 +192,34 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
cleanupRequest()

if voidResponse.result.isFailure {
completion(
nil,
ErrorResponse.error(voidResponse.response?.statusCode ?? 500, voidResponse.data, voidResponse.result.error!)
)
return
}

completion(
Response(
error = ErrorResponse.error(voidResponse.response?.statusCode ?? 500, voidResponse.data, voidResponse.result.error!)
} else {
responseObj = Response(
response: voidResponse.response!,
body: nil),
nil
)
body: nil)
}
})
default:
validatedRequest.responseData(completionHandler: { (dataResponse) in
cleanupRequest()

if dataResponse.result.isFailure {
completion(
nil,
ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!)
)
return
}

completion(
Response(
error = ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!)
} else {
responseObj = Response(
response: dataResponse.response!,
body: (dataResponse.data as! T)
),
nil
)
)
}
})
}


if responseObj == nil, let httpResponse = validatedRequest.response {
responseObj = Response(response: httpResponse, body: nil)
}

completion(responseObj, error)
}

open func buildHeaders() -> [String: String] {
Expand Down Expand Up @@ -327,96 +312,83 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
}

let validatedRequest = request.validate()
var responseObj: Response<T>?
var error: Error?

switch T.self {
case is String.Type:
validatedRequest.responseString(completionHandler: { (stringResponse) in
cleanupRequest()

if stringResponse.result.isFailure {
completion(
nil,
ErrorResponse.error(stringResponse.response?.statusCode ?? 500, stringResponse.data, stringResponse.result.error!)
)
return
}

completion(
Response(
error = ErrorResponse.error(stringResponse.response?.statusCode ?? 500, stringResponse.data, stringResponse.result.error!)
} else {
responseObj = Response(
response: stringResponse.response!,
body: ((stringResponse.result.value ?? "") as! T)
),
nil
)
)
}
})
case is Void.Type:
validatedRequest.responseData(completionHandler: { (voidResponse) in
cleanupRequest()

if voidResponse.result.isFailure {
completion(
nil,
ErrorResponse.error(voidResponse.response?.statusCode ?? 500, voidResponse.data, voidResponse.result.error!)
)
return
error = ErrorResponse.error(voidResponse.response?.statusCode ?? 500, voidResponse.data, voidResponse.result.error!)
} else {
responseObj = Response(
response: voidResponse.response!,
body: nil
)
}

completion(
Response(
response: voidResponse.response!,
body: nil),
nil
)
})
case is Data.Type:
validatedRequest.responseData(completionHandler: { (dataResponse) in
cleanupRequest()

if dataResponse.result.isFailure {
completion(
nil,
ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!)
)
return
}

completion(
Response(
error = ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!)
} else {
responseObj = Response(
response: dataResponse.response!,
body: (dataResponse.data as! T)
),
nil
)
)
}
})
default:
validatedRequest.responseData(completionHandler: { (dataResponse: DataResponse<Data>) in
cleanupRequest()
do {
guard dataResponse.result.isSuccess else {
throw ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!)
}

guard dataResponse.result.isSuccess else {
completion(nil, ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!))
return
}

guard let data = dataResponse.data, !data.isEmpty else {
completion(nil, ErrorResponse.error(-1, nil, AlamofireDecodableRequestBuilderError.emptyDataResponse))
return
}
guard let data = dataResponse.data, !data.isEmpty else {
throw ErrorResponse.error(-1, nil, AlamofireDecodableRequestBuilderError.emptyDataResponse)
}

guard let httpResponse = dataResponse.response else {
completion(nil, ErrorResponse.error(-2, nil, AlamofireDecodableRequestBuilderError.nilHTTPResponse))
return
}
guard let httpResponse = dataResponse.response else {
throw ErrorResponse.error(-2, nil, AlamofireDecodableRequestBuilderError.nilHTTPResponse)
}

var responseObj: Response<T>? = nil
let decodeResult: (decodableObj: T?, error: Error?) = CodableHelper.decode(T.self, from: data)

let decodeResult: (decodableObj: T?, error: Error?) = CodableHelper.decode(T.self, from: data)
if decodeResult.error == nil {
if let _error = decodeResult.error {
throw _error
}
responseObj = Response(response: httpResponse, body: decodeResult.decodableObj)
} catch let _error {
error = _error
}

completion(responseObj, decodeResult.error)
})
}

if responseObj == nil, let httpResponse = validatedRequest.response {
responseObj = Response(response: httpResponse, body: nil)
}

completion(responseObj, error)
}

}