{{ "noTwoStepProviders" | i18n }}
diff --git a/apps/browser/src/auth/popup/two-factor.component.ts b/apps/browser/src/auth/popup/two-factor.component.ts index 678675ba389..c0af31d25e5 100644 --- a/apps/browser/src/auth/popup/two-factor.component.ts +++ b/apps/browser/src/auth/popup/two-factor.component.ts @@ -1,25 +1,27 @@ -import { Component } from "@angular/core"; +import { Component, Inject } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/auth/components/two-factor.component"; -import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog"; +import { WINDOW } from "@bitwarden/angular/services/injection-tokens"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; +import { DialogService } from "@bitwarden/components"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { PopupUtilsService } from "../../popup/services/popup-utils.service"; const BroadcasterSubscriptionId = "TwoFactorComponent"; @@ -48,7 +50,9 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { twoFactorService: TwoFactorService, appIdService: AppIdService, loginService: LoginService, - private dialogService: DialogServiceAbstraction + configService: ConfigServiceAbstraction, + private dialogService: DialogService, + @Inject(WINDOW) protected win: Window ) { super( authService, @@ -56,19 +60,28 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { i18nService, apiService, platformUtilsService, - window, + win, environmentService, stateService, route, logService, twoFactorService, appIdService, - loginService + loginService, + configService ); - super.onSuccessfulLogin = () => { - this.loginService.clearValues(); - return syncService.fullSync(true); + super.onSuccessfulLogin = async () => { + syncService.fullSync(true); }; + + super.onSuccessfulLoginTde = async () => { + syncService.fullSync(true); + }; + + super.onSuccessfulLoginTdeNavigate = async () => { + this.win.close(); + }; + super.successRoute = "/tabs/vault"; // FIXME: Chromium 110 has broken WebAuthn support in extensions via an iframe this.webAuthnNewTab = true; @@ -107,7 +120,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { const confirmed = await this.dialogService.openSimpleDialog({ title: { key: "warning" }, content: { key: "popup2faCloseMessage" }, - type: SimpleDialogType.WARNING, + type: "warning", }); if (confirmed) { this.popupUtilsService.popOut(window); @@ -117,11 +130,19 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe this.route.queryParams.pipe(first()).subscribe(async (qParams) => { if (qParams.sso === "true") { - super.onSuccessfulLogin = () => { - BrowserApi.reloadOpenWindows(); - const thisWindow = window.open("", "_self"); - thisWindow.close(); - return this.syncService.fullSync(true); + super.onSuccessfulLogin = async () => { + // This is not awaited so we don't pause the application while the sync is happening. + // This call is executed by the service that lives in the background script so it will continue + // the sync even if this tab closes. + this.syncService.fullSync(true); + + // Force sidebars (FF && Opera) to reload while exempting current window + // because we are just going to close the current window. + BrowserApi.reloadOpenWindows(true); + + // We don't need this window anymore because the intent is for the user to be left + // on the web vault screen which tells them to continue in the browser extension (sidebar or popup) + BrowserApi.closeBitwardenExtensionTab(); }; } }); @@ -137,7 +158,15 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { } anotherMethod() { - this.router.navigate(["2fa-options"]); + const sso = this.route.snapshot.queryParamMap.get("sso") === "true"; + + if (sso) { + // We must persist this so when the user returns to the 2FA comp, the + // proper onSuccessfulLogin logic is executed. + this.router.navigate(["2fa-options"], { queryParams: { sso: true } }); + } else { + this.router.navigate(["2fa-options"]); + } } async isLinux() { diff --git a/apps/browser/src/autofill/background/context-menus.background.ts b/apps/browser/src/autofill/background/context-menus.background.ts index 9d04571a7c4..bc26353cbd9 100644 --- a/apps/browser/src/autofill/background/context-menus.background.ts +++ b/apps/browser/src/autofill/background/context-menus.background.ts @@ -1,5 +1,5 @@ import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler"; export default class ContextMenusBackground { @@ -30,6 +30,7 @@ export default class ContextMenusBackground { msg.data.commandToRetry.msg.data, msg.data.commandToRetry.sender.tab ); + await BrowserApi.tabSendMessageData(sender.tab, "closeNotificationBar"); } } ); diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts index b7cdfd97929..73bdc2cd16f 100644 --- a/apps/browser/src/autofill/background/notification.background.ts +++ b/apps/browser/src/autofill/background/notification.background.ts @@ -5,24 +5,30 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { ThemeType } from "@bitwarden/common/enums"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import AddUnlockVaultQueueMessage from "../../background/models/add-unlock-vault-queue-message"; import AddChangePasswordQueueMessage from "../../background/models/addChangePasswordQueueMessage"; import AddLoginQueueMessage from "../../background/models/addLoginQueueMessage"; import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessage"; import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage"; import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; import { NotificationQueueMessageType } from "../../background/models/notificationQueueMessageType"; -import { BrowserApi } from "../../browser/browserApi"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +import { BrowserApi } from "../../platform/browser/browser-api"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; import { AutofillService } from "../services/abstractions/autofill.service"; export default class NotificationBackground { - private notificationQueue: (AddLoginQueueMessage | AddChangePasswordQueueMessage)[] = []; + private notificationQueue: ( + | AddLoginQueueMessage + | AddChangePasswordQueueMessage + | AddUnlockVaultQueueMessage + )[] = []; constructor( private autofillService: AutofillService, @@ -30,7 +36,8 @@ export default class NotificationBackground { private authService: AuthService, private policyService: PolicyService, private folderService: FolderService, - private stateService: BrowserStateService + private stateService: BrowserStateService, + private environmentService: EnvironmentService ) {} async init() { @@ -51,10 +58,7 @@ export default class NotificationBackground { async processMessage(msg: any, sender: chrome.runtime.MessageSender) { switch (msg.command) { case "unlockCompleted": - if (msg.data.target !== "notification.background") { - return; - } - await this.processMessage(msg.data.commandToRetry.msg, msg.data.commandToRetry.sender); + await this.handleUnlockCompleted(msg.data, sender); break; case "bgGetDataForTab": await this.getDataForTab(sender.tab, msg.responseCommand); @@ -80,7 +84,9 @@ export default class NotificationBackground { if ((await this.authService.getAuthStatus()) < AuthenticationStatus.Unlocked) { const retryMessage: LockedVaultPendingNotificationsItem = { commandToRetry: { - msg: msg, + msg: { + command: msg, + }, sender: sender, }, target: "notification.background", @@ -112,6 +118,9 @@ export default class NotificationBackground { break; } break; + case "promptForLogin": + await this.unlockVault(sender.tab); + break; default: break; } @@ -167,11 +176,21 @@ export default class NotificationBackground { isVaultLocked: this.notificationQueue[i].wasVaultLocked, theme: await this.getCurrentTheme(), removeIndividualVault: await this.removeIndividualVault(), + webVaultURL: await this.environmentService.getWebVaultUrl(), }, }); } else if (this.notificationQueue[i].type === NotificationQueueMessageType.ChangePassword) { BrowserApi.tabSendMessageData(tab, "openNotificationBar", { type: "change", + typeData: { + isVaultLocked: this.notificationQueue[i].wasVaultLocked, + theme: await this.getCurrentTheme(), + webVaultURL: await this.environmentService.getWebVaultUrl(), + }, + }); + } else if (this.notificationQueue[i].type === NotificationQueueMessageType.UnlockVault) { + BrowserApi.tabSendMessageData(tab, "openNotificationBar", { + type: "unlock", typeData: { isVaultLocked: this.notificationQueue[i].wasVaultLocked, theme: await this.getCurrentTheme(), @@ -301,6 +320,20 @@ export default class NotificationBackground { } } + private async unlockVault(tab: chrome.tabs.Tab) { + const currentAuthStatus = await this.authService.getAuthStatus(); + if (currentAuthStatus !== AuthenticationStatus.Locked || this.notificationQueue.length) { + return; + } + + const loginDomain = Utils.getDomain(tab.url); + if (!loginDomain) { + return; + } + + this.pushUnlockVaultToQueue(loginDomain, tab); + } + private async pushChangePasswordToQueue( cipherId: string, loginDomain: string, @@ -323,6 +356,20 @@ export default class NotificationBackground { await this.checkNotificationQueue(tab); } + private async pushUnlockVaultToQueue(loginDomain: string, tab: chrome.tabs.Tab) { + this.removeTabFromNotificationQueue(tab); + const message: AddUnlockVaultQueueMessage = { + type: NotificationQueueMessageType.UnlockVault, + domain: loginDomain, + tabId: tab.id, + expires: new Date(new Date().getTime() + 0.5 * 60000), // 30 seconds + wasVaultLocked: true, + }; + this.notificationQueue.push(message); + await this.checkNotificationQueue(tab); + this.removeTabFromNotificationQueue(tab); + } + private async saveOrUpdateCredentials(tab: chrome.tabs.Tab, edit: boolean, folderId?: string) { for (let i = this.notificationQueue.length - 1; i >= 0; i--) { const queueMessage = this.notificationQueue[i]; @@ -417,7 +464,7 @@ export default class NotificationBackground { private async getDecryptedCipherById(cipherId: string) { const cipher = await this.cipherService.get(cipherId); if (cipher != null && cipher.type === CipherType.Login) { - return await cipher.decrypt(); + return await cipher.decrypt(await this.cipherService.getKeyForCipherKeyDecryption(cipher)); } return null; } @@ -459,4 +506,22 @@ export default class NotificationBackground { this.policyService.policyAppliesToActiveUser$(PolicyType.PersonalOwnership) ); } + + private async handleUnlockCompleted( + messageData: LockedVaultPendingNotificationsItem, + sender: chrome.runtime.MessageSender + ): Promise
-
-
+
-
+
+
appInputVerbatim
/>
-
+
{
- document.getElementById(this.pinLock ? "pin" : "masterPassword").focus();
+ document.getElementById(this.pinEnabled ? "pin" : "masterPassword")?.focus();
if (
this.biometricLock &&
!disableAutoBiometricsPrompt &&
@@ -93,7 +96,7 @@ export class LockComponent extends BaseLockComponent {
}, 100);
}
- async unlockBiometric(): Promise {
+ override async unlockBiometric(): Promise {
if (!this.biometricLock) {
return;
}
diff --git a/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.html b/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.html
new file mode 100644
index 00000000000..32e3ea0c598
--- /dev/null
+++ b/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.html
@@ -0,0 +1,108 @@
+ {
+ try {
+ await super.createUser();
+ await this.router.navigate(["/tabs/vault"]);
+ } catch (error) {
+ this.validationService.showError(error);
+ }
+ }
+}
diff --git a/apps/browser/src/auth/popup/login-with-device.component.html b/apps/browser/src/auth/popup/login-with-device.component.html
index d794b7d212b..127f7ec96fe 100644
--- a/apps/browser/src/auth/popup/login-with-device.component.html
+++ b/apps/browser/src/auth/popup/login-with-device.component.html
@@ -5,32 +5,57 @@
diff --git a/apps/browser/src/auth/popup/login-with-device.component.ts b/apps/browser/src/auth/popup/login-with-device.component.ts
index dae6fd2d4da..f3a1dfffaa0 100644
--- a/apps/browser/src/auth/popup/login-with-device.component.ts
+++ b/apps/browser/src/auth/popup/login-with-device.component.ts
@@ -1,20 +1,23 @@
+import { Location } from "@angular/common";
import { Component, OnDestroy, OnInit } from "@angular/core";
import { Router } from "@angular/router";
import { LoginWithDeviceComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-with-device.component";
import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { ValidationService } from "@bitwarden/common/abstractions/validation.service";
+import { AuthRequestCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-crypto.service.abstraction";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction";
import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
+import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
@@ -42,7 +45,10 @@ export class LoginWithDeviceComponent
validationService: ValidationService,
stateService: StateService,
loginService: LoginService,
- syncService: SyncService
+ syncService: SyncService,
+ deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction,
+ authReqCryptoService: AuthRequestCryptoServiceAbstraction,
+ private location: Location
) {
super(
router,
@@ -59,10 +65,16 @@ export class LoginWithDeviceComponent
anonymousHubService,
validationService,
stateService,
- loginService
+ loginService,
+ deviceTrustCryptoService,
+ authReqCryptoService
);
super.onSuccessfulLogin = async () => {
await syncService.fullSync(true);
};
}
+
+ protected back() {
+ this.location.back();
+ }
}
diff --git a/apps/browser/src/auth/popup/login.component.html b/apps/browser/src/auth/popup/login.component.html
index d3db7069644..64c3048507e 100644
--- a/apps/browser/src/auth/popup/login.component.html
+++ b/apps/browser/src/auth/popup/login.component.html
@@ -44,7 +44,11 @@
+
+
+
+
diff --git a/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.ts b/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.ts
new file mode 100644
index 00000000000..7fac9a42b06
--- /dev/null
+++ b/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.ts
@@ -0,0 +1,18 @@
+import { Component } from "@angular/core";
+
+import { BaseLoginDecryptionOptionsComponent } from "@bitwarden/angular/auth/components/base-login-decryption-options.component";
+
+@Component({
+ selector: "browser-login-decryption-options",
+ templateUrl: "login-decryption-options.component.html",
+})
+export class LoginDecryptionOptionsComponent extends BaseLoginDecryptionOptionsComponent {
+ override async createUser(): Promise+ {{ "loginInitiated" | i18n }} +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ {{ "loginInitiated" | i18n }}
+{{ "deviceApprovalRequired" | i18n }}
+
+
+
+
+
+
+
+
+
+
+ {{ "loginInitiated" | i18n }}
+
+
+
+ + +
+
+ {{ "loggingInAs" | i18n }} {{ data.userEmail }}
+ {{ + "notYou" | i18n + }} +
-
-
+
+
{{ "logInInitiated" | i18n }}
- +
-
+ {{ "notificationSentDevice" | i18n }}
+{{ "loginInitiated" | i18n }}
+ +
+
+
+ {{ "notificationSentDevice" | i18n }}
+ ++ {{ "fingerprintMatchInfo" | i18n }} +
+
+ {{ "fingerprintPhraseHeader" | i18n }}
+
-
+ {{ fingerprintPhrase }}
+
- {{ "fingerprintMatchInfo" | i18n }} -
+ + +
- {{ "fingerprintPhraseHeader" | i18n }}
-
+
- {{ fingerprintPhrase }}
-
{{ "adminApprovalRequested" | i18n }}
- +
+
+
+ {{ "adminApprovalRequestSentToAdmins" | i18n }}
+{{ "youWillBeNotifiedOnceApproved" | i18n }}
+
+ {{ "fingerprintPhraseHeader" | i18n }}
+
-
-
+ {{ fingerprintPhrase }}
+
-
+
+
+
{
- await syncService.fullSync(true);
+ syncService.fullSync(true);
// If the vault is unlocked then this will clear keys from memory, which we don't want to do
if ((await this.authService.getAuthStatus()) !== AuthenticationStatus.Unlocked) {
BrowserApi.reloadOpenWindows();
}
- const thisWindow = window.open("", "_self");
- thisWindow.close();
+ this.win.close();
+ };
+
+ super.onSuccessfulLoginTde = async () => {
+ syncService.fullSync(true);
+ };
+
+ super.onSuccessfulLoginTdeNavigate = async () => {
+ this.win.close();
};
}
}
diff --git a/apps/browser/src/auth/popup/two-factor-options.component.html b/apps/browser/src/auth/popup/two-factor-options.component.html
index 3fc510bb27c..f25944aba65 100644
--- a/apps/browser/src/auth/popup/two-factor-options.component.html
+++ b/apps/browser/src/auth/popup/two-factor-options.component.html
@@ -1,6 +1,6 @@
{{ "twoStepOptions" | i18n }}
diff --git a/apps/browser/src/auth/popup/two-factor-options.component.ts b/apps/browser/src/auth/popup/two-factor-options.component.ts
index 6aa8109f05b..a7e95a2a4ec 100644
--- a/apps/browser/src/auth/popup/two-factor-options.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-options.component.ts
@@ -1,10 +1,10 @@
import { Component } from "@angular/core";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/auth/components/two-factor-options.component";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@Component({
selector: "app-two-factor-options",
@@ -15,14 +15,33 @@ export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent {
twoFactorService: TwoFactorService,
router: Router,
i18nService: I18nService,
- platformUtilsService: PlatformUtilsService
+ platformUtilsService: PlatformUtilsService,
+ private activatedRoute: ActivatedRoute
) {
super(twoFactorService, router, i18nService, platformUtilsService, window);
}
+ close() {
+ this.navigateTo2FA();
+ }
+
choose(p: any) {
super.choose(p);
this.twoFactorService.setSelectedProvider(p.type);
- this.router.navigate(["2fa"]);
+
+ this.navigateTo2FA();
+ }
+
+ navigateTo2FA() {
+ const sso = this.activatedRoute.snapshot.queryParamMap.get("sso") === "true";
+
+ if (sso) {
+ // Persist SSO flag back to the 2FA comp if it exists
+ // in order for successful login logic to work properly for
+ // SSO + 2FA in browser extension
+ this.router.navigate(["2fa"], { queryParams: { sso: true } });
+ } else {
+ this.router.navigate(["2fa"]);
+ }
}
}
diff --git a/apps/browser/src/auth/popup/two-factor.component.html b/apps/browser/src/auth/popup/two-factor.component.html
index 8abe2d4aeb6..7fec67378cc 100644
--- a/apps/browser/src/auth/popup/two-factor.component.html
+++ b/apps/browser/src/auth/popup/two-factor.component.html
@@ -87,7 +87,7 @@
-
+
{{ "twoStepOptions" | i18n }}
diff --git a/apps/browser/src/auth/popup/two-factor-options.component.ts b/apps/browser/src/auth/popup/two-factor-options.component.ts
index 6aa8109f05b..a7e95a2a4ec 100644
--- a/apps/browser/src/auth/popup/two-factor-options.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-options.component.ts
@@ -1,10 +1,10 @@
import { Component } from "@angular/core";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/auth/components/two-factor-options.component";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@Component({
selector: "app-two-factor-options",
@@ -15,14 +15,33 @@ export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent {
twoFactorService: TwoFactorService,
router: Router,
i18nService: I18nService,
- platformUtilsService: PlatformUtilsService
+ platformUtilsService: PlatformUtilsService,
+ private activatedRoute: ActivatedRoute
) {
super(twoFactorService, router, i18nService, platformUtilsService, window);
}
+ close() {
+ this.navigateTo2FA();
+ }
+
choose(p: any) {
super.choose(p);
this.twoFactorService.setSelectedProvider(p.type);
- this.router.navigate(["2fa"]);
+
+ this.navigateTo2FA();
+ }
+
+ navigateTo2FA() {
+ const sso = this.activatedRoute.snapshot.queryParamMap.get("sso") === "true";
+
+ if (sso) {
+ // Persist SSO flag back to the 2FA comp if it exists
+ // in order for successful login logic to work properly for
+ // SSO + 2FA in browser extension
+ this.router.navigate(["2fa"], { queryParams: { sso: true } });
+ } else {
+ this.router.navigate(["2fa"]);
+ }
}
}
diff --git a/apps/browser/src/auth/popup/two-factor.component.html b/apps/browser/src/auth/popup/two-factor.component.html
index 8abe2d4aeb6..7fec67378cc 100644
--- a/apps/browser/src/auth/popup/two-factor.component.html
+++ b/apps/browser/src/auth/popup/two-factor.component.html
@@ -87,7 +87,7 @@
-
+
@@ -112,7 +112,9 @@
selectedProviderType === providerType.OrganizationDuo
"
>
-
+
+
+
@@ -123,7 +125,7 @@
-
+
{
+ if (messageData.commandToRetry.msg.command === "autofill_login") {
+ await BrowserApi.tabSendMessageData(sender.tab, "closeNotificationBar");
+ }
+
+ if (messageData.target !== "notification.background") {
+ return;
+ }
+
+ await this.processMessage(
+ messageData.commandToRetry.msg.command,
+ messageData.commandToRetry.sender
+ );
+ }
}
diff --git a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
index a23b5e8dbaf..efa5bdcffbb 100644
--- a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
+++ b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
@@ -2,27 +2,31 @@ import {
TotpServiceInitOptions,
totpServiceFactory,
} from "../../../auth/background/service-factories/totp-service.factory";
+import {
+ UserVerificationServiceInitOptions,
+ userVerificationServiceFactory,
+} from "../../../auth/background/service-factories/user-verification-service.factory";
import {
EventCollectionServiceInitOptions,
eventCollectionServiceFactory,
-} from "../../../background/service_factories/event-collection-service.factory";
+} from "../../../background/service-factories/event-collection-service.factory";
+import {
+ settingsServiceFactory,
+ SettingsServiceInitOptions,
+} from "../../../background/service-factories/settings-service.factory";
import {
CachedServices,
factory,
FactoryOptions,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
import {
logServiceFactory,
LogServiceInitOptions,
-} from "../../../background/service_factories/log-service.factory";
-import {
- settingsServiceFactory,
- SettingsServiceInitOptions,
-} from "../../../background/service_factories/settings-service.factory";
+} from "../../../platform/background/service-factories/log-service.factory";
import {
stateServiceFactory,
StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";
import {
cipherServiceFactory,
CipherServiceInitOptions,
@@ -38,7 +42,8 @@ export type AutoFillServiceInitOptions = AutoFillServiceOptions &
TotpServiceInitOptions &
EventCollectionServiceInitOptions &
LogServiceInitOptions &
- SettingsServiceInitOptions;
+ SettingsServiceInitOptions &
+ UserVerificationServiceInitOptions;
export function autofillServiceFactory(
cache: { autofillService?: AbstractAutoFillService } & CachedServices,
@@ -55,7 +60,8 @@ export function autofillServiceFactory(
await totpServiceFactory(cache, opts),
await eventCollectionServiceFactory(cache, opts),
await logServiceFactory(cache, opts),
- await settingsServiceFactory(cache, opts)
+ await settingsServiceFactory(cache, opts),
+ await userVerificationServiceFactory(cache, opts)
)
);
}
diff --git a/apps/browser/src/autofill/background/tabs.background.ts b/apps/browser/src/autofill/background/tabs.background.ts
index 0f724c84dd5..0655fd23b62 100644
--- a/apps/browser/src/autofill/background/tabs.background.ts
+++ b/apps/browser/src/autofill/background/tabs.background.ts
@@ -21,6 +21,8 @@ export default class TabsBackground {
}
this.focusedWindowId = windowId;
+ await this.main.refreshBadge();
+ await this.main.refreshMenu();
this.main.messagingService.send("windowChanged");
});
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
index 53d3d100769..4532718809e 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
@@ -69,12 +69,12 @@ describe("CipherContextMenuHandler", () => {
expect(mainContextMenuHandler.noLogins).toHaveBeenCalledTimes(1);
});
- it("only adds valid ciphers", async () => {
+ it("only adds autofill ciphers including ciphers that require reprompt", async () => {
authService.getAuthStatus.mockResolvedValue(AuthenticationStatus.Unlocked);
mainContextMenuHandler.init.mockResolvedValue(true);
- const realCipher = {
+ const loginCipher = {
id: "5",
type: CipherType.Login,
reprompt: CipherRepromptType.None,
@@ -82,27 +82,57 @@ describe("CipherContextMenuHandler", () => {
login: { username: "Test Username" },
};
+ const repromptLoginCipher = {
+ id: "6",
+ type: CipherType.Login,
+ reprompt: CipherRepromptType.Password,
+ name: "Test Reprompt Cipher",
+ login: { username: "Test Username" },
+ };
+
+ const cardCipher = {
+ id: "7",
+ type: CipherType.Card,
+ name: "Test Card Cipher",
+ card: { username: "Test Username" },
+ };
+
cipherService.getAllDecryptedForUrl.mockResolvedValue([
- null,
- undefined,
- { type: CipherType.Card },
- { type: CipherType.Login, reprompt: CipherRepromptType.Password },
- realCipher,
+ null, // invalid cipher
+ undefined, // invalid cipher
+ { type: CipherType.SecureNote }, // invalid cipher
+ loginCipher, // valid cipher
+ repromptLoginCipher,
+ cardCipher, // valid cipher
] as any[]);
await sut.update("https://test.com");
expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledTimes(1);
- expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com", [
+ CipherType.Card,
+ CipherType.Identity,
+ ]);
- expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledTimes(1);
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledTimes(3);
expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
"Test Cipher (Test Username)",
"5",
- "https://test.com",
- realCipher
+ loginCipher
+ );
+
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
+ "Test Reprompt Cipher (Test Username)",
+ "6",
+ repromptLoginCipher
+ );
+
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
+ "Test Card Cipher",
+ "7",
+ cardCipher
);
});
});
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
index 8803267685c..f46442c4192 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
@@ -1,10 +1,9 @@
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -12,13 +11,14 @@ import {
authServiceFactory,
AuthServiceInitOptions,
} from "../../auth/background/service-factories/auth-service.factory";
-import { CachedServices } from "../../background/service_factories/factory-options";
-import { BrowserApi } from "../../browser/browserApi";
import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
+import { BrowserApi } from "../../platform/browser/browser-api";
import {
cipherServiceFactory,
CipherServiceInitOptions,
} from "../../vault/background/service_factories/cipher-service.factory";
+import { AutofillCipherTypeId } from "../types";
import { MainContextMenuHandler } from "./main-context-menu-handler";
@@ -67,9 +67,6 @@ export class CipherContextMenuHandler {
clipboardWriteCallback: NOT_IMPLEMENTED,
win: self,
},
- stateMigrationServiceOptions: {
- stateFactory: stateFactory,
- },
stateServiceOptions: {
stateFactory: stateFactory,
},
@@ -81,6 +78,12 @@ export class CipherContextMenuHandler {
);
}
+ static async windowsOnFocusChangedListener(windowId: number, serviceCache: CachedServices) {
+ const cipherContextMenuHandler = await CipherContextMenuHandler.create(serviceCache);
+ const tab = await BrowserApi.getTabFromCurrentWindow();
+ await cipherContextMenuHandler.update(tab?.url);
+ }
+
static async tabsOnActivatedListener(
activeInfo: chrome.tabs.TabActiveInfo,
serviceCache: CachedServices
@@ -157,33 +160,67 @@ export class CipherContextMenuHandler {
return;
}
- const ciphers = await this.cipherService.getAllDecryptedForUrl(url);
+ const ciphers = await this.cipherService.getAllDecryptedForUrl(url, [
+ CipherType.Card,
+ CipherType.Identity,
+ ]);
ciphers.sort((a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b));
- if (ciphers.length === 0) {
- await this.mainContextMenuHandler.noLogins(url);
- return;
+ const groupedCiphers: Record = ciphers.reduce(
+ (ciphersByType, cipher) => {
+ if (!cipher?.type) {
+ return ciphersByType;
+ }
+
+ const existingCiphersOfType = ciphersByType[cipher.type as AutofillCipherTypeId] || [];
+
+ return {
+ ...ciphersByType,
+ [cipher.type]: [...existingCiphersOfType, cipher],
+ };
+ },
+ {
+ [CipherType.Login]: [],
+ [CipherType.Card]: [],
+ [CipherType.Identity]: [],
+ }
+ );
+
+ if (groupedCiphers[CipherType.Login].length === 0) {
+ await this.mainContextMenuHandler.noLogins();
+ }
+
+ if (groupedCiphers[CipherType.Identity].length === 0) {
+ await this.mainContextMenuHandler.noIdentities();
+ }
+
+ if (groupedCiphers[CipherType.Card].length === 0) {
+ await this.mainContextMenuHandler.noCards();
}
for (const cipher of ciphers) {
- await this.updateForCipher(url, cipher);
+ await this.updateForCipher(cipher);
}
}
- private async updateForCipher(url: string, cipher: CipherView) {
+ private async updateForCipher(cipher: CipherView) {
if (
cipher == null ||
- cipher.type !== CipherType.Login ||
- cipher.reprompt !== CipherRepromptType.None
+ !new Set([CipherType.Login, CipherType.Card, CipherType.Identity]).has(cipher.type)
) {
return;
}
let title = cipher.name;
- if (!Utils.isNullOrEmpty(title)) {
+
+ if (cipher.type === CipherType.Login && !Utils.isNullOrEmpty(title) && cipher.login?.username) {
title += ` (${cipher.login.username})`;
}
- await this.mainContextMenuHandler.loadOptions(title, cipher.id, url, cipher);
+ if (cipher.type === CipherType.Card && cipher.card?.subTitle) {
+ title += ` ${cipher.card.subTitle}`;
+ }
+
+ await this.mainContextMenuHandler.loadOptions(title, cipher.id, cipher);
}
}
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
index a9dbcbaacc5..5c6b5e07da3 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
@@ -3,12 +3,23 @@ import { mock, MockProxy } from "jest-mock-extended";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { TotpService } from "@bitwarden/common/abstractions/totp.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+ AUTOFILL_ID,
+ COPY_PASSWORD_ID,
+ COPY_USERNAME_ID,
+ COPY_VERIFICATIONCODE_ID,
+ GENERATE_PASSWORD_ID,
+ NOOP_COMMAND_SUFFIX,
+} from "../constants";
+
import {
CopyToClipboardAction,
ContextMenuClickedHandler,
@@ -16,13 +27,6 @@ import {
GeneratePasswordToClipboardAction,
AutofillAction,
} from "./context-menu-clicked-handler";
-import {
- AUTOFILL_ID,
- COPY_PASSWORD_ID,
- COPY_USERNAME_ID,
- COPY_VERIFICATIONCODE_ID,
- GENERATE_PASSWORD_ID,
-} from "./main-context-menu-handler";
describe("ContextMenuClickedHandler", () => {
const createData = (
@@ -50,6 +54,7 @@ describe("ContextMenuClickedHandler", () => {
type: CipherType.Login,
} as any)
);
+
cipherView.login.username = username ?? "USERNAME";
cipherView.login.password = password ?? "PASSWORD";
cipherView.login.totp = totp ?? "TOTP";
@@ -61,8 +66,10 @@ describe("ContextMenuClickedHandler", () => {
let autofill: AutofillAction;
let authService: MockProxy;
let cipherService: MockProxy;
+ let stateService: MockProxy;
let totpService: MockProxy;
let eventCollectionService: MockProxy;
+ let userVerificationService: MockProxy;
let sut: ContextMenuClickedHandler;
@@ -72,6 +79,7 @@ describe("ContextMenuClickedHandler", () => {
autofill = jest.fn, [tab: chrome.tabs.Tab, cipher: CipherView]>();
authService = mock();
cipherService = mock();
+ stateService = mock();
totpService = mock();
eventCollectionService = mock();
@@ -81,8 +89,10 @@ describe("ContextMenuClickedHandler", () => {
autofill,
authService,
cipherService,
+ stateService,
totpService,
- eventCollectionService
+ eventCollectionService,
+ userVerificationService
);
});
@@ -103,7 +113,7 @@ describe("ContextMenuClickedHandler", () => {
const cipher = createCipher();
cipherService.getAllDecrypted.mockResolvedValue([cipher]);
- await sut.run(createData("T_1", AUTOFILL_ID), { id: 5 } as any);
+ await sut.run(createData(`${AUTOFILL_ID}_1`, AUTOFILL_ID), { id: 5 } as any);
expect(autofill).toBeCalledTimes(1);
@@ -115,11 +125,16 @@ describe("ContextMenuClickedHandler", () => {
createCipher({ username: "TEST_USERNAME" }),
]);
- await sut.run(createData("T_1", COPY_USERNAME_ID));
+ await sut.run(createData(`${COPY_USERNAME_ID}_1`, COPY_USERNAME_ID), {
+ url: "https://test.com",
+ } as any);
expect(copyToClipboard).toBeCalledTimes(1);
- expect(copyToClipboard).toHaveBeenCalledWith({ text: "TEST_USERNAME", options: undefined });
+ expect(copyToClipboard).toHaveBeenCalledWith({
+ text: "TEST_USERNAME",
+ tab: { url: "https://test.com" },
+ });
});
it("copies password to clipboard", async () => {
@@ -127,11 +142,16 @@ describe("ContextMenuClickedHandler", () => {
createCipher({ password: "TEST_PASSWORD" }),
]);
- await sut.run(createData("T_1", COPY_PASSWORD_ID));
+ await sut.run(createData(`${COPY_PASSWORD_ID}_1`, COPY_PASSWORD_ID), {
+ url: "https://test.com",
+ } as any);
expect(copyToClipboard).toBeCalledTimes(1);
- expect(copyToClipboard).toHaveBeenCalledWith({ text: "TEST_PASSWORD", options: undefined });
+ expect(copyToClipboard).toHaveBeenCalledWith({
+ text: "TEST_PASSWORD",
+ tab: { url: "https://test.com" },
+ });
});
it("copies totp code to clipboard", async () => {
@@ -145,11 +165,16 @@ describe("ContextMenuClickedHandler", () => {
return Promise.resolve("654321");
});
- await sut.run(createData("T_1", COPY_VERIFICATIONCODE_ID));
+ await sut.run(createData(`${COPY_VERIFICATIONCODE_ID}_1`, COPY_VERIFICATIONCODE_ID), {
+ url: "https://test.com",
+ } as any);
expect(totpService.getCode).toHaveBeenCalledTimes(1);
- expect(copyToClipboard).toHaveBeenCalledWith({ text: "123456" });
+ expect(copyToClipboard).toHaveBeenCalledWith({
+ text: "123456",
+ tab: { url: "https://test.com" },
+ });
});
it("attempts to find a cipher when noop but unlocked", async () => {
@@ -160,11 +185,13 @@ describe("ContextMenuClickedHandler", () => {
} as any,
]);
- await sut.run(createData("T_noop", COPY_USERNAME_ID), { url: "https://test.com" } as any);
+ await sut.run(createData(`${COPY_USERNAME_ID}_${NOOP_COMMAND_SUFFIX}`, COPY_USERNAME_ID), {
+ url: "https://test.com",
+ } as any);
expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledTimes(1);
- expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com", []);
expect(copyToClipboard).toHaveBeenCalledTimes(1);
@@ -182,11 +209,13 @@ describe("ContextMenuClickedHandler", () => {
} as any,
]);
- await sut.run(createData("T_noop", COPY_USERNAME_ID), { url: "https://test.com" } as any);
+ await sut.run(createData(`${COPY_USERNAME_ID}_${NOOP_COMMAND_SUFFIX}`, COPY_USERNAME_ID), {
+ url: "https://test.com",
+ } as any);
expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledTimes(1);
- expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com", []);
});
});
});
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index 4b75942e031..54c3e244991 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -1,12 +1,15 @@
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { TotpService } from "@bitwarden/common/abstractions/totp.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
import { EventType } from "@bitwarden/common/enums";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import {
@@ -14,13 +17,14 @@ import {
AuthServiceInitOptions,
} from "../../auth/background/service-factories/auth-service.factory";
import { totpServiceFactory } from "../../auth/background/service-factories/totp-service.factory";
+import { userVerificationServiceFactory } from "../../auth/background/service-factories/user-verification-service.factory";
import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
-import { eventCollectionServiceFactory } from "../../background/service_factories/event-collection-service.factory";
-import { CachedServices } from "../../background/service_factories/factory-options";
-import { passwordGenerationServiceFactory } from "../../background/service_factories/password-generation-service.factory";
-import { stateServiceFactory } from "../../background/service_factories/state-service.factory";
-import { BrowserApi } from "../../browser/browserApi";
+import { eventCollectionServiceFactory } from "../../background/service-factories/event-collection-service.factory";
import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
+import { stateServiceFactory } from "../../platform/background/service-factories/state-service.factory";
+import { BrowserApi } from "../../platform/browser/browser-api";
+import { passwordGenerationServiceFactory } from "../../tools/background/service_factories/password-generation-service.factory";
import {
cipherServiceFactory,
CipherServiceInitOptions,
@@ -28,16 +32,21 @@ import {
import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory";
import { copyToClipboard, GeneratePasswordToClipboardCommand } from "../clipboard";
import { AutofillTabCommand } from "../commands/autofill-tab-command";
-
import {
+ AUTOFILL_CARD_ID,
AUTOFILL_ID,
+ AUTOFILL_IDENTITY_ID,
COPY_IDENTIFIER_ID,
COPY_PASSWORD_ID,
COPY_USERNAME_ID,
COPY_VERIFICATIONCODE_ID,
+ CREATE_CARD_ID,
+ CREATE_IDENTITY_ID,
+ CREATE_LOGIN_ID,
GENERATE_PASSWORD_ID,
NOOP_COMMAND_SUFFIX,
-} from "./main-context-menu-handler";
+} from "../constants";
+import { AutofillCipherTypeId } from "../types";
export type CopyToClipboardOptions = { text: string; tab: chrome.tabs.Tab };
export type CopyToClipboardAction = (options: CopyToClipboardOptions) => void;
@@ -55,8 +64,10 @@ export class ContextMenuClickedHandler {
private autofillAction: AutofillAction,
private authService: AuthService,
private cipherService: CipherService,
+ private stateService: StateService,
private totpService: TotpService,
- private eventCollectionService: EventCollectionService
+ private eventCollectionService: EventCollectionService,
+ private userVerificationService: UserVerificationService
) {}
static async mv3Create(cachedServices: CachedServices) {
@@ -85,9 +96,6 @@ export class ContextMenuClickedHandler {
clipboardWriteCallback: NOT_IMPLEMENTED,
win: self,
},
- stateMigrationServiceOptions: {
- stateFactory: stateFactory,
- },
stateServiceOptions: {
stateFactory: stateFactory,
},
@@ -108,8 +116,10 @@ export class ContextMenuClickedHandler {
(tab, cipher) => autofillCommand.doAutofillTabWithCipherCommand(tab, cipher),
await authServiceFactory(cachedServices, serviceOptions),
await cipherServiceFactory(cachedServices, serviceOptions),
+ await stateServiceFactory(cachedServices, serviceOptions),
await totpServiceFactory(cachedServices, serviceOptions),
- await eventCollectionServiceFactory(cachedServices, serviceOptions)
+ await eventCollectionServiceFactory(cachedServices, serviceOptions),
+ await userVerificationServiceFactory(cachedServices, serviceOptions)
);
}
@@ -141,18 +151,16 @@ export class ContextMenuClickedHandler {
);
}
- async run(info: chrome.contextMenus.OnClickData, tab?: chrome.tabs.Tab) {
+ async run(info: chrome.contextMenus.OnClickData, tab: chrome.tabs.Tab) {
+ if (!tab) {
+ return;
+ }
+
switch (info.menuItemId) {
case GENERATE_PASSWORD_ID:
- if (!tab) {
- return;
- }
await this.generatePasswordToClipboard(tab);
break;
case COPY_IDENTIFIER_ID:
- if (!tab) {
- return;
- }
this.copyToClipboard({ text: await this.getIdentifier(tab, info), tab: tab });
break;
default:
@@ -160,7 +168,11 @@ export class ContextMenuClickedHandler {
}
}
- async cipherAction(info: chrome.contextMenus.OnClickData, tab?: chrome.tabs.Tab) {
+ async cipherAction(info: chrome.contextMenus.OnClickData, tab: chrome.tabs.Tab) {
+ if (!tab) {
+ return;
+ }
+
if ((await this.authService.getAuthStatus()) < AuthenticationStatus.Unlocked) {
const retryMessage: LockedVaultPendingNotificationsItem = {
commandToRetry: {
@@ -181,43 +193,136 @@ export class ContextMenuClickedHandler {
// NOTE: We don't actually use the first part of this ID, we further switch based on the parentMenuItemId
// I would really love to not add it but that is a departure from how it currently works.
- const id = (info.menuItemId as string).split("_")[1]; // We create all the ids, we can guarantee they are strings
+ const menuItemId = (info.menuItemId as string).split("_")[1]; // We create all the ids, we can guarantee they are strings
let cipher: CipherView | undefined;
- if (id === NOOP_COMMAND_SUFFIX) {
+ const isCreateCipherAction = [CREATE_LOGIN_ID, CREATE_IDENTITY_ID, CREATE_CARD_ID].includes(
+ menuItemId as string
+ );
+
+ if (isCreateCipherAction) {
+ // pass; defer to logic below
+ } else if (menuItemId === NOOP_COMMAND_SUFFIX) {
+ const additionalCiphersToGet =
+ info.parentMenuItemId === AUTOFILL_IDENTITY_ID
+ ? [CipherType.Identity]
+ : info.parentMenuItemId === AUTOFILL_CARD_ID
+ ? [CipherType.Card]
+ : [];
+
// This NOOP item has come through which is generally only for no access state but since we got here
// we are actually unlocked we will do our best to find a good match of an item to autofill this is useful
// in scenarios like unlock on autofill
- const ciphers = await this.cipherService.getAllDecryptedForUrl(tab.url);
- cipher = ciphers.find((c) => c.reprompt === CipherRepromptType.None);
+ const ciphers = await this.cipherService.getAllDecryptedForUrl(
+ tab.url,
+ additionalCiphersToGet
+ );
+
+ cipher = ciphers[0];
} else {
const ciphers = await this.cipherService.getAllDecrypted();
- cipher = ciphers.find((c) => c.id === id);
+ cipher = ciphers.find(({ id }) => id === menuItemId);
}
- if (cipher == null) {
+ if (!cipher && !isCreateCipherAction) {
return;
}
+ this.stateService.setLastActive(new Date().getTime());
switch (info.parentMenuItemId) {
case AUTOFILL_ID:
- if (tab == null) {
- return;
+ case AUTOFILL_IDENTITY_ID:
+ case AUTOFILL_CARD_ID: {
+ const cipherType = this.getCipherCreationType(menuItemId);
+
+ if (cipherType) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType,
+ });
+ break;
}
- await this.autofillAction(tab, cipher);
+
+ if (await this.isPasswordRepromptRequired(cipher)) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ // The action here is passed on to the single-use reprompt window and doesn't change based on cipher type
+ action: AUTOFILL_ID,
+ });
+ } else {
+ await this.autofillAction(tab, cipher);
+ }
+
break;
+ }
case COPY_USERNAME_ID:
+ if (menuItemId === CREATE_LOGIN_ID) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType: CipherType.Login,
+ });
+ break;
+ }
+
this.copyToClipboard({ text: cipher.login.username, tab: tab });
break;
case COPY_PASSWORD_ID:
- this.copyToClipboard({ text: cipher.login.password, tab: tab });
- this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
+ if (menuItemId === CREATE_LOGIN_ID) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType: CipherType.Login,
+ });
+ break;
+ }
+
+ if (await this.isPasswordRepromptRequired(cipher)) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ action: info.parentMenuItemId,
+ });
+ } else {
+ this.copyToClipboard({ text: cipher.login.password, tab: tab });
+ this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
+ }
+
break;
case COPY_VERIFICATIONCODE_ID:
- this.copyToClipboard({ text: await this.totpService.getCode(cipher.login.totp), tab: tab });
+ if (menuItemId === CREATE_LOGIN_ID) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType: CipherType.Login,
+ });
+ break;
+ }
+
+ if (await this.isPasswordRepromptRequired(cipher)) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ action: info.parentMenuItemId,
+ });
+ } else {
+ this.copyToClipboard({
+ text: await this.totpService.getCode(cipher.login.totp),
+ tab: tab,
+ });
+ }
+
break;
}
}
+ private async isPasswordRepromptRequired(cipher: CipherView): Promise {
+ return (
+ cipher.reprompt === CipherRepromptType.Password &&
+ (await this.userVerificationService.hasMasterPasswordAndMasterKeyHash())
+ );
+ }
+
+ private getCipherCreationType(menuItemId?: string): AutofillCipherTypeId | null {
+ return menuItemId === CREATE_IDENTITY_ID
+ ? CipherType.Identity
+ : menuItemId === CREATE_CARD_ID
+ ? CipherType.Card
+ : menuItemId === CREATE_LOGIN_ID
+ ? CipherType.Login
+ : null;
+ }
+
private async getIdentifier(tab: chrome.tabs.Tab, info: chrome.contextMenus.OnClickData) {
return new Promise((resolve, reject) => {
BrowserApi.sendTabsMessage(
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
index 9d6a1db84a7..95916d2e6f1 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
@@ -1,12 +1,12 @@
import { mock, MockProxy } from "jest-mock-extended";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
import { MainContextMenuHandler } from "./main-context-menu-handler";
@@ -60,7 +60,7 @@ describe("context-menu", () => {
const createdMenu = await sut.init();
expect(createdMenu).toBeTruthy();
- expect(createSpy).toHaveBeenCalledTimes(7);
+ expect(createSpy).toHaveBeenCalledTimes(10);
});
it("has menu enabled and has premium", async () => {
@@ -70,7 +70,7 @@ describe("context-menu", () => {
const createdMenu = await sut.init();
expect(createdMenu).toBeTruthy();
- expect(createSpy).toHaveBeenCalledTimes(8);
+ expect(createSpy).toHaveBeenCalledTimes(11);
});
});
@@ -97,7 +97,7 @@ describe("context-menu", () => {
};
it("is not a login cipher", async () => {
- await sut.loadOptions("TEST_TITLE", "1", "", {
+ await sut.loadOptions("TEST_TITLE", "1", {
...createCipher(),
type: CipherType.SecureNote,
} as any);
@@ -109,7 +109,6 @@ describe("context-menu", () => {
await sut.loadOptions(
"TEST_TITLE",
"1",
- "",
createCipher({
username: "",
totp: "",
@@ -123,18 +122,18 @@ describe("context-menu", () => {
it("create entry for each cipher piece", async () => {
stateService.getCanAccessPremium.mockResolvedValue(true);
- await sut.loadOptions("TEST_TITLE", "1", "", createCipher());
+ await sut.loadOptions("TEST_TITLE", "1", createCipher());
// One for autofill, copy username, copy password, and copy totp code
expect(createSpy).toHaveBeenCalledTimes(4);
});
- it("creates noop item for no cipher", async () => {
+ it("creates a login/unlock item for each context menu action option when user is not authenticated", async () => {
stateService.getCanAccessPremium.mockResolvedValue(true);
- await sut.loadOptions("TEST_TITLE", "NOOP", "");
+ await sut.loadOptions("TEST_TITLE", "NOOP");
- expect(createSpy).toHaveBeenCalledTimes(4);
+ expect(createSpy).toHaveBeenCalledTimes(6);
});
});
});
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
index 14775c846f3..cc5cc9a5166 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -1,42 +1,44 @@
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { CachedServices } from "../../background/service_factories/factory-options";
+import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
import {
i18nServiceFactory,
I18nServiceInitOptions,
-} from "../../background/service_factories/i18n-service.factory";
+} from "../../platform/background/service-factories/i18n-service.factory";
import {
logServiceFactory,
LogServiceInitOptions,
-} from "../../background/service_factories/log-service.factory";
+} from "../../platform/background/service-factories/log-service.factory";
import {
stateServiceFactory,
StateServiceInitOptions,
-} from "../../background/service_factories/state-service.factory";
-import { Account } from "../../models/account";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
-
-export const ROOT_ID = "root";
-
-export const AUTOFILL_ID = "autofill";
-export const COPY_USERNAME_ID = "copy-username";
-export const COPY_PASSWORD_ID = "copy-password";
-export const COPY_VERIFICATIONCODE_ID = "copy-totp";
-export const COPY_IDENTIFIER_ID = "copy-identifier";
-
-const SEPARATOR_ID = "separator";
-export const GENERATE_PASSWORD_ID = "generate-password";
-
-export const NOOP_COMMAND_SUFFIX = "noop";
+} from "../../platform/background/service-factories/state-service.factory";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
+import {
+ AUTOFILL_CARD_ID,
+ AUTOFILL_ID,
+ AUTOFILL_IDENTITY_ID,
+ COPY_IDENTIFIER_ID,
+ COPY_PASSWORD_ID,
+ COPY_USERNAME_ID,
+ COPY_VERIFICATIONCODE_ID,
+ CREATE_CARD_ID,
+ CREATE_IDENTITY_ID,
+ CREATE_LOGIN_ID,
+ GENERATE_PASSWORD_ID,
+ NOOP_COMMAND_SUFFIX,
+ ROOT_ID,
+ SEPARATOR_ID,
+} from "../constants";
export class MainContextMenuHandler {
- //
private initRunning = false;
create: (options: chrome.contextMenus.CreateProperties) => Promise;
@@ -79,9 +81,6 @@ export class MainContextMenuHandler {
logServiceOptions: {
isDev: false,
},
- stateMigrationServiceOptions: {
- stateFactory: stateFactory,
- },
stateServiceOptions: {
stateFactory: stateFactory,
},
@@ -123,7 +122,7 @@ export class MainContextMenuHandler {
await create({
id: AUTOFILL_ID,
parentId: ROOT_ID,
- title: this.i18nService.t("autoFill"),
+ title: this.i18nService.t("autoFillLogin"),
});
await create({
@@ -147,7 +146,25 @@ export class MainContextMenuHandler {
}
await create({
- id: SEPARATOR_ID,
+ id: SEPARATOR_ID + 1,
+ type: "separator",
+ parentId: ROOT_ID,
+ });
+
+ await create({
+ id: AUTOFILL_IDENTITY_ID,
+ parentId: ROOT_ID,
+ title: this.i18nService.t("autoFillIdentity"),
+ });
+
+ await create({
+ id: AUTOFILL_CARD_ID,
+ parentId: ROOT_ID,
+ title: this.i18nService.t("autoFillCard"),
+ });
+
+ await create({
+ id: SEPARATOR_ID + 2,
type: "separator",
parentId: ROOT_ID,
});
@@ -197,40 +214,52 @@ export class MainContextMenuHandler {
});
}
- async loadOptions(title: string, id: string, url: string, cipher?: CipherView | undefined) {
- if (cipher != null && cipher.type !== CipherType.Login) {
- return;
- }
-
+ async loadOptions(title: string, optionId: string, cipher?: CipherView) {
try {
const sanitizedTitle = MainContextMenuHandler.sanitizeContextMenuTitle(title);
- const createChildItem = async (parent: string) => {
- const menuItemId = `${parent}_${id}`;
+ const createChildItem = async (parentId: string) => {
+ const menuItemId = `${parentId}_${optionId}`;
+
return await this.create({
type: "normal",
id: menuItemId,
- parentId: parent,
+ parentId,
title: sanitizedTitle,
contexts: ["all"],
});
};
- if (cipher == null || !Utils.isNullOrEmpty(cipher.login.password)) {
+ if (
+ !cipher ||
+ (cipher.type === CipherType.Login && !Utils.isNullOrEmpty(cipher.login?.password))
+ ) {
await createChildItem(AUTOFILL_ID);
+
if (cipher?.viewPassword ?? true) {
await createChildItem(COPY_PASSWORD_ID);
}
}
- if (cipher == null || !Utils.isNullOrEmpty(cipher.login.username)) {
+ if (
+ !cipher ||
+ (cipher.type === CipherType.Login && !Utils.isNullOrEmpty(cipher.login?.username))
+ ) {
await createChildItem(COPY_USERNAME_ID);
}
const canAccessPremium = await this.stateService.getCanAccessPremium();
- if (canAccessPremium && (cipher == null || !Utils.isNullOrEmpty(cipher.login.totp))) {
+ if (canAccessPremium && (!cipher || !Utils.isNullOrEmpty(cipher.login?.totp))) {
await createChildItem(COPY_VERIFICATIONCODE_ID);
}
+
+ if ((!cipher || cipher.type === CipherType.Card) && optionId !== CREATE_LOGIN_ID) {
+ await createChildItem(AUTOFILL_CARD_ID);
+ }
+
+ if ((!cipher || cipher.type === CipherType.Identity) && optionId !== CREATE_LOGIN_ID) {
+ await createChildItem(AUTOFILL_IDENTITY_ID);
+ }
} catch (error) {
this.logService.warning(error.message);
}
@@ -245,13 +274,72 @@ export class MainContextMenuHandler {
const authed = await this.stateService.getIsAuthenticated();
await this.loadOptions(
this.i18nService.t(authed ? "unlockVaultMenu" : "loginToVaultMenu"),
- NOOP_COMMAND_SUFFIX,
- ""
+ NOOP_COMMAND_SUFFIX
);
}
}
- async noLogins(url: string) {
- await this.loadOptions(this.i18nService.t("noMatchingLogins"), NOOP_COMMAND_SUFFIX, url);
+ async noCards() {
+ await this.create({
+ id: `${AUTOFILL_CARD_ID}_NOTICE`,
+ enabled: false,
+ parentId: AUTOFILL_CARD_ID,
+ title: this.i18nService.t("noCards"),
+ type: "normal",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_CARD_ID}_${SEPARATOR_ID}`,
+ parentId: AUTOFILL_CARD_ID,
+ type: "separator",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_CARD_ID}_${CREATE_CARD_ID}`,
+ parentId: AUTOFILL_CARD_ID,
+ title: this.i18nService.t("addCardMenu"),
+ type: "normal",
+ });
+ }
+
+ async noIdentities() {
+ await this.create({
+ id: `${AUTOFILL_IDENTITY_ID}_NOTICE`,
+ enabled: false,
+ parentId: AUTOFILL_IDENTITY_ID,
+ title: this.i18nService.t("noIdentities"),
+ type: "normal",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_IDENTITY_ID}_${SEPARATOR_ID}`,
+ parentId: AUTOFILL_IDENTITY_ID,
+ type: "separator",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_IDENTITY_ID}_${CREATE_IDENTITY_ID}`,
+ parentId: AUTOFILL_IDENTITY_ID,
+ title: this.i18nService.t("addIdentityMenu"),
+ type: "normal",
+ });
+ }
+
+ async noLogins() {
+ await this.create({
+ id: `${AUTOFILL_ID}_NOTICE`,
+ enabled: false,
+ parentId: AUTOFILL_ID,
+ title: this.i18nService.t("noMatchingLogins"),
+ type: "normal",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_ID}_${SEPARATOR_ID}` + 1,
+ parentId: AUTOFILL_ID,
+ type: "separator",
+ });
+
+ await this.loadOptions(this.i18nService.t("addLoginMenu"), CREATE_LOGIN_ID);
}
}
diff --git a/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
index baced83894d..7bfe7934046 100644
--- a/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
+++ b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
import { ClearClipboard } from "./clear-clipboard";
diff --git a/apps/browser/src/autofill/clipboard/clear-clipboard.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.ts
index a96a72fc658..f8018bb036a 100644
--- a/apps/browser/src/autofill/clipboard/clear-clipboard.ts
+++ b/apps/browser/src/autofill/clipboard/clear-clipboard.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
export const clearClipboardAlarmName = "clearClipboard";
diff --git a/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
index 926b78b9762..92d35e70e57 100644
--- a/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
+++ b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
/**
* Copies text to the clipboard in a MV3 safe way.
diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
index 38c62231ac8..3001087f74f 100644
--- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
+++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
@@ -2,14 +2,14 @@ import { mock, MockProxy } from "jest-mock-extended";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
-import { setAlarmTime } from "../../alarms/alarm-state";
-import { BrowserApi } from "../../browser/browserApi";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../platform/alarms/alarm-state";
+import { BrowserApi } from "../../platform/browser/browser-api";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
import { clearClipboardAlarmName } from "./clear-clipboard";
import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command";
-jest.mock("../../alarms/alarm-state", () => {
+jest.mock("../../platform/alarms/alarm-state", () => {
return {
setAlarmTime: jest.fn(),
};
diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
index 7dd37a64ad4..62110166658 100644
--- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
+++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
@@ -1,7 +1,7 @@
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
-import { setAlarmTime } from "../../alarms/alarm-state";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../platform/alarms/alarm-state";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
import { clearClipboardAlarmName } from "./clear-clipboard";
import { copyToClipboard } from "./copy-to-clipboard-command";
diff --git a/apps/browser/src/autofill/commands/autofill-tab-command.ts b/apps/browser/src/autofill/commands/autofill-tab-command.ts
index 4910a6cf6fa..b51edd929ee 100644
--- a/apps/browser/src/autofill/commands/autofill-tab-command.ts
+++ b/apps/browser/src/autofill/commands/autofill-tab-command.ts
@@ -46,6 +46,7 @@ export class AutofillTabCommand {
onlyEmptyFields: false,
onlyVisibleFields: false,
fillNewPassword: true,
+ allowTotpAutofill: true,
});
}
diff --git a/apps/browser/src/autofill/constants.ts b/apps/browser/src/autofill/constants.ts
new file mode 100644
index 00000000000..ef82035aef7
--- /dev/null
+++ b/apps/browser/src/autofill/constants.ts
@@ -0,0 +1,29 @@
+export const TYPE_CHECK = {
+ FUNCTION: "function",
+ NUMBER: "number",
+ STRING: "string",
+} as const;
+
+export const EVENTS = {
+ CHANGE: "change",
+ INPUT: "input",
+ KEYDOWN: "keydown",
+ KEYPRESS: "keypress",
+ KEYUP: "keyup",
+} as const;
+
+/* Context Menu item Ids */
+export const AUTOFILL_CARD_ID = "autofill-card";
+export const AUTOFILL_ID = "autofill";
+export const AUTOFILL_IDENTITY_ID = "autofill-identity";
+export const COPY_IDENTIFIER_ID = "copy-identifier";
+export const COPY_PASSWORD_ID = "copy-password";
+export const COPY_USERNAME_ID = "copy-username";
+export const COPY_VERIFICATIONCODE_ID = "copy-totp";
+export const CREATE_CARD_ID = "create-card";
+export const CREATE_IDENTITY_ID = "create-identity";
+export const CREATE_LOGIN_ID = "create-login";
+export const GENERATE_PASSWORD_ID = "generate-password";
+export const NOOP_COMMAND_SUFFIX = "noop";
+export const ROOT_ID = "root";
+export const SEPARATOR_ID = "separator";
diff --git a/apps/browser/src/autofill/content/abstractions/autofill-init.ts b/apps/browser/src/autofill/content/abstractions/autofill-init.ts
new file mode 100644
index 00000000000..706c6da4ee1
--- /dev/null
+++ b/apps/browser/src/autofill/content/abstractions/autofill-init.ts
@@ -0,0 +1,21 @@
+import AutofillScript from "../../models/autofill-script";
+
+type AutofillExtensionMessage = {
+ command: string;
+ tab?: chrome.tabs.Tab;
+ sender?: string;
+ fillScript?: AutofillScript;
+};
+
+type AutofillExtensionMessageHandlers = {
+ [key: string]: CallableFunction;
+ collectPageDetails: (message: { message: AutofillExtensionMessage }) => void;
+ collectPageDetailsImmediately: (message: { message: AutofillExtensionMessage }) => void;
+ fillForm: (message: { message: AutofillExtensionMessage }) => void;
+};
+
+interface AutofillInit {
+ init(): void;
+}
+
+export { AutofillExtensionMessage, AutofillExtensionMessageHandlers, AutofillInit };
diff --git a/apps/browser/src/autofill/content/autofill-init.spec.ts b/apps/browser/src/autofill/content/autofill-init.spec.ts
new file mode 100644
index 00000000000..447fe31a8a3
--- /dev/null
+++ b/apps/browser/src/autofill/content/autofill-init.spec.ts
@@ -0,0 +1,175 @@
+import { mock } from "jest-mock-extended";
+
+import AutofillPageDetails from "../models/autofill-page-details";
+import AutofillScript from "../models/autofill-script";
+
+import { AutofillExtensionMessage } from "./abstractions/autofill-init";
+
+describe("AutofillInit", () => {
+ let bitwardenAutofillInit: any;
+
+ beforeEach(() => {
+ require("../content/autofill-init");
+ bitwardenAutofillInit = window.bitwardenAutofillInit;
+ });
+
+ afterEach(() => {
+ jest.resetModules();
+ jest.clearAllMocks();
+ });
+
+ describe("init", () => {
+ it("sets up the extension message listeners", () => {
+ jest.spyOn(bitwardenAutofillInit, "setupExtensionMessageListeners");
+
+ bitwardenAutofillInit.init();
+
+ expect(bitwardenAutofillInit.setupExtensionMessageListeners).toHaveBeenCalled();
+ });
+ });
+
+ describe("collectPageDetails", () => {
+ let extensionMessage: AutofillExtensionMessage;
+ let pageDetails: AutofillPageDetails;
+
+ beforeEach(() => {
+ extensionMessage = {
+ command: "collectPageDetails",
+ tab: mock(),
+ sender: "sender",
+ };
+ pageDetails = {
+ title: "title",
+ url: "http://example.com",
+ documentUrl: "documentUrl",
+ forms: {},
+ fields: [],
+ collectedTimestamp: 0,
+ };
+ jest
+ .spyOn(bitwardenAutofillInit.collectAutofillContentService, "getPageDetails")
+ .mockReturnValue(pageDetails);
+ });
+
+ it("returns collected page details for autofill if set to send the details in the response", async () => {
+ const response = await bitwardenAutofillInit["collectPageDetails"](extensionMessage, true);
+
+ expect(bitwardenAutofillInit.collectAutofillContentService.getPageDetails).toHaveBeenCalled();
+ expect(response).toEqual(pageDetails);
+ });
+
+ it("sends the collected page details for autofill using a background script message", async () => {
+ jest.spyOn(chrome.runtime, "sendMessage");
+
+ await bitwardenAutofillInit["collectPageDetails"](extensionMessage);
+
+ expect(chrome.runtime.sendMessage).toHaveBeenCalledWith({
+ command: "collectPageDetailsResponse",
+ tab: extensionMessage.tab,
+ details: pageDetails,
+ sender: extensionMessage.sender,
+ });
+ });
+ });
+
+ describe("fillForm", () => {
+ it("will call the InsertAutofillContentService to fill the form", () => {
+ const fillScript = mock();
+ jest
+ .spyOn(bitwardenAutofillInit.insertAutofillContentService, "fillForm")
+ .mockImplementation();
+
+ bitwardenAutofillInit.fillForm(fillScript);
+
+ expect(bitwardenAutofillInit.insertAutofillContentService.fillForm).toHaveBeenCalledWith(
+ fillScript
+ );
+ });
+ });
+
+ describe("setupExtensionMessageListeners", () => {
+ it("sets up a chrome runtime on message listener", () => {
+ jest.spyOn(chrome.runtime.onMessage, "addListener");
+
+ bitwardenAutofillInit["setupExtensionMessageListeners"]();
+
+ expect(chrome.runtime.onMessage.addListener).toHaveBeenCalledWith(
+ bitwardenAutofillInit["handleExtensionMessage"]
+ );
+ });
+ });
+
+ describe("handleExtensionMessage", () => {
+ let message: AutofillExtensionMessage;
+ let sender: chrome.runtime.MessageSender;
+ const sendResponse = jest.fn();
+
+ beforeEach(() => {
+ message = {
+ command: "collectPageDetails",
+ tab: mock(),
+ sender: "sender",
+ };
+ sender = mock();
+ });
+
+ it("returns a false value if a extension message handler is not found with the given message command", () => {
+ message.command = "unknownCommand";
+
+ const response = bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+
+ expect(response).toBe(false);
+ });
+
+ it("returns a false value if the message handler does not return a response", async () => {
+ const response1 = await bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+ await Promise.resolve(response1);
+
+ expect(response1).not.toBe(false);
+
+ message.command = "fillForm";
+ message.fillScript = mock();
+
+ const response2 = await bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+
+ expect(response2).toBe(false);
+ });
+
+ it("returns a true value and calls sendResponse if the message handler returns a response", async () => {
+ message.command = "collectPageDetailsImmediately";
+ const pageDetails: AutofillPageDetails = {
+ title: "title",
+ url: "http://example.com",
+ documentUrl: "documentUrl",
+ forms: {},
+ fields: [],
+ collectedTimestamp: 0,
+ };
+ jest
+ .spyOn(bitwardenAutofillInit.collectAutofillContentService, "getPageDetails")
+ .mockReturnValue(pageDetails);
+
+ const response = await bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+ await Promise.resolve(response);
+
+ expect(response).toBe(true);
+ expect(sendResponse).toHaveBeenCalledWith(pageDetails);
+ });
+ });
+});
diff --git a/apps/browser/src/autofill/content/autofill-init.ts b/apps/browser/src/autofill/content/autofill-init.ts
new file mode 100644
index 00000000000..8b441ae0e20
--- /dev/null
+++ b/apps/browser/src/autofill/content/autofill-init.ts
@@ -0,0 +1,130 @@
+import AutofillPageDetails from "../models/autofill-page-details";
+import AutofillScript from "../models/autofill-script";
+import CollectAutofillContentService from "../services/collect-autofill-content.service";
+import DomElementVisibilityService from "../services/dom-element-visibility.service";
+import InsertAutofillContentService from "../services/insert-autofill-content.service";
+
+import {
+ AutofillExtensionMessage,
+ AutofillExtensionMessageHandlers,
+ AutofillInit as AutofillInitInterface,
+} from "./abstractions/autofill-init";
+
+class AutofillInit implements AutofillInitInterface {
+ private readonly domElementVisibilityService: DomElementVisibilityService;
+ private readonly collectAutofillContentService: CollectAutofillContentService;
+ private readonly insertAutofillContentService: InsertAutofillContentService;
+ private readonly extensionMessageHandlers: AutofillExtensionMessageHandlers = {
+ collectPageDetails: ({ message }) => this.collectPageDetails(message),
+ collectPageDetailsImmediately: ({ message }) => this.collectPageDetails(message, true),
+ fillForm: ({ message }) => this.fillForm(message.fillScript),
+ };
+
+ /**
+ * AutofillInit constructor. Initializes the DomElementVisibilityService,
+ * CollectAutofillContentService and InsertAutofillContentService classes.
+ */
+ constructor() {
+ this.domElementVisibilityService = new DomElementVisibilityService();
+ this.collectAutofillContentService = new CollectAutofillContentService(
+ this.domElementVisibilityService
+ );
+ this.insertAutofillContentService = new InsertAutofillContentService(
+ this.domElementVisibilityService,
+ this.collectAutofillContentService
+ );
+ }
+
+ /**
+ * Initializes the autofill content script, setting up
+ * the extension message listeners. This method should
+ * be called once when the content script is loaded.
+ * @public
+ */
+ init() {
+ this.setupExtensionMessageListeners();
+ }
+
+ /**
+ * Collects the page details and sends them to the
+ * extension background script. If the `sendDetailsInResponse`
+ * parameter is set to true, the page details will be
+ * returned to facilitate sending the details in the
+ * response to the extension message.
+ * @param {AutofillExtensionMessage} message
+ * @param {boolean} sendDetailsInResponse
+ * @returns {AutofillPageDetails | void}
+ * @private
+ */
+ private async collectPageDetails(
+ message: AutofillExtensionMessage,
+ sendDetailsInResponse = false
+ ): Promise {
+ const pageDetails: AutofillPageDetails =
+ await this.collectAutofillContentService.getPageDetails();
+ if (sendDetailsInResponse) {
+ return pageDetails;
+ }
+
+ chrome.runtime.sendMessage({
+ command: "collectPageDetailsResponse",
+ tab: message.tab,
+ details: pageDetails,
+ sender: message.sender,
+ });
+ }
+
+ /**
+ * Fills the form with the given fill script.
+ * @param {AutofillScript} fillScript
+ * @private
+ */
+ private fillForm(fillScript: AutofillScript) {
+ this.insertAutofillContentService.fillForm(fillScript);
+ }
+
+ /**
+ * Sets up the extension message listeners
+ * for the content script.
+ * @private
+ */
+ private setupExtensionMessageListeners() {
+ chrome.runtime.onMessage.addListener(this.handleExtensionMessage);
+ }
+
+ /**
+ * Handles the extension messages
+ * sent to the content script.
+ * @param {AutofillExtensionMessage} message
+ * @param {chrome.runtime.MessageSender} sender
+ * @param {(response?: any) => void} sendResponse
+ * @returns {boolean}
+ * @private
+ */
+ private handleExtensionMessage = (
+ message: AutofillExtensionMessage,
+ sender: chrome.runtime.MessageSender,
+ sendResponse: (response?: any) => void
+ ): boolean => {
+ const command: string = message.command;
+ const handler: CallableFunction | undefined = this.extensionMessageHandlers[command];
+ if (!handler) {
+ return false;
+ }
+
+ const messageResponse = handler({ message, sender });
+ if (!messageResponse) {
+ return false;
+ }
+
+ Promise.resolve(messageResponse).then((response) => sendResponse(response));
+ return true;
+ };
+}
+
+(function () {
+ if (!window.bitwardenAutofillInit) {
+ window.bitwardenAutofillInit = new AutofillInit();
+ window.bitwardenAutofillInit.init();
+ }
+})();
diff --git a/apps/browser/src/autofill/content/autofill.js b/apps/browser/src/autofill/content/autofill.js
index 052fd1120fe..2f3857d3fa8 100644
--- a/apps/browser/src/autofill/content/autofill.js
+++ b/apps/browser/src/autofill/content/autofill.js
@@ -751,8 +751,8 @@
].join('\n\n');
if (
- // At least one of the `savedURLs` uses SSL
- savedURLs.some(url => url.startsWith('https://')) &&
+ // At least one of the `savedURLs` uses SSL for the current page
+ savedURLs.some(url => url.startsWith(`https://${window.location.hostname}`)) &&
// The current page is not using SSL
document.location.protocol === 'http:' &&
// There are password inputs on the page
@@ -768,8 +768,16 @@
// Detect if within an iframe, and the iframe is sandboxed
function isSandboxed() {
- // self.origin is 'null' if inside a frame with sandboxed csp or iframe tag
- return self.origin == null || self.origin === 'null';
+ // self.origin is 'null' if inside a frame with sandboxed csp or iframe tag
+ if (String(self.origin).toLowerCase() === "null") {
+ return true;
+ }
+
+ if (window.frameElement?.hasAttribute("sandbox")) {
+ return true;
+ }
+
+ return location.hostname === "";
}
function doFill(fillScript) {
@@ -978,13 +986,18 @@
styleTimeout = 200;
/**
- * Fll an element `el` using the value `op` from the fill script
+ * Fill an element `el` using the value `op` from the fill script
* @param {HTMLElement} el
* @param {string} op
*/
function fillTheElement(el, op) {
var shouldCheck;
if (el && null !== op && void 0 !== op && !(el.disabled || el.a || el.readOnly)) {
+ const tabURLChanged = !fillScript.savedUrls?.some(url => url.startsWith(window.location.origin))
+ // Check to make sure the page location didn't change
+ if (tabURLChanged) {
+ return;
+ }
switch (markTheFilling && el.form && !el.form.opfilled && (el.form.opfilled = true),
el.type ? el.type.toLowerCase() : null) {
case 'checkbox':
diff --git a/apps/browser/src/autofill/content/autofiller.ts b/apps/browser/src/autofill/content/autofiller.ts
index 7fe9e5514a8..7f58e72c7d3 100644
--- a/apps/browser/src/autofill/content/autofiller.ts
+++ b/apps/browser/src/autofill/content/autofiller.ts
@@ -1,4 +1,10 @@
-document.addEventListener("DOMContentLoaded", (event) => {
+if (document.readyState === "loading") {
+ document.addEventListener("DOMContentLoaded", loadAutofiller);
+} else {
+ loadAutofiller();
+}
+
+function loadAutofiller() {
let pageHref: string = null;
let filledThisHref = false;
let delayFillTimeout: number;
@@ -49,4 +55,4 @@ document.addEventListener("DOMContentLoaded", (event) => {
chrome.runtime.sendMessage(msg);
}
}
-});
+}
diff --git a/apps/browser/src/autofill/content/autofillv2.ts b/apps/browser/src/autofill/content/autofillv2.ts
deleted file mode 100644
index 8bf16ff879c..00000000000
--- a/apps/browser/src/autofill/content/autofillv2.ts
+++ /dev/null
@@ -1,1391 +0,0 @@
-/* eslint-disable no-var, no-console, no-prototype-builtins */
-// These eslint rules are disabled because the original JS was not written with them in mind and we don't want to fix
-// them all now
-
-/*
- 1Password Extension
-
- Lovingly handcrafted by Dave Teare, Michael Fey, Rad Azzouz, and Roustem Karimov.
- Copyright (c) 2014 AgileBits. All rights reserved.
-
- ================================================================================
-
- Copyright (c) 2014 AgileBits Inc.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
- */
-
-/*
- MODIFICATIONS FROM ORIGINAL
-
- 1. Populate isFirefox
- 2. Remove isChrome and isSafari since they are not used.
- 3. Unminify and format to meet Mozilla review requirements.
- 4. Remove unnecessary input types from getFormElements query selector and limit number of elements returned.
- 5. Remove fakeTested prop.
- 6. Rename com.agilebits.* stuff to com.bitwarden.*
- 7. Remove "some useful globals" on window
- 8. Add ability to autofill span[data-bwautofill] elements
- 9. Add new handler, for new command that responds with page details in response callback
- 10. Handle sandbox iframe and sandbox rule in CSP
- 11. Work on array of saved urls instead of just one to determine if we should autofill non-https sites
- 12. Remove setting of attribute com.browser.browser.userEdited on user-inputs
- 13. Handle null value URLs in urlNotSecure
- 14. Convert to Typescript, add typings and remove dead code (not marked with START/END MODIFICATION)
- */
-import AutofillForm from "../models/autofill-form";
-import AutofillPageDetails from "../models/autofill-page-details";
-import AutofillScript, {
- AutofillScriptOptions,
- FillScript,
- FillScriptOp,
-} from "../models/autofill-script";
-
-/**
- * The Document with additional custom properties added by this script
- */
-type AutofillDocument = Document & {
- elementsByOPID: Record;
- elementForOPID: (opId: string) => Element;
-};
-
-/**
- * A HTMLElement (usually a form element) with additional custom properties added by this script
- */
-type ElementWithOpId = T & {
- opid: string;
-};
-
-/**
- * This script's definition of a Form Element (only a subset of HTML form elements)
- * This is defined by getFormElements
- */
-type FormElement = HTMLInputElement | HTMLSelectElement | HTMLSpanElement;
-
-/**
- * A Form Element that we can set a value on (fill)
- */
-type FillableControl = HTMLInputElement | HTMLSelectElement;
-
-function collect(document: Document) {
- // START MODIFICATION
- var isFirefox =
- navigator.userAgent.indexOf("Firefox") !== -1 || navigator.userAgent.indexOf("Gecko/") !== -1;
- // END MODIFICATION
-
- (document as AutofillDocument).elementsByOPID = {};
-
- function getPageDetails(theDoc: Document, oneShotId: string) {
- // start helpers
-
- /**
- * For a given element `el`, returns the value of the attribute `attrName`.
- * @param {HTMLElement} el
- * @param {string} attrName
- * @returns {string} The value of the attribute
- */
- function getElementAttrValue(el: any, attrName: string) {
- var attrVal = el[attrName];
- if ("string" == typeof attrVal) {
- return attrVal;
- }
- attrVal = el.getAttribute(attrName);
- return "string" == typeof attrVal ? attrVal : null;
- }
-
- /**
- * Returns the value of the given element.
- * @param {HTMLElement} el
- * @returns {any} Value of the element
- */
- function getElementValue(el: any) {
- switch (toLowerString(el.type)) {
- case "checkbox":
- return el.checked ? "✓" : "";
-
- case "hidden":
- el = el.value;
- if (!el || "number" != typeof el.length) {
- return "";
- }
- 254 < el.length && (el = el.substr(0, 254) + "...SNIPPED");
- return el;
-
- default:
- // START MODIFICATION
- if (!el.type && el.tagName.toLowerCase() === "span") {
- return el.innerText;
- }
- // END MODIFICATION
- return el.value;
- }
- }
-
- /**
- * If `el` is a `
+
+
+
+
+
+
+
+
+
-
+
@@ -112,7 +112,9 @@
selectedProviderType === providerType.OrganizationDuo
"
>
-
+
selectedProviderType === providerType.OrganizationDuo
"
>
-
+
+
+
@@ -123,7 +125,7 @@
-
+
{
+ if (messageData.commandToRetry.msg.command === "autofill_login") {
+ await BrowserApi.tabSendMessageData(sender.tab, "closeNotificationBar");
+ }
+
+ if (messageData.target !== "notification.background") {
+ return;
+ }
+
+ await this.processMessage(
+ messageData.commandToRetry.msg.command,
+ messageData.commandToRetry.sender
+ );
+ }
}
diff --git a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
index a23b5e8dbaf..efa5bdcffbb 100644
--- a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
+++ b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts
@@ -2,27 +2,31 @@ import {
TotpServiceInitOptions,
totpServiceFactory,
} from "../../../auth/background/service-factories/totp-service.factory";
+import {
+ UserVerificationServiceInitOptions,
+ userVerificationServiceFactory,
+} from "../../../auth/background/service-factories/user-verification-service.factory";
import {
EventCollectionServiceInitOptions,
eventCollectionServiceFactory,
-} from "../../../background/service_factories/event-collection-service.factory";
+} from "../../../background/service-factories/event-collection-service.factory";
+import {
+ settingsServiceFactory,
+ SettingsServiceInitOptions,
+} from "../../../background/service-factories/settings-service.factory";
import {
CachedServices,
factory,
FactoryOptions,
-} from "../../../background/service_factories/factory-options";
+} from "../../../platform/background/service-factories/factory-options";
import {
logServiceFactory,
LogServiceInitOptions,
-} from "../../../background/service_factories/log-service.factory";
-import {
- settingsServiceFactory,
- SettingsServiceInitOptions,
-} from "../../../background/service_factories/settings-service.factory";
+} from "../../../platform/background/service-factories/log-service.factory";
import {
stateServiceFactory,
StateServiceInitOptions,
-} from "../../../background/service_factories/state-service.factory";
+} from "../../../platform/background/service-factories/state-service.factory";
import {
cipherServiceFactory,
CipherServiceInitOptions,
@@ -38,7 +42,8 @@ export type AutoFillServiceInitOptions = AutoFillServiceOptions &
TotpServiceInitOptions &
EventCollectionServiceInitOptions &
LogServiceInitOptions &
- SettingsServiceInitOptions;
+ SettingsServiceInitOptions &
+ UserVerificationServiceInitOptions;
export function autofillServiceFactory(
cache: { autofillService?: AbstractAutoFillService } & CachedServices,
@@ -55,7 +60,8 @@ export function autofillServiceFactory(
await totpServiceFactory(cache, opts),
await eventCollectionServiceFactory(cache, opts),
await logServiceFactory(cache, opts),
- await settingsServiceFactory(cache, opts)
+ await settingsServiceFactory(cache, opts),
+ await userVerificationServiceFactory(cache, opts)
)
);
}
diff --git a/apps/browser/src/autofill/background/tabs.background.ts b/apps/browser/src/autofill/background/tabs.background.ts
index 0f724c84dd5..0655fd23b62 100644
--- a/apps/browser/src/autofill/background/tabs.background.ts
+++ b/apps/browser/src/autofill/background/tabs.background.ts
@@ -21,6 +21,8 @@ export default class TabsBackground {
}
this.focusedWindowId = windowId;
+ await this.main.refreshBadge();
+ await this.main.refreshMenu();
this.main.messagingService.send("windowChanged");
});
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
index 53d3d100769..4532718809e 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
@@ -69,12 +69,12 @@ describe("CipherContextMenuHandler", () => {
expect(mainContextMenuHandler.noLogins).toHaveBeenCalledTimes(1);
});
- it("only adds valid ciphers", async () => {
+ it("only adds autofill ciphers including ciphers that require reprompt", async () => {
authService.getAuthStatus.mockResolvedValue(AuthenticationStatus.Unlocked);
mainContextMenuHandler.init.mockResolvedValue(true);
- const realCipher = {
+ const loginCipher = {
id: "5",
type: CipherType.Login,
reprompt: CipherRepromptType.None,
@@ -82,27 +82,57 @@ describe("CipherContextMenuHandler", () => {
login: { username: "Test Username" },
};
+ const repromptLoginCipher = {
+ id: "6",
+ type: CipherType.Login,
+ reprompt: CipherRepromptType.Password,
+ name: "Test Reprompt Cipher",
+ login: { username: "Test Username" },
+ };
+
+ const cardCipher = {
+ id: "7",
+ type: CipherType.Card,
+ name: "Test Card Cipher",
+ card: { username: "Test Username" },
+ };
+
cipherService.getAllDecryptedForUrl.mockResolvedValue([
- null,
- undefined,
- { type: CipherType.Card },
- { type: CipherType.Login, reprompt: CipherRepromptType.Password },
- realCipher,
+ null, // invalid cipher
+ undefined, // invalid cipher
+ { type: CipherType.SecureNote }, // invalid cipher
+ loginCipher, // valid cipher
+ repromptLoginCipher,
+ cardCipher, // valid cipher
] as any[]);
await sut.update("https://test.com");
expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledTimes(1);
- expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com", [
+ CipherType.Card,
+ CipherType.Identity,
+ ]);
- expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledTimes(1);
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledTimes(3);
expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
"Test Cipher (Test Username)",
"5",
- "https://test.com",
- realCipher
+ loginCipher
+ );
+
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
+ "Test Reprompt Cipher (Test Username)",
+ "6",
+ repromptLoginCipher
+ );
+
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
+ "Test Card Cipher",
+ "7",
+ cardCipher
);
});
});
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
index 8803267685c..f46442c4192 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
@@ -1,10 +1,9 @@
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -12,13 +11,14 @@ import {
authServiceFactory,
AuthServiceInitOptions,
} from "../../auth/background/service-factories/auth-service.factory";
-import { CachedServices } from "../../background/service_factories/factory-options";
-import { BrowserApi } from "../../browser/browserApi";
import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
+import { BrowserApi } from "../../platform/browser/browser-api";
import {
cipherServiceFactory,
CipherServiceInitOptions,
} from "../../vault/background/service_factories/cipher-service.factory";
+import { AutofillCipherTypeId } from "../types";
import { MainContextMenuHandler } from "./main-context-menu-handler";
@@ -67,9 +67,6 @@ export class CipherContextMenuHandler {
clipboardWriteCallback: NOT_IMPLEMENTED,
win: self,
},
- stateMigrationServiceOptions: {
- stateFactory: stateFactory,
- },
stateServiceOptions: {
stateFactory: stateFactory,
},
@@ -81,6 +78,12 @@ export class CipherContextMenuHandler {
);
}
+ static async windowsOnFocusChangedListener(windowId: number, serviceCache: CachedServices) {
+ const cipherContextMenuHandler = await CipherContextMenuHandler.create(serviceCache);
+ const tab = await BrowserApi.getTabFromCurrentWindow();
+ await cipherContextMenuHandler.update(tab?.url);
+ }
+
static async tabsOnActivatedListener(
activeInfo: chrome.tabs.TabActiveInfo,
serviceCache: CachedServices
@@ -157,33 +160,67 @@ export class CipherContextMenuHandler {
return;
}
- const ciphers = await this.cipherService.getAllDecryptedForUrl(url);
+ const ciphers = await this.cipherService.getAllDecryptedForUrl(url, [
+ CipherType.Card,
+ CipherType.Identity,
+ ]);
ciphers.sort((a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b));
- if (ciphers.length === 0) {
- await this.mainContextMenuHandler.noLogins(url);
- return;
+ const groupedCiphers: Record = ciphers.reduce(
+ (ciphersByType, cipher) => {
+ if (!cipher?.type) {
+ return ciphersByType;
+ }
+
+ const existingCiphersOfType = ciphersByType[cipher.type as AutofillCipherTypeId] || [];
+
+ return {
+ ...ciphersByType,
+ [cipher.type]: [...existingCiphersOfType, cipher],
+ };
+ },
+ {
+ [CipherType.Login]: [],
+ [CipherType.Card]: [],
+ [CipherType.Identity]: [],
+ }
+ );
+
+ if (groupedCiphers[CipherType.Login].length === 0) {
+ await this.mainContextMenuHandler.noLogins();
+ }
+
+ if (groupedCiphers[CipherType.Identity].length === 0) {
+ await this.mainContextMenuHandler.noIdentities();
+ }
+
+ if (groupedCiphers[CipherType.Card].length === 0) {
+ await this.mainContextMenuHandler.noCards();
}
for (const cipher of ciphers) {
- await this.updateForCipher(url, cipher);
+ await this.updateForCipher(cipher);
}
}
- private async updateForCipher(url: string, cipher: CipherView) {
+ private async updateForCipher(cipher: CipherView) {
if (
cipher == null ||
- cipher.type !== CipherType.Login ||
- cipher.reprompt !== CipherRepromptType.None
+ !new Set([CipherType.Login, CipherType.Card, CipherType.Identity]).has(cipher.type)
) {
return;
}
let title = cipher.name;
- if (!Utils.isNullOrEmpty(title)) {
+
+ if (cipher.type === CipherType.Login && !Utils.isNullOrEmpty(title) && cipher.login?.username) {
title += ` (${cipher.login.username})`;
}
- await this.mainContextMenuHandler.loadOptions(title, cipher.id, url, cipher);
+ if (cipher.type === CipherType.Card && cipher.card?.subTitle) {
+ title += ` ${cipher.card.subTitle}`;
+ }
+
+ await this.mainContextMenuHandler.loadOptions(title, cipher.id, cipher);
}
}
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
index a9dbcbaacc5..5c6b5e07da3 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts
@@ -3,12 +3,23 @@ import { mock, MockProxy } from "jest-mock-extended";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { TotpService } from "@bitwarden/common/abstractions/totp.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+ AUTOFILL_ID,
+ COPY_PASSWORD_ID,
+ COPY_USERNAME_ID,
+ COPY_VERIFICATIONCODE_ID,
+ GENERATE_PASSWORD_ID,
+ NOOP_COMMAND_SUFFIX,
+} from "../constants";
+
import {
CopyToClipboardAction,
ContextMenuClickedHandler,
@@ -16,13 +27,6 @@ import {
GeneratePasswordToClipboardAction,
AutofillAction,
} from "./context-menu-clicked-handler";
-import {
- AUTOFILL_ID,
- COPY_PASSWORD_ID,
- COPY_USERNAME_ID,
- COPY_VERIFICATIONCODE_ID,
- GENERATE_PASSWORD_ID,
-} from "./main-context-menu-handler";
describe("ContextMenuClickedHandler", () => {
const createData = (
@@ -50,6 +54,7 @@ describe("ContextMenuClickedHandler", () => {
type: CipherType.Login,
} as any)
);
+
cipherView.login.username = username ?? "USERNAME";
cipherView.login.password = password ?? "PASSWORD";
cipherView.login.totp = totp ?? "TOTP";
@@ -61,8 +66,10 @@ describe("ContextMenuClickedHandler", () => {
let autofill: AutofillAction;
let authService: MockProxy;
let cipherService: MockProxy;
+ let stateService: MockProxy;
let totpService: MockProxy;
let eventCollectionService: MockProxy;
+ let userVerificationService: MockProxy;
let sut: ContextMenuClickedHandler;
@@ -72,6 +79,7 @@ describe("ContextMenuClickedHandler", () => {
autofill = jest.fn, [tab: chrome.tabs.Tab, cipher: CipherView]>();
authService = mock();
cipherService = mock();
+ stateService = mock();
totpService = mock();
eventCollectionService = mock();
@@ -81,8 +89,10 @@ describe("ContextMenuClickedHandler", () => {
autofill,
authService,
cipherService,
+ stateService,
totpService,
- eventCollectionService
+ eventCollectionService,
+ userVerificationService
);
});
@@ -103,7 +113,7 @@ describe("ContextMenuClickedHandler", () => {
const cipher = createCipher();
cipherService.getAllDecrypted.mockResolvedValue([cipher]);
- await sut.run(createData("T_1", AUTOFILL_ID), { id: 5 } as any);
+ await sut.run(createData(`${AUTOFILL_ID}_1`, AUTOFILL_ID), { id: 5 } as any);
expect(autofill).toBeCalledTimes(1);
@@ -115,11 +125,16 @@ describe("ContextMenuClickedHandler", () => {
createCipher({ username: "TEST_USERNAME" }),
]);
- await sut.run(createData("T_1", COPY_USERNAME_ID));
+ await sut.run(createData(`${COPY_USERNAME_ID}_1`, COPY_USERNAME_ID), {
+ url: "https://test.com",
+ } as any);
expect(copyToClipboard).toBeCalledTimes(1);
- expect(copyToClipboard).toHaveBeenCalledWith({ text: "TEST_USERNAME", options: undefined });
+ expect(copyToClipboard).toHaveBeenCalledWith({
+ text: "TEST_USERNAME",
+ tab: { url: "https://test.com" },
+ });
});
it("copies password to clipboard", async () => {
@@ -127,11 +142,16 @@ describe("ContextMenuClickedHandler", () => {
createCipher({ password: "TEST_PASSWORD" }),
]);
- await sut.run(createData("T_1", COPY_PASSWORD_ID));
+ await sut.run(createData(`${COPY_PASSWORD_ID}_1`, COPY_PASSWORD_ID), {
+ url: "https://test.com",
+ } as any);
expect(copyToClipboard).toBeCalledTimes(1);
- expect(copyToClipboard).toHaveBeenCalledWith({ text: "TEST_PASSWORD", options: undefined });
+ expect(copyToClipboard).toHaveBeenCalledWith({
+ text: "TEST_PASSWORD",
+ tab: { url: "https://test.com" },
+ });
});
it("copies totp code to clipboard", async () => {
@@ -145,11 +165,16 @@ describe("ContextMenuClickedHandler", () => {
return Promise.resolve("654321");
});
- await sut.run(createData("T_1", COPY_VERIFICATIONCODE_ID));
+ await sut.run(createData(`${COPY_VERIFICATIONCODE_ID}_1`, COPY_VERIFICATIONCODE_ID), {
+ url: "https://test.com",
+ } as any);
expect(totpService.getCode).toHaveBeenCalledTimes(1);
- expect(copyToClipboard).toHaveBeenCalledWith({ text: "123456" });
+ expect(copyToClipboard).toHaveBeenCalledWith({
+ text: "123456",
+ tab: { url: "https://test.com" },
+ });
});
it("attempts to find a cipher when noop but unlocked", async () => {
@@ -160,11 +185,13 @@ describe("ContextMenuClickedHandler", () => {
} as any,
]);
- await sut.run(createData("T_noop", COPY_USERNAME_ID), { url: "https://test.com" } as any);
+ await sut.run(createData(`${COPY_USERNAME_ID}_${NOOP_COMMAND_SUFFIX}`, COPY_USERNAME_ID), {
+ url: "https://test.com",
+ } as any);
expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledTimes(1);
- expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com", []);
expect(copyToClipboard).toHaveBeenCalledTimes(1);
@@ -182,11 +209,13 @@ describe("ContextMenuClickedHandler", () => {
} as any,
]);
- await sut.run(createData("T_noop", COPY_USERNAME_ID), { url: "https://test.com" } as any);
+ await sut.run(createData(`${COPY_USERNAME_ID}_${NOOP_COMMAND_SUFFIX}`, COPY_USERNAME_ID), {
+ url: "https://test.com",
+ } as any);
expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledTimes(1);
- expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com", []);
});
});
});
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index 4b75942e031..54c3e244991 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -1,12 +1,15 @@
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { TotpService } from "@bitwarden/common/abstractions/totp.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
import { EventType } from "@bitwarden/common/enums";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import {
@@ -14,13 +17,14 @@ import {
AuthServiceInitOptions,
} from "../../auth/background/service-factories/auth-service.factory";
import { totpServiceFactory } from "../../auth/background/service-factories/totp-service.factory";
+import { userVerificationServiceFactory } from "../../auth/background/service-factories/user-verification-service.factory";
import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
-import { eventCollectionServiceFactory } from "../../background/service_factories/event-collection-service.factory";
-import { CachedServices } from "../../background/service_factories/factory-options";
-import { passwordGenerationServiceFactory } from "../../background/service_factories/password-generation-service.factory";
-import { stateServiceFactory } from "../../background/service_factories/state-service.factory";
-import { BrowserApi } from "../../browser/browserApi";
+import { eventCollectionServiceFactory } from "../../background/service-factories/event-collection-service.factory";
import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
+import { stateServiceFactory } from "../../platform/background/service-factories/state-service.factory";
+import { BrowserApi } from "../../platform/browser/browser-api";
+import { passwordGenerationServiceFactory } from "../../tools/background/service_factories/password-generation-service.factory";
import {
cipherServiceFactory,
CipherServiceInitOptions,
@@ -28,16 +32,21 @@ import {
import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory";
import { copyToClipboard, GeneratePasswordToClipboardCommand } from "../clipboard";
import { AutofillTabCommand } from "../commands/autofill-tab-command";
-
import {
+ AUTOFILL_CARD_ID,
AUTOFILL_ID,
+ AUTOFILL_IDENTITY_ID,
COPY_IDENTIFIER_ID,
COPY_PASSWORD_ID,
COPY_USERNAME_ID,
COPY_VERIFICATIONCODE_ID,
+ CREATE_CARD_ID,
+ CREATE_IDENTITY_ID,
+ CREATE_LOGIN_ID,
GENERATE_PASSWORD_ID,
NOOP_COMMAND_SUFFIX,
-} from "./main-context-menu-handler";
+} from "../constants";
+import { AutofillCipherTypeId } from "../types";
export type CopyToClipboardOptions = { text: string; tab: chrome.tabs.Tab };
export type CopyToClipboardAction = (options: CopyToClipboardOptions) => void;
@@ -55,8 +64,10 @@ export class ContextMenuClickedHandler {
private autofillAction: AutofillAction,
private authService: AuthService,
private cipherService: CipherService,
+ private stateService: StateService,
private totpService: TotpService,
- private eventCollectionService: EventCollectionService
+ private eventCollectionService: EventCollectionService,
+ private userVerificationService: UserVerificationService
) {}
static async mv3Create(cachedServices: CachedServices) {
@@ -85,9 +96,6 @@ export class ContextMenuClickedHandler {
clipboardWriteCallback: NOT_IMPLEMENTED,
win: self,
},
- stateMigrationServiceOptions: {
- stateFactory: stateFactory,
- },
stateServiceOptions: {
stateFactory: stateFactory,
},
@@ -108,8 +116,10 @@ export class ContextMenuClickedHandler {
(tab, cipher) => autofillCommand.doAutofillTabWithCipherCommand(tab, cipher),
await authServiceFactory(cachedServices, serviceOptions),
await cipherServiceFactory(cachedServices, serviceOptions),
+ await stateServiceFactory(cachedServices, serviceOptions),
await totpServiceFactory(cachedServices, serviceOptions),
- await eventCollectionServiceFactory(cachedServices, serviceOptions)
+ await eventCollectionServiceFactory(cachedServices, serviceOptions),
+ await userVerificationServiceFactory(cachedServices, serviceOptions)
);
}
@@ -141,18 +151,16 @@ export class ContextMenuClickedHandler {
);
}
- async run(info: chrome.contextMenus.OnClickData, tab?: chrome.tabs.Tab) {
+ async run(info: chrome.contextMenus.OnClickData, tab: chrome.tabs.Tab) {
+ if (!tab) {
+ return;
+ }
+
switch (info.menuItemId) {
case GENERATE_PASSWORD_ID:
- if (!tab) {
- return;
- }
await this.generatePasswordToClipboard(tab);
break;
case COPY_IDENTIFIER_ID:
- if (!tab) {
- return;
- }
this.copyToClipboard({ text: await this.getIdentifier(tab, info), tab: tab });
break;
default:
@@ -160,7 +168,11 @@ export class ContextMenuClickedHandler {
}
}
- async cipherAction(info: chrome.contextMenus.OnClickData, tab?: chrome.tabs.Tab) {
+ async cipherAction(info: chrome.contextMenus.OnClickData, tab: chrome.tabs.Tab) {
+ if (!tab) {
+ return;
+ }
+
if ((await this.authService.getAuthStatus()) < AuthenticationStatus.Unlocked) {
const retryMessage: LockedVaultPendingNotificationsItem = {
commandToRetry: {
@@ -181,43 +193,136 @@ export class ContextMenuClickedHandler {
// NOTE: We don't actually use the first part of this ID, we further switch based on the parentMenuItemId
// I would really love to not add it but that is a departure from how it currently works.
- const id = (info.menuItemId as string).split("_")[1]; // We create all the ids, we can guarantee they are strings
+ const menuItemId = (info.menuItemId as string).split("_")[1]; // We create all the ids, we can guarantee they are strings
let cipher: CipherView | undefined;
- if (id === NOOP_COMMAND_SUFFIX) {
+ const isCreateCipherAction = [CREATE_LOGIN_ID, CREATE_IDENTITY_ID, CREATE_CARD_ID].includes(
+ menuItemId as string
+ );
+
+ if (isCreateCipherAction) {
+ // pass; defer to logic below
+ } else if (menuItemId === NOOP_COMMAND_SUFFIX) {
+ const additionalCiphersToGet =
+ info.parentMenuItemId === AUTOFILL_IDENTITY_ID
+ ? [CipherType.Identity]
+ : info.parentMenuItemId === AUTOFILL_CARD_ID
+ ? [CipherType.Card]
+ : [];
+
// This NOOP item has come through which is generally only for no access state but since we got here
// we are actually unlocked we will do our best to find a good match of an item to autofill this is useful
// in scenarios like unlock on autofill
- const ciphers = await this.cipherService.getAllDecryptedForUrl(tab.url);
- cipher = ciphers.find((c) => c.reprompt === CipherRepromptType.None);
+ const ciphers = await this.cipherService.getAllDecryptedForUrl(
+ tab.url,
+ additionalCiphersToGet
+ );
+
+ cipher = ciphers[0];
} else {
const ciphers = await this.cipherService.getAllDecrypted();
- cipher = ciphers.find((c) => c.id === id);
+ cipher = ciphers.find(({ id }) => id === menuItemId);
}
- if (cipher == null) {
+ if (!cipher && !isCreateCipherAction) {
return;
}
+ this.stateService.setLastActive(new Date().getTime());
switch (info.parentMenuItemId) {
case AUTOFILL_ID:
- if (tab == null) {
- return;
+ case AUTOFILL_IDENTITY_ID:
+ case AUTOFILL_CARD_ID: {
+ const cipherType = this.getCipherCreationType(menuItemId);
+
+ if (cipherType) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType,
+ });
+ break;
}
- await this.autofillAction(tab, cipher);
+
+ if (await this.isPasswordRepromptRequired(cipher)) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ // The action here is passed on to the single-use reprompt window and doesn't change based on cipher type
+ action: AUTOFILL_ID,
+ });
+ } else {
+ await this.autofillAction(tab, cipher);
+ }
+
break;
+ }
case COPY_USERNAME_ID:
+ if (menuItemId === CREATE_LOGIN_ID) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType: CipherType.Login,
+ });
+ break;
+ }
+
this.copyToClipboard({ text: cipher.login.username, tab: tab });
break;
case COPY_PASSWORD_ID:
- this.copyToClipboard({ text: cipher.login.password, tab: tab });
- this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
+ if (menuItemId === CREATE_LOGIN_ID) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType: CipherType.Login,
+ });
+ break;
+ }
+
+ if (await this.isPasswordRepromptRequired(cipher)) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ action: info.parentMenuItemId,
+ });
+ } else {
+ this.copyToClipboard({ text: cipher.login.password, tab: tab });
+ this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
+ }
+
break;
case COPY_VERIFICATIONCODE_ID:
- this.copyToClipboard({ text: await this.totpService.getCode(cipher.login.totp), tab: tab });
+ if (menuItemId === CREATE_LOGIN_ID) {
+ await BrowserApi.tabSendMessageData(tab, "openAddEditCipher", {
+ cipherType: CipherType.Login,
+ });
+ break;
+ }
+
+ if (await this.isPasswordRepromptRequired(cipher)) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ action: info.parentMenuItemId,
+ });
+ } else {
+ this.copyToClipboard({
+ text: await this.totpService.getCode(cipher.login.totp),
+ tab: tab,
+ });
+ }
+
break;
}
}
+ private async isPasswordRepromptRequired(cipher: CipherView): Promise {
+ return (
+ cipher.reprompt === CipherRepromptType.Password &&
+ (await this.userVerificationService.hasMasterPasswordAndMasterKeyHash())
+ );
+ }
+
+ private getCipherCreationType(menuItemId?: string): AutofillCipherTypeId | null {
+ return menuItemId === CREATE_IDENTITY_ID
+ ? CipherType.Identity
+ : menuItemId === CREATE_CARD_ID
+ ? CipherType.Card
+ : menuItemId === CREATE_LOGIN_ID
+ ? CipherType.Login
+ : null;
+ }
+
private async getIdentifier(tab: chrome.tabs.Tab, info: chrome.contextMenus.OnClickData) {
return new Promise((resolve, reject) => {
BrowserApi.sendTabsMessage(
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
index 9d6a1db84a7..95916d2e6f1 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
@@ -1,12 +1,12 @@
import { mock, MockProxy } from "jest-mock-extended";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
import { MainContextMenuHandler } from "./main-context-menu-handler";
@@ -60,7 +60,7 @@ describe("context-menu", () => {
const createdMenu = await sut.init();
expect(createdMenu).toBeTruthy();
- expect(createSpy).toHaveBeenCalledTimes(7);
+ expect(createSpy).toHaveBeenCalledTimes(10);
});
it("has menu enabled and has premium", async () => {
@@ -70,7 +70,7 @@ describe("context-menu", () => {
const createdMenu = await sut.init();
expect(createdMenu).toBeTruthy();
- expect(createSpy).toHaveBeenCalledTimes(8);
+ expect(createSpy).toHaveBeenCalledTimes(11);
});
});
@@ -97,7 +97,7 @@ describe("context-menu", () => {
};
it("is not a login cipher", async () => {
- await sut.loadOptions("TEST_TITLE", "1", "", {
+ await sut.loadOptions("TEST_TITLE", "1", {
...createCipher(),
type: CipherType.SecureNote,
} as any);
@@ -109,7 +109,6 @@ describe("context-menu", () => {
await sut.loadOptions(
"TEST_TITLE",
"1",
- "",
createCipher({
username: "",
totp: "",
@@ -123,18 +122,18 @@ describe("context-menu", () => {
it("create entry for each cipher piece", async () => {
stateService.getCanAccessPremium.mockResolvedValue(true);
- await sut.loadOptions("TEST_TITLE", "1", "", createCipher());
+ await sut.loadOptions("TEST_TITLE", "1", createCipher());
// One for autofill, copy username, copy password, and copy totp code
expect(createSpy).toHaveBeenCalledTimes(4);
});
- it("creates noop item for no cipher", async () => {
+ it("creates a login/unlock item for each context menu action option when user is not authenticated", async () => {
stateService.getCanAccessPremium.mockResolvedValue(true);
- await sut.loadOptions("TEST_TITLE", "NOOP", "");
+ await sut.loadOptions("TEST_TITLE", "NOOP");
- expect(createSpy).toHaveBeenCalledTimes(4);
+ expect(createSpy).toHaveBeenCalledTimes(6);
});
});
});
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
index 14775c846f3..cc5cc9a5166 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -1,42 +1,44 @@
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { CachedServices } from "../../background/service_factories/factory-options";
+import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
import {
i18nServiceFactory,
I18nServiceInitOptions,
-} from "../../background/service_factories/i18n-service.factory";
+} from "../../platform/background/service-factories/i18n-service.factory";
import {
logServiceFactory,
LogServiceInitOptions,
-} from "../../background/service_factories/log-service.factory";
+} from "../../platform/background/service-factories/log-service.factory";
import {
stateServiceFactory,
StateServiceInitOptions,
-} from "../../background/service_factories/state-service.factory";
-import { Account } from "../../models/account";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
-
-export const ROOT_ID = "root";
-
-export const AUTOFILL_ID = "autofill";
-export const COPY_USERNAME_ID = "copy-username";
-export const COPY_PASSWORD_ID = "copy-password";
-export const COPY_VERIFICATIONCODE_ID = "copy-totp";
-export const COPY_IDENTIFIER_ID = "copy-identifier";
-
-const SEPARATOR_ID = "separator";
-export const GENERATE_PASSWORD_ID = "generate-password";
-
-export const NOOP_COMMAND_SUFFIX = "noop";
+} from "../../platform/background/service-factories/state-service.factory";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
+import {
+ AUTOFILL_CARD_ID,
+ AUTOFILL_ID,
+ AUTOFILL_IDENTITY_ID,
+ COPY_IDENTIFIER_ID,
+ COPY_PASSWORD_ID,
+ COPY_USERNAME_ID,
+ COPY_VERIFICATIONCODE_ID,
+ CREATE_CARD_ID,
+ CREATE_IDENTITY_ID,
+ CREATE_LOGIN_ID,
+ GENERATE_PASSWORD_ID,
+ NOOP_COMMAND_SUFFIX,
+ ROOT_ID,
+ SEPARATOR_ID,
+} from "../constants";
export class MainContextMenuHandler {
- //
private initRunning = false;
create: (options: chrome.contextMenus.CreateProperties) => Promise;
@@ -79,9 +81,6 @@ export class MainContextMenuHandler {
logServiceOptions: {
isDev: false,
},
- stateMigrationServiceOptions: {
- stateFactory: stateFactory,
- },
stateServiceOptions: {
stateFactory: stateFactory,
},
@@ -123,7 +122,7 @@ export class MainContextMenuHandler {
await create({
id: AUTOFILL_ID,
parentId: ROOT_ID,
- title: this.i18nService.t("autoFill"),
+ title: this.i18nService.t("autoFillLogin"),
});
await create({
@@ -147,7 +146,25 @@ export class MainContextMenuHandler {
}
await create({
- id: SEPARATOR_ID,
+ id: SEPARATOR_ID + 1,
+ type: "separator",
+ parentId: ROOT_ID,
+ });
+
+ await create({
+ id: AUTOFILL_IDENTITY_ID,
+ parentId: ROOT_ID,
+ title: this.i18nService.t("autoFillIdentity"),
+ });
+
+ await create({
+ id: AUTOFILL_CARD_ID,
+ parentId: ROOT_ID,
+ title: this.i18nService.t("autoFillCard"),
+ });
+
+ await create({
+ id: SEPARATOR_ID + 2,
type: "separator",
parentId: ROOT_ID,
});
@@ -197,40 +214,52 @@ export class MainContextMenuHandler {
});
}
- async loadOptions(title: string, id: string, url: string, cipher?: CipherView | undefined) {
- if (cipher != null && cipher.type !== CipherType.Login) {
- return;
- }
-
+ async loadOptions(title: string, optionId: string, cipher?: CipherView) {
try {
const sanitizedTitle = MainContextMenuHandler.sanitizeContextMenuTitle(title);
- const createChildItem = async (parent: string) => {
- const menuItemId = `${parent}_${id}`;
+ const createChildItem = async (parentId: string) => {
+ const menuItemId = `${parentId}_${optionId}`;
+
return await this.create({
type: "normal",
id: menuItemId,
- parentId: parent,
+ parentId,
title: sanitizedTitle,
contexts: ["all"],
});
};
- if (cipher == null || !Utils.isNullOrEmpty(cipher.login.password)) {
+ if (
+ !cipher ||
+ (cipher.type === CipherType.Login && !Utils.isNullOrEmpty(cipher.login?.password))
+ ) {
await createChildItem(AUTOFILL_ID);
+
if (cipher?.viewPassword ?? true) {
await createChildItem(COPY_PASSWORD_ID);
}
}
- if (cipher == null || !Utils.isNullOrEmpty(cipher.login.username)) {
+ if (
+ !cipher ||
+ (cipher.type === CipherType.Login && !Utils.isNullOrEmpty(cipher.login?.username))
+ ) {
await createChildItem(COPY_USERNAME_ID);
}
const canAccessPremium = await this.stateService.getCanAccessPremium();
- if (canAccessPremium && (cipher == null || !Utils.isNullOrEmpty(cipher.login.totp))) {
+ if (canAccessPremium && (!cipher || !Utils.isNullOrEmpty(cipher.login?.totp))) {
await createChildItem(COPY_VERIFICATIONCODE_ID);
}
+
+ if ((!cipher || cipher.type === CipherType.Card) && optionId !== CREATE_LOGIN_ID) {
+ await createChildItem(AUTOFILL_CARD_ID);
+ }
+
+ if ((!cipher || cipher.type === CipherType.Identity) && optionId !== CREATE_LOGIN_ID) {
+ await createChildItem(AUTOFILL_IDENTITY_ID);
+ }
} catch (error) {
this.logService.warning(error.message);
}
@@ -245,13 +274,72 @@ export class MainContextMenuHandler {
const authed = await this.stateService.getIsAuthenticated();
await this.loadOptions(
this.i18nService.t(authed ? "unlockVaultMenu" : "loginToVaultMenu"),
- NOOP_COMMAND_SUFFIX,
- ""
+ NOOP_COMMAND_SUFFIX
);
}
}
- async noLogins(url: string) {
- await this.loadOptions(this.i18nService.t("noMatchingLogins"), NOOP_COMMAND_SUFFIX, url);
+ async noCards() {
+ await this.create({
+ id: `${AUTOFILL_CARD_ID}_NOTICE`,
+ enabled: false,
+ parentId: AUTOFILL_CARD_ID,
+ title: this.i18nService.t("noCards"),
+ type: "normal",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_CARD_ID}_${SEPARATOR_ID}`,
+ parentId: AUTOFILL_CARD_ID,
+ type: "separator",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_CARD_ID}_${CREATE_CARD_ID}`,
+ parentId: AUTOFILL_CARD_ID,
+ title: this.i18nService.t("addCardMenu"),
+ type: "normal",
+ });
+ }
+
+ async noIdentities() {
+ await this.create({
+ id: `${AUTOFILL_IDENTITY_ID}_NOTICE`,
+ enabled: false,
+ parentId: AUTOFILL_IDENTITY_ID,
+ title: this.i18nService.t("noIdentities"),
+ type: "normal",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_IDENTITY_ID}_${SEPARATOR_ID}`,
+ parentId: AUTOFILL_IDENTITY_ID,
+ type: "separator",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_IDENTITY_ID}_${CREATE_IDENTITY_ID}`,
+ parentId: AUTOFILL_IDENTITY_ID,
+ title: this.i18nService.t("addIdentityMenu"),
+ type: "normal",
+ });
+ }
+
+ async noLogins() {
+ await this.create({
+ id: `${AUTOFILL_ID}_NOTICE`,
+ enabled: false,
+ parentId: AUTOFILL_ID,
+ title: this.i18nService.t("noMatchingLogins"),
+ type: "normal",
+ });
+
+ await this.create({
+ id: `${AUTOFILL_ID}_${SEPARATOR_ID}` + 1,
+ parentId: AUTOFILL_ID,
+ type: "separator",
+ });
+
+ await this.loadOptions(this.i18nService.t("addLoginMenu"), CREATE_LOGIN_ID);
}
}
diff --git a/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
index baced83894d..7bfe7934046 100644
--- a/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
+++ b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
import { ClearClipboard } from "./clear-clipboard";
diff --git a/apps/browser/src/autofill/clipboard/clear-clipboard.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.ts
index a96a72fc658..f8018bb036a 100644
--- a/apps/browser/src/autofill/clipboard/clear-clipboard.ts
+++ b/apps/browser/src/autofill/clipboard/clear-clipboard.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
export const clearClipboardAlarmName = "clearClipboard";
diff --git a/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
index 926b78b9762..92d35e70e57 100644
--- a/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
+++ b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts
@@ -1,4 +1,4 @@
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
/**
* Copies text to the clipboard in a MV3 safe way.
diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
index 38c62231ac8..3001087f74f 100644
--- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
+++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts
@@ -2,14 +2,14 @@ import { mock, MockProxy } from "jest-mock-extended";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
-import { setAlarmTime } from "../../alarms/alarm-state";
-import { BrowserApi } from "../../browser/browserApi";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../platform/alarms/alarm-state";
+import { BrowserApi } from "../../platform/browser/browser-api";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
import { clearClipboardAlarmName } from "./clear-clipboard";
import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command";
-jest.mock("../../alarms/alarm-state", () => {
+jest.mock("../../platform/alarms/alarm-state", () => {
return {
setAlarmTime: jest.fn(),
};
diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
index 7dd37a64ad4..62110166658 100644
--- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
+++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
@@ -1,7 +1,7 @@
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
-import { setAlarmTime } from "../../alarms/alarm-state";
-import { BrowserStateService } from "../../services/abstractions/browser-state.service";
+import { setAlarmTime } from "../../platform/alarms/alarm-state";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
import { clearClipboardAlarmName } from "./clear-clipboard";
import { copyToClipboard } from "./copy-to-clipboard-command";
diff --git a/apps/browser/src/autofill/commands/autofill-tab-command.ts b/apps/browser/src/autofill/commands/autofill-tab-command.ts
index 4910a6cf6fa..b51edd929ee 100644
--- a/apps/browser/src/autofill/commands/autofill-tab-command.ts
+++ b/apps/browser/src/autofill/commands/autofill-tab-command.ts
@@ -46,6 +46,7 @@ export class AutofillTabCommand {
onlyEmptyFields: false,
onlyVisibleFields: false,
fillNewPassword: true,
+ allowTotpAutofill: true,
});
}
diff --git a/apps/browser/src/autofill/constants.ts b/apps/browser/src/autofill/constants.ts
new file mode 100644
index 00000000000..ef82035aef7
--- /dev/null
+++ b/apps/browser/src/autofill/constants.ts
@@ -0,0 +1,29 @@
+export const TYPE_CHECK = {
+ FUNCTION: "function",
+ NUMBER: "number",
+ STRING: "string",
+} as const;
+
+export const EVENTS = {
+ CHANGE: "change",
+ INPUT: "input",
+ KEYDOWN: "keydown",
+ KEYPRESS: "keypress",
+ KEYUP: "keyup",
+} as const;
+
+/* Context Menu item Ids */
+export const AUTOFILL_CARD_ID = "autofill-card";
+export const AUTOFILL_ID = "autofill";
+export const AUTOFILL_IDENTITY_ID = "autofill-identity";
+export const COPY_IDENTIFIER_ID = "copy-identifier";
+export const COPY_PASSWORD_ID = "copy-password";
+export const COPY_USERNAME_ID = "copy-username";
+export const COPY_VERIFICATIONCODE_ID = "copy-totp";
+export const CREATE_CARD_ID = "create-card";
+export const CREATE_IDENTITY_ID = "create-identity";
+export const CREATE_LOGIN_ID = "create-login";
+export const GENERATE_PASSWORD_ID = "generate-password";
+export const NOOP_COMMAND_SUFFIX = "noop";
+export const ROOT_ID = "root";
+export const SEPARATOR_ID = "separator";
diff --git a/apps/browser/src/autofill/content/abstractions/autofill-init.ts b/apps/browser/src/autofill/content/abstractions/autofill-init.ts
new file mode 100644
index 00000000000..706c6da4ee1
--- /dev/null
+++ b/apps/browser/src/autofill/content/abstractions/autofill-init.ts
@@ -0,0 +1,21 @@
+import AutofillScript from "../../models/autofill-script";
+
+type AutofillExtensionMessage = {
+ command: string;
+ tab?: chrome.tabs.Tab;
+ sender?: string;
+ fillScript?: AutofillScript;
+};
+
+type AutofillExtensionMessageHandlers = {
+ [key: string]: CallableFunction;
+ collectPageDetails: (message: { message: AutofillExtensionMessage }) => void;
+ collectPageDetailsImmediately: (message: { message: AutofillExtensionMessage }) => void;
+ fillForm: (message: { message: AutofillExtensionMessage }) => void;
+};
+
+interface AutofillInit {
+ init(): void;
+}
+
+export { AutofillExtensionMessage, AutofillExtensionMessageHandlers, AutofillInit };
diff --git a/apps/browser/src/autofill/content/autofill-init.spec.ts b/apps/browser/src/autofill/content/autofill-init.spec.ts
new file mode 100644
index 00000000000..447fe31a8a3
--- /dev/null
+++ b/apps/browser/src/autofill/content/autofill-init.spec.ts
@@ -0,0 +1,175 @@
+import { mock } from "jest-mock-extended";
+
+import AutofillPageDetails from "../models/autofill-page-details";
+import AutofillScript from "../models/autofill-script";
+
+import { AutofillExtensionMessage } from "./abstractions/autofill-init";
+
+describe("AutofillInit", () => {
+ let bitwardenAutofillInit: any;
+
+ beforeEach(() => {
+ require("../content/autofill-init");
+ bitwardenAutofillInit = window.bitwardenAutofillInit;
+ });
+
+ afterEach(() => {
+ jest.resetModules();
+ jest.clearAllMocks();
+ });
+
+ describe("init", () => {
+ it("sets up the extension message listeners", () => {
+ jest.spyOn(bitwardenAutofillInit, "setupExtensionMessageListeners");
+
+ bitwardenAutofillInit.init();
+
+ expect(bitwardenAutofillInit.setupExtensionMessageListeners).toHaveBeenCalled();
+ });
+ });
+
+ describe("collectPageDetails", () => {
+ let extensionMessage: AutofillExtensionMessage;
+ let pageDetails: AutofillPageDetails;
+
+ beforeEach(() => {
+ extensionMessage = {
+ command: "collectPageDetails",
+ tab: mock(),
+ sender: "sender",
+ };
+ pageDetails = {
+ title: "title",
+ url: "http://example.com",
+ documentUrl: "documentUrl",
+ forms: {},
+ fields: [],
+ collectedTimestamp: 0,
+ };
+ jest
+ .spyOn(bitwardenAutofillInit.collectAutofillContentService, "getPageDetails")
+ .mockReturnValue(pageDetails);
+ });
+
+ it("returns collected page details for autofill if set to send the details in the response", async () => {
+ const response = await bitwardenAutofillInit["collectPageDetails"](extensionMessage, true);
+
+ expect(bitwardenAutofillInit.collectAutofillContentService.getPageDetails).toHaveBeenCalled();
+ expect(response).toEqual(pageDetails);
+ });
+
+ it("sends the collected page details for autofill using a background script message", async () => {
+ jest.spyOn(chrome.runtime, "sendMessage");
+
+ await bitwardenAutofillInit["collectPageDetails"](extensionMessage);
+
+ expect(chrome.runtime.sendMessage).toHaveBeenCalledWith({
+ command: "collectPageDetailsResponse",
+ tab: extensionMessage.tab,
+ details: pageDetails,
+ sender: extensionMessage.sender,
+ });
+ });
+ });
+
+ describe("fillForm", () => {
+ it("will call the InsertAutofillContentService to fill the form", () => {
+ const fillScript = mock();
+ jest
+ .spyOn(bitwardenAutofillInit.insertAutofillContentService, "fillForm")
+ .mockImplementation();
+
+ bitwardenAutofillInit.fillForm(fillScript);
+
+ expect(bitwardenAutofillInit.insertAutofillContentService.fillForm).toHaveBeenCalledWith(
+ fillScript
+ );
+ });
+ });
+
+ describe("setupExtensionMessageListeners", () => {
+ it("sets up a chrome runtime on message listener", () => {
+ jest.spyOn(chrome.runtime.onMessage, "addListener");
+
+ bitwardenAutofillInit["setupExtensionMessageListeners"]();
+
+ expect(chrome.runtime.onMessage.addListener).toHaveBeenCalledWith(
+ bitwardenAutofillInit["handleExtensionMessage"]
+ );
+ });
+ });
+
+ describe("handleExtensionMessage", () => {
+ let message: AutofillExtensionMessage;
+ let sender: chrome.runtime.MessageSender;
+ const sendResponse = jest.fn();
+
+ beforeEach(() => {
+ message = {
+ command: "collectPageDetails",
+ tab: mock(),
+ sender: "sender",
+ };
+ sender = mock();
+ });
+
+ it("returns a false value if a extension message handler is not found with the given message command", () => {
+ message.command = "unknownCommand";
+
+ const response = bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+
+ expect(response).toBe(false);
+ });
+
+ it("returns a false value if the message handler does not return a response", async () => {
+ const response1 = await bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+ await Promise.resolve(response1);
+
+ expect(response1).not.toBe(false);
+
+ message.command = "fillForm";
+ message.fillScript = mock();
+
+ const response2 = await bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+
+ expect(response2).toBe(false);
+ });
+
+ it("returns a true value and calls sendResponse if the message handler returns a response", async () => {
+ message.command = "collectPageDetailsImmediately";
+ const pageDetails: AutofillPageDetails = {
+ title: "title",
+ url: "http://example.com",
+ documentUrl: "documentUrl",
+ forms: {},
+ fields: [],
+ collectedTimestamp: 0,
+ };
+ jest
+ .spyOn(bitwardenAutofillInit.collectAutofillContentService, "getPageDetails")
+ .mockReturnValue(pageDetails);
+
+ const response = await bitwardenAutofillInit["handleExtensionMessage"](
+ message,
+ sender,
+ sendResponse
+ );
+ await Promise.resolve(response);
+
+ expect(response).toBe(true);
+ expect(sendResponse).toHaveBeenCalledWith(pageDetails);
+ });
+ });
+});
diff --git a/apps/browser/src/autofill/content/autofill-init.ts b/apps/browser/src/autofill/content/autofill-init.ts
new file mode 100644
index 00000000000..8b441ae0e20
--- /dev/null
+++ b/apps/browser/src/autofill/content/autofill-init.ts
@@ -0,0 +1,130 @@
+import AutofillPageDetails from "../models/autofill-page-details";
+import AutofillScript from "../models/autofill-script";
+import CollectAutofillContentService from "../services/collect-autofill-content.service";
+import DomElementVisibilityService from "../services/dom-element-visibility.service";
+import InsertAutofillContentService from "../services/insert-autofill-content.service";
+
+import {
+ AutofillExtensionMessage,
+ AutofillExtensionMessageHandlers,
+ AutofillInit as AutofillInitInterface,
+} from "./abstractions/autofill-init";
+
+class AutofillInit implements AutofillInitInterface {
+ private readonly domElementVisibilityService: DomElementVisibilityService;
+ private readonly collectAutofillContentService: CollectAutofillContentService;
+ private readonly insertAutofillContentService: InsertAutofillContentService;
+ private readonly extensionMessageHandlers: AutofillExtensionMessageHandlers = {
+ collectPageDetails: ({ message }) => this.collectPageDetails(message),
+ collectPageDetailsImmediately: ({ message }) => this.collectPageDetails(message, true),
+ fillForm: ({ message }) => this.fillForm(message.fillScript),
+ };
+
+ /**
+ * AutofillInit constructor. Initializes the DomElementVisibilityService,
+ * CollectAutofillContentService and InsertAutofillContentService classes.
+ */
+ constructor() {
+ this.domElementVisibilityService = new DomElementVisibilityService();
+ this.collectAutofillContentService = new CollectAutofillContentService(
+ this.domElementVisibilityService
+ );
+ this.insertAutofillContentService = new InsertAutofillContentService(
+ this.domElementVisibilityService,
+ this.collectAutofillContentService
+ );
+ }
+
+ /**
+ * Initializes the autofill content script, setting up
+ * the extension message listeners. This method should
+ * be called once when the content script is loaded.
+ * @public
+ */
+ init() {
+ this.setupExtensionMessageListeners();
+ }
+
+ /**
+ * Collects the page details and sends them to the
+ * extension background script. If the `sendDetailsInResponse`
+ * parameter is set to true, the page details will be
+ * returned to facilitate sending the details in the
+ * response to the extension message.
+ * @param {AutofillExtensionMessage} message
+ * @param {boolean} sendDetailsInResponse
+ * @returns {AutofillPageDetails | void}
+ * @private
+ */
+ private async collectPageDetails(
+ message: AutofillExtensionMessage,
+ sendDetailsInResponse = false
+ ): Promise {
+ const pageDetails: AutofillPageDetails =
+ await this.collectAutofillContentService.getPageDetails();
+ if (sendDetailsInResponse) {
+ return pageDetails;
+ }
+
+ chrome.runtime.sendMessage({
+ command: "collectPageDetailsResponse",
+ tab: message.tab,
+ details: pageDetails,
+ sender: message.sender,
+ });
+ }
+
+ /**
+ * Fills the form with the given fill script.
+ * @param {AutofillScript} fillScript
+ * @private
+ */
+ private fillForm(fillScript: AutofillScript) {
+ this.insertAutofillContentService.fillForm(fillScript);
+ }
+
+ /**
+ * Sets up the extension message listeners
+ * for the content script.
+ * @private
+ */
+ private setupExtensionMessageListeners() {
+ chrome.runtime.onMessage.addListener(this.handleExtensionMessage);
+ }
+
+ /**
+ * Handles the extension messages
+ * sent to the content script.
+ * @param {AutofillExtensionMessage} message
+ * @param {chrome.runtime.MessageSender} sender
+ * @param {(response?: any) => void} sendResponse
+ * @returns {boolean}
+ * @private
+ */
+ private handleExtensionMessage = (
+ message: AutofillExtensionMessage,
+ sender: chrome.runtime.MessageSender,
+ sendResponse: (response?: any) => void
+ ): boolean => {
+ const command: string = message.command;
+ const handler: CallableFunction | undefined = this.extensionMessageHandlers[command];
+ if (!handler) {
+ return false;
+ }
+
+ const messageResponse = handler({ message, sender });
+ if (!messageResponse) {
+ return false;
+ }
+
+ Promise.resolve(messageResponse).then((response) => sendResponse(response));
+ return true;
+ };
+}
+
+(function () {
+ if (!window.bitwardenAutofillInit) {
+ window.bitwardenAutofillInit = new AutofillInit();
+ window.bitwardenAutofillInit.init();
+ }
+})();
diff --git a/apps/browser/src/autofill/content/autofill.js b/apps/browser/src/autofill/content/autofill.js
index 052fd1120fe..2f3857d3fa8 100644
--- a/apps/browser/src/autofill/content/autofill.js
+++ b/apps/browser/src/autofill/content/autofill.js
@@ -751,8 +751,8 @@
].join('\n\n');
if (
- // At least one of the `savedURLs` uses SSL
- savedURLs.some(url => url.startsWith('https://')) &&
+ // At least one of the `savedURLs` uses SSL for the current page
+ savedURLs.some(url => url.startsWith(`https://${window.location.hostname}`)) &&
// The current page is not using SSL
document.location.protocol === 'http:' &&
// There are password inputs on the page
@@ -768,8 +768,16 @@
// Detect if within an iframe, and the iframe is sandboxed
function isSandboxed() {
- // self.origin is 'null' if inside a frame with sandboxed csp or iframe tag
- return self.origin == null || self.origin === 'null';
+ // self.origin is 'null' if inside a frame with sandboxed csp or iframe tag
+ if (String(self.origin).toLowerCase() === "null") {
+ return true;
+ }
+
+ if (window.frameElement?.hasAttribute("sandbox")) {
+ return true;
+ }
+
+ return location.hostname === "";
}
function doFill(fillScript) {
@@ -978,13 +986,18 @@
styleTimeout = 200;
/**
- * Fll an element `el` using the value `op` from the fill script
+ * Fill an element `el` using the value `op` from the fill script
* @param {HTMLElement} el
* @param {string} op
*/
function fillTheElement(el, op) {
var shouldCheck;
if (el && null !== op && void 0 !== op && !(el.disabled || el.a || el.readOnly)) {
+ const tabURLChanged = !fillScript.savedUrls?.some(url => url.startsWith(window.location.origin))
+ // Check to make sure the page location didn't change
+ if (tabURLChanged) {
+ return;
+ }
switch (markTheFilling && el.form && !el.form.opfilled && (el.form.opfilled = true),
el.type ? el.type.toLowerCase() : null) {
case 'checkbox':
diff --git a/apps/browser/src/autofill/content/autofiller.ts b/apps/browser/src/autofill/content/autofiller.ts
index 7fe9e5514a8..7f58e72c7d3 100644
--- a/apps/browser/src/autofill/content/autofiller.ts
+++ b/apps/browser/src/autofill/content/autofiller.ts
@@ -1,4 +1,10 @@
-document.addEventListener("DOMContentLoaded", (event) => {
+if (document.readyState === "loading") {
+ document.addEventListener("DOMContentLoaded", loadAutofiller);
+} else {
+ loadAutofiller();
+}
+
+function loadAutofiller() {
let pageHref: string = null;
let filledThisHref = false;
let delayFillTimeout: number;
@@ -49,4 +55,4 @@ document.addEventListener("DOMContentLoaded", (event) => {
chrome.runtime.sendMessage(msg);
}
}
-});
+}
diff --git a/apps/browser/src/autofill/content/autofillv2.ts b/apps/browser/src/autofill/content/autofillv2.ts
deleted file mode 100644
index 8bf16ff879c..00000000000
--- a/apps/browser/src/autofill/content/autofillv2.ts
+++ /dev/null
@@ -1,1391 +0,0 @@
-/* eslint-disable no-var, no-console, no-prototype-builtins */
-// These eslint rules are disabled because the original JS was not written with them in mind and we don't want to fix
-// them all now
-
-/*
- 1Password Extension
-
- Lovingly handcrafted by Dave Teare, Michael Fey, Rad Azzouz, and Roustem Karimov.
- Copyright (c) 2014 AgileBits. All rights reserved.
-
- ================================================================================
-
- Copyright (c) 2014 AgileBits Inc.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
- */
-
-/*
- MODIFICATIONS FROM ORIGINAL
-
- 1. Populate isFirefox
- 2. Remove isChrome and isSafari since they are not used.
- 3. Unminify and format to meet Mozilla review requirements.
- 4. Remove unnecessary input types from getFormElements query selector and limit number of elements returned.
- 5. Remove fakeTested prop.
- 6. Rename com.agilebits.* stuff to com.bitwarden.*
- 7. Remove "some useful globals" on window
- 8. Add ability to autofill span[data-bwautofill] elements
- 9. Add new handler, for new command that responds with page details in response callback
- 10. Handle sandbox iframe and sandbox rule in CSP
- 11. Work on array of saved urls instead of just one to determine if we should autofill non-https sites
- 12. Remove setting of attribute com.browser.browser.userEdited on user-inputs
- 13. Handle null value URLs in urlNotSecure
- 14. Convert to Typescript, add typings and remove dead code (not marked with START/END MODIFICATION)
- */
-import AutofillForm from "../models/autofill-form";
-import AutofillPageDetails from "../models/autofill-page-details";
-import AutofillScript, {
- AutofillScriptOptions,
- FillScript,
- FillScriptOp,
-} from "../models/autofill-script";
-
-/**
- * The Document with additional custom properties added by this script
- */
-type AutofillDocument = Document & {
- elementsByOPID: Record;
- elementForOPID: (opId: string) => Element;
-};
-
-/**
- * A HTMLElement (usually a form element) with additional custom properties added by this script
- */
-type ElementWithOpId = T & {
- opid: string;
-};
-
-/**
- * This script's definition of a Form Element (only a subset of HTML form elements)
- * This is defined by getFormElements
- */
-type FormElement = HTMLInputElement | HTMLSelectElement | HTMLSpanElement;
-
-/**
- * A Form Element that we can set a value on (fill)
- */
-type FillableControl = HTMLInputElement | HTMLSelectElement;
-
-function collect(document: Document) {
- // START MODIFICATION
- var isFirefox =
- navigator.userAgent.indexOf("Firefox") !== -1 || navigator.userAgent.indexOf("Gecko/") !== -1;
- // END MODIFICATION
-
- (document as AutofillDocument).elementsByOPID = {};
-
- function getPageDetails(theDoc: Document, oneShotId: string) {
- // start helpers
-
- /**
- * For a given element `el`, returns the value of the attribute `attrName`.
- * @param {HTMLElement} el
- * @param {string} attrName
- * @returns {string} The value of the attribute
- */
- function getElementAttrValue(el: any, attrName: string) {
- var attrVal = el[attrName];
- if ("string" == typeof attrVal) {
- return attrVal;
- }
- attrVal = el.getAttribute(attrName);
- return "string" == typeof attrVal ? attrVal : null;
- }
-
- /**
- * Returns the value of the given element.
- * @param {HTMLElement} el
- * @returns {any} Value of the element
- */
- function getElementValue(el: any) {
- switch (toLowerString(el.type)) {
- case "checkbox":
- return el.checked ? "✓" : "";
-
- case "hidden":
- el = el.value;
- if (!el || "number" != typeof el.length) {
- return "";
- }
- 254 < el.length && (el = el.substr(0, 254) + "...SNIPPED");
- return el;
-
- default:
- // START MODIFICATION
- if (!el.type && el.tagName.toLowerCase() === "span") {
- return el.innerText;
- }
- // END MODIFICATION
- return el.value;
- }
- }
-
- /**
- * If `el` is a `
+
+
+
+
+
+
+
+
+
@@ -123,7 +125,7 @@
-
+
+
+
+
+
+
+