Skip to content

feat: validator for http client #685

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
zapcannon87 merged 1 commit into from
Dec 30, 2021
Merged

feat: validator for http client #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions AVOS/Sources/Foundation/Request/LCPaasClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@ FOUNDATION_EXPORT NSString * const LCHeaderFieldNameProduction;
failure:(void (^)(NSHTTPURLResponse *response, id responseObject, NSError *error))failureBlock;

- (void)performRequest:(NSURLRequest *)request
validator:(BOOL (^)(NSHTTPURLResponse *response, id responseObject))validator
success:(void (^)(NSHTTPURLResponse *response, id responseObject))successBlock
failure:(void (^)(NSHTTPURLResponse *response, id responseObject, NSError *error))failureBlock;

- (void)performRequest:(NSURLRequest *)request
success:(void (^)(NSHTTPURLResponse *response, id responseObject))successBlock
failure:(void (^)(NSHTTPURLResponse *response, id responseObject, NSError *error))failureBlock
wait:(BOOL)wait;

- (void)performRequest:(NSURLRequest *)request
validator:(BOOL (^)(NSHTTPURLResponse *response, id responseObject))validator
success:(void (^)(NSHTTPURLResponse *response, id responseObject))successBlock
failure:(void (^)(NSHTTPURLResponse *response, id responseObject, NSError *error))failureBlock
wait:(BOOL)wait;
Expand Down
38 changes: 36 additions & 2 deletions AVOS/Sources/Foundation/Request/LCPaasClient.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,12 +541,37 @@ - (void)performRequest:(NSURLRequest *)request
failure:(void (^)(NSHTTPURLResponse *response, id responseObject, NSError *error))failureBlock
{
[self performRequest:request
validator:nil
success:successBlock
failure:failureBlock];
}

- (void)performRequest:(NSURLRequest *)request
validator:(BOOL (^)(NSHTTPURLResponse *, id))validator
success:(void (^)(NSHTTPURLResponse *, id))successBlock
failure:(void (^)(NSHTTPURLResponse *, id, NSError *))failureBlock
{
[self performRequest:request
validator:validator
success:successBlock
failure:failureBlock
wait:NO];
}

- (void)performRequest:(NSURLRequest *)request
success:(void (^)(NSHTTPURLResponse *, id))successBlock
failure:(void (^)(NSHTTPURLResponse *, id, NSError *))failureBlock
wait:(BOOL)wait
{
[self performRequest:request
validator:nil
success:successBlock
failure:failureBlock
wait:wait];
}

- (void)performRequest:(NSURLRequest *)request
validator:(BOOL (^)(NSHTTPURLResponse *, id))validator
success:(void (^)(NSHTTPURLResponse *response, id responseObject))successBlock
failure:(void (^)(NSHTTPURLResponse *response, id responseObject, NSError *error))failureBlock
wait:(BOOL)wait
Expand Down Expand Up @@ -593,8 +618,17 @@ - (void)performRequest:(NSURLRequest *)request
} else {
NSTimeInterval costTime = -([operationEnqueueDate timeIntervalSinceNow] * 1000);
LCLoggerDebug(LCLoggerDomainNetwork, LC_REST_RESPONSE_LOG_FORMAT, path, costTime, responseObject);
if (successBlock) {
successBlock(HTTPResponse, responseObject);
if (validator && !validator(HTTPResponse, responseObject)) {
if (failureBlock) {
NSError *err = LCError(LCErrorInternalErrorCodeMalformedData,
@"Malformed response data.",
@{ @"responseObject" : responseObject ?: NSNull.null });
failureBlock(HTTPResponse, responseObject, err);
}
} else {
if (successBlock) {
successBlock(HTTPResponse, responseObject);
}
}
}
if (wait) {
Expand Down