From 9aee32d17e2dec85052a92e2967ba66a8eac3f3f Mon Sep 17 00:00:00 2001
From: Daniel Riera <driera@livefront.com>
Date: Mon, 12 Jan 2026 15:55:34 -0500
Subject: [PATCH]  add explicit checks and change remove listener to any in
 order to match add listener and chrome api

---
 .../auto-submit-login.background.ts           | 33 +++++++++++++------
 .../src/platform/browser/browser-api.ts       |  2 +-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.ts b/apps/browser/src/autofill/background/auto-submit-login.background.ts
index f593fab2516..308b1335901 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { filter, firstValueFrom, of, switchMap } from "rxjs";
 
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -64,6 +62,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
           this.policyService.policiesByType$(PolicyType.AutomaticAppLogIn, userId),
         ),
         getFirstPolicy,
+        filter((policy): policy is Policy => policy !== undefined),
       )
       .subscribe(this.handleAutoSubmitLoginPolicySubscription.bind(this));
   }
@@ -165,6 +164,9 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
     details: chrome.webRequest.OnBeforeRequestDetails,
   ): undefined => {
     const requestInitiator = this.getRequestInitiator(details);
+    if (!requestInitiator) {
+      return;
+    }
     const isValidInitiator = this.isValidInitiator(requestInitiator);
 
     if (
@@ -368,8 +370,9 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
     }
 
     const tab = await BrowserApi.getTab(details.tabId);
-    if (this.isValidAutoSubmitHost(tab?.url)) {
-      this.removeUrlFromAutoSubmitHosts(tab.url);
+    const tabUrl = tab?.url;
+    if (tabUrl && this.isValidAutoSubmitHost(tabUrl)) {
+      this.removeUrlFromAutoSubmitHosts(tabUrl);
     }
   };
 
@@ -495,6 +498,10 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
     message: AutoSubmitLoginMessage,
     sender: chrome.runtime.MessageSender,
   ) => {
+    if (sender.frameId == null || !sender.tab || !message.pageDetails) {
+      return;
+    }
+
     await this.autofillService.doAutoFillOnTab(
       [
         {
@@ -515,7 +522,9 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param sender - The message sender.
    */
   private handleMultiStepAutoSubmitLoginComplete = (sender: chrome.runtime.MessageSender) => {
-    this.removeUrlFromAutoSubmitHosts(sender.url);
+    if (sender.url) {
+      this.removeUrlFromAutoSubmitHosts(sender.url);
+    }
   };
 
   /**
@@ -526,7 +535,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    */
   private async initSafari() {
     const currentTab = await BrowserApi.getTabFromCurrentWindow();
-    if (currentTab) {
+    if (currentTab?.url && currentTab.id !== undefined) {
       this.setMostRecentIdpHost(currentTab.url, currentTab.id);
     }
 
@@ -558,7 +567,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
     }
 
     const tab = await BrowserApi.getTab(activeInfo.tabId);
-    if (tab) {
+    if (tab?.url && tab.id !== undefined) {
       this.setMostRecentIdpHost(tab.url, tab.id);
     }
   };
@@ -570,7 +579,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param changeInfo - The change information of the tab.
    */
   private handleSafariTabOnUpdated = (tabId: number, changeInfo: chrome.tabs.OnUpdatedInfo) => {
-    if (changeInfo) {
+    if (changeInfo && changeInfo.url) {
       this.setMostRecentIdpHost(changeInfo.url, tabId);
     }
   };
@@ -626,13 +635,17 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    * @param sender - The message sender.
    * @param sendResponse - The response callback.
    */
-  private handleExtensionMessage = async (
+  private handleExtensionMessage = (
     message: AutoSubmitLoginMessage,
     sender: chrome.runtime.MessageSender,
     sendResponse: (response?: any) => void,
   ) => {
     const { tab, url } = sender;
-    if (tab?.id !== this.currentAutoSubmitHostData.tabId || !this.isValidAutoSubmitHost(url)) {
+    if (
+      !url ||
+      tab?.id !== this.currentAutoSubmitHostData.tabId ||
+      !this.isValidAutoSubmitHost(url)
+    ) {
       return null;
     }
 
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index cfc39fa18a1..1d2116b2ac7 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -560,7 +560,7 @@ export class BrowserApi {
    * @param event - The event in which to remove the listener from.
    * @param callback - The callback you want removed from the event.
    */
-  static removeListener<T extends (...args: readonly unknown[]) => unknown>(
+  static removeListener<T extends (...args: readonly any[]) => any>(
     event: chrome.events.Event<T>,
     callback: T,
   ) {