Bug 1858633 - Pass preselected login as attribute to opened tab. r=cr…

…edential-management-reviewers,mtigley Differential Revision: https://phabricator.services.mozilla.com/D191716
dothq · Oct 31, 2023 · 34c0bed · 34c0bed
1 parent 5bf0590
commit 34c0bed
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 25 deletions.
diff --git a/browser/components/aboutlogins/AboutLoginsParent.sys.mjs b/browser/components/aboutlogins/AboutLoginsParent.sys.mjs
@@ -201,6 +201,14 @@ export class AboutLoginsParent extends JSWindowActorParent {
     }
   }
 
+  get preselectedLogin() {
+    const preselectedLogin =
+      this.#ownerGlobal.gBrowser.selectedTab.getAttribute("preselect-login") ||
+      this.browsingContext.currentURI?.ref;
+    this.#ownerGlobal.gBrowser.selectedTab.removeAttribute("preselect-login");
+    return preselectedLogin || null;
+  }
+
   #deleteLogin(loginObject) {
     let login = lazy.LoginHelper.vanillaObjectToLogin(loginObject);
     Services.logins.removeLogin(login);
@@ -316,6 +324,7 @@ export class AboutLoginsParent extends JSWindowActorParent {
         importVisible:
           Services.policies.isAllowed("profileImport") &&
           AppConstants.platform != "linux",
+        preselectedLogin: this.preselectedLogin,
       });
 
       await AboutLogins.sendAllLoginRelatedObjects(

diff --git a/browser/components/aboutlogins/content/aboutLogins.mjs b/browser/components/aboutlogins/content/aboutLogins.mjs
@@ -121,6 +121,9 @@ window.addEventListener("AboutLoginsChromeToContent", event => {
       break;
     }
     case "Setup": {
+      gElements.loginList.selectLoginByDomainOrGuid(
+        event.detail.value.preselectedLogin
+      );
       handleAllLogins(event.detail.value.logins);
       handleSyncState(event.detail.value.syncState);
       gElements.loginList.setSortDirection(event.detail.value.selectedSort);
@@ -277,12 +280,6 @@ if (searchParamsChanged) {
 }
 
 if (!searchParamsChanged) {
-  if (document.location.hash) {
-    const loginDomainOrGuid = decodeURIComponent(
-      document.location.hash.slice(1)
-    );
-    gElements.loginList.selectLoginByDomainOrGuid(loginDomainOrGuid);
-  }
   gElements.loginFilter.focus();
   document.dispatchEvent(new CustomEvent("AboutLoginsInit", { bubbles: true }));
 }
diff --git a/browser/components/aboutlogins/content/components/login-list.mjs b/browser/components/aboutlogins/content/components/login-list.mjs
@@ -874,11 +874,12 @@ export default class LoginList extends HTMLElement {
       ...this._loginGuidsSortedOrder,
     ].find(guid => visibleLoginsGuids.has(guid));
 
-    if (selectedLoginGuid && this._logins[selectedLoginGuid]) {
-      let { login } = this._logins[selectedLoginGuid];
+    const selectedLogin = this._logins[selectedLoginGuid]?.login;
+
+    if (selectedLogin) {
       window.dispatchEvent(
         new CustomEvent("AboutLoginsInitialLoginSelected", {
-          detail: login,
+          detail: selectedLogin,
         })
       );
       this.updateSelectedLocationHash(selectedLoginGuid);

diff --git a/toolkit/components/passwordmgr/LoginHelper.sys.mjs b/toolkit/components/passwordmgr/LoginHelper.sys.mjs
@@ -1254,7 +1254,6 @@ export const LoginHelper = {
     // Get currently active tab's origin
     const openedFrom =
       window.gBrowser?.selectedTab.linkedBrowser.currentURI.spec;
-
     // If no loginGuid is set, get sanitized origin, this will return null for about:* uris
     const preselectedLogin = loginGuid ?? this.getLoginOrigin(openedFrom);
 
@@ -1264,13 +1263,14 @@ export const LoginHelper = {
     });
 
     const paramsPart = params.toString() ? `?${params}` : "";
-    const fragmentsPart = preselectedLogin
-      ? `#${window.encodeURIComponent(preselectedLogin)}`
-      : "";
-    const destination = `about:logins${paramsPart}${fragmentsPart}`;
 
-    // We assume that managementURL has a '?' already
-    window.openTrustedLinkIn(destination, "tab");
+    const browser = window.gBrowser ?? window.opener?.gBrowser;
+
+    const tab = browser.addTrustedTab(`about:logins${paramsPart}`, {
+      inBackground: false,
+    });
+
+    tab.setAttribute("preselect-login", preselectedLogin);
   },
 
   /**

diff --git a/toolkit/components/passwordmgr/test/browser/browser_openPasswordManager.js b/toolkit/components/passwordmgr/test/browser/browser_openPasswordManager.js
@@ -59,15 +59,15 @@ add_task(async function test_management_filter() {
 
 add_task(
   async function test_url_when_opening_password_manager_without_a_filterString() {
-    sinon.spy(window, "openTrustedLinkIn");
+    sinon.spy(window.gBrowser, "addTrustedTab");
     const openingFunc = () =>
       LoginHelper.openPasswordManager(window, {
         filterString: "",
         entryPoint: "mainmenu",
       });
     const passwordManager = await openPasswordManager(openingFunc);
 
-    const url = window.openTrustedLinkIn.lastCall.args[0];
+    const url = window.gBrowser.addTrustedTab.lastCall.args[0];
 
     Assert.ok(
       !url.includes("filter"),
@@ -86,21 +86,21 @@ add_task(
 
     Assert.ok(passwordManager, "Login dialog was opened");
     await passwordManager.close();
-    window.openTrustedLinkIn.restore();
+    window.gBrowser.addTrustedTab.restore();
   }
 );
 
 add_task(
   async function test_url_when_opening_password_manager_with_a_filterString() {
-    sinon.spy(window, "openTrustedLinkIn");
+    sinon.spy(window.gBrowser, "addTrustedTab");
     const openingFunc = () =>
       LoginHelper.openPasswordManager(window, {
         filterString: "testFilter",
         entryPoint: "mainmenu",
       });
     const passwordManager = await openPasswordManager(openingFunc);
 
-    const url = window.openTrustedLinkIn.lastCall.args[0];
+    const url = window.gBrowser.addTrustedTab.lastCall.args[0];
 
     Assert.ok(
       url.includes("filter"),
@@ -119,21 +119,21 @@ add_task(
 
     Assert.ok(passwordManager, "Login dialog was opened");
     await passwordManager.close();
-    window.openTrustedLinkIn.restore();
+    window.gBrowser.addTrustedTab.restore();
   }
 );
 
 add_task(
   async function test_url_when_opening_password_manager_without_filterString_or_entryPoint() {
-    sinon.spy(window, "openTrustedLinkIn");
+    sinon.spy(window.gBrowser, "addTrustedTab");
     const openingFunc = () =>
       LoginHelper.openPasswordManager(window, {
         filterString: "",
         entryPoint: "",
       });
     const passwordManager = await openPasswordManager(openingFunc);
 
-    const url = window.openTrustedLinkIn.lastCall.args[0];
+    const url = window.gBrowser.addTrustedTab.lastCall.args[0];
 
     Assert.ok(
       !url.includes("filter"),
@@ -156,6 +156,6 @@ add_task(
 
     Assert.ok(passwordManager, "Login dialog was opened");
     await passwordManager.close();
-    window.openTrustedLinkIn.restore();
+    window.gBrowser.addTrustedTab.restore();
   }
 );