Skip to content

Fixed error on network requests to Object APIs with 'error' column. #147

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
merged 1 commit into from
Sep 1, 2015
Merged

Fixed error on network requests to Object APIs with 'error' column. #147

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
28 changes: 16 additions & 12 deletions ...Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionJSONDataTaskDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,25 @@ - (void)_taskDidFinish {
return;
}

if ([result isKindOfClass:[NSDictionary class]]) {
NSDictionary *resultDictionary = (NSDictionary *)result;
if (resultDictionary[@"error"]) {
NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionaryWithDictionary:resultDictionary];
errorDictionary[@"temporary"] = @(self.response.statusCode >= 500 || self.response.statusCode < 400);
self.error = [PFErrorUtilities errorFromResult:errorDictionary];
[super _taskDidFinish];
return;
if (self.response.statusCode >= 200) {
if (self.response.statusCode < 400) {
PFCommandResult *commandResult = [PFCommandResult commandResultWithResult:result
resultString:resultString
httpResponse:self.response];
self.result = commandResult;
} else if ([result isKindOfClass:[NSDictionary class]]) {
NSDictionary *resultDictionary = (NSDictionary *)result;
if (resultDictionary[@"error"]) {
NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionaryWithDictionary:resultDictionary];
errorDictionary[@"temporary"] = @(self.response.statusCode >= 500 || self.response.statusCode < 400);
self.error = [PFErrorUtilities errorFromResult:errorDictionary];
}
}
}

PFCommandResult *commandResult = [PFCommandResult commandResultWithResult:result
resultString:resultString
httpResponse:self.response];
self.result = commandResult;
if (!self.result && !self.error) {
self.error = [PFErrorUtilities errorWithCode:kPFErrorInternalServer message:resultString];
}
[super _taskDidFinish];
}

Expand Down
10 changes: 5 additions & 5 deletions Tests/Unit/URLSessionDataTaskDelegateTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ - (void)testSuccess {
NSData *chunkA = [@"{ \"foo\" :" dataUsingEncoding:NSUTF8StringEncoding];
NSData *chunkB = [@" \"bar\" }" dataUsingEncoding:NSUTF8StringEncoding];

NSURLResponse *urlResponse = [[NSURLResponse alloc] initWithURL:[NSURL URLWithString:@"http://foo.bar"]
MIMEType:@"application/json"
expectedContentLength:chunkA.length + chunkB.length
textEncodingName:@"UTF-8"];

NSHTTPURLResponse *urlResponse = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:@"http://foo.bar"]
statusCode:200
HTTPVersion:@"HTTP/1.1"
headerFields:nil];
[delegate URLSession:mockedSession
task:mockedTask
didSendBodyData:5
Expand Down
Loading