Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-24 21:41:33 +01:00
Code Issues Projects Releases Wiki Activity

[PM-2857] Reworking how we handle invalidating cache when a tab chagne has occurred

Browse Source
This commit is contained in:
Cesar Gonzalez 2024-06-24 12:19:43 -05:00
parent ca61740568
commit fe7bd3c2a3
No known key found for this signature in database
GPG Key ID: 3381A5457F8CCECF
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/browser/src/autofill/background/overlay.background.spec.ts
View File

@ -319,7 +319,7 @@ describe("OverlayBackground", () => {
}); });
describe("removing pageDetails", () => { describe("removing pageDetails", () => {
it("removes the page details, sub frame details, and port key for a specific tab from the pageDetailsForTab object", () => { it("removes the page details and port key for a specific tab from the pageDetailsForTab object", () => {
const tabId = 1; const tabId = 1;
sendMockExtensionMessage( sendMockExtensionMessage(
{ command: "collectPageDetailsResponse", details: createAutofillPageDetailsMock() }, { command: "collectPageDetailsResponse", details: createAutofillPageDetailsMock() },
@ -329,7 +329,6 @@ describe("OverlayBackground", () => {
overlayBackground.removePageDetails(tabId); overlayBackground.removePageDetails(tabId);
expect(pageDetailsForTabSpy[tabId]).toBeUndefined(); expect(pageDetailsForTabSpy[tabId]).toBeUndefined();
expect(subFrameOffsetsSpy[tabId]).toBeUndefined();
expect(portKeyForTabSpy[tabId]).toBeUndefined(); expect(portKeyForTabSpy[tabId]).toBeUndefined();
}); });
}); });

29
apps/browser/src/autofill/background/overlay.background.ts
View File

@ -151,7 +151,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
* overlay's visibility and the user's authentication status. * overlay's visibility and the user's authentication status.
*/ */
async init() { async init() {
this.setupExtensionMessageListeners(); this.setupExtensionListeners();
const env = await firstValueFrom(this.environmentService.environment$); const env = await firstValueFrom(this.environmentService.environment$);
this.iconsServerUrl = env.getIconsUrl(); this.iconsServerUrl = env.getIconsUrl();
} }
@ -201,11 +201,6 @@ export class OverlayBackground implements OverlayBackgroundInterface {
delete this.pageDetailsForTab[tabId]; delete this.pageDetailsForTab[tabId];
} }
if (this.subFrameOffsetsForTab[tabId]) {
this.subFrameOffsetsForTab[tabId].clear();
delete this.subFrameOffsetsForTab[tabId];
}
if (this.portKeyForTab[tabId]) { if (this.portKeyForTab[tabId]) {
delete this.portKeyForTab[tabId]; delete this.portKeyForTab[tabId];
} }
@ -1255,8 +1250,9 @@ export class OverlayBackground implements OverlayBackgroundInterface {
/** /**
* Sets up the extension message listeners for the overlay. * Sets up the extension message listeners for the overlay.
*/ */
private setupExtensionMessageListeners() { private setupExtensionListeners() {
BrowserApi.messageListener("overlay.background", this.handleExtensionMessage); BrowserApi.messageListener("overlay.background", this.handleExtensionMessage);
BrowserApi.addListener(chrome.webNavigation.onCommitted, this.handleWebNavigationOnCommitted);
BrowserApi.addListener(chrome.runtime.onConnect, this.handlePortOnConnect); BrowserApi.addListener(chrome.runtime.onConnect, this.handlePortOnConnect);
} }
@ -1288,6 +1284,25 @@ export class OverlayBackground implements OverlayBackgroundInterface {
return true; return true;
}; };
private handleWebNavigationOnCommitted = (
details: chrome.webNavigation.WebNavigationTransitionCallbackDetails,
) => {
const { frameId, tabId } = details;
const subFrames = this.subFrameOffsetsForTab[tabId];
if (frameId === 0) {
this.removePageDetails(tabId);
if (subFrames) {
subFrames.clear();
delete this.subFrameOffsetsForTab[tabId];
}
return;
}
if (subFrames && subFrames.has(frameId)) {
subFrames.delete(frameId);
}
};
/** /**
* Handles the connection of a port to the extension background. * Handles the connection of a port to the extension background.
* *

5
apps/browser/src/autofill/background/tabs.background.ts
View File

@ -86,11 +86,6 @@ export default class TabsBackground {
changeInfo: chrome.tabs.TabChangeInfo, changeInfo: chrome.tabs.TabChangeInfo,
tab: chrome.tabs.Tab, tab: chrome.tabs.Tab,
) => { ) => {
const removePageDetailsStatus = new Set(["loading", "unloaded"]);
if (removePageDetailsStatus.has(changeInfo.status)) {
this.overlayBackground.removePageDetails(tabId);
}
if (this.focusedWindowId > 0 && tab.windowId !== this.focusedWindowId) { if (this.focusedWindowId > 0 && tab.windowId !== this.focusedWindowId) {
return; return;
} }