Train 1D: merge via --admin on .113 validation

Squash merge from local merge-train (Hard Rule owner-approved). Tip 029cdf4215cf465f0e1716ac9f84a84692b1e881 validated on 192.168.0.113: 26631/26653 pass.
This commit is contained in:
backryun
2026-07-27 23:29:23 +09:00
committed by GitHub
parent 96c3b94811
commit dd34520ffe

View File

@@ -1569,8 +1569,8 @@ async function imsCheckToken(opts: {
guestAllowed: boolean;
fetchImpl: typeof fetch;
}): Promise<
| { ok: true; token: string; data: ImsTokenResponse }
| { ok: false; status: number; error: string }
| { state: "ok"; token: string; data: ImsTokenResponse }
| { state: "failed"; status: number; error: string }
> {
const form = new URLSearchParams({
client_id: opts.clientId,
@@ -1602,7 +1602,7 @@ async function imsCheckToken(opts: {
if (!resp.ok) {
return {
ok: false,
state: "failed",
status: resp.status,
error: sanitizeErrorMessage(
data?.error_description || data?.error || text.slice(0, 200) || `HTTP ${resp.status}`
@@ -1613,14 +1613,14 @@ async function imsCheckToken(opts: {
const token = String(data?.access_token || "").trim();
if (!token) {
return {
ok: false,
state: "failed",
status: 401,
error: sanitizeErrorMessage(
data?.error_description || data?.error || "IMS response missing access_token"
),
};
}
return { ok: true, token, data: data || {} };
return { state: "ok", token, data: data || {} };
}
/**
@@ -1667,7 +1667,7 @@ export async function exchangeAdobeCookieForAccessToken(
guestAllowed: false,
fetchImpl,
});
if (authed.ok) {
if (authed.state === "ok") {
if (
isAdobeGuestAccessToken(authed.token) ||
authed.data.account_type === "guest" ||
@@ -1690,7 +1690,7 @@ export async function exchangeAdobeCookieForAccessToken(
guestAllowed: true,
fetchImpl,
});
if (guest.ok) {
if (guest.state === "ok") {
if (
guest.data.account_type === "guest" ||
guest.data.guestId ||