${NotificationHeader({
diff --git a/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts b/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts
index 2c22097f3d0..497664542ad 100644
--- a/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts
+++ b/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.spec.ts
@@ -110,6 +110,7 @@ describe("OverlayBackground", () => {
i18nService,
platformUtilsService,
themeStateService,
+ accountService,
);
jest
@@ -205,7 +206,7 @@ describe("OverlayBackground", () => {
await overlayBackground.updateOverlayCiphers();
expect(BrowserApi.getTabFromCurrentWindowId).toHaveBeenCalled();
- expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith(url);
+ expect(cipherService.getAllDecryptedForUrl).toHaveBeenCalledWith(url, mockUserId);
expect(overlayBackground["cipherService"].sortCiphersByLastUsedThenName).toHaveBeenCalled();
expect(overlayBackground["overlayLoginCiphers"]).toStrictEqual(
new Map([
diff --git a/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.ts b/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.ts
index 5dfade0f863..d0fad4cd00e 100644
--- a/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.ts
+++ b/apps/browser/src/autofill/deprecated/background/overlay.background.deprecated.ts
@@ -1,7 +1,8 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, map } from "rxjs";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
import { SHOW_AUTOFILL_BUTTON } from "@bitwarden/common/autofill/constants";
@@ -106,6 +107,7 @@ class LegacyOverlayBackground implements OverlayBackgroundInterface {
private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService,
private themeStateService: ThemeStateService,
+ private accountService: AccountService,
) {}
/**
@@ -152,9 +154,13 @@ class LegacyOverlayBackground implements OverlayBackgroundInterface {
}
this.overlayLoginCiphers = new Map();
- const ciphersViews = (await this.cipherService.getAllDecryptedForUrl(currentTab.url)).sort(
- (a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b),
+
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(map((a) => a?.id)),
);
+ const ciphersViews = (
+ await this.cipherService.getAllDecryptedForUrl(currentTab.url, activeUserId)
+ ).sort((a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b));
for (let cipherIndex = 0; cipherIndex < ciphersViews.length; cipherIndex++) {
this.overlayLoginCiphers.set(`overlay-cipher-${cipherIndex}`, ciphersViews[cipherIndex]);
}
@@ -660,10 +666,16 @@ class LegacyOverlayBackground implements OverlayBackgroundInterface {
cipherView.type = CipherType.Login;
cipherView.login = loginView;
- await this.cipherService.setAddEditCipherInfo({
- cipher: cipherView,
- collectionIds: cipherView.collectionIds,
- });
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(map((a) => a?.id)),
+ );
+ await this.cipherService.setAddEditCipherInfo(
+ {
+ cipher: cipherView,
+ collectionIds: cipherView.collectionIds,
+ },
+ activeUserId,
+ );
await this.openAddEditVaultItemPopout(sender.tab, { cipherId: cipherView.id });
await BrowserApi.sendMessage("inlineAutofillMenuRefreshAddEditCipher");
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index 202b144258d..2316df19857 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -84,23 +84,25 @@ function initNotificationBar(message: NotificationBarWindowMessage) {
document.body.innerHTML = "";
// Current implementations utilize a require for scss files which creates the need to remove the node.
document.head.querySelectorAll('link[rel="stylesheet"]').forEach((node) => node.remove());
-
const themeType = getTheme(globalThis, theme);
// There are other possible passed theme values, but for now, resolve to dark or light
const resolvedTheme: Theme = themeType === ThemeTypes.Dark ? ThemeTypes.Dark : ThemeTypes.Light;
- // @TODO use context to avoid prop drilling
- return render(
- NotificationContainer({
- ...notificationBarIframeInitData,
- type: notificationBarIframeInitData.type as NotificationType,
- theme: resolvedTheme,
- handleCloseNotification,
- i18n,
- }),
- document.body,
- );
+ sendPlatformMessage({ command: "bgGetDecryptedCiphers" }, (cipherData) => {
+ // @TODO use context to avoid prop drilling
+ return render(
+ NotificationContainer({
+ ...notificationBarIframeInitData,
+ type: notificationBarIframeInitData.type as NotificationType,
+ theme: resolvedTheme,
+ handleCloseNotification,
+ i18n,
+ ciphers: cipherData,
+ }),
+ document.body,
+ );
+ });
}
setNotificationBarTheme();
diff --git a/apps/browser/src/autofill/popup/fido2/fido2.component.ts b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
index 4555d87f249..24c14c98685 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
@@ -20,6 +20,7 @@ import {
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { SearchService } from "@bitwarden/common/abstractions/search.service";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -186,7 +187,10 @@ export class Fido2Component implements OnInit, OnDestroy {
this.domainSettingsService.getUrlEquivalentDomains(this.url),
);
- this.ciphers = (await this.cipherService.getAllDecrypted()).filter(
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(getUserId),
+ );
+ this.ciphers = (await this.cipherService.getAllDecrypted(activeUserId)).filter(
(cipher) => cipher.type === CipherType.Login && !cipher.isDeleted,
);
@@ -211,7 +215,7 @@ export class Fido2Component implements OnInit, OnDestroy {
this.ciphers = await Promise.all(
message.cipherIds.map(async (cipherId) => {
- const cipher = await this.cipherService.get(cipherId);
+ const cipher = await this.cipherService.get(cipherId, activeUserId);
return cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
@@ -232,7 +236,7 @@ export class Fido2Component implements OnInit, OnDestroy {
this.ciphers = await Promise.all(
message.existingCipherIds.map(async (cipherId) => {
- const cipher = await this.cipherService.get(cipherId);
+ const cipher = await this.cipherService.get(cipherId, activeUserId);
return cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts
index 378521cfc42..3843734ad64 100644
--- a/apps/browser/src/autofill/services/autofill.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -747,7 +747,7 @@ describe("AutofillService", () => {
jest.spyOn(autofillService as any, "generateFillScript");
jest.spyOn(autofillService as any, "generateLoginFillScript");
jest.spyOn(logService, "info");
- jest.spyOn(chrome.runtime, "sendMessage");
+ jest.spyOn(cipherService, "updateLastUsedDate");
jest.spyOn(eventCollectionService, "collect");
const autofillResult = await autofillService.doAutoFill(autofillOptions);
@@ -769,10 +769,10 @@ describe("AutofillService", () => {
);
expect(autofillService["generateLoginFillScript"]).toHaveBeenCalled();
expect(logService.info).not.toHaveBeenCalled();
- expect(chrome.runtime.sendMessage).toHaveBeenCalledWith({
- cipherId: autofillOptions.cipher.id,
- command: "updateLastUsedDate",
- });
+ expect(cipherService.updateLastUsedDate).toHaveBeenCalledWith(
+ autofillOptions.cipher.id,
+ mockUserId,
+ );
expect(chrome.tabs.sendMessage).toHaveBeenCalledWith(
autofillOptions.pageDetails[0].tab.id,
{
@@ -893,11 +893,11 @@ describe("AutofillService", () => {
it("skips updating the cipher's last used date if the passed options indicate that we should skip the last used cipher", async () => {
autofillOptions.skipLastUsed = true;
- jest.spyOn(chrome.runtime, "sendMessage");
+ jest.spyOn(cipherService, "updateLastUsedDate");
await autofillService.doAutoFill(autofillOptions);
- expect(chrome.runtime.sendMessage).not.toHaveBeenCalled();
+ expect(cipherService.updateLastUsedDate).not.toHaveBeenCalled();
});
it("returns early if the fillScript cannot be generated", async () => {
@@ -1033,8 +1033,8 @@ describe("AutofillService", () => {
const result = await autofillService.doAutoFillOnTab(pageDetails, tab, false);
expect(cipherService.getNextCipherForUrl).not.toHaveBeenCalled();
- expect(cipherService.getLastLaunchedForUrl).toHaveBeenCalledWith(tab.url, true);
- expect(cipherService.getLastUsedForUrl).toHaveBeenCalledWith(tab.url, true);
+ expect(cipherService.getLastLaunchedForUrl).toHaveBeenCalledWith(tab.url, mockUserId, true);
+ expect(cipherService.getLastUsedForUrl).toHaveBeenCalledWith(tab.url, mockUserId, true);
expect(autofillService.doAutoFill).not.toHaveBeenCalled();
expect(result).toBeNull();
});
@@ -1047,7 +1047,7 @@ describe("AutofillService", () => {
const result = await autofillService.doAutoFillOnTab(pageDetails, tab, true);
- expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url);
+ expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url, mockUserId);
expect(cipherService.getLastLaunchedForUrl).not.toHaveBeenCalled();
expect(cipherService.getLastUsedForUrl).not.toHaveBeenCalled();
expect(autofillService.doAutoFill).not.toHaveBeenCalled();
@@ -1077,7 +1077,7 @@ describe("AutofillService", () => {
const result = await autofillService.doAutoFillOnTab(pageDetails, tab, fromCommand);
- expect(cipherService.getLastLaunchedForUrl).toHaveBeenCalledWith(tab.url, true);
+ expect(cipherService.getLastLaunchedForUrl).toHaveBeenCalledWith(tab.url, mockUserId, true);
expect(cipherService.getLastUsedForUrl).not.toHaveBeenCalled();
expect(cipherService.updateLastUsedIndexForUrl).not.toHaveBeenCalled();
expect(autofillService.doAutoFill).toHaveBeenCalledWith({
@@ -1107,8 +1107,8 @@ describe("AutofillService", () => {
const result = await autofillService.doAutoFillOnTab(pageDetails, tab, fromCommand);
- expect(cipherService.getLastLaunchedForUrl).toHaveBeenCalledWith(tab.url, true);
- expect(cipherService.getLastUsedForUrl).toHaveBeenCalledWith(tab.url, true);
+ expect(cipherService.getLastLaunchedForUrl).toHaveBeenCalledWith(tab.url, mockUserId, true);
+ expect(cipherService.getLastUsedForUrl).toHaveBeenCalledWith(tab.url, mockUserId, true);
expect(cipherService.updateLastUsedIndexForUrl).not.toHaveBeenCalled();
expect(autofillService.doAutoFill).toHaveBeenCalledWith({
tab: tab,
@@ -1135,7 +1135,7 @@ describe("AutofillService", () => {
const result = await autofillService.doAutoFillOnTab(pageDetails, tab, fromCommand);
- expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url);
+ expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url, mockUserId);
expect(cipherService.updateLastUsedIndexForUrl).toHaveBeenCalledWith(tab.url);
expect(autofillService.doAutoFill).toHaveBeenCalledWith({
tab: tab,
@@ -1166,7 +1166,7 @@ describe("AutofillService", () => {
const result = await autofillService.doAutoFillOnTab(pageDetails, tab, true);
- expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url);
+ expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url, mockUserId);
expect(userVerificationService.hasMasterPasswordAndMasterKeyHash).toHaveBeenCalled();
expect(autofillService["openVaultItemPasswordRepromptPopout"]).toHaveBeenCalledWith(tab, {
cipherId: cipher.id,
@@ -1192,7 +1192,7 @@ describe("AutofillService", () => {
const result = await autofillService.doAutoFillOnTab(pageDetails, tab, true);
- expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url);
+ expect(cipherService.getNextCipherForUrl).toHaveBeenCalledWith(tab.url, mockUserId);
expect(autofillService["openVaultItemPasswordRepromptPopout"]).not.toHaveBeenCalled();
expect(autofillService.doAutoFill).not.toHaveBeenCalled();
expect(result).toBeNull();
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index c35b19990cb..fc7d0ebcc99 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -8,6 +8,7 @@ import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions
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 { getOptionalUserId } from "@bitwarden/common/auth/services/account.service";
import {
AutofillOverlayVisibility,
CardExpiryDateDelimiters,
@@ -463,13 +464,8 @@ export default class AutofillService implements AutofillServiceInterface {
fillScript.properties.delay_between_operations = 20;
didAutofill = true;
-
if (!options.skipLastUsed) {
- // In order to prevent a UI update send message to background script to update last used date
- await chrome.runtime.sendMessage({
- command: "updateLastUsedDate",
- cipherId: options.cipher.id,
- });
+ await this.cipherService.updateLastUsedDate(options.cipher.id, activeAccount.id);
}
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
@@ -532,17 +528,29 @@ export default class AutofillService implements AutofillServiceInterface {
autoSubmitLogin = false,
): Promise
{
let cipher: CipherView;
+
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(getOptionalUserId),
+ );
+ if (activeUserId == null) {
+ return null;
+ }
+
if (fromCommand) {
- cipher = await this.cipherService.getNextCipherForUrl(tab.url);
+ cipher = await this.cipherService.getNextCipherForUrl(tab.url, activeUserId);
} else {
- const lastLaunchedCipher = await this.cipherService.getLastLaunchedForUrl(tab.url, true);
+ const lastLaunchedCipher = await this.cipherService.getLastLaunchedForUrl(
+ tab.url,
+ activeUserId,
+ true,
+ );
if (
lastLaunchedCipher &&
Date.now().valueOf() - lastLaunchedCipher.localData?.lastLaunched?.valueOf() < 30000
) {
cipher = lastLaunchedCipher;
} else {
- cipher = await this.cipherService.getLastUsedForUrl(tab.url, true);
+ cipher = await this.cipherService.getLastUsedForUrl(tab.url, activeUserId, true);
}
}
@@ -631,12 +639,19 @@ export default class AutofillService implements AutofillServiceInterface {
let cipher: CipherView;
let cacheKey = "";
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(getOptionalUserId),
+ );
+ if (activeUserId == null) {
+ return null;
+ }
+
if (cipherType === CipherType.Card) {
cacheKey = "cardCiphers";
- cipher = await this.cipherService.getNextCardCipher();
+ cipher = await this.cipherService.getNextCardCipher(activeUserId);
} else {
cacheKey = "identityCiphers";
- cipher = await this.cipherService.getNextIdentityCipher();
+ cipher = await this.cipherService.getNextIdentityCipher(activeUserId);
}
if (!cipher || !cacheKey || (cipher.reprompt === CipherRepromptType.Password && !fromCommand)) {
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 7729981740d..d2b51c7ef40 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -1142,7 +1142,6 @@ export default class MainBackground {
this.accountService,
lockService,
this.billingAccountProfileStateService,
- this.cipherService,
);
this.nativeMessagingBackground = new NativeMessagingBackground(
this.keyService,
@@ -1259,6 +1258,7 @@ export default class MainBackground {
this.mainContextMenuHandler,
this.authService,
this.cipherService,
+ this.accountService,
);
if (chrome.webRequest != null && chrome.webRequest.onAuthRequired != null) {
@@ -1266,6 +1266,7 @@ export default class MainBackground {
this.platformUtilsService,
this.cipherService,
this.authService,
+ this.accountService,
chrome.webRequest,
);
}
@@ -1637,6 +1638,7 @@ export default class MainBackground {
this.i18nService,
this.platformUtilsService,
this.themeStateService,
+ this.accountService,
);
} else {
this.overlayBackground = new OverlayBackground(
@@ -1654,6 +1656,7 @@ export default class MainBackground {
this.inlineMenuFieldQualificationService,
this.themeStateService,
this.totpService,
+ this.accountService,
() => this.generatePassword(),
(password) => this.addPasswordToHistory(password),
);
diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts
index 8c369e966c5..8100ff3cffa 100644
--- a/apps/browser/src/background/nativeMessaging.background.ts
+++ b/apps/browser/src/background/nativeMessaging.background.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
import { delay, filter, firstValueFrom, from, map, race, timer } from "rxjs";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -57,26 +55,29 @@ type ReceiveMessageOuter = {
messageId?: number;
// Should only have one of these.
- message?: EncString;
+ message?: ReceiveMessage | EncString;
sharedSecret?: string;
};
type Callback = {
- resolver: any;
- rejecter: any;
+ resolver: (value?: unknown) => void;
+ rejecter: (reason?: any) => void;
+};
+
+type SecureChannel = {
+ privateKey: Uint8Array;
+ publicKey: Uint8Array;
+ sharedSecret?: SymmetricCryptoKey;
+ setupResolve: (value?: unknown) => void;
};
export class NativeMessagingBackground {
connected = false;
- private connecting: boolean;
- private port: browser.runtime.Port | chrome.runtime.Port;
+ private connecting: boolean = false;
+ private port?: browser.runtime.Port | chrome.runtime.Port;
+ private appId?: string;
- private privateKey: Uint8Array = null;
- private publicKey: Uint8Array = null;
- private secureSetupResolve: any = null;
- private sharedSecret: SymmetricCryptoKey;
- private appId: string;
- private validatingFingerprint: boolean;
+ private secureChannel?: SecureChannel;
private messageId = 0;
private callbacks = new Map();
@@ -108,11 +109,13 @@ export class NativeMessagingBackground {
async connect() {
this.logService.info("[Native Messaging IPC] Connecting to Bitwarden Desktop app...");
- this.appId = await this.appIdService.getAppId();
+ const appId = await this.appIdService.getAppId();
+ this.appId = appId;
await this.biometricStateService.setFingerprintValidated(false);
return new Promise((resolve, reject) => {
- this.port = BrowserApi.connectNative("com.8bit.bitwarden");
+ const port = BrowserApi.connectNative("com.8bit.bitwarden");
+ this.port = port;
this.connecting = true;
@@ -131,7 +134,8 @@ export class NativeMessagingBackground {
connectedCallback();
}
- this.port.onMessage.addListener(async (message: ReceiveMessageOuter) => {
+ port.onMessage.addListener(async (messageRaw: unknown) => {
+ const message = messageRaw as ReceiveMessageOuter;
switch (message.command) {
case "connected":
connectedCallback();
@@ -142,7 +146,7 @@ export class NativeMessagingBackground {
reject(new Error("startDesktop"));
}
this.connected = false;
- this.port.disconnect();
+ port.disconnect();
// reject all
for (const callback of this.callbacks.values()) {
callback.rejecter("disconnected");
@@ -151,18 +155,31 @@ export class NativeMessagingBackground {
break;
case "setupEncryption": {
// Ignore since it belongs to another device
- if (message.appId !== this.appId) {
+ if (message.appId !== appId) {
+ return;
+ }
+
+ if (message.sharedSecret == null) {
+ this.logService.info(
+ "[Native Messaging IPC] Unable to create secureChannel channel, no shared secret",
+ );
+ return;
+ }
+ if (this.secureChannel == null) {
+ this.logService.info(
+ "[Native Messaging IPC] Unable to create secureChannel channel, no secureChannel communication setup",
+ );
return;
}
const encrypted = Utils.fromB64ToArray(message.sharedSecret);
const decrypted = await this.cryptoFunctionService.rsaDecrypt(
encrypted,
- this.privateKey,
+ this.secureChannel.privateKey,
HashAlgorithmForEncryption,
);
- this.sharedSecret = new SymmetricCryptoKey(decrypted);
+ this.secureChannel.sharedSecret = new SymmetricCryptoKey(decrypted);
this.logService.info("[Native Messaging IPC] Secure channel established");
if ("messageId" in message) {
@@ -173,26 +190,27 @@ export class NativeMessagingBackground {
this.isConnectedToOutdatedDesktopClient = true;
}
- this.secureSetupResolve();
+ this.secureChannel.setupResolve();
break;
}
case "invalidateEncryption":
// Ignore since it belongs to another device
- if (message.appId !== this.appId) {
+ if (message.appId !== appId) {
return;
}
this.logService.warning(
"[Native Messaging IPC] Secure channel encountered an error; disconnecting and wiping keys...",
);
- this.sharedSecret = null;
- this.privateKey = null;
+ this.secureChannel = undefined;
this.connected = false;
- if (this.callbacks.has(message.messageId)) {
- this.callbacks.get(message.messageId).rejecter({
- message: "invalidateEncryption",
- });
+ if (message.messageId != null) {
+ if (this.callbacks.has(message.messageId)) {
+ this.callbacks.get(message.messageId)?.rejecter({
+ message: "invalidateEncryption",
+ });
+ }
}
return;
case "verifyFingerprint": {
@@ -217,21 +235,25 @@ export class NativeMessagingBackground {
break;
}
case "wrongUserId":
- if (this.callbacks.has(message.messageId)) {
- this.callbacks.get(message.messageId).rejecter({
- message: "wrongUserId",
- });
+ if (message.messageId != null) {
+ if (this.callbacks.has(message.messageId)) {
+ this.callbacks.get(message.messageId)?.rejecter({
+ message: "wrongUserId",
+ });
+ }
}
return;
default:
// Ignore since it belongs to another device
- if (!this.platformUtilsService.isSafari() && message.appId !== this.appId) {
+ if (!this.platformUtilsService.isSafari() && message.appId !== appId) {
return;
}
- // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
- this.onMessage(message.message);
+ if (message.message != null) {
+ // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+ // eslint-disable-next-line @typescript-eslint/no-floating-promises
+ this.onMessage(message.message);
+ }
}
});
@@ -240,16 +262,15 @@ export class NativeMessagingBackground {
if (BrowserApi.isWebExtensionsApi) {
error = p.error.message;
} else {
- error = chrome.runtime.lastError.message;
+ error = chrome.runtime.lastError?.message;
}
- this.sharedSecret = null;
- this.privateKey = null;
+ this.secureChannel = undefined;
this.connected = false;
this.logService.error("NativeMessaging port disconnected because of error: " + error);
- const reason = error != null ? "desktopIntegrationDisabled" : null;
+ const reason = error != null ? "desktopIntegrationDisabled" : undefined;
reject(new Error(reason));
});
});
@@ -293,13 +314,13 @@ export class NativeMessagingBackground {
);
const callback = this.callbacks.get(messageId);
this.callbacks.delete(messageId);
- callback.rejecter("errorConnecting");
+ callback?.rejecter("errorConnecting");
}
setTimeout(() => {
if (this.callbacks.has(messageId)) {
this.logService.info("[Native Messaging IPC] Message timed out and received no response");
- this.callbacks.get(messageId).rejecter({
+ this.callbacks.get(messageId)!.rejecter({
message: "timeout",
});
this.callbacks.delete(messageId);
@@ -320,16 +341,19 @@ export class NativeMessagingBackground {
if (this.platformUtilsService.isSafari()) {
this.postMessage(message as any);
} else {
- this.postMessage({ appId: this.appId, message: await this.encryptMessage(message) });
+ this.postMessage({ appId: this.appId!, message: await this.encryptMessage(message) });
}
}
async encryptMessage(message: Message) {
- if (this.sharedSecret == null) {
+ if (this.secureChannel?.sharedSecret == null) {
await this.secureCommunication();
}
- return await this.encryptService.encrypt(JSON.stringify(message), this.sharedSecret);
+ return await this.encryptService.encrypt(
+ JSON.stringify(message),
+ this.secureChannel!.sharedSecret!,
+ );
}
private postMessage(message: OuterMessage, messageId?: number) {
@@ -346,7 +370,7 @@ export class NativeMessagingBackground {
mac: message.message.mac,
};
}
- this.port.postMessage(msg);
+ this.port!.postMessage(msg);
// FIXME: Remove when updating file. Eslint update
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (e) {
@@ -354,26 +378,30 @@ export class NativeMessagingBackground {
"[Native Messaging IPC] Disconnected from Bitwarden Desktop app because of the native port disconnecting.",
);
- this.sharedSecret = null;
- this.privateKey = null;
+ this.secureChannel = undefined;
this.connected = false;
- if (this.callbacks.has(messageId)) {
- this.callbacks.get(messageId).rejecter("invalidateEncryption");
+ if (messageId != null && this.callbacks.has(messageId)) {
+ this.callbacks.get(messageId)!.rejecter("invalidateEncryption");
}
}
}
private async onMessage(rawMessage: ReceiveMessage | EncString) {
- let message = rawMessage as ReceiveMessage;
+ let message: ReceiveMessage;
if (!this.platformUtilsService.isSafari()) {
+ if (this.secureChannel?.sharedSecret == null) {
+ return;
+ }
message = JSON.parse(
await this.encryptService.decryptToUtf8(
rawMessage as EncString,
- this.sharedSecret,
+ this.secureChannel.sharedSecret,
"ipc-desktop-ipc-channel-key",
),
);
+ } else {
+ message = rawMessage as ReceiveMessage;
}
if (Math.abs(message.timestamp - Date.now()) > MessageValidTimeout) {
@@ -390,15 +418,17 @@ export class NativeMessagingBackground {
this.logService.info(
`[Native Messaging IPC] Received legacy message of type ${message.command}`,
);
- const messageId = this.callbacks.keys().next().value;
- const resolver = this.callbacks.get(messageId);
- this.callbacks.delete(messageId);
- resolver.resolver(message);
+ const messageId: number | undefined = this.callbacks.keys().next().value;
+ if (messageId != null) {
+ const resolver = this.callbacks.get(messageId);
+ this.callbacks.delete(messageId);
+ resolver!.resolver(message);
+ }
return;
}
if (this.callbacks.has(messageId)) {
- this.callbacks.get(messageId).resolver(message);
+ this.callbacks.get(messageId)!.resolver(message);
} else {
this.logService.info("[Native Messaging IPC] Received message without a callback", message);
}
@@ -406,8 +436,6 @@ export class NativeMessagingBackground {
private async secureCommunication() {
const [publicKey, privateKey] = await this.cryptoFunctionService.rsaGenerateKeyPair(2048);
- this.publicKey = publicKey;
- this.privateKey = privateKey;
const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
@@ -419,7 +447,13 @@ export class NativeMessagingBackground {
messageId: this.messageId++,
});
- return new Promise((resolve, reject) => (this.secureSetupResolve = resolve));
+ return new Promise((resolve) => {
+ this.secureChannel = {
+ publicKey,
+ privateKey,
+ setupResolve: resolve,
+ };
+ });
}
private async sendUnencrypted(message: Message) {
@@ -429,11 +463,17 @@ export class NativeMessagingBackground {
message.timestamp = Date.now();
- this.postMessage({ appId: this.appId, message: message });
+ this.postMessage({ appId: this.appId!, message: message });
}
private async showFingerprintDialog() {
- const fingerprint = await this.keyService.getFingerprint(this.appId, this.publicKey);
+ if (this.secureChannel?.publicKey == null) {
+ return;
+ }
+ const fingerprint = await this.keyService.getFingerprint(
+ this.appId!,
+ this.secureChannel.publicKey,
+ );
this.messagingService.send("showNativeMessagingFingerprintDialog", {
fingerprint: fingerprint,
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index b9622e82005..2a756293070 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -16,7 +16,6 @@ import { MessageListener, isExternalMessage } from "@bitwarden/common/platform/m
import { devFlagEnabled } from "@bitwarden/common/platform/misc/flags";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { NotificationsService } from "@bitwarden/common/platform/notifications";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherType } from "@bitwarden/common/vault/enums";
import { BiometricsCommands } from "@bitwarden/key-management";
@@ -54,7 +53,6 @@ export default class RuntimeBackground {
private accountService: AccountService,
private readonly lockService: LockService,
private billingAccountProfileStateService: BillingAccountProfileStateService,
- private cipherService: CipherService,
) {
// onInstalled listener must be wired up before anything else, so we do it in the ctor
chrome.runtime.onInstalled.addListener((details: any) => {
@@ -202,9 +200,6 @@ export default class RuntimeBackground {
case BiometricsCommands.GetBiometricsStatusForUser: {
return await this.main.biometricsService.getBiometricsStatusForUser(msg.userId);
}
- case "updateLastUsedDate": {
- return await this.cipherService.updateLastUsedDate(msg.cipherId);
- }
case "getUseTreeWalkerApiForPageDetailsCollectionFeatureFlag": {
return await this.configService.getFeatureFlag(
FeatureFlag.UseTreeWalkerApiForPageDetailsCollection,
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 6a2e017d06c..e5d5db20758 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_extName__",
"short_name": "__MSG_appName__",
- "version": "2025.1.3",
+ "version": "2025.2.1",
"description": "__MSG_extDesc__",
"default_locale": "en",
"author": "Bitwarden Inc.",
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index dee6ebef31c..fe3aad37cf4 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
"minimum_chrome_version": "102.0",
"name": "__MSG_extName__",
"short_name": "__MSG_appName__",
- "version": "2025.1.3",
+ "version": "2025.2.1",
"description": "__MSG_extDesc__",
"default_locale": "en",
"author": "Bitwarden Inc.",
@@ -63,6 +63,22 @@
"webRequestAuthProvider",
"notifications"
],
+ "__firefox__permissions": [
+ "activeTab",
+ "alarms",
+ "clipboardRead",
+ "clipboardWrite",
+ "contextMenus",
+ "idle",
+ "scripting",
+ "storage",
+ "tabs",
+ "unlimitedStorage",
+ "webNavigation",
+ "webRequest",
+ "webRequestAuthProvider",
+ "notifications"
+ ],
"__safari__permissions": [
"activeTab",
"alarms",
@@ -86,7 +102,7 @@
"host_permissions": ["https://*/*", "http://*/*"],
"content_security_policy": {
"extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'",
- "sandbox": "sandbox allow-scripts; script-src 'self'"
+ "__chrome__sandbox": "sandbox allow-scripts; script-src 'self'"
},
"sandbox": {
"pages": [
@@ -112,6 +128,13 @@
},
"description": "__MSG_commandOpenSidebar__"
},
+ "__opera___execute_sidebar_action": {
+ "suggested_key": {
+ "default": "Alt+Shift+Y",
+ "linux": "Alt+Shift+U"
+ },
+ "description": "__MSG_commandOpenSidebar__"
+ },
"autofill_login": {
"suggested_key": {
"default": "Ctrl+Shift+L"
@@ -166,5 +189,12 @@
"storage": {
"managed_schema": "managed_schema.json"
},
- "__firefox__storage": null
+ "__firefox__storage": null,
+ "__opera__sidebar_action": {
+ "default_title": "Bitwarden",
+ "default_panel": "popup/index.html?uilocation=sidebar",
+ "default_icon": "images/icon19.png",
+ "open_at_install": false,
+ "browser_style": false
+ }
}
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index 1d8ff65c17d..293fca4d029 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -530,10 +530,15 @@ export class BrowserApi {
win: Window & typeof globalThis,
): OperaSidebarAction | FirefoxSidebarAction | null {
const deviceType = BrowserPlatformUtilsService.getDevice(win);
- if (deviceType !== DeviceType.FirefoxExtension && deviceType !== DeviceType.OperaExtension) {
- return null;
+ if (deviceType === DeviceType.FirefoxExtension) {
+ return browser.sidebarAction;
}
- return win.opr?.sidebarAction || browser.sidebarAction;
+
+ if (deviceType === DeviceType.OperaExtension) {
+ return win.opr?.sidebarAction;
+ }
+
+ return null;
}
static captureVisibleTab(): Promise {
diff --git a/apps/browser/src/platform/listeners/update-badge.ts b/apps/browser/src/platform/listeners/update-badge.ts
index f67b96c847f..cd74b9ebf7d 100644
--- a/apps/browser/src/platform/listeners/update-badge.ts
+++ b/apps/browser/src/platform/listeners/update-badge.ts
@@ -2,8 +2,10 @@
// @ts-strict-ignore
import { firstValueFrom } from "rxjs";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { getOptionalUserId } from "@bitwarden/common/auth/services/account.service";
import { BadgeSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/badge-settings.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -22,6 +24,7 @@ export class UpdateBadge {
private authService: AuthService;
private badgeSettingsService: BadgeSettingsServiceAbstraction;
private cipherService: CipherService;
+ private accountService: AccountService;
private badgeAction: typeof chrome.action | typeof chrome.browserAction;
private sidebarAction: OperaSidebarAction | FirefoxSidebarAction;
private win: Window & typeof globalThis;
@@ -34,6 +37,7 @@ export class UpdateBadge {
this.badgeSettingsService = services.badgeSettingsService;
this.authService = services.authService;
this.cipherService = services.cipherService;
+ this.accountService = services.accountService;
}
async run(opts?: { tabId?: number; windowId?: number }): Promise {
@@ -87,7 +91,14 @@ export class UpdateBadge {
return;
}
- const ciphers = await this.cipherService.getAllDecryptedForUrl(opts?.tab?.url);
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(getOptionalUserId),
+ );
+ if (!activeUserId) {
+ return;
+ }
+
+ const ciphers = await this.cipherService.getAllDecryptedForUrl(opts?.tab?.url, activeUserId);
let countText = ciphers.length == 0 ? "" : ciphers.length.toString();
if (ciphers.length > 9) {
countText = "9+";
@@ -165,6 +176,13 @@ export class UpdateBadge {
return;
}
+ if ("opr" in this.win && BrowserApi.isManifestVersion(3)) {
+ // setIcon API is currenly broken for Opera MV3 extensions
+ // https://forums.opera.com/topic/75680/opr-sidebaraction-seticon-api-is-broken-access-to-extension-api-denied?_=1738349261570
+ // The API currently crashes on MacOS
+ return;
+ }
+
if (this.isOperaSidebar(this.sidebarAction)) {
await new Promise((resolve) =>
(this.sidebarAction as OperaSidebarAction).setIcon(options, () => resolve()),
diff --git a/apps/browser/src/platform/popup/layout/popup-layout.mdx b/apps/browser/src/platform/popup/layout/popup-layout.mdx
index 5723bef44b1..b93c649d695 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.mdx
+++ b/apps/browser/src/platform/popup/layout/popup-layout.mdx
@@ -100,9 +100,7 @@ Usage example:
### Transparent header
-
+
Common interactive elements to insert into the `end` slot are:
@@ -113,9 +111,7 @@ Common interactive elements to insert into the `end` slot are:
### Notice
-
+
Common interactive elements to insert into the `full-width-notice` slot are:
@@ -160,29 +156,21 @@ View the story source code to see examples of how to construct these types of pa
Example of wrapping an extension page in the `popup-tab-navigation` component.
-
+
## Extension Page
Examples of using just the `popup-page` component, without and with a footer.
-
+
-
+
## Popped out
When the browser extension is popped out, the "popout" button should not be passed to the header.
-
+
# Other stories
@@ -190,14 +178,10 @@ When the browser extension is popped out, the "popout" button should not be pass
An example of how to center the default content.
-
+
## Loading
An example of what the loading state looks like.
-
+
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 70a78ce548f..4dca29ee914 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -10,9 +10,9 @@ import {
import { unauthUiRefreshRedirect } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-redirect";
import { unauthUiRefreshSwap } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-route-swap";
import {
+ activeAuthGuard,
authGuard,
lockGuard,
- activeAuthGuard,
redirectGuard,
tdeDecryptionRequiredGuard,
unauthGuardFn,
@@ -23,10 +23,14 @@ import { NewDeviceVerificationNoticeGuard } from "@bitwarden/angular/vault/guard
import {
AnonLayoutWrapperComponent,
AnonLayoutWrapperData,
- LoginComponent,
- LoginSecondaryContentComponent,
+ DevicesIcon,
+ DeviceVerificationIcon,
LockIcon,
+ LoginComponent,
+ LoginDecryptionOptionsComponent,
+ LoginSecondaryContentComponent,
LoginViaAuthRequestComponent,
+ NewDeviceVerificationComponent,
PasswordHintComponent,
RegistrationFinishComponent,
RegistrationLockAltIcon,
@@ -35,14 +39,10 @@ import {
RegistrationStartSecondaryComponentData,
RegistrationUserAddIcon,
SetPasswordJitComponent,
- UserLockIcon,
- VaultIcon,
- LoginDecryptionOptionsComponent,
- DevicesIcon,
SsoComponent,
TwoFactorTimeoutIcon,
- NewDeviceVerificationComponent,
- DeviceVerificationIcon,
+ UserLockIcon,
+ VaultIcon,
} from "@bitwarden/auth/angular";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { LockComponent } from "@bitwarden/key-management-ui";
@@ -64,7 +64,6 @@ import { HomeComponent } from "../auth/popup/home.component";
import { LoginDecryptionOptionsComponentV1 } from "../auth/popup/login-decryption-options/login-decryption-options-v1.component";
import { LoginComponentV1 } from "../auth/popup/login-v1.component";
import { LoginViaAuthRequestComponentV1 } from "../auth/popup/login-via-auth-request-v1.component";
-import { RegisterComponent } from "../auth/popup/register.component";
import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
import { SetPasswordComponent } from "../auth/popup/set-password.component";
import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
@@ -91,7 +90,9 @@ import { MoreFromBitwardenPageV2Component } from "../tools/popup/settings/about-
import { ExportBrowserV2Component } from "../tools/popup/settings/export/export-browser-v2.component";
import { ImportBrowserV2Component } from "../tools/popup/settings/import/import-browser-v2.component";
import { SettingsV2Component } from "../tools/popup/settings/settings-v2.component";
+import { canAccessAtRiskPasswords } from "../vault/guards/at-risk-passwords.guard";
import { clearVaultStateGuard } from "../vault/guards/clear-vault-state.guard";
+import { AtRiskPasswordsComponent } from "../vault/popup/components/at-risk-passwords/at-risk-passwords.component";
import { AddEditV2Component } from "../vault/popup/components/vault-v2/add-edit/add-edit-v2.component";
import { AssignCollections } from "../vault/popup/components/vault-v2/assign-collections/assign-collections.component";
import { AttachmentsV2Component } from "../vault/popup/components/vault-v2/attachments/attachments-v2.component";
@@ -267,12 +268,6 @@ const routes: Routes = [
canActivate: [authGuard],
data: { elevation: 1 } satisfies RouteDataProperties,
},
- {
- path: "register",
- component: RegisterComponent,
- canActivate: [unauthGuardFn(unauthRouteOverrides)],
- data: { elevation: 1 } satisfies RouteDataProperties,
- },
{
path: "environment",
component: EnvironmentComponent,
@@ -759,6 +754,11 @@ const routes: Routes = [
},
],
},
+ {
+ path: "at-risk-passwords",
+ component: AtRiskPasswordsComponent,
+ canActivate: [authGuard, canAccessAtRiskPasswords],
+ },
{
path: "account-switcher",
component: AccountSwitcherComponent,
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 8147524d2f3..a97d001c54b 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -179,7 +179,7 @@ export class AppComponent implements OnInit, OnDestroy {
await this.clearComponentStates();
}
if (url.startsWith("/tabs/")) {
- await this.cipherService.setAddEditCipherInfo(null);
+ await this.cipherService.setAddEditCipherInfo(null, this.activeUserId);
}
(window as any).previousPopupUrl = url;
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index 15a898aef53..3046ec7916a 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -26,7 +26,6 @@ import { HomeComponent } from "../auth/popup/home.component";
import { LoginDecryptionOptionsComponentV1 } from "../auth/popup/login-decryption-options/login-decryption-options-v1.component";
import { LoginComponentV1 } from "../auth/popup/login-v1.component";
import { LoginViaAuthRequestComponentV1 } from "../auth/popup/login-via-auth-request-v1.component";
-import { RegisterComponent } from "../auth/popup/register.component";
import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
import { SetPasswordComponent } from "../auth/popup/set-password.component";
import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
@@ -103,7 +102,6 @@ import "../platform/popup/locales";
LoginViaAuthRequestComponentV1,
LoginComponentV1,
LoginDecryptionOptionsComponentV1,
- RegisterComponent,
SetPasswordComponent,
SsoComponentV1,
TabsV2Component,
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 257497fb13d..210a05d9947 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -2,7 +2,7 @@
// @ts-strict-ignore
import { APP_INITIALIZER, NgModule, NgZone } from "@angular/core";
import { Router } from "@angular/router";
-import { Subject, merge, of } from "rxjs";
+import { merge, of, Subject } from "rxjs";
import { CollectionService } from "@bitwarden/admin-console/common";
import { ViewCacheService } from "@bitwarden/angular/platform/abstractions/view-cache.service";
@@ -11,21 +11,21 @@ import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/sa
import {
CLIENT_TYPE,
DEFAULT_VAULT_TIMEOUT,
+ ENV_ADDITIONAL_REGIONS,
INTRAPROCESS_MESSAGING_SUBJECT,
MEMORY_STORAGE,
OBSERVABLE_DISK_STORAGE,
OBSERVABLE_MEMORY_STORAGE,
+ SafeInjectionToken,
SECURE_STORAGE,
SYSTEM_THEME_OBSERVABLE,
- SafeInjectionToken,
- ENV_ADDITIONAL_REGIONS,
} from "@bitwarden/angular/services/injection-tokens";
import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
import {
AnonLayoutWrapperDataService,
LoginComponentService,
- SsoComponentService,
LoginDecryptionOptionsService,
+ SsoComponentService,
} from "@bitwarden/auth/angular";
import { LockService, LoginEmailService, PinServiceAbstraction } from "@bitwarden/auth/common";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -111,10 +111,10 @@ import { TotpService } from "@bitwarden/common/vault/services/totp.service";
import { CompactModeService, DialogService, ToastService } from "@bitwarden/components";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
import {
- KdfConfigService,
- KeyService,
BiometricsService,
DefaultKeyService,
+ KdfConfigService,
+ KeyService,
} from "@bitwarden/key-management";
import { LockComponentService } from "@bitwarden/key-management-ui";
import { PasswordRepromptService } from "@bitwarden/vault";
diff --git a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
index 86131176a6e..851509ab17f 100644
--- a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
@@ -34,6 +34,6 @@ export class ExportBrowserV2Component {
constructor(private router: Router) {}
protected async onSuccessfulExport(organizationId: string): Promise {
- await this.router.navigate(["/vault-settings"]);
+ await this.router.navigate(["/tabs/settings"]);
}
}
diff --git a/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts b/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
index 66cb5c62f48..1c5558bd90e 100644
--- a/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
@@ -4,7 +4,7 @@ import { Router } from "@angular/router";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
-import { ImportComponent } from "@bitwarden/importer/ui";
+import { ImportComponent } from "@bitwarden/importer-ui";
import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-footer.component";
diff --git a/apps/browser/src/vault/guards/at-risk-passwords.guard.ts b/apps/browser/src/vault/guards/at-risk-passwords.guard.ts
new file mode 100644
index 00000000000..ee991c81239
--- /dev/null
+++ b/apps/browser/src/vault/guards/at-risk-passwords.guard.ts
@@ -0,0 +1,29 @@
+import { inject } from "@angular/core";
+import { CanActivateFn } from "@angular/router";
+import { switchMap, tap } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ToastService } from "@bitwarden/components";
+import { filterOutNullish, TaskService } from "@bitwarden/vault";
+
+export const canAccessAtRiskPasswords: CanActivateFn = () => {
+ const accountService = inject(AccountService);
+ const taskService = inject(TaskService);
+ const toastService = inject(ToastService);
+ const i18nService = inject(I18nService);
+
+ return accountService.activeAccount$.pipe(
+ filterOutNullish(),
+ switchMap((user) => taskService.tasksEnabled$(user.id)),
+ tap((tasksEnabled) => {
+ if (!tasksEnabled) {
+ toastService.showToast({
+ variant: "error",
+ title: "",
+ message: i18nService.t("accessDenied"),
+ });
+ }
+ }),
+ );
+};
diff --git a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.html b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.html
new file mode 100644
index 00000000000..16d9b6a322a
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.html
@@ -0,0 +1,9 @@
+
+
+
+ {{
+ (taskCount === 1 ? "reviewAndChangeAtRiskPassword" : "reviewAndChangeAtRiskPasswordsPlural")
+ | i18n: taskCount.toString()
+ }}
+
+
diff --git a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
new file mode 100644
index 00000000000..5e46f3cd3d9
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
@@ -0,0 +1,32 @@
+import { CommonModule } from "@angular/common";
+import { Component, inject } from "@angular/core";
+import { RouterModule } from "@angular/router";
+import { map, switchMap } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AnchorLinkDirective, CalloutModule } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+import { filterOutNullish, SecurityTaskType, TaskService } from "@bitwarden/vault";
+
+// TODO: This component will need to be reworked to use the new EndUserNotificationService in PM-10609
+
+@Component({
+ selector: "vault-at-risk-password-callout",
+ standalone: true,
+ imports: [CommonModule, AnchorLinkDirective, RouterModule, CalloutModule, I18nPipe],
+ templateUrl: "./at-risk-password-callout.component.html",
+})
+export class AtRiskPasswordCalloutComponent {
+ private taskService = inject(TaskService);
+ private activeAccount$ = inject(AccountService).activeAccount$.pipe(filterOutNullish());
+
+ protected pendingTasks$ = this.activeAccount$.pipe(
+ switchMap((user) =>
+ this.taskService
+ .pendingTasks$(user.id)
+ .pipe(
+ map((tasks) => tasks.filter((t) => t.type === SecurityTaskType.UpdateAtRiskCredential)),
+ ),
+ ),
+ );
+}
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-password-page.service.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-password-page.service.ts
new file mode 100644
index 00000000000..f8cd4a60650
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-password-page.service.ts
@@ -0,0 +1,35 @@
+import { inject, Injectable } from "@angular/core";
+import { map, Observable } from "rxjs";
+
+import {
+ BANNERS_DISMISSED_DISK,
+ StateProvider,
+ UserKeyDefinition,
+} from "@bitwarden/common/platform/state";
+import { UserId } from "@bitwarden/common/types/guid";
+
+export const AT_RISK_PASSWORD_AUTOFILL_CALLOUT_DISMISSED_KEY = new UserKeyDefinition(
+ BANNERS_DISMISSED_DISK,
+ "atRiskPasswordAutofillBannerDismissed",
+ {
+ deserializer: (bannersDismissed) => bannersDismissed,
+ clearOn: [], // Do not clear dismissed banners
+ },
+);
+
+@Injectable()
+export class AtRiskPasswordPageService {
+ private stateProvider = inject(StateProvider);
+
+ isCalloutDismissed(userId: UserId): Observable {
+ return this.stateProvider
+ .getUser(userId, AT_RISK_PASSWORD_AUTOFILL_CALLOUT_DISMISSED_KEY)
+ .state$.pipe(map((dismissed) => !!dismissed));
+ }
+
+ async dismissCallout(userId: UserId): Promise {
+ await this.stateProvider
+ .getUser(userId, AT_RISK_PASSWORD_AUTOFILL_CALLOUT_DISMISSED_KEY)
+ .update(() => true);
+ }
+}
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
new file mode 100644
index 00000000000..ece00af3df2
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+ {{ "changeAtRiskPasswordsFasterDesc" | i18n }}
+
+
+
+
+
+ {{ pageDescription$ | async }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
new file mode 100644
index 00000000000..c71c9fa56c0
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
@@ -0,0 +1,265 @@
+import { Component, Input } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject, firstValueFrom, of } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { IconComponent } from "@bitwarden/angular/vault/components/icon.component";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants";
+import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
+import { InlineMenuVisibilitySetting } from "@bitwarden/common/autofill/types";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { ToastService } from "@bitwarden/components";
+import {
+ PasswordRepromptService,
+ SecurityTask,
+ SecurityTaskType,
+ TaskService,
+} from "@bitwarden/vault";
+
+import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
+import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
+
+import { AtRiskPasswordPageService } from "./at-risk-password-page.service";
+import { AtRiskPasswordsComponent } from "./at-risk-passwords.component";
+
+@Component({
+ standalone: true,
+ selector: "popup-header",
+ template: ``,
+})
+class MockPopupHeaderComponent {
+ @Input() pageTitle: string | undefined;
+ @Input() backAction: (() => void) | undefined;
+}
+
+@Component({
+ standalone: true,
+ selector: "popup-page",
+ template: ``,
+})
+class MockPopupPageComponent {
+ @Input() loading: boolean | undefined;
+}
+
+@Component({
+ standalone: true,
+ selector: "app-vault-icon",
+ template: ``,
+})
+class MockAppIcon {
+ @Input() cipher: CipherView | undefined;
+}
+
+describe("AtRiskPasswordsComponent", () => {
+ let component: AtRiskPasswordsComponent;
+ let fixture: ComponentFixture;
+
+ let mockTasks$: BehaviorSubject;
+ let mockCiphers$: BehaviorSubject;
+ let mockOrgs$: BehaviorSubject;
+ let mockInlineMenuVisibility$: BehaviorSubject;
+ let calloutDismissed$: BehaviorSubject;
+ const setInlineMenuVisibility = jest.fn();
+ const mockToastService = mock();
+ const mockAtRiskPasswordPageService = mock();
+
+ beforeEach(async () => {
+ mockTasks$ = new BehaviorSubject([
+ {
+ id: "task",
+ organizationId: "org",
+ cipherId: "cipher",
+ type: SecurityTaskType.UpdateAtRiskCredential,
+ } as SecurityTask,
+ ]);
+ mockCiphers$ = new BehaviorSubject([
+ {
+ id: "cipher",
+ organizationId: "org",
+ name: "Item 1",
+ } as CipherView,
+ {
+ id: "cipher2",
+ organizationId: "org",
+ name: "Item 2",
+ } as CipherView,
+ ]);
+ mockOrgs$ = new BehaviorSubject([
+ {
+ id: "org",
+ name: "Org 1",
+ } as Organization,
+ ]);
+
+ mockInlineMenuVisibility$ = new BehaviorSubject(
+ AutofillOverlayVisibility.Off,
+ );
+
+ calloutDismissed$ = new BehaviorSubject(false);
+ setInlineMenuVisibility.mockClear();
+ mockToastService.showToast.mockClear();
+ mockAtRiskPasswordPageService.isCalloutDismissed.mockReturnValue(calloutDismissed$);
+
+ await TestBed.configureTestingModule({
+ imports: [AtRiskPasswordsComponent],
+ providers: [
+ {
+ provide: TaskService,
+ useValue: {
+ pendingTasks$: () => mockTasks$,
+ },
+ },
+ {
+ provide: OrganizationService,
+ useValue: {
+ organizations$: () => mockOrgs$,
+ },
+ },
+ {
+ provide: CipherService,
+ useValue: {
+ cipherViews$: () => mockCiphers$,
+ },
+ },
+ { provide: I18nService, useValue: { t: (key: string) => key } },
+ { provide: AccountService, useValue: { activeAccount$: of({ id: "user" }) } },
+ { provide: PlatformUtilsService, useValue: mock() },
+ { provide: PasswordRepromptService, useValue: mock() },
+ {
+ provide: AutofillSettingsServiceAbstraction,
+ useValue: {
+ inlineMenuVisibility$: mockInlineMenuVisibility$,
+ setInlineMenuVisibility: setInlineMenuVisibility,
+ },
+ },
+ { provide: ToastService, useValue: mockToastService },
+ ],
+ })
+ .overrideModule(JslibModule, {
+ remove: {
+ imports: [IconComponent],
+ exports: [IconComponent],
+ },
+ add: {
+ imports: [MockAppIcon],
+ exports: [MockAppIcon],
+ },
+ })
+ .overrideComponent(AtRiskPasswordsComponent, {
+ remove: {
+ imports: [PopupHeaderComponent, PopupPageComponent],
+ providers: [AtRiskPasswordPageService],
+ },
+ add: {
+ imports: [MockPopupHeaderComponent, MockPopupPageComponent],
+ providers: [
+ { provide: AtRiskPasswordPageService, useValue: mockAtRiskPasswordPageService },
+ ],
+ },
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(AtRiskPasswordsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it("should create", () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe("pending atRiskItems$", () => {
+ it("should list pending at risk item tasks", async () => {
+ const items = await firstValueFrom(component["atRiskItems$"]);
+ expect(items).toHaveLength(1);
+ expect(items[0].name).toBe("Item 1");
+ });
+ });
+
+ describe("pageDescription$", () => {
+ it("should use single org description when tasks belong to one org", async () => {
+ const description = await firstValueFrom(component["pageDescription$"]);
+ expect(description).toBe("atRiskPasswordsDescSingleOrg");
+ });
+
+ it("should use multiple org description when tasks belong to multiple orgs", async () => {
+ mockTasks$.next([
+ {
+ id: "task",
+ organizationId: "org",
+ cipherId: "cipher",
+ type: SecurityTaskType.UpdateAtRiskCredential,
+ } as SecurityTask,
+ {
+ id: "task2",
+ organizationId: "org2",
+ cipherId: "cipher2",
+ type: SecurityTaskType.UpdateAtRiskCredential,
+ } as SecurityTask,
+ ]);
+ const description = await firstValueFrom(component["pageDescription$"]);
+ expect(description).toBe("atRiskPasswordsDescMultiOrg");
+ });
+ });
+
+ describe("autofill callout", () => {
+ it("should show the callout if inline autofill is disabled", async () => {
+ mockInlineMenuVisibility$.next(AutofillOverlayVisibility.Off);
+ calloutDismissed$.next(false);
+ fixture.detectChanges();
+ const callout = fixture.debugElement.query(By.css('[data-testid="autofill-callout"]'));
+
+ expect(callout).toBeTruthy();
+ });
+
+ it("should hide the callout if inline autofill is enabled", async () => {
+ mockInlineMenuVisibility$.next(AutofillOverlayVisibility.OnButtonClick);
+ calloutDismissed$.next(false);
+ fixture.detectChanges();
+ const callout = fixture.debugElement.query(By.css('[data-testid="autofill-callout"]'));
+
+ expect(callout).toBeFalsy();
+ });
+
+ it("should hide the callout if the user has previously dismissed it", async () => {
+ mockInlineMenuVisibility$.next(AutofillOverlayVisibility.Off);
+ calloutDismissed$.next(true);
+ fixture.detectChanges();
+ const callout = fixture.debugElement.query(By.css('[data-testid="autofill-callout"]'));
+
+ expect(callout).toBeFalsy();
+ });
+
+ it("should call dismissCallout when the dismiss callout button is clicked", async () => {
+ mockInlineMenuVisibility$.next(AutofillOverlayVisibility.Off);
+ fixture.detectChanges();
+ const dismissButton = fixture.debugElement.query(
+ By.css('[data-testid="dismiss-callout-button"]'),
+ );
+ dismissButton.nativeElement.click();
+ expect(mockAtRiskPasswordPageService.dismissCallout).toHaveBeenCalled();
+ });
+
+ describe("turn on autofill button", () => {
+ it("should call the service to turn on inline autofill and show a toast", () => {
+ const button = fixture.debugElement.query(
+ By.css('[data-testid="turn-on-autofill-button"]'),
+ );
+ button.nativeElement.click();
+
+ expect(setInlineMenuVisibility).toHaveBeenCalledWith(
+ AutofillOverlayVisibility.OnButtonClick,
+ );
+ expect(mockToastService.showToast).toHaveBeenCalled();
+ });
+ });
+ });
+});
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
new file mode 100644
index 00000000000..f075335102f
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
@@ -0,0 +1,162 @@
+import { CommonModule } from "@angular/common";
+import { Component, inject } from "@angular/core";
+import { Router } from "@angular/router";
+import { combineLatest, firstValueFrom, map, of, shareReplay, startWith, switchMap } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+ getOrganizationById,
+ OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants";
+import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+ BadgeComponent,
+ ButtonModule,
+ CalloutModule,
+ ItemModule,
+ ToastService,
+ TypographyModule,
+} from "@bitwarden/components";
+import {
+ filterOutNullish,
+ PasswordRepromptService,
+ SecurityTaskType,
+ TaskService,
+} from "@bitwarden/vault";
+
+import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
+import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
+import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
+
+import { AtRiskPasswordPageService } from "./at-risk-password-page.service";
+
+@Component({
+ selector: "vault-at-risk-passwords",
+ standalone: true,
+ imports: [
+ PopupPageComponent,
+ PopupHeaderComponent,
+ PopOutComponent,
+ ItemModule,
+ CommonModule,
+ JslibModule,
+ BadgeComponent,
+ TypographyModule,
+ CalloutModule,
+ ButtonModule,
+ ],
+ providers: [AtRiskPasswordPageService],
+ templateUrl: "./at-risk-passwords.component.html",
+})
+export class AtRiskPasswordsComponent {
+ private taskService = inject(TaskService);
+ private organizationService = inject(OrganizationService);
+ private cipherService = inject(CipherService);
+ private i18nService = inject(I18nService);
+ private accountService = inject(AccountService);
+ private platformUtilsService = inject(PlatformUtilsService);
+ private passwordRepromptService = inject(PasswordRepromptService);
+ private router = inject(Router);
+ private autofillSettingsService = inject(AutofillSettingsServiceAbstraction);
+ private toastService = inject(ToastService);
+ private atRiskPasswordPageService = inject(AtRiskPasswordPageService);
+
+ private activeUserData$ = this.accountService.activeAccount$.pipe(
+ filterOutNullish(),
+ switchMap((user) =>
+ combineLatest([
+ this.taskService.pendingTasks$(user.id),
+ this.cipherService.cipherViews$(user.id).pipe(
+ filterOutNullish(),
+ map((ciphers) => Object.fromEntries(ciphers.map((c) => [c.id, c]))),
+ ),
+ of(user),
+ ]),
+ ),
+ map(([tasks, ciphers, user]) => ({
+ tasks,
+ ciphers,
+ userId: user.id,
+ })),
+ shareReplay({ bufferSize: 1, refCount: true }),
+ );
+
+ protected loading$ = this.activeUserData$.pipe(
+ map(() => false),
+ startWith(true),
+ );
+
+ protected calloutDismissed$ = this.activeUserData$.pipe(
+ switchMap(({ userId }) => this.atRiskPasswordPageService.isCalloutDismissed(userId)),
+ );
+
+ protected inlineAutofillSettingEnabled$ = this.autofillSettingsService.inlineMenuVisibility$.pipe(
+ map((setting) => setting !== AutofillOverlayVisibility.Off),
+ );
+
+ protected atRiskItems$ = this.activeUserData$.pipe(
+ map(({ tasks, ciphers }) =>
+ tasks
+ .filter(
+ (t) =>
+ t.type === SecurityTaskType.UpdateAtRiskCredential &&
+ t.cipherId != null &&
+ ciphers[t.cipherId] != null,
+ )
+ .map((t) => ciphers[t.cipherId!]),
+ ),
+ );
+
+ protected pageDescription$ = this.activeUserData$.pipe(
+ switchMap(({ tasks, userId }) => {
+ const orgIds = new Set(tasks.map((t) => t.organizationId));
+ if (orgIds.size === 1) {
+ const [orgId] = orgIds;
+ return this.organizationService.organizations$(userId).pipe(
+ getOrganizationById(orgId),
+ map((org) => this.i18nService.t("atRiskPasswordsDescSingleOrg", org?.name, tasks.length)),
+ );
+ }
+
+ return of(this.i18nService.t("atRiskPasswordsDescMultiOrg", tasks.length));
+ }),
+ );
+
+ async viewCipher(cipher: CipherView) {
+ const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
+ if (!repromptPassed) {
+ return;
+ }
+ await this.router.navigate(["/view-cipher"], {
+ queryParams: { cipherId: cipher.id, type: cipher.type },
+ });
+ }
+
+ async launchChangePassword(cipher: CipherView) {
+ if (cipher.login?.uri) {
+ this.platformUtilsService.launchUri(cipher.login.uri);
+ }
+ }
+
+ async activateInlineAutofillMenuVisibility() {
+ await this.autofillSettingsService.setInlineMenuVisibility(
+ AutofillOverlayVisibility.OnButtonClick,
+ );
+ this.toastService.showToast({
+ variant: "success",
+ message: this.i18nService.t("turnedOnAutofill"),
+ title: "",
+ });
+ }
+
+ async dismissCallout() {
+ const { userId } = await firstValueFrom(this.activeUserData$);
+ await this.atRiskPasswordPageService.dismissCallout(userId);
+ }
+}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts
index 3252f030fc3..6974e6f7359 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts
@@ -1,14 +1,17 @@
import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testing";
import { ActivatedRoute, Router } from "@angular/router";
import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject, Observable } from "rxjs";
+import { BehaviorSubject } from "rxjs";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { EventType } from "@bitwarden/common/enums";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.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 { mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherType } from "@bitwarden/common/vault/enums";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@@ -58,9 +61,9 @@ describe("AddEditV2Component", () => {
collect.mockClear();
addEditCipherInfo$ = new BehaviorSubject(null);
- cipherServiceMock = mock();
- cipherServiceMock.addEditCipherInfo$ =
- addEditCipherInfo$.asObservable() as Observable;
+ cipherServiceMock = mock({
+ addEditCipherInfo$: jest.fn().mockReturnValue(addEditCipherInfo$),
+ });
await TestBed.configureTestingModule({
imports: [AddEditV2Component],
@@ -81,6 +84,7 @@ describe("AddEditV2Component", () => {
canDeleteCipher$: jest.fn().mockReturnValue(true),
},
},
+ { provide: AccountService, useValue: mockAccountServiceWith("UserId" as UserId) },
],
})
.overrideProvider(CipherFormConfigService, {
diff --git a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
index b46b1d61509..1dcb48c918d 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
@@ -9,10 +9,12 @@ import { firstValueFrom, map, Observable, switchMap } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { EventType } from "@bitwarden/common/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { CipherId, CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
+import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherType } from "@bitwarden/common/vault/enums";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -180,6 +182,7 @@ export class AddEditV2Component implements OnInit {
private toastService: ToastService,
private dialogService: DialogService,
protected cipherAuthorizationService: CipherAuthorizationService,
+ private accountService: AccountService,
) {
this.subscribeToParams();
}
@@ -281,9 +284,15 @@ export class AddEditV2Component implements OnInit {
config.initialValues = this.setInitialValuesFromParams(params);
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(getUserId),
+ );
+
// The browser notification bar and overlay use addEditCipherInfo$ to pass modified cipher details to the form
// Attempt to fetch them here and overwrite the initialValues if present
- const cachedCipherInfo = await firstValueFrom(this.cipherService.addEditCipherInfo$);
+ const cachedCipherInfo = await firstValueFrom(
+ this.cipherService.addEditCipherInfo$(activeUserId),
+ );
if (cachedCipherInfo != null) {
// Cached cipher info has priority over queryParams
@@ -292,7 +301,7 @@ export class AddEditV2Component implements OnInit {
...mapAddEditCipherInfoToInitialValues(cachedCipherInfo),
};
// Be sure to clear the "cached" cipher info, so it doesn't get used again
- await this.cipherService.setAddEditCipherInfo(null);
+ await this.cipherService.setAddEditCipherInfo(null, activeUserId);
}
if (["edit", "partial-edit"].includes(config.mode) && config.originalCipher?.id) {
@@ -371,7 +380,8 @@ export class AddEditV2Component implements OnInit {
}
try {
- await this.deleteCipher();
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ await this.deleteCipher(activeUserId);
} catch (e) {
this.logService.error(e);
return false;
@@ -388,10 +398,10 @@ export class AddEditV2Component implements OnInit {
return true;
};
- protected deleteCipher() {
+ protected deleteCipher(userId: UserId) {
return this.config.originalCipher.deletedDate
- ? this.cipherService.deleteWithServer(this.config.originalCipher.id)
- : this.cipherService.softDeleteWithServer(this.config.originalCipher.id);
+ ? this.cipherService.deleteWithServer(this.config.originalCipher.id, userId)
+ : this.cipherService.softDeleteWithServer(this.config.originalCipher.id, userId);
}
}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts b/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
index 51ebe9bdb62..27f3b7e5e18 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
@@ -5,12 +5,13 @@ import { Component } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { ReactiveFormsModule } from "@angular/forms";
import { ActivatedRoute } from "@angular/router";
-import { Observable, combineLatest, first, map, switchMap } from "rxjs";
+import { Observable, combineLatest, filter, first, map, switchMap } from "rxjs";
import { CollectionService } from "@bitwarden/admin-console/common";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { OrganizationId } from "@bitwarden/common/types/guid";
+import { OrgKey, UserKey } from "@bitwarden/common/types/key";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import {
@@ -58,16 +59,19 @@ export class AssignCollections {
private accountService: AccountService,
route: ActivatedRoute,
) {
- const cipher$: Observable = route.queryParams.pipe(
- switchMap(({ cipherId }) => this.cipherService.get(cipherId)),
- switchMap((cipherDomain) =>
- this.accountService.activeAccount$.pipe(
- map((account) => account?.id),
- switchMap((userId) =>
- this.cipherService
- .getKeyForCipherKeyDecryption(cipherDomain, userId)
- .then(cipherDomain.decrypt.bind(cipherDomain)),
- ),
+ const cipher$: Observable = this.accountService.activeAccount$.pipe(
+ map((account) => account?.id),
+ filter((userId) => userId != null),
+ switchMap((userId) =>
+ route.queryParams.pipe(
+ switchMap(async ({ cipherId }) => {
+ const cipherDomain = await this.cipherService.get(cipherId, userId);
+ const key: UserKey | OrgKey = await this.cipherService.getKeyForCipherKeyDecryption(
+ cipherDomain,
+ userId,
+ );
+ return cipherDomain.decrypt(key);
+ }),
),
),
);
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
index aca494716b1..1bc7e22e6d5 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
@@ -77,10 +77,10 @@ export class OpenAttachmentsComponent implements OnInit {
return;
}
- const cipherDomain = await this.cipherService.get(this.cipherId);
const activeUserId = await firstValueFrom(
this.accountService.activeAccount$.pipe(map((a) => a?.id)),
);
+ const cipherDomain = await this.cipherService.get(this.cipherId, activeUserId);
const cipher = await cipherDomain.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipherDomain, activeUserId),
);
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
index 1f67dd51c21..fb5ac4b3391 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
@@ -59,7 +59,9 @@ describe("VaultHeaderV2Component", () => {
providers: [
{
provide: CipherService,
- useValue: mock({ cipherViews$: new BehaviorSubject([]) }),
+ useValue: mock({
+ cipherViews$: jest.fn().mockReturnValue(new BehaviorSubject([])),
+ }),
},
{ provide: VaultSettingsService, useValue: mock() },
{ provide: FolderService, useValue: mock() },
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
index f95790cda5f..cb758e7a48d 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
@@ -22,6 +22,8 @@ import { Router } from "@angular/router";
import { firstValueFrom, Observable, map } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { CipherId } from "@bitwarden/common/types/guid";
@@ -265,6 +267,7 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
private router: Router,
private platformUtilsService: PlatformUtilsService,
private dialogService: DialogService,
+ private accountService: AccountService,
) {}
ngOnInit(): void {
@@ -311,7 +314,8 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
this.viewCipherTimeout = null;
}
- await this.cipherService.updateLastLaunchedDate(cipher.id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ await this.cipherService.updateLastLaunchedDate(cipher.id, activeUserId);
await BrowserApi.createNewTab(cipher.login.launchUri);
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.spec.ts
index 9ac17b49386..838ce2e9426 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.spec.ts
@@ -1,13 +1,15 @@
import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testing";
import { ActivatedRoute } from "@angular/router";
import { mock } from "jest-mock-extended";
-import { BehaviorSubject, Subject } from "rxjs";
+import { Subject } from "rxjs";
import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
-import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -19,6 +21,7 @@ import { PasswordHistoryV2Component } from "./vault-password-history-v2.componen
describe("PasswordHistoryV2Component", () => {
let fixture: ComponentFixture;
const params$ = new Subject();
+ const mockUserId = "acct-1" as UserId;
const mockCipherView = {
id: "111-222-333",
@@ -45,9 +48,7 @@ describe("PasswordHistoryV2Component", () => {
{ provide: CipherService, useValue: mock({ get: getCipher }) },
{
provide: AccountService,
- useValue: mock({
- activeAccount$: new BehaviorSubject({ id: "acct-1" } as Account),
- }),
+ useValue: mockAccountServiceWith(mockUserId),
},
{ provide: PopupRouterCacheService, useValue: { back } },
{ provide: ActivatedRoute, useValue: { queryParams: params$ } },
@@ -64,7 +65,7 @@ describe("PasswordHistoryV2Component", () => {
tick(100);
- expect(getCipher).toHaveBeenCalledWith(mockCipherView.id);
+ expect(getCipher).toHaveBeenCalledWith(mockCipherView.id, mockUserId);
}));
it("navigates back when a cipherId is not in the params", () => {
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
index e20bb1f1bcd..5d315775b10 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
@@ -58,8 +58,6 @@ export class PasswordHistoryV2Component implements OnInit {
/** Load the cipher based on the given Id */
private async loadCipher(cipherId: string) {
- const cipher = await this.cipherService.get(cipherId);
-
const activeAccount = await firstValueFrom(
this.accountService.activeAccount$.pipe(map((a: { id: string | undefined }) => a)),
);
@@ -69,6 +67,8 @@ export class PasswordHistoryV2Component implements OnInit {
}
const activeUserId = activeAccount.id as UserId;
+
+ const cipher = await this.cipherService.get(cipherId, activeUserId);
this.cipher = await cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
index 6e017042711..8cb538a429a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
@@ -32,6 +32,9 @@
slot="above-scroll-area"
*ngIf="vaultState !== VaultStateEnum.Empty && !(loading$ | async)"
>
+
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
index 12952a69c79..be5c33aab70 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
@@ -3,13 +3,31 @@ import { CommonModule } from "@angular/common";
import { AfterViewInit, Component, DestroyRef, OnDestroy, OnInit, ViewChild } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { RouterLink } from "@angular/router";
-import { combineLatest, filter, map, Observable, shareReplay, switchMap, take } from "rxjs";
+import {
+ combineLatest,
+ filter,
+ map,
+ firstValueFrom,
+ Observable,
+ shareReplay,
+ switchMap,
+ take,
+} from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { CipherId, CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CipherType } from "@bitwarden/common/vault/enums";
-import { ButtonModule, DialogService, Icons, NoItemsModule } from "@bitwarden/components";
+import {
+ BannerComponent,
+ ButtonModule,
+ DialogService,
+ Icons,
+ NoItemsModule,
+} from "@bitwarden/components";
import { DecryptionFailureDialogComponent, VaultIcons } from "@bitwarden/vault";
import { CurrentAccountComponent } from "../../../../auth/popup/account-switching/current-account.component";
@@ -19,6 +37,7 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
import { VaultPopupItemsService } from "../../services/vault-popup-items.service";
import { VaultPopupListFiltersService } from "../../services/vault-popup-list-filters.service";
import { VaultPopupScrollPositionService } from "../../services/vault-popup-scroll-position.service";
+import { AtRiskPasswordCalloutComponent } from "../at-risk-callout/at-risk-password-callout.component";
import { BlockedInjectionBanner } from "./blocked-injection-banner/blocked-injection-banner.component";
import {
@@ -56,6 +75,8 @@ enum VaultState {
ScrollingModule,
VaultHeaderV2Component,
DecryptionFailureDialogComponent,
+ BannerComponent,
+ AtRiskPasswordCalloutComponent,
],
})
export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
@@ -96,6 +117,7 @@ export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
private vaultPopupItemsService: VaultPopupItemsService,
private vaultPopupListFiltersService: VaultPopupListFiltersService,
private vaultScrollPositionService: VaultPopupScrollPositionService,
+ private accountService: AccountService,
private destroyRef: DestroyRef,
private cipherService: CipherService,
private dialogService: DialogService,
@@ -136,7 +158,10 @@ export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
}
async ngOnInit() {
- this.cipherService.failedToDecryptCiphers$
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+ this.cipherService
+ .failedToDecryptCiphers$(activeUserId)
.pipe(
map((ciphers) => ciphers.filter((c) => !c.isDeleted)),
filter((ciphers) => ciphers.length > 0),
@@ -153,4 +178,6 @@ export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
ngOnDestroy(): void {
this.vaultScrollPositionService.stop();
}
+
+ protected readonly FeatureFlag = FeatureFlag;
}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
index 39feb86f4fd..17464c025af 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
@@ -150,7 +150,7 @@ describe("ViewV2Component", () => {
flush(); // Resolve all promises
- expect(mockCipherService.get).toHaveBeenCalledWith("122-333-444");
+ expect(mockCipherService.get).toHaveBeenCalledWith("122-333-444", mockUserId);
expect(component.cipher).toEqual(mockCipher);
}));
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
index 65fb024ee99..209691869f0 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
@@ -5,13 +5,14 @@ import { Component } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { FormsModule } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, map, Observable, switchMap } from "rxjs";
+import { firstValueFrom, Observable, switchMap } from "rxjs";
import { CollectionView } from "@bitwarden/admin-console/common";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import {
AUTOFILL_ID,
COPY_PASSWORD_ID,
@@ -22,6 +23,7 @@ import {
import { EventType } from "@bitwarden/common/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions/view-password-history.service";
@@ -87,6 +89,8 @@ type LoadAction =
],
})
export class ViewV2Component {
+ private activeUserId: UserId;
+
headerText: string;
cipher: CipherView;
organization$: Observable;
@@ -117,14 +121,20 @@ export class ViewV2Component {
subscribeToParams(): void {
this.route.queryParams
.pipe(
- switchMap(async (params): Promise => {
+ switchMap(async (params) => {
this.loadAction = params.action;
this.senderTabId = params.senderTabId ? parseInt(params.senderTabId, 10) : undefined;
- return await this.getCipherData(params.cipherId);
+
+ const activeUserId = await firstValueFrom(
+ this.accountService.activeAccount$.pipe(getUserId),
+ );
+ const cipher = await this.getCipherData(params.cipherId, activeUserId);
+ return { activeUserId, cipher };
}),
- switchMap(async (cipher) => {
+ switchMap(async ({ activeUserId, cipher }) => {
this.cipher = cipher;
this.headerText = this.setHeader(cipher.type);
+ this.activeUserId = activeUserId;
if (this.loadAction) {
await this._handleLoadAction(this.loadAction, this.senderTabId);
@@ -159,13 +169,10 @@ export class ViewV2Component {
}
}
- async getCipherData(id: string) {
- const cipher = await this.cipherService.get(id);
- const activeUserId = await firstValueFrom(
- this.accountService.activeAccount$.pipe(map((a) => a?.id)),
- );
+ async getCipherData(id: string, userId: UserId) {
+ const cipher = await this.cipherService.get(id, userId);
return await cipher.decrypt(
- await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
+ await this.cipherService.getKeyForCipherKeyDecryption(cipher, userId),
);
}
@@ -213,7 +220,7 @@ export class ViewV2Component {
restore = async (): Promise => {
try {
- await this.cipherService.restoreWithServer(this.cipher.id);
+ await this.cipherService.restoreWithServer(this.cipher.id, this.activeUserId);
} catch (e) {
this.logService.error(e);
}
@@ -228,8 +235,8 @@ export class ViewV2Component {
protected deleteCipher() {
return this.cipher.isDeleted
- ? this.cipherService.deleteWithServer(this.cipher.id)
- : this.cipherService.softDeleteWithServer(this.cipher.id);
+ ? this.cipherService.deleteWithServer(this.cipher.id, this.activeUserId)
+ : this.cipherService.softDeleteWithServer(this.cipher.id, this.activeUserId);
}
protected showFooter(): boolean {
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
index ec20458ca60..6d7b7b57d23 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
@@ -15,6 +15,8 @@ import { CipherId, UserId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
+import { LocalData } from "@bitwarden/common/vault/models/data/local.data";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { InlineMenuFieldQualificationService } from "../../../autofill/services/inline-menu-field-qualification.service";
@@ -34,6 +36,10 @@ describe("VaultPopupItemsService", () => {
let mockCollections: CollectionView[];
let activeUserLastSync$: BehaviorSubject;
+ let ciphersSubject: BehaviorSubject>;
+ let localDataSubject: BehaviorSubject>;
+ let failedToDecryptCiphersSubject: BehaviorSubject;
+
const cipherServiceMock = mock();
const vaultSettingsServiceMock = mock();
const organizationServiceMock = mock();
@@ -60,9 +66,21 @@ describe("VaultPopupItemsService", () => {
cipherList[3].favorite = true;
cipherServiceMock.getAllDecrypted.mockResolvedValue(cipherList);
- cipherServiceMock.ciphers$ = new BehaviorSubject(null);
- cipherServiceMock.localData$ = new BehaviorSubject(null);
- cipherServiceMock.failedToDecryptCiphers$ = new BehaviorSubject([]);
+
+ ciphersSubject = new BehaviorSubject>({});
+ localDataSubject = new BehaviorSubject>({});
+ failedToDecryptCiphersSubject = new BehaviorSubject([]);
+
+ cipherServiceMock.ciphers$.mockImplementation((userId: UserId) =>
+ ciphersSubject.asObservable(),
+ );
+ cipherServiceMock.localData$.mockImplementation((userId: UserId) =>
+ localDataSubject.asObservable(),
+ );
+ cipherServiceMock.failedToDecryptCiphers$.mockImplementation((userId: UserId) =>
+ failedToDecryptCiphersSubject.asObservable(),
+ );
+
searchService.searchCiphers.mockImplementation(async (_, __, ciphers) => ciphers);
cipherServiceMock.filterCiphersForUrl.mockImplementation(async (ciphers) =>
ciphers.filter((c) => ["0", "1"].includes(c.id)),
@@ -118,6 +136,7 @@ describe("VaultPopupItemsService", () => {
{ provide: CollectionService, useValue: collectionService },
{ provide: VaultPopupAutofillService, useValue: vaultAutofillServiceMock },
{ provide: SyncService, useValue: syncServiceMock },
+ { provide: AccountService, useValue: mockAccountServiceWith("UserId" as UserId) },
{
provide: InlineMenuFieldQualificationService,
useValue: inlineMenuFieldQualificationServiceMock,
@@ -155,7 +174,7 @@ describe("VaultPopupItemsService", () => {
await tracker.expectEmission();
- (cipherServiceMock.ciphers$ as BehaviorSubject).next(null);
+ ciphersSubject.next({});
await tracker.expectEmission();
@@ -169,7 +188,7 @@ describe("VaultPopupItemsService", () => {
await tracker.expectEmission();
- (cipherServiceMock.localData$ as BehaviorSubject).next(null);
+ localDataSubject.next({});
await tracker.expectEmission();
@@ -373,7 +392,7 @@ describe("VaultPopupItemsService", () => {
cipherServiceMock.getAllDecrypted.mockResolvedValue(ciphers);
- (cipherServiceMock.ciphers$ as BehaviorSubject).next(null);
+ ciphersSubject.next({});
const deletedCiphers = await firstValueFrom(service.deletedCiphers$);
expect(deletedCiphers.length).toBe(1);
@@ -422,7 +441,7 @@ describe("VaultPopupItemsService", () => {
it("should cycle when cipherService.ciphers$ emits", async () => {
// Restart tracking
tracked = new ObservableTracker(service.loading$);
- (cipherServiceMock.ciphers$ as BehaviorSubject).next(null);
+ ciphersSubject.next({});
await trackedCiphers.pauseUntilReceived(2);
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
index 8e0711abb1e..0b3e7eba492 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
@@ -1,6 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { inject, Injectable, NgZone } from "@angular/core";
+import { Injectable, NgZone } from "@angular/core";
import {
BehaviorSubject,
combineLatest,
@@ -86,16 +86,19 @@ export class VaultPopupItemsService {
* Observable that contains the list of all decrypted ciphers.
* @private
*/
- private _allDecryptedCiphers$: Observable = merge(
- this.cipherService.ciphers$,
- this.cipherService.localData$,
- ).pipe(
- runInsideAngular(inject(NgZone)), // Workaround to ensure cipher$ state provider emissions are run inside Angular
- tap(() => this._ciphersLoading$.next()),
- waitUntilSync(this.syncService),
- switchMap(() => Utils.asyncToObservable(() => this.cipherService.getAllDecrypted())),
- withLatestFrom(this.cipherService.failedToDecryptCiphers$),
- map(([ciphers, failedToDecryptCiphers]) => [...failedToDecryptCiphers, ...ciphers]),
+ private _allDecryptedCiphers$: Observable = this.accountService.activeAccount$.pipe(
+ map((a) => a?.id),
+ filter((userId) => userId != null),
+ switchMap((userId) =>
+ merge(this.cipherService.ciphers$(userId), this.cipherService.localData$(userId)).pipe(
+ runInsideAngular(this.ngZone),
+ tap(() => this._ciphersLoading$.next()),
+ waitUntilSync(this.syncService),
+ switchMap(() => Utils.asyncToObservable(() => this.cipherService.getAllDecrypted(userId))),
+ withLatestFrom(this.cipherService.failedToDecryptCiphers$(userId)),
+ map(([ciphers, failedToDecryptCiphers]) => [...failedToDecryptCiphers, ...ciphers]),
+ ),
+ ),
shareReplay({ refCount: true, bufferSize: 1 }),
);
@@ -281,6 +284,7 @@ export class VaultPopupItemsService {
private vaultPopupAutofillService: VaultPopupAutofillService,
private syncService: SyncService,
private accountService: AccountService,
+ private ngZone: NgZone,
) {}
applyFilter(newSearchText: string) {
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
index 7f570e8f5c9..ec823d5738f 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
@@ -41,7 +41,7 @@ describe("VaultPopupListFiltersService", () => {
} as unknown as FolderService;
const cipherService = {
- cipherViews$,
+ cipherViews$: () => cipherViews$,
} as unknown as CipherService;
const organizationService = {
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
index 579319c92ab..b1451318499 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
@@ -93,16 +93,6 @@ export class VaultPopupListFiltersService {
*/
private cipherViews: CipherView[] = [];
- /**
- * Observable of cipher views
- */
- private cipherViews$: Observable = this.cipherService.cipherViews$.pipe(
- tap((cipherViews) => {
- this.cipherViews = Object.values(cipherViews);
- }),
- map((ciphers) => Object.values(ciphers)),
- );
-
private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
constructor(
@@ -271,8 +261,16 @@ export class VaultPopupListFiltersService {
* Folder array structured to be directly passed to `ChipSelectComponent`
*/
folders$: Observable[]> = this.activeUserId$.pipe(
- switchMap((userId) =>
- combineLatest([
+ switchMap((userId) => {
+ // Observable of cipher views
+ const cipherViews$ = this.cipherService.cipherViews$(userId).pipe(
+ tap((cipherViews) => {
+ this.cipherViews = Object.values(cipherViews);
+ }),
+ map((ciphers) => Object.values(ciphers)),
+ );
+
+ return combineLatest([
this.filters$.pipe(
distinctUntilChanged(
(previousFilter, currentFilter) =>
@@ -281,7 +279,7 @@ export class VaultPopupListFiltersService {
),
),
this.folderService.folderViews$(userId),
- this.cipherViews$,
+ cipherViews$,
]).pipe(
map(([filters, folders, cipherViews]): [PopupListFilter, FolderView[], CipherView[]] => {
if (folders.length === 1 && folders[0].id === null) {
@@ -330,8 +328,8 @@ export class VaultPopupListFiltersService {
map((folders) =>
folders.nestedList.map((f) => this.convertToChipSelectOption(f, "bwi-folder")),
),
- ),
- ),
+ );
+ }),
);
/**
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
index c56d1c7d10d..7e30ab26035 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
@@ -3,8 +3,11 @@
import { CommonModule } from "@angular/common";
import { ChangeDetectionStrategy, Component, Input } from "@angular/core";
import { Router } from "@angular/router";
+import { firstValueFrom } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { CipherId } from "@bitwarden/common/types/guid";
@@ -65,6 +68,7 @@ export class TrashListItemsContainerComponent {
private i18nService: I18nService,
private dialogService: DialogService,
private passwordRepromptService: PasswordRepromptService,
+ private accountService: AccountService,
private router: Router,
) {}
@@ -81,7 +85,8 @@ export class TrashListItemsContainerComponent {
async restore(cipher: CipherView) {
try {
- await this.cipherService.restoreWithServer(cipher.id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ await this.cipherService.restoreWithServer(cipher.id, activeUserId);
await this.router.navigate(["/trash"]);
this.toastService.showToast({
@@ -112,7 +117,8 @@ export class TrashListItemsContainerComponent {
}
try {
- await this.cipherService.deleteWithServer(cipher.id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ await this.cipherService.deleteWithServer(cipher.id, activeUserId);
await this.router.navigate(["/trash"]);
this.toastService.showToast({
diff --git a/apps/browser/store/locales/pt_PT/copy.resx b/apps/browser/store/locales/pt_PT/copy.resx
index 65b81e2d2d4..fa62a0f1d5c 100644
--- a/apps/browser/store/locales/pt_PT/copy.resx
+++ b/apps/browser/store/locales/pt_PT/copy.resx
@@ -175,7 +175,7 @@ As soluções de gestão de credenciais encriptadas ponto a ponto do Bitwarden p
Sincronize e aceda ao seu cofre através de vários dispositivos
- Gira todas as suas credenciais e palavras-passe a partir de um cofre seguro
+ Faça a gestão de todas as suas credenciais e palavras-passe a partir de um cofre seguro
Preencha rapidamente e de forma automática as suas credenciais de início de sessão em qualquer site que visite
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index 81b9bc870c4..8055260db57 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -25,7 +25,7 @@
"@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
"@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
"@bitwarden/importer-core": ["../../libs/importer/src"],
- "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
+ "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
"@bitwarden/key-management": ["../../libs/key-management/src"],
"@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
"@bitwarden/platform": ["../../libs/platform/src"],
diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js
index ba60a577a71..d077e54bb73 100644
--- a/apps/browser/webpack.config.js
+++ b/apps/browser/webpack.config.js
@@ -317,19 +317,24 @@ if (manifestVersion == 2) {
configs.push(mainConfig);
} else {
- // Manifest v3 needs an extra helper for utilities in the content script.
- // The javascript output of this should be added to manifest.v3.json
- mainConfig.entry["content/misc-utils"] = "./src/autofill/content/misc-utils.ts";
- mainConfig.entry["offscreen-document/offscreen-document"] =
- "./src/platform/offscreen-document/offscreen-document.ts";
+ // Firefox does not use the offscreen API
+ if (browser !== "firefox") {
+ // Manifest v3 needs an extra helper for utilities in the content script.
+ // The javascript output of this should be added to manifest.v3.json
+ mainConfig.entry["content/misc-utils"] = "./src/autofill/content/misc-utils.ts";
+ mainConfig.entry["offscreen-document/offscreen-document"] =
+ "./src/platform/offscreen-document/offscreen-document.ts";
- mainConfig.plugins.push(
- new HtmlWebpackPlugin({
- template: "./src/platform/offscreen-document/index.html",
- filename: "offscreen-document/index.html",
- chunks: ["offscreen-document/offscreen-document"],
- }),
- );
+ mainConfig.plugins.push(
+ new HtmlWebpackPlugin({
+ template: "./src/platform/offscreen-document/index.html",
+ filename: "offscreen-document/index.html",
+ chunks: ["offscreen-document/offscreen-document"],
+ }),
+ );
+ }
+
+ const target = browser === "firefox" ? "web" : "webworker";
/**
* @type {import("webpack").Configuration}
@@ -339,7 +344,7 @@ if (manifestVersion == 2) {
mode: ENV,
devtool: false,
entry: "./src/platform/background.ts",
- target: "webworker",
+ target: target,
output: {
filename: "background.js",
path: path.resolve(__dirname, "build"),
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 391c9c80808..17dfca83dfa 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,7 +1,7 @@
{
"name": "@bitwarden/cli",
"description": "A secure and free password manager for all of your devices.",
- "version": "2025.1.3",
+ "version": "2025.2.0",
"keywords": [
"bitwarden",
"password",
diff --git a/apps/cli/src/admin-console/commands/share.command.ts b/apps/cli/src/admin-console/commands/share.command.ts
index e26d073326e..6d9e6c8b6c0 100644
--- a/apps/cli/src/admin-console/commands/share.command.ts
+++ b/apps/cli/src/admin-console/commands/share.command.ts
@@ -1,8 +1,9 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { firstValueFrom, map } from "rxjs";
+import { firstValueFrom } from "rxjs";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { Response } from "../../models/response";
@@ -48,7 +49,9 @@ export class ShareCommand {
organizationId = organizationId.toLowerCase();
}
- const cipher = await this.cipherService.get(id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+ const cipher = await this.cipherService.get(id, activeUserId);
if (cipher == null) {
return Response.notFound();
}
@@ -56,15 +59,12 @@ export class ShareCommand {
return Response.badRequest("This item already belongs to an organization.");
}
- const activeUserId = await firstValueFrom(
- this.accountService.activeAccount$.pipe(map((a) => a?.id)),
- );
const cipherView = await cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
try {
await this.cipherService.shareWithServer(cipherView, organizationId, req, activeUserId);
- const updatedCipher = await this.cipherService.get(cipher.id);
+ const updatedCipher = await this.cipherService.get(cipher.id, activeUserId);
const decCipher = await updatedCipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher, activeUserId),
);
diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
index 9af28863c09..2d4a854135d 100644
--- a/apps/cli/src/commands/edit.command.ts
+++ b/apps/cli/src/commands/edit.command.ts
@@ -1,11 +1,12 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { firstValueFrom, map } from "rxjs";
+import { firstValueFrom } from "rxjs";
import { CollectionRequest } from "@bitwarden/admin-console/common";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
import { CollectionExport } from "@bitwarden/common/models/export/collection.export";
@@ -25,8 +26,6 @@ import { CipherResponse } from "../vault/models/cipher.response";
import { FolderResponse } from "../vault/models/folder.response";
export class EditCommand {
- private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
-
constructor(
private cipherService: CipherService,
private folderService: FolderService,
@@ -85,14 +84,12 @@ export class EditCommand {
}
private async editCipher(id: string, req: CipherExport) {
- const cipher = await this.cipherService.get(id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ const cipher = await this.cipherService.get(id, activeUserId);
if (cipher == null) {
return Response.notFound();
}
- const activeUserId = await firstValueFrom(
- this.accountService.activeAccount$.pipe(map((a) => a?.id)),
- );
let cipherView = await cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
@@ -114,7 +111,9 @@ export class EditCommand {
}
private async editCipherCollections(id: string, req: string[]) {
- const cipher = await this.cipherService.get(id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+ const cipher = await this.cipherService.get(id, activeUserId);
if (cipher == null) {
return Response.notFound();
}
@@ -129,11 +128,14 @@ export class EditCommand {
cipher.collectionIds = req;
try {
- const updatedCipher = await this.cipherService.saveCollectionsWithServer(cipher);
+ const updatedCipher = await this.cipherService.saveCollectionsWithServer(
+ cipher,
+ activeUserId,
+ );
const decCipher = await updatedCipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(
updatedCipher,
- await firstValueFrom(this.activeUserId$),
+ await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId)),
),
);
const res = new CipherResponse(decCipher);
@@ -144,7 +146,7 @@ export class EditCommand {
}
private async editFolder(id: string, req: FolderExport) {
- const activeUserId = await firstValueFrom(this.activeUserId$);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const folder = await this.folderService.getFromState(id, activeUserId);
if (folder == null) {
return Response.notFound();
diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
index a90bfa64894..92c3a8baeaf 100644
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -52,8 +52,6 @@ import { FolderResponse } from "../vault/models/folder.response";
import { DownloadCommand } from "./download.command";
export class GetCommand extends DownloadCommand {
- private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
-
constructor(
private cipherService: CipherService,
private folderService: FolderService,
@@ -114,16 +112,16 @@ export class GetCommand extends DownloadCommand {
private async getCipherView(id: string): Promise {
let decCipher: CipherView = null;
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
if (Utils.isGuid(id)) {
- const cipher = await this.cipherService.get(id);
+ const cipher = await this.cipherService.get(id, activeUserId);
if (cipher != null) {
- const activeUserId = await firstValueFrom(this.activeUserId$);
decCipher = await cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
}
} else if (id.trim() !== "") {
- let ciphers = await this.cipherService.getAllDecrypted();
+ let ciphers = await this.cipherService.getAllDecrypted(activeUserId);
ciphers = this.searchService.searchCiphersBasic(ciphers, id);
if (ciphers.length > 1) {
return ciphers;
@@ -265,8 +263,10 @@ export class GetCommand extends DownloadCommand {
const canAccessPremium = await firstValueFrom(
this.accountProfileService.hasPremiumFromAnySource$(account.id),
);
+
if (!canAccessPremium) {
- const originalCipher = await this.cipherService.get(cipher.id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ const originalCipher = await this.cipherService.get(cipher.id, activeUserId);
if (
originalCipher == null ||
originalCipher.organizationId == null ||
@@ -352,7 +352,8 @@ export class GetCommand extends DownloadCommand {
this.accountProfileService.hasPremiumFromAnySource$(account.id),
);
if (!canAccessPremium) {
- const originalCipher = await this.cipherService.get(cipher.id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ const originalCipher = await this.cipherService.get(cipher.id, activeUserId);
if (originalCipher == null || originalCipher.organizationId == null) {
return Response.error("Premium status is required to use this feature.");
}
@@ -384,7 +385,7 @@ export class GetCommand extends DownloadCommand {
private async getFolder(id: string) {
let decFolder: FolderView = null;
- const activeUserId = await firstValueFrom(this.activeUserId$);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
if (Utils.isGuid(id)) {
const folder = await this.folderService.getFromState(id, activeUserId);
if (folder != null) {
@@ -561,7 +562,7 @@ export class GetCommand extends DownloadCommand {
private async getFingerprint(id: string) {
let fingerprint: string[] = null;
if (id === "me") {
- const activeUserId = await firstValueFrom(this.activeUserId$);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const publicKey = await firstValueFrom(this.keyService.userPublicKey$(activeUserId));
fingerprint = await this.keyService.getFingerprint(activeUserId, publicKey);
} else if (Utils.isGuid(id)) {
diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts
index 5e01af798a4..5d512d81bf5 100644
--- a/apps/cli/src/commands/list.command.ts
+++ b/apps/cli/src/commands/list.command.ts
@@ -65,11 +65,14 @@ export class ListCommand {
private async listCiphers(options: Options) {
let ciphers: CipherView[];
+
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
options.trash = options.trash || false;
if (options.url != null && options.url.trim() !== "") {
- ciphers = await this.cipherService.getAllDecryptedForUrl(options.url);
+ ciphers = await this.cipherService.getAllDecryptedForUrl(options.url, activeUserId);
} else {
- ciphers = await this.cipherService.getAllDecrypted();
+ ciphers = await this.cipherService.getAllDecrypted(activeUserId);
}
if (
@@ -138,9 +141,8 @@ export class ListCommand {
}
private async listFolders(options: Options) {
- const activeUserId = await firstValueFrom(
- this.accountService.activeAccount$.pipe(map((a) => a?.id)),
- );
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
let folders = await this.folderService.getAllDecryptedFromState(activeUserId);
if (options.search != null && options.search.trim() !== "") {
diff --git a/apps/cli/src/commands/restore.command.ts b/apps/cli/src/commands/restore.command.ts
index 96179e7b687..fd2f6f239ef 100644
--- a/apps/cli/src/commands/restore.command.ts
+++ b/apps/cli/src/commands/restore.command.ts
@@ -1,9 +1,16 @@
+import { firstValueFrom } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { Response } from "../models/response";
export class RestoreCommand {
- constructor(private cipherService: CipherService) {}
+ constructor(
+ private cipherService: CipherService,
+ private accountService: AccountService,
+ ) {}
async run(object: string, id: string): Promise {
if (id != null) {
@@ -19,7 +26,9 @@ export class RestoreCommand {
}
private async restoreCipher(id: string) {
- const cipher = await this.cipherService.get(id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+ const cipher = await this.cipherService.get(id, activeUserId);
if (cipher == null) {
return Response.notFound();
}
@@ -28,7 +37,7 @@ export class RestoreCommand {
}
try {
- await this.cipherService.restoreWithServer(id);
+ await this.cipherService.restoreWithServer(id, activeUserId);
return Response.success();
} catch (e) {
return Response.error(e);
diff --git a/apps/cli/src/oss-serve-configurator.ts b/apps/cli/src/oss-serve-configurator.ts
index be476d19814..dec09447839 100644
--- a/apps/cli/src/oss-serve-configurator.ts
+++ b/apps/cli/src/oss-serve-configurator.ts
@@ -124,7 +124,10 @@ export class OssServeConfigurator {
this.serviceContainer.encryptService,
this.serviceContainer.organizationUserApiService,
);
- this.restoreCommand = new RestoreCommand(this.serviceContainer.cipherService);
+ this.restoreCommand = new RestoreCommand(
+ this.serviceContainer.cipherService,
+ this.serviceContainer.accountService,
+ );
this.shareCommand = new ShareCommand(
this.serviceContainer.cipherService,
this.serviceContainer.accountService,
diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts
index f3eb6eef613..d6ef27b1428 100644
--- a/apps/cli/src/vault.program.ts
+++ b/apps/cli/src/vault.program.ts
@@ -347,7 +347,10 @@ export class VaultProgram extends BaseProgram {
}
await this.exitIfLocked();
- const command = new RestoreCommand(this.serviceContainer.cipherService);
+ const command = new RestoreCommand(
+ this.serviceContainer.cipherService,
+ this.serviceContainer.accountService,
+ );
const response = await command.run(object, id);
this.processResponse(response);
});
diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts
index 28f58187fdb..713471356c9 100644
--- a/apps/cli/src/vault/create.command.ts
+++ b/apps/cli/src/vault/create.command.ts
@@ -10,6 +10,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
@@ -30,8 +31,6 @@ import { CipherResponse } from "./models/cipher.response";
import { FolderResponse } from "./models/folder.response";
export class CreateCommand {
- private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
-
constructor(
private cipherService: CipherService,
private folderService: FolderService,
@@ -90,7 +89,7 @@ export class CreateCommand {
}
private async createCipher(req: CipherExport) {
- const activeUserId = await firstValueFrom(this.activeUserId$);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const cipher = await this.cipherService.encrypt(CipherExport.toView(req), activeUserId);
try {
const newCipher = await this.cipherService.createWithServer(cipher);
@@ -132,14 +131,14 @@ export class CreateCommand {
return Response.badRequest("File name not provided.");
}
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
const itemId = options.itemId.toLowerCase();
- const cipher = await this.cipherService.get(itemId);
+ const cipher = await this.cipherService.get(itemId, activeUserId);
if (cipher == null) {
return Response.notFound();
}
- const activeUserId = await firstValueFrom(this.activeUserId$);
-
const canAccessPremium = await firstValueFrom(
this.accountProfileService.hasPremiumFromAnySource$(activeUserId),
);
@@ -173,7 +172,7 @@ export class CreateCommand {
}
private async createFolder(req: FolderExport) {
- const activeUserId = await firstValueFrom(this.activeUserId$);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId);
const folder = await this.folderService.encrypt(FolderExport.toView(req), userKey);
try {
diff --git a/apps/cli/src/vault/delete.command.ts b/apps/cli/src/vault/delete.command.ts
index a285f8f5b34..9e648cd9bb0 100644
--- a/apps/cli/src/vault/delete.command.ts
+++ b/apps/cli/src/vault/delete.command.ts
@@ -1,7 +1,8 @@
-import { firstValueFrom, map } from "rxjs";
+import { firstValueFrom } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -44,7 +45,9 @@ export class DeleteCommand {
}
private async deleteCipher(id: string, options: Options) {
- const cipher = await this.cipherService.get(id);
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+ const cipher = await this.cipherService.get(id, activeUserId);
if (cipher == null) {
return Response.notFound();
}
@@ -59,9 +62,9 @@ export class DeleteCommand {
try {
if (options.permanent) {
- await this.cipherService.deleteWithServer(id);
+ await this.cipherService.deleteWithServer(id, activeUserId);
} else {
- await this.cipherService.softDeleteWithServer(id);
+ await this.cipherService.softDeleteWithServer(id, activeUserId);
}
return Response.success();
} catch (e) {
@@ -74,8 +77,10 @@ export class DeleteCommand {
return Response.badRequest("`itemid` option is required.");
}
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
const itemId = options.itemId.toLowerCase();
- const cipher = await this.cipherService.get(itemId);
+ const cipher = await this.cipherService.get(itemId, activeUserId);
if (cipher == null) {
return Response.notFound();
}
@@ -89,16 +94,19 @@ export class DeleteCommand {
return Response.error("Attachment `" + id + "` was not found.");
}
- const account = await firstValueFrom(this.accountService.activeAccount$);
const canAccessPremium = await firstValueFrom(
- this.accountProfileService.hasPremiumFromAnySource$(account.id),
+ this.accountProfileService.hasPremiumFromAnySource$(activeUserId),
);
if (cipher.organizationId == null && !canAccessPremium) {
return Response.error("Premium status is required to use this feature.");
}
try {
- await this.cipherService.deleteAttachmentWithServer(cipher.id, attachments[0].id);
+ await this.cipherService.deleteAttachmentWithServer(
+ cipher.id,
+ attachments[0].id,
+ activeUserId,
+ );
return Response.success();
} catch (e) {
return Response.error(e);
@@ -106,9 +114,7 @@ export class DeleteCommand {
}
private async deleteFolder(id: string) {
- const activeUserId = await firstValueFrom(
- this.accountService.activeAccount$.pipe(map((a) => a?.id)),
- );
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const folder = await this.folderService.getFromState(id, activeUserId);
if (folder == null) {
return Response.notFound();
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 6ab3459c7f8..014cc219464 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
{
"name": "@bitwarden/desktop",
"description": "A secure and free password manager for all of your devices.",
- "version": "2025.1.4",
+ "version": "2025.2.1",
"keywords": [
"bitwarden",
"password",
diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index 709506f576f..a47f938efd2 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -436,6 +436,23 @@
"enableSshAgentDesc" | i18n
}}
diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts
index 136a537dd37..aee1f34437b 100644
--- a/apps/desktop/src/vault/app/vault/view.component.ts
+++ b/apps/desktop/src/vault/app/vault/view.component.ts
@@ -159,10 +159,4 @@ export class ViewComponent extends BaseViewComponent implements OnInit, OnDestro
this.messagingService.send("premiumRequired");
}
}
-
- upgradeOrganization() {
- this.messagingService.send("upgradeOrganization", {
- organizationId: this.cipher.organizationId,
- });
- }
}
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index 1bd97b0130f..0bef5a5564d 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -23,7 +23,7 @@
"@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
"@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
"@bitwarden/importer-core": ["../../libs/importer/src"],
- "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
+ "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
"@bitwarden/key-management": ["../../libs/key-management/src"],
"@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
"@bitwarden/node/*": ["../../libs/node/src/*"],
diff --git a/apps/web/package.json b/apps/web/package.json
index 7047b0fb137..cf2df649773 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
{
"name": "@bitwarden/web-vault",
- "version": "2025.1.2",
+ "version": "2025.2.1",
"scripts": {
"build:oss": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
"build:bit": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
index 58efc7348e1..68ba5830c35 100644
--- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
@@ -1,8 +1,10 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { DIALOG_DATA, DialogConfig } from "@angular/cdk/dialog";
-import { Component, Inject, OnInit } from "@angular/core";
+import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
import { FormBuilder } from "@angular/forms";
+import { ActivatedRoute, Router } from "@angular/router";
+import { firstValueFrom, switchMap } from "rxjs";
import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -12,7 +14,6 @@ import { ListResponse } from "@bitwarden/common/models/response/list.response";
import { EventView } from "@bitwarden/common/models/view/event.view";
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 { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
import { DialogService, TableDataSource, ToastService } from "@bitwarden/components";
@@ -34,7 +35,7 @@ export interface EntityEventsDialogParams {
templateUrl: "entity-events.component.html",
standalone: true,
})
-export class EntityEventsComponent implements OnInit {
+export class EntityEventsComponent implements OnInit, OnDestroy {
loading = true;
continuationToken: string;
protected dataSource = new TableDataSource
();
@@ -59,13 +60,14 @@ export class EntityEventsComponent implements OnInit {
private apiService: ApiService,
private i18nService: I18nService,
private eventService: EventService,
- private platformUtilsService: PlatformUtilsService,
private userNamePipe: UserNamePipe,
private logService: LogService,
private organizationUserApiService: OrganizationUserApiService,
private formBuilder: FormBuilder,
private validationService: ValidationService,
private toastService: ToastService,
+ private router: Router,
+ private activeRoute: ActivatedRoute,
) {}
async ngOnInit() {
@@ -77,6 +79,21 @@ export class EntityEventsComponent implements OnInit {
await this.load();
}
+ async ngOnDestroy() {
+ await firstValueFrom(
+ this.activeRoute.queryParams.pipe(
+ switchMap(async (params) => {
+ await this.router.navigate([], {
+ queryParams: {
+ ...params,
+ viewEvents: null,
+ },
+ });
+ }),
+ ),
+ );
+ }
+
async load() {
try {
if (this.showUser) {
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
index bb5294ebf02..f666decae81 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
@@ -7,9 +7,9 @@
{{ error }}
-
- {{ "deleteManyOrganizationUsersWarningDesc" | i18n }}
-
+
+ {{ "deleteManyOrganizationUsersWarningDesc" | i18n }}
+
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html
index ebe27afabf5..0c64a150425 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html
@@ -3,9 +3,9 @@
*ngIf="{ enabled: accountDeprovisioningEnabled$ | async } as accountDeprovisioning"
>
- {{ bulkMemberTitle }}
+ {{ bulkMemberTitle }}
- {{ bulkTitle }}
+ {{ bulkTitle }}
@@ -46,10 +46,7 @@
-
- {{ "revokeUsersWarning" | i18n }}
-
-
+ {{ "revokeUsersWarning" | i18n }}
@@ -109,7 +106,13 @@
-
-
+
|
{
+ showOrgAtRiskMembers = async (invokerId: string) => {
const dialogData = this.reportService.generateAtRiskMemberList(this.dataSource.data);
- this.dataService.setDrawerForOrgAtRiskMembers(dialogData);
+ this.dataService.setDrawerForOrgAtRiskMembers(dialogData, invokerId);
};
- showOrgAtRiskApps = async () => {
+ showOrgAtRiskApps = async (invokerId: string) => {
const data = this.reportService.generateAtRiskApplicationList(this.dataSource.data);
- this.dataService.setDrawerForOrgAtRiskApps(data);
+ this.dataService.setDrawerForOrgAtRiskApps(data, invokerId);
};
onCheckboxChange(applicationName: string, event: Event) {
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.html
index 72e60c470b0..4dc4b7ffb1a 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.html
@@ -35,19 +35,27 @@
@@ -70,7 +78,11 @@
|
-
+
|
|
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.ts
index 4d820a3cc66..f1fa38dd28f 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.ts
@@ -131,17 +131,17 @@ export class CriticalApplicationsComponent implements OnInit {
?.atRiskMemberDetails ?? [],
applicationName,
};
- this.dataService.setDrawerForAppAtRiskMembers(data);
+ this.dataService.setDrawerForAppAtRiskMembers(data, applicationName);
};
- showOrgAtRiskMembers = async () => {
+ showOrgAtRiskMembers = async (invokerId: string) => {
const data = this.reportService.generateAtRiskMemberList(this.dataSource.data);
- this.dataService.setDrawerForOrgAtRiskMembers(data);
+ this.dataService.setDrawerForOrgAtRiskMembers(data, invokerId);
};
- showOrgAtRiskApps = async () => {
+ showOrgAtRiskApps = async (invokerId: string) => {
const data = this.reportService.generateAtRiskApplicationList(this.dataSource.data);
- this.dataService.setDrawerForOrgAtRiskApps(data);
+ this.dataService.setDrawerForOrgAtRiskApps(data, invokerId);
};
trackByFunction(_: number, item: ApplicationHealthReportDetailWithCriticalFlag) {
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html
index a368f5c0c18..12082e888b0 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html
@@ -56,7 +56,11 @@
-
+
{
expect(apiService.send).toHaveBeenCalledWith(
"POST",
`/tasks/${organizationId}/bulk-create`,
- tasks,
+ { tasks },
true,
true,
);
diff --git a/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts b/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts
index 442fde9dbf6..520fb744486 100644
--- a/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts
+++ b/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts
@@ -43,6 +43,12 @@ export class DefaultAdminTaskService implements AdminTaskService {
organizationId: OrganizationId,
tasks: CreateTasksRequest[],
): Promise {
- await this.apiService.send("POST", `/tasks/${organizationId}/bulk-create`, tasks, true, true);
+ await this.apiService.send(
+ "POST",
+ `/tasks/${organizationId}/bulk-create`,
+ { tasks },
+ true,
+ true,
+ );
}
}
diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json
index 1c9a530d273..82e0b7f57fa 100644
--- a/bitwarden_license/bit-web/tsconfig.json
+++ b/bitwarden_license/bit-web/tsconfig.json
@@ -22,7 +22,7 @@
],
"@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
"@bitwarden/importer-core": ["../../libs/importer/src"],
- "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
+ "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
"@bitwarden/key-management": ["../../libs/key-management/src"],
"@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
"@bitwarden/platform": ["../../libs/platform/src"],
diff --git a/libs/angular/src/admin-console/components/collections.component.ts b/libs/angular/src/admin-console/components/collections.component.ts
index 52a22ac2946..5f39966468f 100644
--- a/libs/angular/src/admin-console/components/collections.component.ts
+++ b/libs/angular/src/admin-console/components/collections.component.ts
@@ -7,9 +7,11 @@ import { CollectionService, CollectionView } from "@bitwarden/admin-console/comm
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.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 { UserId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -45,11 +47,9 @@ export class CollectionsComponent implements OnInit {
}
async load() {
- this.cipherDomain = await this.loadCipher();
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ this.cipherDomain = await this.loadCipher(activeUserId);
this.collectionIds = this.loadCipherCollections();
- const activeUserId = await firstValueFrom(
- this.accountService.activeAccount$.pipe(map((a) => a?.id)),
- );
this.cipher = await this.cipherDomain.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(this.cipherDomain, activeUserId),
);
@@ -95,7 +95,8 @@ export class CollectionsComponent implements OnInit {
}
this.cipherDomain.collectionIds = selectedCollectionIds;
try {
- this.formPromise = this.saveCollections();
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ this.formPromise = this.saveCollections(activeUserId);
await this.formPromise;
this.onSavedCollections.emit();
this.toastService.showToast({
@@ -114,8 +115,8 @@ export class CollectionsComponent implements OnInit {
}
}
- protected loadCipher() {
- return this.cipherService.get(this.cipherId);
+ protected loadCipher(userId: UserId) {
+ return this.cipherService.get(this.cipherId, userId);
}
protected loadCipherCollections() {
@@ -129,7 +130,7 @@ export class CollectionsComponent implements OnInit {
);
}
- protected saveCollections() {
- return this.cipherService.saveCollectionsWithServer(this.cipherDomain);
+ protected saveCollections(userId: UserId) {
+ return this.cipherService.saveCollectionsWithServer(this.cipherDomain, userId);
}
}
diff --git a/libs/angular/src/auth/components/environment-selector.component.html b/libs/angular/src/auth/components/environment-selector.component.html
index 786afe40371..19f49f73dd2 100644
--- a/libs/angular/src/auth/components/environment-selector.component.html
+++ b/libs/angular/src/auth/components/environment-selector.component.html
@@ -3,7 +3,7 @@
selectedRegion: selectedRegion$ | async,
} as data"
>
-
+
{{ "accessing" | i18n }}: