Skip to content

Commit a7d3366

Browse files
committed
fix(site): prefer upstream Set-Cookie for playback token
1 parent 3654107 commit a7d3366

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

  • apps/site/app/api/player/[assetId]

apps/site/app/api/player/[assetId]/route.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
type UpstreamPlaybackResponse,
1010
} from "../../../../lib/player-bootstrap.ts";
1111
import {
12+
playbackCookieFromSetCookieHeaders,
1213
playbackDirectCookieHeader,
1314
playbackProxyCookieHeader,
1415
} from "../../../../lib/player-artifact-proxy.ts";
@@ -331,19 +332,21 @@ export async function GET(
331332
}
332333

333334
const headers = new Headers();
335+
const upstreamPlaybackCookie = playbackCookieFromSetCookieHeaders(upstream.headers);
336+
const playbackToken = upstreamPlaybackCookie ?? data?.playback_token;
334337
const playbackCookie = playbackBaseUrl
335338
? playbackDirectCookieHeader(
336339
request.url,
337340
normalizedAssetId,
338-
data?.playback_token,
341+
playbackToken,
339342
safeResponse.ttl_seconds,
340343
playbackBaseUrl,
341344
directPlaybackCookieDomain(request, playbackBaseUrl)
342345
)
343346
: playbackProxyCookieHeader(
344347
request.url,
345348
normalizedAssetId,
346-
data?.playback_token,
349+
playbackToken,
347350
safeResponse.ttl_seconds
348351
);
349352
if (playbackCookie) headers.append("set-cookie", playbackCookie);

0 commit comments

Comments
 (0)