-
-
+
+
-
+
+
+
+
{{ "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.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..1cb006fa3a2 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];
@@ -459,4 +506,22 @@ export default class NotificationBackground {
this.policyService.policyAppliesToActiveUser$(PolicyType.PersonalOwnership)
);
}
+
+ private async handleUnlockCompleted(
+ messageData: LockedVaultPendingNotificationsItem,
+ sender: chrome.runtime.MessageSender
+ ): Promise
{
- 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.ts b/apps/browser/src/auth/popup/login.component.ts
index cc48a75e4e9..d9b789e4d81 100644
--- a/apps/browser/src/auth/popup/login.component.ts
+++ b/apps/browser/src/auth/popup/login.component.ts
@@ -3,22 +3,22 @@ import { FormBuilder } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router";
import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.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 { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
-import { Utils } from "@bitwarden/common/misc/utils";
+import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.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 { Utils } from "@bitwarden/common/platform/misc/utils";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { flagEnabled } from "../../flags";
+import { flagEnabled } from "../../platform/flags";
@Component({
selector: "app-login",
@@ -27,7 +27,7 @@ import { flagEnabled } from "../../flags";
export class LoginComponent extends BaseLoginComponent {
showPasswordless = false;
constructor(
- apiService: ApiService,
+ devicesApiService: DevicesApiServiceAbstraction,
appIdService: AppIdService,
authService: AuthService,
router: Router,
@@ -46,7 +46,7 @@ export class LoginComponent extends BaseLoginComponent {
loginService: LoginService
) {
super(
- apiService,
+ devicesApiService,
appIdService,
authService,
router,
diff --git a/apps/browser/src/auth/popup/register.component.ts b/apps/browser/src/auth/popup/register.component.ts
index f7a80b62938..1599af2216c 100644
--- a/apps/browser/src/auth/popup/register.component.ts
+++ b/apps/browser/src/auth/popup/register.component.ts
@@ -3,18 +3,18 @@ import { UntypedFormBuilder } from "@angular/forms";
import { Router } from "@angular/router";
import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.component";
-import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
+import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.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 { AuthService } from "@bitwarden/common/auth/abstractions/auth.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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
+import { DialogService } from "@bitwarden/components";
@Component({
selector: "app-register",
@@ -38,7 +38,7 @@ export class RegisterComponent extends BaseRegisterComponent {
environmentService: EnvironmentService,
logService: LogService,
auditService: AuditService,
- dialogService: DialogServiceAbstraction
+ dialogService: DialogService
) {
super(
formValidationErrorService,
diff --git a/apps/browser/src/auth/popup/services/index.ts b/apps/browser/src/auth/popup/services/index.ts
index 06bfe0009bd..63563f61fd9 100644
--- a/apps/browser/src/auth/popup/services/index.ts
+++ b/apps/browser/src/auth/popup/services/index.ts
@@ -1,2 +1 @@
-export { LockGuardService } from "./lock-guard.service";
export { UnauthGuardService } from "./unauth-guard.service";
diff --git a/apps/browser/src/auth/popup/services/lock-guard.service.ts b/apps/browser/src/auth/popup/services/lock-guard.service.ts
deleted file mode 100644
index ef6ebc73aca..00000000000
--- a/apps/browser/src/auth/popup/services/lock-guard.service.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Injectable } from "@angular/core";
-
-import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/auth/guards/lock.guard";
-
-@Injectable()
-export class LockGuardService extends BaseLockGuardService {
- protected homepage = "tabs/current";
-}
diff --git a/apps/browser/src/auth/popup/services/unauth-guard.service.ts b/apps/browser/src/auth/popup/services/unauth-guard.service.ts
index 4aa700b5568..062239a7d36 100644
--- a/apps/browser/src/auth/popup/services/unauth-guard.service.ts
+++ b/apps/browser/src/auth/popup/services/unauth-guard.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from "@angular/core";
-import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/auth/guards/unauth.guard";
+import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/auth/guards";
@Injectable()
export class UnauthGuardService extends BaseUnauthGuardService {
diff --git a/apps/browser/src/auth/popup/set-password.component.ts b/apps/browser/src/auth/popup/set-password.component.ts
index 35af812714a..73b092f32e0 100644
--- a/apps/browser/src/auth/popup/set-password.component.ts
+++ b/apps/browser/src/auth/popup/set-password.component.ts
@@ -2,19 +2,19 @@ import { Component } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/components/set-password.component";
-import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { StateService } from "@bitwarden/common/abstractions/state.service";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { DialogService } from "@bitwarden/components";
@Component({
selector: "app-set-password",
@@ -36,7 +36,7 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
route: ActivatedRoute,
organizationApiService: OrganizationApiServiceAbstraction,
organizationUserService: OrganizationUserService,
- dialogService: DialogServiceAbstraction
+ dialogService: DialogService
) {
super(
i18nService,
diff --git a/apps/browser/src/auth/popup/sso.component.ts b/apps/browser/src/auth/popup/sso.component.ts
index 3892704ca47..9d04701680e 100644
--- a/apps/browser/src/auth/popup/sso.component.ts
+++ b/apps/browser/src/auth/popup/sso.component.ts
@@ -1,21 +1,22 @@
-import { Component } from "@angular/core";
+import { Component, Inject } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/auth/components/sso.component";
+import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
import { ApiService } from "@bitwarden/common/abstractions/api.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 { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
+import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.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 { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { BrowserApi } from "../../browser/browserApi";
+import { BrowserApi } from "../../platform/browser/browser-api";
@Component({
selector: "app-sso",
@@ -35,7 +36,8 @@ export class SsoComponent extends BaseSsoComponent {
syncService: SyncService,
environmentService: EnvironmentService,
logService: LogService,
- private vaultTimeoutService: VaultTimeoutService
+ configService: ConfigServiceAbstraction,
+ @Inject(WINDOW) private win: Window
) {
super(
authService,
@@ -48,7 +50,8 @@ export class SsoComponent extends BaseSsoComponent {
cryptoFunctionService,
environmentService,
passwordGenerationService,
- logService
+ logService,
+ configService
);
const url = this.environmentService.getWebVaultUrl();
@@ -57,15 +60,22 @@ export class SsoComponent extends BaseSsoComponent {
this.clientId = "browser";
super.onSuccessfulLogin = async () => {
- 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 @@
+
+
+
+
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 }}
-- {{ "fingerprintMatchInfo" | i18n }} -
+
+
+
+ {{ "notificationSentDevice" | i18n }}
+ ++ {{ "fingerprintMatchInfo" | i18n }} +
+
+ {{ "fingerprintPhraseHeader" | i18n }}
+
+
+
+
+
+ {{ fingerprintPhrase }}
+
- {{ "fingerprintPhraseHeader" | i18n }}
-
+
- {{ fingerprintPhrase }}
-
{{ "adminApprovalRequested" | i18n }}
- +
+
-
- {{ "adminApprovalRequestSentToAdmins" | i18n }}
+{{ "youWillBeNotifiedOnceApproved" | i18n }}
+
-
+
{{ "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.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..1cb006fa3a2 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];
@@ -459,4 +506,22 @@ export default class NotificationBackground {
this.policyService.policyAppliesToActiveUser$(PolicyType.PersonalOwnership)
);
}
+
+ private async handleUnlockCompleted(
+ messageData: LockedVaultPendingNotificationsItem,
+ sender: chrome.runtime.MessageSender
+ ): Promise {
+ 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..dbe391ce4ab 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
@@ -1,6 +1,7 @@
import { mock, MockProxy } from "jest-mock-extended";
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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
@@ -13,6 +14,7 @@ describe("CipherContextMenuHandler", () => {
let mainContextMenuHandler: MockProxy;
let authService: MockProxy;
let cipherService: MockProxy;
+ let userVerificationService: MockProxy;
let sut: CipherContextMenuHandler;
@@ -20,10 +22,17 @@ describe("CipherContextMenuHandler", () => {
mainContextMenuHandler = mock();
authService = mock();
cipherService = mock();
+ userVerificationService = mock();
+ userVerificationService.hasMasterPassword.mockResolvedValue(true);
jest.spyOn(MainContextMenuHandler, "removeAll").mockResolvedValue();
- sut = new CipherContextMenuHandler(mainContextMenuHandler, authService, cipherService);
+ sut = new CipherContextMenuHandler(
+ mainContextMenuHandler,
+ authService,
+ cipherService,
+ userVerificationService
+ );
});
afterEach(() => jest.resetAllMocks());
@@ -83,11 +92,11 @@ describe("CipherContextMenuHandler", () => {
};
cipherService.getAllDecryptedForUrl.mockResolvedValue([
- null,
- undefined,
- { type: CipherType.Card },
- { type: CipherType.Login, reprompt: CipherRepromptType.Password },
- realCipher,
+ null, // invalid cipher
+ undefined, // invalid cipher
+ { type: CipherType.Card }, // invalid cipher
+ { type: CipherType.Login, reprompt: CipherRepromptType.Password }, // invalid cipher
+ realCipher, // valid cipher
] as any[]);
await sut.update("https://test.com");
@@ -96,7 +105,7 @@ describe("CipherContextMenuHandler", () => {
expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
- expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledTimes(1);
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledTimes(2);
expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
"Test Cipher (Test Username)",
@@ -105,5 +114,61 @@ describe("CipherContextMenuHandler", () => {
realCipher
);
});
+
+ it("adds ciphers with master password reprompt if the user does not have a master password", async () => {
+ authService.getAuthStatus.mockResolvedValue(AuthenticationStatus.Unlocked);
+
+ // User does not have a master password, or has one but hasn't logged in with it (key connector user or TDE user)
+ userVerificationService.hasMasterPasswordAndMasterKeyHash.mockResolvedValue(false);
+
+ mainContextMenuHandler.init.mockResolvedValue(true);
+
+ const realCipher = {
+ id: "5",
+ type: CipherType.Login,
+ reprompt: CipherRepromptType.None,
+ name: "Test Cipher",
+ login: { username: "Test Username" },
+ };
+
+ const repromptCipher = {
+ id: "6",
+ type: CipherType.Login,
+ reprompt: CipherRepromptType.Password,
+ name: "Test Reprompt Cipher",
+ login: { username: "Test Username" },
+ };
+
+ cipherService.getAllDecryptedForUrl.mockResolvedValue([
+ null, // invalid cipher
+ undefined, // invalid cipher
+ { type: CipherType.Card }, // invalid cipher
+ repromptCipher, // valid cipher
+ realCipher, // valid cipher
+ ] as any[]);
+
+ await sut.update("https://test.com");
+
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledTimes(1);
+
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith("https://test.com");
+
+ // Should call this twice, once for each valid cipher
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledTimes(2);
+
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
+ "Test Cipher (Test Username)",
+ "5",
+ "https://test.com",
+ realCipher
+ );
+
+ expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith(
+ "Test Reprompt Cipher (Test Username)",
+ "6",
+ "https://test.com",
+ repromptCipher
+ );
+ });
});
});
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..1d1be8f8386 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,10 @@
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 { 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,9 +12,10 @@ 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 { userVerificationServiceFactory } from "../../auth/background/service-factories/user-verification-service.factory";
import { Account } from "../../models/account";
+import { CachedServices } from "../../platform/background/service-factories/factory-options";
+import { BrowserApi } from "../../platform/browser/browser-api";
import {
cipherServiceFactory,
CipherServiceInitOptions,
@@ -38,7 +39,8 @@ export class CipherContextMenuHandler {
constructor(
private mainContextMenuHandler: MainContextMenuHandler,
private authService: AuthService,
- private cipherService: CipherService
+ private cipherService: CipherService,
+ private userVerificationService: UserVerificationService
) {}
static async create(cachedServices: CachedServices) {
@@ -77,10 +79,17 @@ export class CipherContextMenuHandler {
return new CipherContextMenuHandler(
await MainContextMenuHandler.mv3Create(cachedServices),
await authServiceFactory(cachedServices, serviceOptions),
- await cipherServiceFactory(cachedServices, serviceOptions)
+ await cipherServiceFactory(cachedServices, serviceOptions),
+ await userVerificationServiceFactory(cachedServices, serviceOptions)
);
}
+ 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
@@ -174,7 +183,7 @@ export class CipherContextMenuHandler {
if (
cipher == null ||
cipher.type !== CipherType.Login ||
- cipher.reprompt !== CipherRepromptType.None
+ (await this.userVerificationService.hasMasterPasswordAndMasterKeyHash())
) {
return;
}
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..38e605abe70 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -3,8 +3,8 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
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 { 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 { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -15,12 +15,12 @@ import {
} from "../../auth/background/service-factories/auth-service.factory";
import { totpServiceFactory } from "../../auth/background/service-factories/totp-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,
@@ -203,17 +203,45 @@ export class ContextMenuClickedHandler {
if (tab == null) {
return;
}
- await this.autofillAction(tab, cipher);
+
+ if (cipher.reprompt !== CipherRepromptType.None) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ action: AUTOFILL_ID,
+ });
+ } else {
+ await this.autofillAction(tab, cipher);
+ }
+
break;
case COPY_USERNAME_ID:
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 (cipher.reprompt !== CipherRepromptType.None) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ action: COPY_PASSWORD_ID,
+ });
+ } 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 (cipher.reprompt !== CipherRepromptType.None) {
+ await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
+ cipherId: cipher.id,
+ action: COPY_VERIFICATIONCODE_ID,
+ });
+ } else {
+ this.copyToClipboard({
+ text: await this.totpService.getCode(cipher.login.totp),
+ tab: tab,
+ });
+ }
+
break;
}
}
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..6b599986b67 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";
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..9b16aa266db 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -1,26 +1,26 @@
-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";
+} from "../../platform/background/service-factories/state-service.factory";
+import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
export const ROOT_ID = "root";
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/content/autofill.js b/apps/browser/src/autofill/content/autofill.js
index 661eb8e2528..f6db33af97d 100644
--- a/apps/browser/src/autofill/content/autofill.js
+++ b/apps/browser/src/autofill/content/autofill.js
@@ -676,7 +676,7 @@
var els = [];
try {
var elsList = theDoc.querySelectorAll('input:not([type="hidden"]):not([type="submit"]):not([type="reset"])' +
- ':not([type="button"]):not([type="image"]):not([type="file"]):not([data-bwignore]), select, ' +
+ ':not([type="button"]):not([type="image"]):not([type="file"]):not([data-bwignore]), select, textarea, ' +
'span[data-bwautofill]');
els = Array.prototype.slice.call(elsList);
} catch (e) { }
@@ -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
@@ -1177,7 +1177,7 @@
}
try {
// START MODIFICATION
- var elements = Array.prototype.slice.call(selectAllFromDoc('input, select, button, ' +
+ var elements = Array.prototype.slice.call(selectAllFromDoc('input, select, button, textarea, ' +
'span[data-bwautofill]'));
// END MODIFICATION
var filteredElements = elements.filter(function (o) {
diff --git a/apps/browser/src/autofill/content/autofillv2.ts b/apps/browser/src/autofill/content/autofillv2.ts
new file mode 100644
index 00000000000..8bf16ff879c
--- /dev/null
+++ b/apps/browser/src/autofill/content/autofillv2.ts
@@ -0,0 +1,1391 @@
+/* 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 `
+
+
+
+
+
+