Skip to content

Response headers to image - iOS #33880

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

Closed
frags51 wants to merge 2 commits into from
Closed

Response headers to image - iOS #33880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0626ac
HTTP Error
May 30, 2022
8e5d112
remove unneeded if
May 30, 2022
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
13 changes: 13 additions & 0 deletions Libraries/Image/RCTImageLoader.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ static uint64_t monotonicTimeGetCurrentNanoseconds(void)
return (mach_absolute_time() * tb_info.numer) / tb_info.denom;
}

static NSError* addResponseHeadersToError(NSError* originalError, NSHTTPURLResponse* response) {
NSMutableDictionary<NSString*, id>* _userInfo = (NSMutableDictionary<NSString*, id>*)originalError.userInfo.mutableCopy;
_userInfo[@"httpStatusCode"] = [NSNumber numberWithInt:response.statusCode];
_userInfo[@"httpResponseHeaders"] = response.allHeaderFields;
NSError *error = [NSError errorWithDomain:originalError.domain code:originalError.code userInfo:_userInfo];

return error;
}

@interface RCTImageLoader() <NativeImageLoaderIOSSpec, RCTImageLoaderWithAttributionProtocol>

@end
Expand Down Expand Up @@ -523,6 +532,10 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
}
});
} else if (!std::atomic_load(cancelled.get())) {
if (response && error && [response isKindOfClass: [NSHTTPURLResponse class]]) {
NSHTTPURLResponse* _httpResp = (NSHTTPURLResponse*)response;
error = addResponseHeadersToError(error, _httpResp);
}
completionBlock(error, imageOrData, imageMetadata, cacheResult, response);
}
};
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Image/RCTImageView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ - (void)imageLoaderLoadedImage:(UIImage *)loadedImage error:(NSError *)error for
});

if (_onError) {
_onError(@{ @"error": error.localizedDescription });
_onError(@{ @"error": error.localizedDescription, @"responseCode": (error.userInfo[@"httpStatusCode"]?: [NSNull null]), @"httpResponseHeaders": (error.userInfo[@"httpResponseHeaders"] ?: [NSNull null]) });
}
if (_onLoadEnd) {
_onLoadEnd(nil);
Expand Down