From 25a86231937ccf1c39c4f0ebc6f23cbcee20e56a Mon Sep 17 00:00:00 2001 From: regalijan Date: Thu, 19 Oct 2023 16:50:14 -0400 Subject: [PATCH] Simplify url generation --- functions/api/reports/submit.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/functions/api/reports/submit.ts b/functions/api/reports/submit.ts index 8d3069d..7e901a5 100644 --- a/functions/api/reports/submit.ts +++ b/functions/api/reports/submit.ts @@ -182,7 +182,7 @@ export async function onRequestPost(context: RequestContext) { ); } - const uploadUrls = await Promise.allSettled(uploadUrlPromises); + const uploadUrlResults = await Promise.allSettled(uploadUrlPromises); const reportId = `${Date.now()}${context.request.headers.get( "cf-ray", @@ -196,12 +196,15 @@ export async function onRequestPost(context: RequestContext) { { expirationTtl: 3600 }, ); - if (uploadUrls.find((uploadUrl) => uploadUrl.status === "rejected")) + if (uploadUrlResults.find((uploadUrl) => uploadUrl.status === "rejected")) return errorResponse("Failed to generate upload url", 500); const attachments: string[] = []; + const uploadUrls: string[] = []; + + for (const urlResult of uploadUrlResults as PromiseFulfilledResult[]) { + uploadUrls.push(urlResult.value); - for (const urlResult of uploadUrls) { let url = urlResult.toString().replace("t/", ""); const extension = (url.split(".").at(-1) as string).toLowerCase();