From 08c7781e5a5cf413344f0cc46885a4b7c34ddd14 Mon Sep 17 00:00:00 2001 From: Maximilian Krause Date: Fri, 4 Sep 2026 14:19:29 -0700 Subject: [PATCH] fix(image): preserve source headers with crossOrigin and referrerPolicy (#58319) Summary: When `crossOrigin="use-credentials"` or `referrerPolicy` is used on an `Image`, `getImageSourcesFromImageProps` currently fully replaces `source.headers`, removing custom headers such as `Authorization`. This fix merges the generated headers with the user-provided source headers instead (user-provided headers take precedence). ## Changelog: [GENERAL] [FIXED] - Preserve Image source headers when using crossOrigin or referrerPolicy Pull Request resolved: https://github.com/react/react-native/pull/58319 Test Plan: Confirmed existing tests are unchanged & added a regression test Reviewed By: christophpurrer Differential Revision: D118797893 Pulled By: javache fbshipit-source-id: 8018846647232f97cb9e12d6095774826999c89b --- .../Libraries/Image/ImageSourceUtils.js | 10 +++++++++- .../Libraries/Image/__tests__/Image-itest.js | 15 ++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/react-native/Libraries/Image/ImageSourceUtils.js b/packages/react-native/Libraries/Image/ImageSourceUtils.js index 7e5ea6436d5..17af6b716c9 100644 --- a/packages/react-native/Libraries/Image/ImageSourceUtils.js +++ b/packages/react-native/Libraries/Image/ImageSourceUtils.js @@ -12,6 +12,7 @@ import type {ResolvedAssetSource} from './AssetSourceResolver'; import type {ImageProps} from './ImageProps'; +import type {ImageURISource} from './ImageSource'; import resolveAssetSource from './resolveAssetSource'; @@ -87,7 +88,14 @@ export function getImageSourcesFromImageProps(imageProps: ImageProps): } else if (src != null) { sources = [{uri: src, headers: headers, width, height}]; } else if (source != null && source.uri && Object.keys(headers).length > 0) { - sources = [{...source, headers}]; + const sourceHeaders = (source as ImageURISource).headers; + sources = [ + { + ...source, + headers: + sourceHeaders != null ? {...headers, ...sourceHeaders} : headers, + }, + ]; } else { sources = source; } diff --git a/packages/react-native/Libraries/Image/__tests__/Image-itest.js b/packages/react-native/Libraries/Image/__tests__/Image-itest.js index a1f3140f850..6eb0d0e8a9e 100644 --- a/packages/react-native/Libraries/Image/__tests__/Image-itest.js +++ b/packages/react-native/Libraries/Image/__tests__/Image-itest.js @@ -102,19 +102,28 @@ describe('', () => { ); }); - it('sets the "Access-Control-Allow-Credentials" header in "use-credentials" mode', () => { + it('adds the credentials header without replacing source headers', () => { const root = Fantom.createRoot(); Fantom.runTask(() => { root.render( - , + , ); }); expect( root.getRenderedOutput({props: ['source-header']}).toJSX(), ).toEqual( - , + , ); }); });