From 54a281b78035581a96dbae1d03b2ca8790bdffb3 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Wed, 23 Sep 2026 19:31:50 +0800 Subject: [PATCH] use PDA identity across downstream loading checks --- scripts/admin-test-env-modules/manual-state-loading-pda.mjs | 2 +- scripts/admin-test-env-modules/phase3-loading-finalize.mjs | 2 +- scripts/admin-test-env-modules/phase3-order-splitting.mjs | 6 +++--- scripts/admin-test-env-modules/phase3-pda-convergence.mjs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/admin-test-env-modules/manual-state-loading-pda.mjs b/scripts/admin-test-env-modules/manual-state-loading-pda.mjs index 5bf1f7b3a..7c1acc72d 100644 --- a/scripts/admin-test-env-modules/manual-state-loading-pda.mjs +++ b/scripts/admin-test-env-modules/manual-state-loading-pda.mjs @@ -37,7 +37,7 @@ async function ensureCompletionEvidence(context, chain, label) { const form = new FormData() form.append('file', new Blob([png], { type: 'image/png' }), `${label}-${evidenceType}.png`) const rawUpload = await fetch(`${context.options.gateway}${uploadPath}`, { - method: 'POST', headers: { Accept: 'application/json', Authorization: `Bearer ${context.token}`, + method: 'POST', headers: { Accept: 'application/json', Authorization: `Bearer ${context.pdaToken || context.token}`, 'Idempotency-Key': operationId(context, `${label}-evidence-${evidenceType}`) }, body: form, signal: AbortSignal.timeout(60_000), }) diff --git a/scripts/admin-test-env-modules/phase3-loading-finalize.mjs b/scripts/admin-test-env-modules/phase3-loading-finalize.mjs index 8d4ebc037..cc38656b6 100644 --- a/scripts/admin-test-env-modules/phase3-loading-finalize.mjs +++ b/scripts/admin-test-env-modules/phase3-loading-finalize.mjs @@ -73,7 +73,7 @@ async function request(context, method, path, body, headers = {}) { try { const response = await fetch(`${context.options.gateway}${path}`, { method, - headers: { Accept: 'application/json', Authorization: `Bearer ${context.token}`, + headers: { Accept: 'application/json', Authorization: `Bearer ${context.pdaToken && /\/pda-loading\/tasks\/\d+/.test(path) ? context.pdaToken : context.token}`, ...(body === undefined ? {} : { 'Content-Type': 'application/json; charset=utf-8' }), ...headers }, body: body === undefined ? undefined : JSON.stringify(body), signal: AbortSignal.timeout(60_000), }) diff --git a/scripts/admin-test-env-modules/phase3-order-splitting.mjs b/scripts/admin-test-env-modules/phase3-order-splitting.mjs index 14069d148..fd6228711 100644 --- a/scripts/admin-test-env-modules/phase3-order-splitting.mjs +++ b/scripts/admin-test-env-modules/phase3-order-splitting.mjs @@ -45,13 +45,13 @@ function sameBookingTransport(left, right) { return BOOKING_TRANSPORT_FIELDS.every((field) => left?.[field] === right?.[field]) } -async function request(context, method, path, body, headers = {}, token = context.token) { +async function request(context, method, path, body, headers = {}, token = undefined) { try { const response = await fetch(`${context.options.gateway}${path}`, { method, headers: { Accept: 'application/json', - ...(token ? { Authorization: `Bearer ${token}` } : {}), + ...((token || (context.pdaToken && /\/pda-loading\/tasks\/\d+/.test(path) ? context.pdaToken : context.token)) ? { Authorization: `Bearer ${token || (context.pdaToken && /\/pda-loading\/tasks\/\d+/.test(path) ? context.pdaToken : context.token)}` } : {}), ...(body === undefined ? {} : { 'Content-Type': 'application/json; charset=utf-8' }), ...headers, }, @@ -81,7 +81,7 @@ async function ensureCompletionEvidence(context, taskId, warehouseId, keyBase) { const form = new FormData() form.append('file', new Blob([png], { type: 'image/png' }), `${keyBase}-${evidenceType}.png`) const rawUpload = await fetch(`${context.options.gateway}${uploadPath}`, { - method: 'POST', headers: { Accept: 'application/json', Authorization: `Bearer ${context.token}`, + method: 'POST', headers: { Accept: 'application/json', Authorization: `Bearer ${context.pdaToken || context.token}`, 'Idempotency-Key': `${keyBase}-evidence-${evidenceType}`.slice(0, 128) }, body: form, signal: AbortSignal.timeout(60_000), }) diff --git a/scripts/admin-test-env-modules/phase3-pda-convergence.mjs b/scripts/admin-test-env-modules/phase3-pda-convergence.mjs index 63970322b..ef15e60aa 100644 --- a/scripts/admin-test-env-modules/phase3-pda-convergence.mjs +++ b/scripts/admin-test-env-modules/phase3-pda-convergence.mjs @@ -11,7 +11,7 @@ export function buildPendingActions(task) { async function request(context, method, path, body, headers = {}) { try { const response = await fetch(`${context.options.gateway}${path}`, { method, - headers: { Accept: 'application/json', Authorization: `Bearer ${context.token}`, + headers: { Accept: 'application/json', Authorization: `Bearer ${context.pdaToken && /\/pda-loading\/tasks\/\d+/.test(path) ? context.pdaToken : context.token}`, ...(body === undefined ? {} : { 'Content-Type': 'application/json; charset=utf-8' }), ...headers }, body: body === undefined ? undefined : JSON.stringify(body), signal: AbortSignal.timeout(60_000) }) const raw = await response.text(); let payload = null