Unverified Commit ecbf5373 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Only apply metadata manifest credentials for preview deployment (#64940)

### What

Follow up for #62873
Only apply credentials in metadata manifest tag for preview deployment

### Why

When the CORS header is "\*" and if you're including credentials in
request it will block by browser. For manifest's case, if it's fetching
from a publich CDN with responsing the CORS header "\*" and mismatching
with the current website domain it will get blocked. Previously we
introduced that change mostly for vercel deployment auth protection, now
we're going to check if it's preview deployment and also the same
origin, if yes then we'll include credentails for manifest request

Closes NEXT-3208
parent 029d1da2
...@@ -8,6 +8,7 @@ import type { ViewportLayout } from '../types/extra-types' ...@@ -8,6 +8,7 @@ import type { ViewportLayout } from '../types/extra-types'
import React from 'react' import React from 'react'
import { Meta, MetaFilter, MultiMeta } from './meta' import { Meta, MetaFilter, MultiMeta } from './meta'
import { ViewportMetaKeys } from '../constants' import { ViewportMetaKeys } from '../constants'
import { getOrigin } from './utils'
// convert viewport object to string for viewport meta tag // convert viewport object to string for viewport meta tag
function resolveViewportLayout(viewport: Viewport) { function resolveViewportLayout(viewport: Viewport) {
...@@ -45,6 +46,10 @@ export function ViewportMeta({ viewport }: { viewport: ResolvedViewport }) { ...@@ -45,6 +46,10 @@ export function ViewportMeta({ viewport }: { viewport: ResolvedViewport }) {
} }
export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) { export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) {
const manifestOrigin = metadata.manifest
? getOrigin(metadata.manifest)
: undefined
return MetaFilter([ return MetaFilter([
<meta charSet="utf-8" />, <meta charSet="utf-8" />,
metadata.title !== null && metadata.title.absolute ? ( metadata.title !== null && metadata.title.absolute ? (
...@@ -64,7 +69,13 @@ export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) { ...@@ -64,7 +69,13 @@ export function BasicMeta({ metadata }: { metadata: ResolvedMetadata }) {
<link <link
rel="manifest" rel="manifest"
href={metadata.manifest.toString()} href={metadata.manifest.toString()}
crossOrigin="use-credentials" // If it's same origin, and it's a preview deployment,
// including credentials for manifest request.
crossOrigin={
!manifestOrigin && process.env.VERCEL_ENV === 'preview'
? 'use-credentials'
: undefined
}
/> />
) : null, ) : null,
Meta({ name: 'generator', content: metadata.generator }), Meta({ name: 'generator', content: metadata.generator }),
......
...@@ -14,4 +14,15 @@ function resolveAsArrayOrUndefined<T>( ...@@ -14,4 +14,15 @@ function resolveAsArrayOrUndefined<T>(
return resolveArray(value) as any return resolveArray(value) as any
} }
export { resolveAsArrayOrUndefined, resolveArray } function getOrigin(url: string | URL): string | undefined {
let origin = undefined
if (typeof url === 'string') {
try {
url = new URL(url)
origin = url.origin
} catch {}
}
return origin
}
export { resolveAsArrayOrUndefined, resolveArray, getOrigin }
...@@ -228,7 +228,7 @@ describe('app dir - metadata', () => { ...@@ -228,7 +228,7 @@ describe('app dir - metadata', () => {
// Manifest link should have crossOrigin attribute // Manifest link should have crossOrigin attribute
await matchDom('link', 'rel="manifest"', { await matchDom('link', 'rel="manifest"', {
href: '/api/manifest', href: '/api/manifest',
crossOrigin: 'use-credentials', crossOrigin: isNextDeploy ? 'use-credentials' : null,
}) })
await matchDom('meta', 'name="theme-color"', { await matchDom('meta', 'name="theme-color"', {
...@@ -263,7 +263,7 @@ describe('app dir - metadata', () => { ...@@ -263,7 +263,7 @@ describe('app dir - metadata', () => {
// Manifest link should have crossOrigin attribute // Manifest link should have crossOrigin attribute
await matchDom('link', 'rel="manifest"', { await matchDom('link', 'rel="manifest"', {
href: '/api/manifest', href: '/api/manifest',
crossOrigin: 'use-credentials', crossOrigin: isNextDeploy ? 'use-credentials' : null,
}) })
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment