From ae489cfdcb18d66561ec66c42babdf8f970ffb49 Mon Sep 17 00:00:00 2001
From: Mattsson <111893710+mattssonn@users.noreply.github.com>
Date: Wed, 8 Jul 2026 18:09:34 +0200
Subject: [PATCH] fix(client): update AWS credential handling to prefer
 BEDROCK_AWS_* environment variables (#937)

---
 components/bookkeeping/JournalEntryForm.tsx   | 24 ++++++++++++-------
 .../lib/extract-invoice-fields.ts             | 19 +++++++++++----
 lib/agent/composer/client.ts                  | 16 ++++++++++---
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/components/bookkeeping/JournalEntryForm.tsx b/components/bookkeeping/JournalEntryForm.tsx
index aacadc6b..e786f57a 100644
--- a/components/bookkeeping/JournalEntryForm.tsx
+++ b/components/bookkeeping/JournalEntryForm.tsx
@@ -1729,15 +1729,21 @@ export default function JournalEntryForm({
                   {t('clear_all')}
                 </Button>
               )}
-              <Button
-                variant="outline"
-                onClick={handleSaveDraft}
-                disabled={!isBalanced || !description || !selectedPeriod || !!periodMismatch || isSubmitting || isSavingDraft || isUploading || !canWrite}
-                title={!canWrite ? t('read_only_tooltip') : t('save_draft_tooltip')}
-              >
-                {!canWrite ? <Lock className="mr-2 h-4 w-4" /> : isSavingDraft && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-                {t('save_draft')}
-              </Button>
+              {/* Draft-saving rides on ?as_draft=true, which only the standard
+                  journal-entries endpoint honors. A custom submitUrl (e.g. the
+                  bank-transaction /book route) ignores the flag and commits a
+                  numbered voucher, so the draft button must not render there. */}
+              {!submitUrl && (
+                <Button
+                  variant="outline"
+                  onClick={handleSaveDraft}
+                  disabled={!isBalanced || !description || !selectedPeriod || !!periodMismatch || isSubmitting || isSavingDraft || isUploading || !canWrite}
+                  title={!canWrite ? t('read_only_tooltip') : t('save_draft_tooltip')}
+                >
+                  {!canWrite ? <Lock className="mr-2 h-4 w-4" /> : isSavingDraft && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+                  {t('save_draft')}
+                </Button>
+              )}
               <Button
                 onClick={handleReview}
                 disabled={!isBalanced || !description || !selectedPeriod || !!periodMismatch || isSubmitting || isSavingDraft || isUploading || !canWrite}
diff --git a/extensions/general/invoice-inbox/lib/extract-invoice-fields.ts b/extensions/general/invoice-inbox/lib/extract-invoice-fields.ts
index 2de640ae..7deaff2a 100644
--- a/extensions/general/invoice-inbox/lib/extract-invoice-fields.ts
+++ b/extensions/general/invoice-inbox/lib/extract-invoice-fields.ts
@@ -246,7 +246,18 @@ export async function extractInvoiceFields(
     return { data: emptyResult(), rawText: null }
   }
 
-  if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
+  // Prefer BEDROCK_AWS_* over the plain AWS_* names: on Vercel/Lambda the
+  // platform injects its own reserved AWS_* execution-role vars that shadow
+  // whatever is configured, so a hosted deploy must use the BEDROCK_AWS_* names
+  // (see lib/agent/composer/client.ts for the full explanation).
+  const awsRegion =
+    process.env.BEDROCK_AWS_REGION || process.env.AWS_REGION || 'eu-north-1'
+  const awsAccessKey =
+    process.env.BEDROCK_AWS_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID
+  const awsSecretKey =
+    process.env.BEDROCK_AWS_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY
+
+  if (!awsAccessKey || !awsSecretKey) {
     log.warn('AWS Bedrock credentials missing: returning empty extraction', {
       file_name_hash: createHash('sha256').update(input.fileName).digest('hex').slice(0, 12),
     })
@@ -254,9 +265,9 @@ export async function extractInvoiceFields(
   }
 
   const client = new AnthropicBedrock({
-    awsRegion: process.env.AWS_REGION || 'eu-north-1',
-    awsAccessKey: process.env.AWS_ACCESS_KEY_ID,
-    awsSecretKey: process.env.AWS_SECRET_ACCESS_KEY,
+    awsRegion,
+    awsAccessKey,
+    awsSecretKey,
   })
 
   let rawText: string | null = null
diff --git a/lib/agent/composer/client.ts b/lib/agent/composer/client.ts
index 5db5ee25..c05e07e9 100644
--- a/lib/agent/composer/client.ts
+++ b/lib/agent/composer/client.ts
@@ -20,9 +20,19 @@ let cached: AnthropicBedrock | null = null
 // API.
 export function getAnthropic(): AnthropicBedrock {
   if (cached) return cached
-  const awsRegion = process.env.AWS_REGION || 'eu-north-1'
-  const awsAccessKey = process.env.AWS_ACCESS_KEY_ID
-  const awsSecretKey = process.env.AWS_SECRET_ACCESS_KEY
+  // Read Bedrock creds from BEDROCK_AWS_* first, falling back to the plain
+  // AWS_* names for local dev. On Vercel the functions run on AWS Lambda, whose
+  // runtime injects its OWN reserved AWS_REGION / AWS_ACCESS_KEY_ID /
+  // AWS_SECRET_ACCESS_KEY / AWS_SESSION_TOKEN for the platform execution role
+  // (wrong account, wrong region, no Bedrock access). Those shadow anything set
+  // in the dashboard, so a hosted deploy MUST use the BEDROCK_AWS_* names or the
+  // stream comes back empty ("request ended without sending any chunks").
+  const awsRegion =
+    process.env.BEDROCK_AWS_REGION || process.env.AWS_REGION || 'eu-north-1'
+  const awsAccessKey =
+    process.env.BEDROCK_AWS_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID
+  const awsSecretKey =
+    process.env.BEDROCK_AWS_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY
   // When both static keys are present, pass them. Otherwise omit them so the
   // SDK falls back to the AWS credential provider chain (instance profile,
   // IRSA, EKS pod identity, ...). The two-overload SDK refuses a mix.