Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-05 18:47:52 +01:00
Code Issues Projects Releases Wiki Activity

Re-focus to last open tab before user was prompted for log in

Browse Source
This commit is contained in:
Daniel James Smith 2021-10-11 17:46:43 +02:00
parent b74efc1dbf
commit 7f98ce347d
No known key found for this signature in database
GPG Key ID: 03E4BD365FF06726
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/background/runtime.background.ts
View File

@ -79,6 +79,10 @@ export default class RuntimeBackground {
await this.processMessage(retryItem.msg, retryItem.sender, null); await this.processMessage(retryItem.msg, retryItem.sender, null);
await BrowserApi.closeLoginTab(); await BrowserApi.closeLoginTab();
if (retryItem?.sender?.tab?.id) {
await BrowserApi.focusSpecifiedTab(retryItem.sender.tab.id);
}
} }
break; break;
case 'addToLockedVaultPendingNotifications': case 'addToLockedVaultPendingNotifications':

4
src/browser/browserApi.ts
View File

@ -111,6 +111,10 @@ export class BrowserApi {
chrome.tabs.remove(tabToClose); chrome.tabs.remove(tabToClose);
} }
static async focusSpecifiedTab(tabId: number) {
chrome.tabs.update(tabId, { active: true, highlighted: true });
}
static closePopup(win: Window) { static closePopup(win: Window) {
if (BrowserApi.isWebExtensionsApi && BrowserApi.isFirefoxOnAndroid) { if (BrowserApi.isWebExtensionsApi && BrowserApi.isFirefoxOnAndroid) {
// Reactivating the active tab dismisses the popup tab. The promise final // Reactivating the active tab dismisses the popup tab. The promise final