-
-
-
-
-
- {{ "otherOptions" | i18n }}
-
-
- - {{ "twoStepOptions" | i18n }} -
- -{{ "enableAutoFillOnPageLoadSectionTitle" | i18n }}
-{{ "additionalOptions" | i18n }}
-{{ "reviewAtRiskLogins" | i18n }}
@@ -18,7 +18,7 @@ class="tw-max-w-full tw-max-h-40" src="../../../../images/at-risk-password-carousel/generate_password.light.png" appDarkImgSrc="../../../../images/at-risk-password-carousel/generate_password.dark.png" - [alt]="'generatePasswordSlideImgAlt' | i18n" + [alt]="'generatePasswordSlideImgAltPeriod' | i18n" />
{{ "generatePassword" | i18n }}
@@ -30,7 +30,7 @@ class="tw-max-w-full tw-max-h-40" src="../../../../images/at-risk-password-carousel/update_login.light.png" appDarkImgSrc="../../../../images/at-risk-password-carousel/update_login.dark.png" - [alt]="'updateInBitwardenSlideImgAlt' | i18n" + [alt]="'updateInBitwardenSlideImgAltPeriod' | i18n" />
{{ "updateInBitwarden" | i18n }}
@@ -39,7 +39,7 @@
+
-
+
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
index 3bf786ad5b7..25bf3ce3716 100644
--- 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
@@ -16,14 +16,12 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
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 { SecurityTask, SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
import { DialogService, ToastService } from "@bitwarden/components";
import {
ChangeLoginPasswordService,
DefaultChangeLoginPasswordService,
PasswordRepromptService,
- SecurityTask,
- SecurityTaskType,
- TaskService,
} from "@bitwarden/vault";
import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
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
index dd3d53fed7d..6711673751c 100644
--- 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
@@ -15,6 +15,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
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 { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
+import { filterOutNullish } from "@bitwarden/common/vault/utils/observable-utilities";
import {
BadgeModule,
ButtonModule,
@@ -28,10 +30,7 @@ import {
import {
ChangeLoginPasswordService,
DefaultChangeLoginPasswordService,
- filterOutNullish,
PasswordRepromptService,
- SecurityTaskType,
- TaskService,
VaultCarouselModule,
} from "@bitwarden/vault";
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
index 40f00ab4332..19f1668eba4 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
@@ -7,6 +7,6 @@
[description]="(showEmptyAutofillTip$ | async) ? ('autofillSuggestionsTip' | i18n) : null"
showAutofillButton
[disableDescriptionMargin]="showEmptyAutofillTip$ | async"
- [primaryActionAutofill]="clickItemsToAutofillVaultView"
+ [primaryActionAutofill]="clickItemsToAutofillVaultView$ | async"
[groupByType]="groupByType()"
>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
index 03d84120785..72d51776f7b 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
@@ -1,7 +1,7 @@
import { CommonModule } from "@angular/common";
-import { Component, OnInit } from "@angular/core";
+import { Component } from "@angular/core";
import { toSignal } from "@angular/core/rxjs-interop";
-import { combineLatest, firstValueFrom, map, Observable } from "rxjs";
+import { combineLatest, map, Observable } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
@@ -33,7 +33,7 @@ import { VaultListItemsContainerComponent } from "../vault-list-items-container/
selector: "app-autofill-vault-list-items",
templateUrl: "autofill-vault-list-items.component.html",
})
-export class AutofillVaultListItemsComponent implements OnInit {
+export class AutofillVaultListItemsComponent {
/**
* The list of ciphers that can be used to autofill the current page.
* @protected
@@ -47,7 +47,9 @@ export class AutofillVaultListItemsComponent implements OnInit {
*/
protected showRefresh: boolean = BrowserPopupUtils.inSidebar(window);
- clickItemsToAutofillVaultView = false;
+ /** Flag indicating whether the login item should automatically autofill when clicked */
+ protected clickItemsToAutofillVaultView$: Observable
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 9d70c0ba236..6df1bdf8ae5 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
@@ -206,11 +206,14 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
/**
* Resolved i18n key to use for suggested cipher items
*/
- cipherItemTitleKey = this.currentURIIsBlocked$.pipe(
- map((uriIsBlocked) =>
- this.primaryActionAutofill && !uriIsBlocked ? "autofillTitle" : "viewItemTitle",
- ),
- );
+ cipherItemTitleKey = (cipher: CipherView) =>
+ this.currentURIIsBlocked$.pipe(
+ map((uriIsBlocked) => {
+ const hasUsername = cipher.login?.username != null;
+ const key = this.primaryActionAutofill && !uriIsBlocked ? "autofillTitle" : "viewItemTitle";
+ return hasUsername ? `${key}WithField` : key;
+ }),
+ );
/**
* Option to show the autofill button for each item.
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 92276ef633f..f8bbb930f72 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
@@ -170,7 +170,7 @@ export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
this.cipherService
.failedToDecryptCiphers$(activeUserId)
.pipe(
- map((ciphers) => ciphers.filter((c) => !c.isDeleted)),
+ map((ciphers) => (ciphers ? ciphers.filter((c) => !c.isDeleted) : [])),
filter((ciphers) => ciphers.length > 0),
take(1),
takeUntilDestroyed(this.destroyRef),
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 b9eae380ca0..6b64e1191fc 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
@@ -33,19 +33,17 @@ import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cip
import {
AsyncActionsModule,
ButtonModule,
+ CalloutModule,
DialogService,
IconButtonModule,
SearchModule,
ToastService,
- CalloutModule,
} from "@bitwarden/components";
import {
ChangeLoginPasswordService,
CipherViewComponent,
CopyCipherFieldService,
DefaultChangeLoginPasswordService,
- DefaultTaskService,
- TaskService,
} from "@bitwarden/vault";
import { BrowserApi } from "../../../../../platform/browser/browser-api";
@@ -95,7 +93,6 @@ type LoadAction =
providers: [
{ provide: ViewPasswordHistoryService, useClass: BrowserViewPasswordHistoryService },
{ provide: PremiumUpgradePromptService, useClass: BrowserPremiumUpgradePromptService },
- { provide: TaskService, useClass: DefaultTaskService },
{ provide: ChangeLoginPasswordService, useClass: DefaultChangeLoginPasswordService },
],
})
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 dac6a141d41..5f2ec858ed6 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
@@ -108,7 +108,7 @@ export class VaultPopupItemsService {
this.cipherService.failedToDecryptCiphers$(userId),
]),
),
- map(([ciphers, failedToDecryptCiphers]) => [...failedToDecryptCiphers, ...ciphers]),
+ map(([ciphers, failedToDecryptCiphers]) => [...(failedToDecryptCiphers || []), ...ciphers]),
),
),
shareReplay({ refCount: true, bufferSize: 1 }),
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 99a27c54bcc..f9785bccd00 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
@@ -36,7 +36,7 @@ describe("VaultPopupListFiltersService", () => {
let folderViews$ = new BehaviorSubject([]);
const cipherViews$ = new BehaviorSubject({});
let decryptedCollections$ = new BehaviorSubject([]);
- const policyAppliesToActiveUser$ = new BehaviorSubject(false);
+ const policyAppliesToUser$ = new BehaviorSubject(false);
let viewCacheService: {
signal: jest.Mock;
mockSignal: WritableSignal;
@@ -65,7 +65,7 @@ describe("VaultPopupListFiltersService", () => {
} as I18nService;
const policyService = {
- policyAppliesToActiveUser$: jest.fn(() => policyAppliesToActiveUser$),
+ policyAppliesToUser$: jest.fn(() => policyAppliesToUser$),
};
const state$ = new BehaviorSubject(false);
@@ -75,8 +75,8 @@ describe("VaultPopupListFiltersService", () => {
_memberOrganizations$ = new BehaviorSubject([]); // Fresh instance per test
folderViews$ = new BehaviorSubject([]); // Fresh instance per test
decryptedCollections$ = new BehaviorSubject([]); // Fresh instance per test
- policyAppliesToActiveUser$.next(false);
- policyService.policyAppliesToActiveUser$.mockClear();
+ policyAppliesToUser$.next(false);
+ policyService.policyAppliesToUser$.mockClear();
const accountService = mockAccountServiceWith("userId" as UserId);
const mockCachedSignal = createMockSignal({});
@@ -196,14 +196,15 @@ describe("VaultPopupListFiltersService", () => {
});
describe("PersonalOwnership policy", () => {
- it('calls policyAppliesToActiveUser$ with "PersonalOwnership"', () => {
- expect(policyService.policyAppliesToActiveUser$).toHaveBeenCalledWith(
+ it('calls policyAppliesToUser$ with "PersonalOwnership"', () => {
+ expect(policyService.policyAppliesToUser$).toHaveBeenCalledWith(
PolicyType.PersonalOwnership,
+ "userId",
);
});
it("returns an empty array when the policy applies and there is a single organization", (done) => {
- policyAppliesToActiveUser$.next(true);
+ policyAppliesToUser$.next(true);
_memberOrganizations$.next([
{ name: "bobby's org", id: "1234-3323-23223" },
] as Organization[]);
@@ -215,7 +216,7 @@ describe("VaultPopupListFiltersService", () => {
});
it('adds "myVault" when the policy does not apply and there are multiple organizations', (done) => {
- policyAppliesToActiveUser$.next(false);
+ policyAppliesToUser$.next(false);
const orgs = [
{ name: "bobby's org", id: "1234-3323-23223" },
{ name: "alice's org", id: "2223-4343-99888" },
@@ -234,7 +235,7 @@ describe("VaultPopupListFiltersService", () => {
});
it('does not add "myVault" the policy applies and there are multiple organizations', (done) => {
- policyAppliesToActiveUser$.next(true);
+ policyAppliesToUser$.next(true);
const orgs = [
{ name: "bobby's org", id: "1234-3323-23223" },
{ name: "alice's org", id: "2223-3242-99888" },
@@ -679,7 +680,7 @@ function createSeededVaultPopupListFiltersService(
} as any;
const policyServiceMock = {
- policyAppliesToActiveUser$: jest.fn(() => new BehaviorSubject(false)),
+ policyAppliesToUser$: jest.fn(() => new BehaviorSubject(false)),
} as any;
const stateProviderMock = {
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 8d9f6664e45..6cce5796cbe 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
@@ -8,12 +8,10 @@ import {
filter,
map,
Observable,
- of,
shareReplay,
startWith,
switchMap,
take,
- tap,
} from "rxjs";
import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
@@ -23,6 +21,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
import { PolicyType } from "@bitwarden/common/admin-console/enums";
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 { ProductTierType } from "@bitwarden/common/billing/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -288,68 +287,70 @@ export class VaultPopupListFiltersService {
/**
* Organization array structured to be directly passed to `ChipSelectComponent`
*/
- organizations$: Observable[]> = combineLatest([
+
+ organizations$: Observable[]> =
this.accountService.activeAccount$.pipe(
- switchMap((account) =>
- account === null ? of([]) : this.organizationService.memberOrganizations$(account.id),
+ getUserId,
+ switchMap((userId) =>
+ combineLatest([
+ this.organizationService.memberOrganizations$(userId),
+ this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+ ]),
),
- ),
- this.policyService.policyAppliesToActiveUser$(PolicyType.PersonalOwnership),
- ]).pipe(
- map(([orgs, personalOwnershipApplies]): [Organization[], boolean] => [
- orgs.sort(Utils.getSortFunction(this.i18nService, "name")),
- personalOwnershipApplies,
- ]),
- map(([orgs, personalOwnershipApplies]) => {
- // When there are no organizations return an empty array,
- // resulting in the org filter being hidden
- if (!orgs.length) {
- return [];
- }
+ map(([orgs, personalOwnershipApplies]): [Organization[], boolean] => [
+ orgs.sort(Utils.getSortFunction(this.i18nService, "name")),
+ personalOwnershipApplies,
+ ]),
+ map(([orgs, personalOwnershipApplies]) => {
+ // When there are no organizations return an empty array,
+ // resulting in the org filter being hidden
+ if (!orgs.length) {
+ return [];
+ }
- // When there is only one organization and personal ownership policy applies,
- // return an empty array, resulting in the org filter being hidden
- if (orgs.length === 1 && personalOwnershipApplies) {
- return [];
- }
+ // When there is only one organization and personal ownership policy applies,
+ // return an empty array, resulting in the org filter being hidden
+ if (orgs.length === 1 && personalOwnershipApplies) {
+ return [];
+ }
- const myVaultOrg: ChipSelectOption[] = [];
+ const myVaultOrg: ChipSelectOption[] = [];
- // Only add "My vault" if personal ownership policy does not apply
- if (!personalOwnershipApplies) {
- myVaultOrg.push({
- value: { id: MY_VAULT_ID } as Organization,
- label: this.i18nService.t("myVault"),
- icon: "bwi-user",
- });
- }
+ // Only add "My vault" if personal ownership policy does not apply
+ if (!personalOwnershipApplies) {
+ myVaultOrg.push({
+ value: { id: MY_VAULT_ID } as Organization,
+ label: this.i18nService.t("myVault"),
+ icon: "bwi-user",
+ });
+ }
- return [
- ...myVaultOrg,
- ...orgs.map((org) => {
- let icon = "bwi-business";
+ return [
+ ...myVaultOrg,
+ ...orgs.map((org) => {
+ let icon = "bwi-business";
- if (!org.enabled) {
- // Show a warning icon if the organization is deactivated
- icon = "bwi-exclamation-triangle tw-text-danger";
- } else if (
- org.productTierType === ProductTierType.Families ||
- org.productTierType === ProductTierType.Free
- ) {
- // Show a family icon if the organization is a family or free org
- icon = "bwi-family";
- }
+ if (!org.enabled) {
+ // Show a warning icon if the organization is deactivated
+ icon = "bwi-exclamation-triangle tw-text-danger";
+ } else if (
+ org.productTierType === ProductTierType.Families ||
+ org.productTierType === ProductTierType.Free
+ ) {
+ // Show a family icon if the organization is a family or free org
+ icon = "bwi-family";
+ }
- return {
- value: org,
- label: org.name,
- icon,
- };
- }),
- ];
- }),
- shareReplay({ refCount: true, bufferSize: 1 }),
- );
+ return {
+ value: org,
+ label: org.name,
+ icon,
+ };
+ }),
+ ];
+ }),
+ shareReplay({ refCount: true, bufferSize: 1 }),
+ );
/**
* Folder array structured to be directly passed to `ChipSelectComponent`
@@ -358,10 +359,10 @@ export class VaultPopupListFiltersService {
switchMap((userId) => {
// Observable of cipher views
const cipherViews$ = this.cipherService.cipherViews$(userId).pipe(
- tap((cipherViews) => {
- this.cipherViews = Object.values(cipherViews);
+ map((ciphers) => {
+ this.cipherViews = ciphers ? Object.values(ciphers) : [];
+ return this.cipherViews;
}),
- map((ciphers) => Object.values(ciphers)),
);
return combineLatest([
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index e836af1327c..e24985f58af 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -29,6 +29,7 @@
"@bitwarden/key-management": ["../../libs/key-management/src"],
"@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
"@bitwarden/platform": ["../../libs/platform/src"],
+ "@bitwarden/platform/*": ["../../libs/platform/src/*"],
"@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
"@bitwarden/tools-card": ["../../libs/tools/card/src"],
"@bitwarden/ui-common": ["../../libs/ui/common/src"],
diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts
index 9af6e1f0613..107afc6dc8d 100644
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -5,7 +5,7 @@ import * as http from "http";
import { OptionValues } from "commander";
import * as inquirer from "inquirer";
import Separator from "inquirer/lib/objects/separator";
-import { firstValueFrom, map } from "rxjs";
+import { firstValueFrom, map, switchMap } from "rxjs";
import {
LoginStrategyServiceAbstraction,
@@ -29,6 +29,7 @@ import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/ide
import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { ClientType } from "@bitwarden/common/enums";
import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@@ -555,7 +556,10 @@ export class LoginCommand {
);
const enforcedPolicyOptions = await firstValueFrom(
- this.policyService.masterPasswordPolicyOptions$(),
+ this.accountService.activeAccount$.pipe(
+ getUserId,
+ switchMap((userId) => this.policyService.masterPasswordPolicyOptions$(userId)),
+ ),
);
// Verify master password meets policy requirements
diff --git a/apps/cli/src/key-management/cli-biometrics-service.ts b/apps/cli/src/key-management/cli-biometrics-service.ts
index bda8fe82895..b4f802eb053 100644
--- a/apps/cli/src/key-management/cli-biometrics-service.ts
+++ b/apps/cli/src/key-management/cli-biometrics-service.ts
@@ -24,4 +24,7 @@ export class CliBiometricsService extends BiometricsService {
}
async setShouldAutopromptNow(value: boolean): Promise {}
+ async canEnableBiometricUnlock(): Promise {
+ return false;
+ }
}
diff --git a/apps/cli/src/platform/services/lowdb-storage.service.ts b/apps/cli/src/platform/services/lowdb-storage.service.ts
index f4542236395..61d3920c918 100644
--- a/apps/cli/src/platform/services/lowdb-storage.service.ts
+++ b/apps/cli/src/platform/services/lowdb-storage.service.ts
@@ -14,7 +14,6 @@ import {
AbstractStorageService,
StorageUpdate,
} from "@bitwarden/common/platform/abstractions/storage.service";
-import { sequentialize } from "@bitwarden/common/platform/misc/sequentialize";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { NodeUtils } from "@bitwarden/node/node-utils";
@@ -44,7 +43,6 @@ export class LowdbStorageService implements AbstractStorageService {
this.updates$ = this.updatesSubject.asObservable();
}
- @sequentialize(() => "lowdbStorageInit")
async init() {
if (this.ready) {
return;
diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index b7f423e8ff7..6a4651bcd5a 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -28,8 +28,8 @@ import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abs
import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
import { DefaultOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-organization.service";
import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service";
+import { DefaultPolicyService } from "@bitwarden/common/admin-console/services/policy/default-policy.service";
import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service";
-import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
import { ProviderApiService } from "@bitwarden/common/admin-console/services/provider/provider-api.service";
import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -237,7 +237,7 @@ export class ServiceContainer {
cryptoFunctionService: NodeCryptoFunctionService;
encryptService: EncryptServiceImplementation;
authService: AuthService;
- policyService: PolicyService;
+ policyService: DefaultPolicyService;
policyApiService: PolicyApiServiceAbstraction;
logService: ConsoleLogService;
sendService: SendService;
@@ -436,9 +436,7 @@ export class ServiceContainer {
this.kdfConfigService,
this.keyGenerationService,
this.logService,
- this.masterPasswordService,
this.stateProvider,
- this.stateService,
);
this.keyService = new KeyService(
@@ -469,7 +467,7 @@ export class ServiceContainer {
this.ssoUrlService = new SsoUrlService();
this.organizationService = new DefaultOrganizationService(this.stateProvider);
- this.policyService = new PolicyService(this.stateProvider, this.organizationService);
+ this.policyService = new DefaultPolicyService(this.stateProvider, this.organizationService);
this.vaultTimeoutSettingsService = new DefaultVaultTimeoutSettingsService(
this.accountService,
@@ -560,7 +558,11 @@ export class ServiceContainer {
this.providerService = new ProviderService(this.stateProvider);
- this.policyApiService = new PolicyApiService(this.policyService, this.apiService);
+ this.policyApiService = new PolicyApiService(
+ this.policyService,
+ this.apiService,
+ this.accountService,
+ );
this.keyConnectorService = new KeyConnectorService(
this.accountService,
@@ -672,6 +674,7 @@ export class ServiceContainer {
this.autofillSettingsService = new AutofillSettingsService(
this.stateProvider,
this.policyService,
+ this.accountService,
);
this.cipherService = new CipherService(
@@ -795,6 +798,7 @@ export class ServiceContainer {
this.cryptoFunctionService,
this.kdfConfigService,
this.accountService,
+ this.apiService,
);
this.organizationExportService = new OrganizationVaultExportService(
diff --git a/apps/cli/src/tools/export.command.ts b/apps/cli/src/tools/export.command.ts
index b2d9d0151a9..f5fea794eef 100644
--- a/apps/cli/src/tools/export.command.ts
+++ b/apps/cli/src/tools/export.command.ts
@@ -2,16 +2,23 @@
// @ts-strict-ignore
import { OptionValues } from "commander";
import * as inquirer from "inquirer";
+import { firstValueFrom, switchMap } from "rxjs";
import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
+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 { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import {
ExportFormat,
EXPORT_FORMATS,
VaultExportServiceAbstraction,
+ ExportedVault,
+ ExportedVaultAsBlob,
} from "@bitwarden/vault-export-core";
import { Response } from "../models/response";
@@ -22,13 +29,19 @@ export class ExportCommand {
private exportService: VaultExportServiceAbstraction,
private policyService: PolicyService,
private eventCollectionService: EventCollectionService,
+ private accountService: AccountService,
+ private configService: ConfigService,
) {}
async run(options: OptionValues): Promise {
- if (
- options.organizationid == null &&
- (await this.policyService.policyAppliesToUser(PolicyType.DisablePersonalVaultExport))
- ) {
+ const policyApplies$ = this.accountService.activeAccount$.pipe(
+ getUserId,
+ switchMap((userId) =>
+ this.policyService.policyAppliesToUser$(PolicyType.DisablePersonalVaultExport, userId),
+ ),
+ );
+
+ if (options.organizationid == null && (await firstValueFrom(policyApplies$))) {
return Response.badRequest(
"One or more organization policies prevents you from exporting your personal vault.",
);
@@ -42,6 +55,13 @@ export class ExportCommand {
const format =
password && options.format == "json" ? "encrypted_json" : (options.format ?? "csv");
+ if (
+ format == "zip" &&
+ !(await this.configService.getFeatureFlag(FeatureFlag.ExportAttachments))
+ ) {
+ return Response.badRequest("Exporting attachments is not supported in this environment.");
+ }
+
if (!this.isSupportedExportFormat(format)) {
return Response.badRequest(
`'${format}' is not a supported export format. Supported formats: ${EXPORT_FORMATS.join(
@@ -54,7 +74,7 @@ export class ExportCommand {
return Response.error("`" + options.organizationid + "` is not a GUID.");
}
- let exportContent: string = null;
+ let exportContent: ExportedVault = null;
try {
if (format === "encrypted_json") {
password = await this.promptPassword(password);
@@ -78,34 +98,28 @@ export class ExportCommand {
} catch (e) {
return Response.error(e);
}
- return await this.saveFile(exportContent, options, format);
+ return await this.saveFile(exportContent, options);
}
- private async saveFile(
- exportContent: string,
- options: OptionValues,
- format: ExportFormat,
- ): Promise {
+ private async saveFile(exportContent: ExportedVault, options: OptionValues): Promise {
try {
- const fileName = this.getFileName(format, options.organizationid != null ? "org" : null);
- return await CliUtils.saveResultToFile(exportContent, options.output, fileName);
+ if (exportContent.type === "application/zip") {
+ exportContent = exportContent as ExportedVaultAsBlob;
+ const arrayBuffer = await exportContent.data.arrayBuffer();
+ const buffer = Buffer.from(arrayBuffer);
+ return await CliUtils.saveResultToFile(buffer, options.output, exportContent.fileName);
+ }
+
+ return await CliUtils.saveResultToFile(
+ exportContent.data,
+ options.output,
+ exportContent.fileName,
+ );
} catch (e) {
return Response.error(e.toString());
}
}
- private getFileName(format: ExportFormat, prefix?: string) {
- if (format === "encrypted_json") {
- if (prefix == null) {
- prefix = "encrypted";
- } else {
- prefix = "encrypted_" + prefix;
- }
- format = "json";
- }
- return this.exportService.getFileName(prefix, format);
- }
-
private async promptPassword(password: string | boolean) {
// boolean => flag set with no value, we need to prompt for password
// string => flag set with value, use this value for password
diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts
index d6ef27b1428..81816540d12 100644
--- a/apps/cli/src/vault.program.ts
+++ b/apps/cli/src/vault.program.ts
@@ -501,6 +501,8 @@ export class VaultProgram extends BaseProgram {
this.serviceContainer.exportService,
this.serviceContainer.policyService,
this.serviceContainer.eventCollectionService,
+ this.serviceContainer.accountService,
+ this.serviceContainer.configService,
);
const response = await command.run(options);
this.processResponse(response);
diff --git a/apps/desktop/src/app/accounts/settings.component.spec.ts b/apps/desktop/src/app/accounts/settings.component.spec.ts
index 342d4717511..b05d90b7e1c 100644
--- a/apps/desktop/src/app/accounts/settings.component.spec.ts
+++ b/apps/desktop/src/app/accounts/settings.component.spec.ts
@@ -153,7 +153,7 @@ describe("SettingsComponent", () => {
it("pin enabled when RemoveUnlockWithPin policy is not set", async () => {
// @ts-strict-ignore
- policyService.get$.mockReturnValue(of(null));
+ policyService.policiesByType$.mockReturnValue(of([null]));
await component.ngOnInit();
@@ -164,7 +164,7 @@ describe("SettingsComponent", () => {
const policy = new Policy();
policy.type = PolicyType.RemoveUnlockWithPin;
policy.enabled = false;
- policyService.get$.mockReturnValue(of(policy));
+ policyService.policiesByType$.mockReturnValue(of([policy]));
await component.ngOnInit();
@@ -175,7 +175,7 @@ describe("SettingsComponent", () => {
const policy = new Policy();
policy.type = PolicyType.RemoveUnlockWithPin;
policy.enabled = true;
- policyService.get$.mockReturnValue(of(policy));
+ policyService.policiesByType$.mockReturnValue(of([policy]));
await component.ngOnInit();
@@ -184,7 +184,7 @@ describe("SettingsComponent", () => {
it("pin visible when RemoveUnlockWithPin policy is not set", async () => {
// @ts-strict-ignore
- policyService.get$.mockReturnValue(of(null));
+ policyService.policiesByType$.mockReturnValue(of([null]));
await component.ngOnInit();
fixture.detectChanges();
@@ -201,7 +201,7 @@ describe("SettingsComponent", () => {
const policy = new Policy();
policy.type = PolicyType.RemoveUnlockWithPin;
policy.enabled = false;
- policyService.get$.mockReturnValue(of(policy));
+ policyService.policiesByType$.mockReturnValue(of([policy]));
await component.ngOnInit();
fixture.detectChanges();
@@ -218,7 +218,7 @@ describe("SettingsComponent", () => {
const policy = new Policy();
policy.type = PolicyType.RemoveUnlockWithPin;
policy.enabled = true;
- policyService.get$.mockReturnValue(of(policy));
+ policyService.policiesByType$.mockReturnValue(of([policy]));
pinServiceAbstraction.isPinSet.mockResolvedValue(true);
await component.ngOnInit();
@@ -236,7 +236,7 @@ describe("SettingsComponent", () => {
const policy = new Policy();
policy.type = PolicyType.RemoveUnlockWithPin;
policy.enabled = true;
- policyService.get$.mockReturnValue(of(policy));
+ policyService.policiesByType$.mockReturnValue(of([policy]));
await component.ngOnInit();
fixture.detectChanges();
@@ -248,6 +248,7 @@ describe("SettingsComponent", () => {
describe("biometrics enabled", () => {
beforeEach(() => {
desktopBiometricsService.getBiometricsStatus.mockResolvedValue(BiometricsStatus.Available);
+ desktopBiometricsService.canEnableBiometricUnlock.mockResolvedValue(true);
vaultTimeoutSettingsService.isBiometricLockSet.mockResolvedValue(true);
});
@@ -255,7 +256,7 @@ describe("SettingsComponent", () => {
const policy = new Policy();
policy.type = PolicyType.RemoveUnlockWithPin;
policy.enabled = false;
- policyService.get$.mockReturnValue(of(policy));
+ policyService.policiesByType$.mockReturnValue(of([policy]));
platformUtilsService.getDevice.mockReturnValue(DeviceType.WindowsDesktop);
i18nService.t.mockImplementation((id: string) => {
if (id === "requirePasswordOnStart") {
@@ -290,7 +291,7 @@ describe("SettingsComponent", () => {
const policy = new Policy();
policy.type = PolicyType.RemoveUnlockWithPin;
policy.enabled = true;
- policyService.get$.mockReturnValue(of(policy));
+ policyService.policiesByType$.mockReturnValue(of([policy]));
platformUtilsService.getDevice.mockReturnValue(DeviceType.WindowsDesktop);
i18nService.t.mockImplementation((id: string) => {
if (id === "requirePasswordOnStart") {
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index cec0d98ccac..a592e542d58 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -17,8 +17,10 @@ import {
import { PinServiceAbstraction } from "@bitwarden/auth/common";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/default-policy.service";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
import { DeviceType } from "@bitwarden/common/enums";
@@ -235,7 +237,12 @@ export class SettingsComponent implements OnInit, OnDestroy {
);
// Load timeout policy
- this.vaultTimeoutPolicyCallout = this.policyService.get$(PolicyType.MaximumVaultTimeout).pipe(
+ this.vaultTimeoutPolicyCallout = this.accountService.activeAccount$.pipe(
+ getUserId,
+ switchMap((userId) =>
+ this.policyService.policiesByType$(PolicyType.MaximumVaultTimeout, userId),
+ ),
+ getFirstPolicy,
filter((policy) => policy != null),
map((policy) => {
let timeout;
@@ -259,7 +266,12 @@ export class SettingsComponent implements OnInit, OnDestroy {
// Load initial values
this.userHasPinSet = await this.pinService.isPinSet(activeAccount.id);
- this.pinEnabled$ = this.policyService.get$(PolicyType.RemoveUnlockWithPin).pipe(
+ this.pinEnabled$ = this.accountService.activeAccount$.pipe(
+ getUserId,
+ switchMap((userId) =>
+ this.policyService.policiesByType$(PolicyType.RemoveUnlockWithPin, userId),
+ ),
+ getFirstPolicy,
map((policy) => {
return policy == null || !policy.enabled;
}),
@@ -376,24 +388,12 @@ export class SettingsComponent implements OnInit, OnDestroy {
}
});
- this.supportsBiometric = this.shouldAllowBiometricSetup(
- await this.biometricsService.getBiometricsStatus(),
- );
+ this.supportsBiometric = await this.biometricsService.canEnableBiometricUnlock();
this.timerId = setInterval(async () => {
- this.supportsBiometric = this.shouldAllowBiometricSetup(
- await this.biometricsService.getBiometricsStatus(),
- );
+ this.supportsBiometric = await this.biometricsService.canEnableBiometricUnlock();
}, 1000);
}
- private shouldAllowBiometricSetup(biometricStatus: BiometricsStatus): boolean {
- return [
- BiometricsStatus.Available,
- BiometricsStatus.AutoSetupNeeded,
- BiometricsStatus.ManualSetupNeeded,
- ].includes(biometricStatus);
- }
-
async saveVaultTimeout(newValue: VaultTimeout) {
if (newValue === VaultTimeoutStringType.Never) {
const confirmed = await this.dialogService.openSimpleDialog({
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index 3bb130d321d..cd5064a87e4 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -6,7 +6,6 @@ import {
DesktopDefaultOverlayPosition,
EnvironmentSelectorComponent,
} from "@bitwarden/angular/auth/components/environment-selector.component";
-import { unauthUiRefreshSwap } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-route-swap";
import {
authGuard,
lockGuard,
@@ -53,7 +52,6 @@ import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.compo
import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard";
import { RemovePasswordComponent } from "../auth/remove-password.component";
import { SetPasswordComponent } from "../auth/set-password.component";
-import { TwoFactorComponentV1 } from "../auth/two-factor-v1.component";
import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
import { VaultComponent } from "../vault/app/vault/vault.component";
@@ -76,28 +74,6 @@ const routes: Routes = [
children: [], // Children lets us have an empty component.
canActivate: [redirectGuard({ loggedIn: "/vault", loggedOut: "/login", locked: "/lock" })],
},
- ...unauthUiRefreshSwap(
- TwoFactorComponentV1,
- AnonLayoutWrapperComponent,
- {
- path: "2fa",
- },
- {
- path: "2fa",
- canActivate: [unauthGuardFn(), TwoFactorAuthGuard],
- children: [
- {
- path: "",
- component: TwoFactorAuthComponent,
- },
- ],
- data: {
- pageTitle: {
- key: "verifyYourIdentity",
- },
- } satisfies RouteDataProperties & AnonLayoutWrapperData,
- },
- ),
{
path: "authentication-timeout",
component: AnonLayoutWrapperComponent,
@@ -360,6 +336,21 @@ const routes: Routes = [
},
} satisfies AnonLayoutWrapperData,
},
+ {
+ path: "2fa",
+ canActivate: [unauthGuardFn(), TwoFactorAuthGuard],
+ children: [
+ {
+ path: "",
+ component: TwoFactorAuthComponent,
+ },
+ ],
+ data: {
+ pageTitle: {
+ key: "verifyYourIdentity",
+ },
+ } satisfies RouteDataProperties & AnonLayoutWrapperData,
+ },
],
},
];
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 924bc2dd30f..e0075975900 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -49,7 +49,6 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
-import { clearCaches } from "@bitwarden/common/platform/misc/sequentialize";
import { NotificationsService } from "@bitwarden/common/platform/notifications";
import { StateEventRunnerService } from "@bitwarden/common/platform/state";
import { SyncService } from "@bitwarden/common/platform/sync";
@@ -406,8 +405,6 @@ export class AppComponent implements OnInit, OnDestroy {
this.router.navigate(["/remove-password"]);
break;
case "switchAccount": {
- // Clear sequentialized caches
- clearCaches();
if (message.userId != null) {
await this.accountService.switchAccount(message.userId);
}
diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts
index b1b2864af5a..b717afe4a41 100644
--- a/apps/desktop/src/app/app.module.ts
+++ b/apps/desktop/src/app/app.module.ts
@@ -16,8 +16,6 @@ import { LoginModule } from "../auth/login/login.module";
import { RemovePasswordComponent } from "../auth/remove-password.component";
import { SetPasswordComponent } from "../auth/set-password.component";
import { SsoComponentV1 } from "../auth/sso-v1.component";
-import { TwoFactorOptionsComponentV1 } from "../auth/two-factor-options-v1.component";
-import { TwoFactorComponentV1 } from "../auth/two-factor-v1.component";
import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
import { SshAgentService } from "../autofill/services/ssh-agent.service";
import { PremiumComponent } from "../billing/app/accounts/premium.component";
@@ -78,9 +76,7 @@ import { SharedModule } from "./shared/shared.module";
SetPasswordComponent,
SettingsComponent,
ShareComponent,
- TwoFactorComponentV1,
SsoComponentV1,
- TwoFactorOptionsComponentV1,
UpdateTempPasswordComponent,
VaultComponent,
VaultTimeoutInputComponent,
diff --git a/apps/desktop/src/app/tools/send/add-edit.component.html b/apps/desktop/src/app/tools/send/add-edit.component.html
index 3d8231d07ce..0bf2e1778e0 100644
--- a/apps/desktop/src/app/tools/send/add-edit.component.html
+++ b/apps/desktop/src/app/tools/send/add-edit.component.html
@@ -282,14 +282,9 @@
-
+
-
+
diff --git a/apps/desktop/src/auth/delete-account.component.html b/apps/desktop/src/auth/delete-account.component.html
index 42c06b74891..0d5eec29bf4 100644
--- a/apps/desktop/src/auth/delete-account.component.html
+++ b/apps/desktop/src/auth/delete-account.component.html
@@ -18,13 +18,13 @@
{{ "confirmIdentity" | i18n }}
-
+
-
+
diff --git a/apps/desktop/src/auth/two-factor-options-v1.component.html b/apps/desktop/src/auth/two-factor-options-v1.component.html
deleted file mode 100644
index 6f87c666215..00000000000
--- a/apps/desktop/src/auth/two-factor-options-v1.component.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
diff --git a/apps/desktop/src/auth/two-factor-options-v1.component.ts b/apps/desktop/src/auth/two-factor-options-v1.component.ts
deleted file mode 100644
index 1cb440a5f5f..00000000000
--- a/apps/desktop/src/auth/two-factor-options-v1.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component } from "@angular/core";
-import { Router } from "@angular/router";
-
-import { TwoFactorOptionsComponentV1 as BaseTwoFactorOptionsComponentV1 } from "@bitwarden/angular/auth/components/two-factor-options-v1.component";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-
-@Component({
- selector: "app-two-factor-options",
- templateUrl: "two-factor-options-v1.component.html",
-})
-export class TwoFactorOptionsComponentV1 extends BaseTwoFactorOptionsComponentV1 {
- constructor(
- twoFactorService: TwoFactorService,
- router: Router,
- i18nService: I18nService,
- platformUtilsService: PlatformUtilsService,
- environmentService: EnvironmentService,
- ) {
- super(twoFactorService, router, i18nService, platformUtilsService, window, environmentService);
- }
-}
diff --git a/apps/desktop/src/auth/two-factor-v1.component.html b/apps/desktop/src/auth/two-factor-v1.component.html
deleted file mode 100644
index 1f65d5070f6..00000000000
--- a/apps/desktop/src/auth/two-factor-v1.component.html
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
+
-
+
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
index 68f439d34a4..6eee68585db 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
@@ -3,11 +3,12 @@
import { DialogConfig, DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
import { Component, OnDestroy, OnInit, Inject, Input } from "@angular/core";
import { FormBuilder, Validators } from "@angular/forms";
-import { takeUntil } from "rxjs";
+import { switchMap, takeUntil } from "rxjs";
import { ChangePasswordComponent } from "@bitwarden/angular/auth/components/change-password.component";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -79,9 +80,12 @@ export class EmergencyAccessTakeoverComponent
const policies = await this.emergencyAccessService.getGrantorPolicies(
this.params.emergencyAccessId,
);
- this.policyService
- .masterPasswordPolicyOptions$(policies)
- .pipe(takeUntil(this.destroy$))
+ this.accountService.activeAccount$
+ .pipe(
+ getUserId,
+ switchMap((userId) => this.policyService.masterPasswordPolicyOptions$(userId, policies)),
+ takeUntil(this.destroy$),
+ )
.subscribe((enforcedPolicyOptions) => (this.enforcedPolicyOptions = enforcedPolicyOptions));
}
diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts
index 6e96b357e3e..ed62b94fb73 100644
--- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts
@@ -17,8 +17,9 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
import { CipherType } from "@bitwarden/common/vault/enums";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { TaskService } from "@bitwarden/common/vault/tasks";
import { DialogService } from "@bitwarden/components";
-import { ChangeLoginPasswordService, TaskService } from "@bitwarden/vault";
+import { ChangeLoginPasswordService } from "@bitwarden/vault";
import { EmergencyViewDialogComponent } from "./emergency-view-dialog.component";
@@ -55,6 +56,7 @@ describe("EmergencyViewDialogComponent", () => {
{ provide: DialogRef, useValue: { close } },
{ provide: DIALOG_DATA, useValue: { cipher: mockCipher } },
{ provide: AccountService, useValue: accountService },
+ { provide: TaskService, useValue: mock
+
-
+
diff --git a/apps/web/src/app/auth/settings/security/security-keys.component.html b/apps/web/src/app/auth/settings/security/security-keys.component.html
index acfe4319c95..1f8d9dfeb00 100644
--- a/apps/web/src/app/auth/settings/security/security-keys.component.html
+++ b/apps/web/src/app/auth/settings/security/security-keys.component.html
@@ -8,11 +8,11 @@
{{ "userApiKeyDesc" | i18n }}
- - -
+
+
+
diff --git a/apps/web/src/app/auth/settings/security/security-keys.component.ts b/apps/web/src/app/auth/settings/security/security-keys.component.ts
index 78b48bea8b4..70e33b242b3 100644
--- a/apps/web/src/app/auth/settings/security/security-keys.component.ts
+++ b/apps/web/src/app/auth/settings/security/security-keys.component.ts
@@ -1,6 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
import { firstValueFrom, map } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -15,11 +15,6 @@ import { ApiKeyComponent } from "./api-key.component";
templateUrl: "security-keys.component.html",
})
export class SecurityKeysComponent implements OnInit {
- @ViewChild("viewUserApiKeyTemplate", { read: ViewContainerRef, static: true })
- viewUserApiKeyModalRef: ViewContainerRef;
- @ViewChild("rotateUserApiKeyTemplate", { read: ViewContainerRef, static: true })
- rotateUserApiKeyModalRef: ViewContainerRef;
-
showChangeKdf = true;
constructor(
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
index 83c9ff23f3c..582a9412182 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
@@ -25,6 +25,7 @@ import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two
import { TwoFactorEmailResponse } from "@bitwarden/common/auth/models/response/two-factor-email.response";
import { TwoFactorWebAuthnResponse } from "@bitwarden/common/auth/models/response/two-factor-web-authn.response";
import { TwoFactorYubiKeyResponse } from "@bitwarden/common/auth/models/response/two-factor-yubi-key.response";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { TwoFactorProviders } from "@bitwarden/common/auth/services/two-factor.service";
import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
@@ -109,13 +110,17 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
this.providers.sort((a: any, b: any) => a.sort - b.sort);
- this.policyService
- .policyAppliesToActiveUser$(PolicyType.TwoFactorAuthentication)
- .pipe(takeUntil(this.destroy$))
+ this.accountService.activeAccount$
+ .pipe(
+ getUserId,
+ switchMap((userId) =>
+ this.policyService.policyAppliesToUser$(PolicyType.TwoFactorAuthentication, userId),
+ ),
+ takeUntil(this.destroy$),
+ )
.subscribe((policyAppliesToActiveUser) => {
this.twoFactorAuthPolicyAppliesToActiveUser = policyAppliesToActiveUser;
});
-
await this.load();
}
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
index c84800aefd4..13c7993768c 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
@@ -1,10 +1,12 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { Component, HostBinding, OnDestroy, OnInit } from "@angular/core";
-import { Subject, takeUntil } from "rxjs";
+import { Subject, switchMap, takeUntil } from "rxjs";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { DialogService } from "@bitwarden/components";
import { WebauthnLoginAdminService } from "../../core";
@@ -35,6 +37,7 @@ export class WebauthnLoginSettingsComponent implements OnInit, OnDestroy {
private webauthnService: WebauthnLoginAdminService,
private dialogService: DialogService,
private policyService: PolicyService,
+ private accountService: AccountService,
) {}
@HostBinding("attr.aria-busy")
@@ -57,9 +60,14 @@ export class WebauthnLoginSettingsComponent implements OnInit, OnDestroy {
requireSsoPolicyEnabled = false;
ngOnInit(): void {
- this.policyService
- .policyAppliesToActiveUser$(PolicyType.RequireSso)
- .pipe(takeUntil(this.destroy$))
+ this.accountService.activeAccount$
+ .pipe(
+ getUserId,
+ switchMap((userId) =>
+ this.policyService.policyAppliesToUser$(PolicyType.RequireSso, userId),
+ ),
+ takeUntil(this.destroy$),
+ )
.subscribe((enabled) => {
this.requireSsoPolicyEnabled = enabled;
});
diff --git a/apps/web/src/app/auth/two-factor-options-v1.component.html b/apps/web/src/app/auth/two-factor-options-v1.component.html
deleted file mode 100644
index 43c054060ea..00000000000
--- a/apps/web/src/app/auth/two-factor-options-v1.component.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ p.name }}
-{{ p.description }}
-
-
-
- -
-
-
-
-
-
-
-
- {{ "recoveryCodeTitle" | i18n }}
-{{ "recoveryCodeDesc" | i18n }}
-
-
-
-
-
{{ title }}
-
-
-
-
- {{ "disabled" | i18n }}
-
-
-
- {{ "password" | i18n }}
-
-
-
- {{ "maxAccessCountReached" | i18n }}
-
-
-
- {{ "expired" | i18n }}
-
-
-
- {{ "pendingDeletion" | i18n }}
-
+
+
+
+
+
+ {{ "disabled" | i18n }}
+
+
+
+ {{ "password" | i18n }}
+
+
+
+ {{ "maxAccessCountReached" | i18n }}
+
+
+
+ {{ "expired" | i18n }}
+
+
+
+ {{ "pendingDeletion" | i18n }}
+
+
{{ s.deletionDate | date: "medium" }}
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
index 0bea6c186eb..ee81ff5237b 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
@@ -15,12 +15,14 @@ describe("BrowserExtensionPromptComponent", () => {
let fixture: ComponentFixture;
let component: BrowserExtensionPromptComponent;
const start = jest.fn();
+ const openExtension = jest.fn();
const pageState$ = new BehaviorSubject(BrowserPromptState.Loading);
const setAttribute = jest.fn();
const getAttribute = jest.fn().mockReturnValue("width=1010");
beforeEach(async () => {
start.mockClear();
+ openExtension.mockClear();
setAttribute.mockClear();
getAttribute.mockClear();
@@ -39,7 +41,7 @@ describe("BrowserExtensionPromptComponent", () => {
providers: [
{
provide: BrowserExtensionPromptService,
- useValue: { start, pageState$ },
+ useValue: { start, openExtension, pageState$ },
},
{
provide: I18nService,
@@ -83,6 +85,15 @@ describe("BrowserExtensionPromptComponent", () => {
const errorText = fixture.debugElement.query(By.css("p")).nativeElement;
expect(errorText.textContent.trim()).toBe("openingExtensionError");
});
+
+ it("opens extension on button click", () => {
+ const button = fixture.debugElement.query(By.css("button")).nativeElement;
+
+ button.click();
+
+ expect(openExtension).toHaveBeenCalledTimes(1);
+ expect(openExtension).toHaveBeenCalledWith(true);
+ });
});
describe("success state", () => {
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
index 4d3a5fa07dd..9800d0c64fe 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
@@ -61,6 +61,6 @@ export class BrowserExtensionPromptComponent implements OnInit, OnDestroy {
}
openExtension(): void {
- this.browserExtensionPromptService.openExtension();
+ this.browserExtensionPromptService.openExtension(true);
}
}
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index b2adeecbf69..25ffd677458 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -39,7 +39,6 @@ import {
} from "@bitwarden/components";
import {
ChangeLoginPasswordService,
- CipherAttachmentsComponent,
CipherFormComponent,
CipherFormConfig,
CipherFormGenerationService,
@@ -47,8 +46,6 @@ import {
CipherViewComponent,
DecryptionFailureDialogComponent,
DefaultChangeLoginPasswordService,
- DefaultTaskService,
- TaskService,
} from "@bitwarden/vault";
import { SharedModule } from "../../../shared/shared.module";
@@ -132,17 +129,14 @@ export enum VaultItemDialogResult {
CommonModule,
SharedModule,
CipherFormModule,
- CipherAttachmentsComponent,
AsyncActionsModule,
ItemModule,
- DecryptionFailureDialogComponent,
],
providers: [
{ provide: PremiumUpgradePromptService, useClass: WebVaultPremiumUpgradePromptService },
{ provide: ViewPasswordHistoryService, useClass: WebViewPasswordHistoryService },
{ provide: CipherFormGenerationService, useClass: WebCipherFormGenerationService },
RoutedVaultFilterService,
- { provide: TaskService, useClass: DefaultTaskService },
{ provide: ChangeLoginPasswordService, useClass: DefaultChangeLoginPasswordService },
],
})
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index ef6a347f7d3..f43cfae348c 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -130,7 +130,7 @@
target="_blank"
rel="noreferrer"
>
-
+
{{ "launch" | i18n }}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index 2fcaa8d74af..138c7514eb6 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -138,6 +138,7 @@ export class VaultItemsComponent {
return canRestore$;
}),
+ map((canRestore) => canRestore && this.showBulkTrashOptions),
);
}
diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.html b/apps/web/src/app/vault/individual-vault/add-edit.component.html
index 2589081d137..29de65efcd5 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.html
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.html
@@ -363,7 +363,7 @@
(click)="launch(u)"
[disabled]="!u.canLaunch"
>
-
+
-
-
+
+
{{ title }}
+
+
+
+
+ {{ "disabled" | i18n }}
+
+
+
+ {{ "password" | i18n }}
+
+
+
+ {{ "maxAccessCountReached" | i18n }}
+
+
+
+ {{ "expired" | i18n }}
+
+
+
+ {{ "pendingDeletion" | i18n }}
+
+