From d00119dc5a676c83cdb2f84d3c8317b9b48df695 Mon Sep 17 00:00:00 2001
From: Francis O'Brien <42175565+F-OBrien@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:29:20 +0000
Subject: [PATCH] Fix: Prevent authorization request from incorrect origin due
 to chrome pre-rendering fixes #1293  (#1308)

* fix: prevent authorization requests from incorrect url when pages are pre-rendered

* lint
---
 packages/extension-base/src/background/handlers/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/extension-base/src/background/handlers/index.ts b/packages/extension-base/src/background/handlers/index.ts
index 5b8dc091..b26b5d34 100644
--- a/packages/extension-base/src/background/handlers/index.ts
+++ b/packages/extension-base/src/background/handlers/index.ts
@@ -22,13 +22,13 @@ export default function handler<TMessageType extends MessageTypes> ({ id, messag
   const isExtension = !port || port?.name === extensionPortName;
   const sender = port?.sender;
 
-  if (!sender) {
+  if (!isExtension && !sender) {
     throw new Error('Unable to extract message sender');
   }
 
   const from = isExtension
     ? 'extension'
-    : (sender.tab?.url) || sender.url || '<unknown>';
+    : sender?.url || sender?.tab?.url || '<unknown>';
   const source = `${from}: ${id}: ${message}`;
 
   console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);