+
{{ "allApplications" | i18n }}
@@ -57,7 +52,7 @@
type="button"
buttonType="secondary"
bitButton
- *ngIf="isCritialAppsFeatureEnabled"
+ *ngIf="isCriticalAppsFeatureEnabled"
[disabled]="!selectedIds.size"
[loading]="markingAsCritical"
(click)="markAppsAsCritical()"
@@ -69,17 +64,17 @@
- |
- {{ "application" | i18n }} |
- {{ "atRiskPasswords" | i18n }} |
- {{ "totalPasswords" | i18n }} |
- {{ "atRiskMembers" | i18n }} |
- {{ "totalMembers" | i18n }} |
+ |
+ {{ "application" | i18n }} |
+ {{ "atRiskPasswords" | i18n }} |
+ {{ "totalPasswords" | i18n }} |
+ {{ "atRiskMembers" | i18n }} |
+ {{ "totalMembers" | i18n }} |
- |
+ |
|
- {{ r.name }}
+ {{ r.applicationName }}
|
- {{ r.atRiskPasswords }}
+ {{ r.atRiskPasswordCount }}
|
- {{ r.totalPasswords }}
+ {{ r.passwordCount }}
|
- {{ r.atRiskMembers }}
+ {{ r.atRiskMemberCount }}
|
- {{ r.totalMembers }}
+ {{ r.memberCount }}
|
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
index 6ee2ecf1690..f4d3656071d 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
@@ -1,20 +1,23 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, DestroyRef, inject, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit, inject } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { FormControl } from "@angular/forms";
import { ActivatedRoute } from "@angular/router";
-import { debounceTime, firstValueFrom, map } from "rxjs";
+import { debounceTime, map, Observable, of, Subscription } from "rxjs";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
+import {
+ RiskInsightsDataService,
+ RiskInsightsReportService,
+} from "@bitwarden/bit-common/tools/reports/risk-insights";
+import {
+ ApplicationHealthReportDetail,
+ ApplicationHealthReportSummary,
+} from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import {
Icons,
NoItemsModule,
@@ -27,60 +30,76 @@ import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.mod
import { SharedModule } from "@bitwarden/web-vault/app/shared";
import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-import { applicationTableMockData } from "./application-table.mock";
+import { ApplicationsLoadingComponent } from "./risk-insights-loading.component";
@Component({
standalone: true,
selector: "tools-all-applications",
templateUrl: "./all-applications.component.html",
- imports: [HeaderModule, CardComponent, SearchModule, PipesModule, NoItemsModule, SharedModule],
+ imports: [
+ ApplicationsLoadingComponent,
+ HeaderModule,
+ CardComponent,
+ SearchModule,
+ PipesModule,
+ NoItemsModule,
+ SharedModule,
+ ],
})
-export class AllApplicationsComponent implements OnInit {
- protected dataSource = new TableDataSource();
+export class AllApplicationsComponent implements OnInit, OnDestroy {
+ protected dataSource = new TableDataSource();
protected selectedIds: Set = new Set();
protected searchControl = new FormControl("", { nonNullable: true });
- private destroyRef = inject(DestroyRef);
- protected loading = false;
- protected organization: Organization;
+ protected loading = true;
+ protected organization = {} as Organization;
noItemsIcon = Icons.Security;
protected markingAsCritical = false;
- isCritialAppsFeatureEnabled = false;
+ protected applicationSummary = {} as ApplicationHealthReportSummary;
+ private subscription = new Subscription();
- // MOCK DATA
- protected mockData = applicationTableMockData;
- protected mockAtRiskMembersCount = 0;
- protected mockAtRiskAppsCount = 0;
- protected mockTotalMembersCount = 0;
- protected mockTotalAppsCount = 0;
+ destroyRef = inject(DestroyRef);
+ isLoading$: Observable = of(false);
+ isCriticalAppsFeatureEnabled = false;
async ngOnInit() {
- this.activatedRoute.paramMap
- .pipe(
- takeUntilDestroyed(this.destroyRef),
- map(async (params) => {
- const organizationId = params.get("organizationId");
- this.organization = await firstValueFrom(this.organizationService.get$(organizationId));
- // TODO: use organizationId to fetch data
- }),
- )
- .subscribe();
-
- this.isCritialAppsFeatureEnabled = await this.configService.getFeatureFlag(
+ this.isCriticalAppsFeatureEnabled = await this.configService.getFeatureFlag(
FeatureFlag.CriticalApps,
);
+
+ const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId");
+
+ if (organizationId) {
+ this.organization = await this.organizationService.get(organizationId);
+ this.subscription = this.dataService.applications$
+ .pipe(
+ map((applications) => {
+ if (applications) {
+ this.dataSource.data = applications;
+ this.applicationSummary =
+ this.reportService.generateApplicationsSummary(applications);
+ }
+ }),
+ takeUntilDestroyed(this.destroyRef),
+ )
+ .subscribe();
+ this.isLoading$ = this.dataService.isLoading$;
+ }
+ }
+
+ ngOnDestroy(): void {
+ this.subscription?.unsubscribe();
}
constructor(
protected cipherService: CipherService,
- protected passwordStrengthService: PasswordStrengthServiceAbstraction,
- protected auditService: AuditService,
protected i18nService: I18nService,
protected activatedRoute: ActivatedRoute,
protected toastService: ToastService,
- protected organizationService: OrganizationService,
protected configService: ConfigService,
+ protected dataService: RiskInsightsDataService,
+ protected organizationService: OrganizationService,
+ protected reportService: RiskInsightsReportService,
) {
- this.dataSource.data = applicationTableMockData;
this.searchControl.valueChanges
.pipe(debounceTime(200), takeUntilDestroyed())
.subscribe((v) => (this.dataSource.filter = v));
@@ -90,7 +109,7 @@ export class AllApplicationsComponent implements OnInit {
// TODO: implement
this.toastService.showToast({
variant: "warning",
- title: null,
+ title: "",
message: "Not yet implemented",
});
};
@@ -103,7 +122,7 @@ export class AllApplicationsComponent implements OnInit {
this.selectedIds.clear();
this.toastService.showToast({
variant: "success",
- title: null,
+ title: "",
message: this.i18nService.t("appsMarkedAsCritical"),
});
resolve(true);
@@ -112,8 +131,8 @@ export class AllApplicationsComponent implements OnInit {
});
};
- trackByFunction(_: number, item: CipherView) {
- return item.id;
+ trackByFunction(_: number, item: ApplicationHealthReportDetail) {
+ return item.applicationName;
}
onCheckboxChange(id: number, event: Event) {
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.html
index 5b1fe4610d9..aeaa9f33197 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.html
@@ -34,10 +34,10 @@
- {{ passwordStrengthMap.get(r.id)[0] | i18n }}
+ {{ r.weakPasswordDetail?.detailValue.label | i18n }}
|
@@ -46,8 +46,8 @@
|
-
- {{ "exposedXTimes" | i18n: exposedPasswordMap.get(r.id) }}
+
+ {{ "exposedXTimes" | i18n: r.exposedPasswordDetail?.exposedXTimes }}
|
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.spec.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.spec.ts
index 98637d0decb..4329cfbde14 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.spec.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.spec.ts
@@ -3,17 +3,9 @@ import { ActivatedRoute, convertToParamMap } from "@angular/router";
import { mock } from "jest-mock-extended";
import { of } from "rxjs";
-import {
- MemberCipherDetailsApiService,
- PasswordHealthService,
-} from "@bitwarden/bit-common/tools/reports/risk-insights";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
+import { RiskInsightsReportService } from "@bitwarden/bit-common/tools/reports/risk-insights";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { TableModule } from "@bitwarden/components";
-import { TableBodyDirective } from "@bitwarden/components/src/table/table.component";
import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared";
import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
@@ -27,21 +19,10 @@ describe("PasswordHealthComponent", () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [PasswordHealthComponent, PipesModule, TableModule, LooseComponentsModule],
- declarations: [TableBodyDirective],
+ declarations: [],
providers: [
- { provide: CipherService, useValue: mock() },
+ { provide: RiskInsightsReportService, useValue: mock() },
{ provide: I18nService, useValue: mock() },
- { provide: AuditService, useValue: mock() },
- { provide: ApiService, useValue: mock() },
- { provide: MemberCipherDetailsApiService, useValue: mock() },
- {
- provide: PasswordStrengthServiceAbstraction,
- useValue: mock(),
- },
- {
- provide: PasswordHealthService,
- useValue: mock(),
- },
{
provide: ActivatedRoute,
useValue: {
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.ts
index 06f7de439cf..62d543a080d 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.ts
@@ -4,21 +4,14 @@ import { CommonModule } from "@angular/common";
import { Component, DestroyRef, inject, OnInit } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { ActivatedRoute } from "@angular/router";
-import { map } from "rxjs";
+import { firstValueFrom, map } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
- MemberCipherDetailsApiService,
- PasswordHealthService,
-} from "@bitwarden/bit-common/tools/reports/risk-insights";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
+import { RiskInsightsReportService } from "@bitwarden/bit-common/tools/reports/risk-insights";
+import { CipherHealthReportDetail } from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import {
BadgeModule,
- BadgeVariant,
ContainerComponent,
TableDataSource,
TableModule,
@@ -41,28 +34,19 @@ import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pip
HeaderModule,
TableModule,
],
- providers: [PasswordHealthService, MemberCipherDetailsApiService],
})
export class PasswordHealthComponent implements OnInit {
- passwordStrengthMap = new Map();
-
passwordUseMap = new Map();
-
- exposedPasswordMap = new Map();
-
- dataSource = new TableDataSource();
+ dataSource = new TableDataSource();
loading = true;
private destroyRef = inject(DestroyRef);
constructor(
- protected cipherService: CipherService,
- protected passwordStrengthService: PasswordStrengthServiceAbstraction,
- protected auditService: AuditService,
+ protected riskInsightsReportService: RiskInsightsReportService,
protected i18nService: I18nService,
protected activatedRoute: ActivatedRoute,
- protected memberCipherDetailsApiService: MemberCipherDetailsApiService,
) {}
ngOnInit() {
@@ -78,20 +62,9 @@ export class PasswordHealthComponent implements OnInit {
}
async setCiphers(organizationId: string) {
- const passwordHealthService = new PasswordHealthService(
- this.passwordStrengthService,
- this.auditService,
- this.cipherService,
- this.memberCipherDetailsApiService,
- organizationId,
+ this.dataSource.data = await firstValueFrom(
+ this.riskInsightsReportService.generateRawDataReport$(organizationId),
);
-
- await passwordHealthService.generateReport();
-
- this.dataSource.data = passwordHealthService.reportCiphers;
- this.exposedPasswordMap = passwordHealthService.exposedPasswordMap;
- this.passwordStrengthMap = passwordHealthService.passwordStrengthMap;
- this.passwordUseMap = passwordHealthService.passwordUseMap;
this.loading = false;
}
}
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights-loading.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights-loading.component.html
new file mode 100644
index 00000000000..d6f945bfb92
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights-loading.component.html
@@ -0,0 +1,8 @@
+
+
+
{{ "generatingRiskInsights" | i18n }}
+
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights-loading.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights-loading.component.ts
new file mode 100644
index 00000000000..1cafa62c608
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights-loading.component.ts
@@ -0,0 +1,14 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+
+@Component({
+ selector: "tools-risk-insights-loading",
+ standalone: true,
+ imports: [CommonModule, JslibModule],
+ templateUrl: "./risk-insights-loading.component.html",
+})
+export class ApplicationsLoadingComponent {
+ constructor() {}
+}
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 6df47e3c46f..e0618c525a7 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
@@ -1,49 +1,58 @@
-{{ "accessIntelligence" | i18n }}
-{{ "riskInsights" | i18n }}
-
- {{ "reviewAtRiskPasswords" | i18n }}
-
{{ "learnMore" | i18n }}
-
diff --git a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
index 070debf2205..5600077c363 100644
--- a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
+++ b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
@@ -30,6 +30,7 @@ import {
AsyncActionsModule,
ButtonModule,
CheckboxModule,
+ DialogService,
FormFieldModule,
ToastService,
TypographyModule,
@@ -90,6 +91,7 @@ export class LoginDecryptionOptionsComponent implements OnInit {
private apiService: ApiService,
private destroyRef: DestroyRef,
private deviceTrustService: DeviceTrustServiceAbstraction,
+ private dialogService: DialogService,
private formBuilder: FormBuilder,
private i18nService: I18nService,
private keyService: KeyService,
@@ -298,4 +300,18 @@ export class LoginDecryptionOptionsComponent implements OnInit {
this.loginEmailService.setLoginEmail(this.email);
await this.router.navigate(["/admin-approval-requested"]);
}
+
+ async logOut() {
+ const confirmed = await this.dialogService.openSimpleDialog({
+ title: { key: "logOut" },
+ content: { key: "logOutConfirmation" },
+ acceptButtonText: { key: "logOut" },
+ type: "warning",
+ });
+
+ const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
+ if (confirmed) {
+ this.messagingService.send("logout", { userId: userId });
+ }
+ }
}
diff --git a/libs/common/src/enums/notification-type.enum.ts b/libs/common/src/enums/notification-type.enum.ts
index c5853cbe2c0..69cbdff9dd2 100644
--- a/libs/common/src/enums/notification-type.enum.ts
+++ b/libs/common/src/enums/notification-type.enum.ts
@@ -22,4 +22,5 @@ export enum NotificationType {
AuthRequestResponse = 16,
SyncOrganizations = 17,
+ SyncOrganizationStatusChanged = 18,
}
diff --git a/libs/common/src/models/response/notification.response.ts b/libs/common/src/models/response/notification.response.ts
index af79b883f08..473e6fc1d10 100644
--- a/libs/common/src/models/response/notification.response.ts
+++ b/libs/common/src/models/response/notification.response.ts
@@ -42,6 +42,9 @@ export class NotificationResponse extends BaseResponse {
case NotificationType.AuthRequestResponse:
this.payload = new AuthRequestPushNotification(payload);
break;
+ case NotificationType.SyncOrganizationStatusChanged:
+ this.payload = new OrganizationStatusPushNotification(payload);
+ break;
default:
break;
}
@@ -112,3 +115,14 @@ export class AuthRequestPushNotification extends BaseResponse {
this.userId = this.getResponseProperty("UserId");
}
}
+
+export class OrganizationStatusPushNotification extends BaseResponse {
+ organizationId: string;
+ enabled: boolean;
+
+ constructor(response: any) {
+ super(response);
+ this.organizationId = this.getResponseProperty("OrganizationId");
+ this.enabled = this.getResponseProperty("Enabled");
+ }
+}
diff --git a/libs/common/src/platform/abstractions/environment.service.ts b/libs/common/src/platform/abstractions/environment.service.ts
index 0293d68903c..8d32fc4231d 100644
--- a/libs/common/src/platform/abstractions/environment.service.ts
+++ b/libs/common/src/platform/abstractions/environment.service.ts
@@ -128,5 +128,10 @@ export abstract class EnvironmentService {
/**
* Get the environment from state. Useful if you need to get the environment for another user.
*/
+ abstract getEnvironment$(userId?: string): Observable
;
+
+ /**
+ * @deprecated Use {@link getEnvironment$} instead.
+ */
abstract getEnvironment(userId?: string): Promise;
}
diff --git a/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
index bacbafcb323..e9e68ca92c3 100644
--- a/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
+++ b/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
@@ -8,7 +8,7 @@ import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential
*
* The authenticator provides key management and cryptographic signatures.
*/
-export abstract class Fido2AuthenticatorService {
+export abstract class Fido2AuthenticatorService {
/**
* Create and save a new credential as described in:
* https://www.w3.org/TR/webauthn-3/#sctn-op-make-cred
@@ -19,7 +19,7 @@ export abstract class Fido2AuthenticatorService {
**/
makeCredential: (
params: Fido2AuthenticatorMakeCredentialsParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController?: AbortController,
) => Promise;
@@ -33,7 +33,7 @@ export abstract class Fido2AuthenticatorService {
*/
getAssertion: (
params: Fido2AuthenticatorGetAssertionParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController?: AbortController,
) => Promise;
diff --git a/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts
index d9cb20995ad..55d9cce8049 100644
--- a/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts
+++ b/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts
@@ -15,7 +15,7 @@ export type UserVerification = "discouraged" | "preferred" | "required";
* It is responsible for both marshalling the inputs for the underlying authenticator operations,
* and for returning the results of the latter operations to the Web Authentication API's callers.
*/
-export abstract class Fido2ClientService {
+export abstract class Fido2ClientService {
isFido2FeatureEnabled: (hostname: string, origin: string) => Promise;
/**
@@ -28,7 +28,7 @@ export abstract class Fido2ClientService {
*/
createCredential: (
params: CreateCredentialParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController?: AbortController,
) => Promise;
@@ -43,7 +43,7 @@ export abstract class Fido2ClientService {
*/
assertCredential: (
params: AssertCredentialParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController?: AbortController,
) => Promise;
}
diff --git a/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts
index 49752138527..7beefc3b4cc 100644
--- a/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts
+++ b/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts
@@ -61,7 +61,7 @@ export interface PickCredentialParams {
* The service is session based and is intended to be used by the FIDO2 authenticator to open a window,
* and then use this window to ask the user for input and/or display messages to the user.
*/
-export abstract class Fido2UserInterfaceService {
+export abstract class Fido2UserInterfaceService {
/**
* Creates a new session.
* Note: This will not necessarily open a window until it is needed to request something from the user.
@@ -71,7 +71,7 @@ export abstract class Fido2UserInterfaceService {
*/
newSession: (
fallbackSupported: boolean,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController?: AbortController,
) => Promise;
}
diff --git a/libs/common/src/platform/abstractions/sdk/sdk.service.ts b/libs/common/src/platform/abstractions/sdk/sdk.service.ts
index ec606896408..d44d38c36ab 100644
--- a/libs/common/src/platform/abstractions/sdk/sdk.service.ts
+++ b/libs/common/src/platform/abstractions/sdk/sdk.service.ts
@@ -7,11 +7,6 @@ import { BitwardenClient } from "@bitwarden/sdk-internal";
import { UserId } from "../../../types/guid";
export abstract class SdkService {
- /**
- * Check if the SDK is supported in the current environment.
- */
- supported$: Observable;
-
/**
* Retrieve the version of the SDK.
*/
@@ -35,6 +30,4 @@ export abstract class SdkService {
* @param userId
*/
abstract userClient$(userId: UserId): Observable;
-
- abstract failedToInitialize(category: string, error?: Error): Promise;
}
diff --git a/libs/common/src/platform/services/default-environment.service.spec.ts b/libs/common/src/platform/services/default-environment.service.spec.ts
index 7d266e93fc3..870f887c160 100644
--- a/libs/common/src/platform/services/default-environment.service.spec.ts
+++ b/libs/common/src/platform/services/default-environment.service.spec.ts
@@ -314,7 +314,7 @@ describe("EnvironmentService", () => {
await switchUser(testUser);
- const env = await sut.getEnvironment();
+ const env = await firstValueFrom(sut.getEnvironment$());
expect(env.getHostname()).toBe(expectedHost);
});
@@ -325,7 +325,7 @@ describe("EnvironmentService", () => {
setGlobalData(region, new EnvironmentUrls());
setUserData(Region.US, new EnvironmentUrls());
- const env = await sut.getEnvironment();
+ const env = await firstValueFrom(sut.getEnvironment$());
expect(env.getHostname()).toBe(expectedHost);
});
@@ -338,7 +338,7 @@ describe("EnvironmentService", () => {
setGlobalData(region, new EnvironmentUrls());
setUserData(Region.US, new EnvironmentUrls());
- const env = await sut.getEnvironment(testUser);
+ const env = await firstValueFrom(sut.getEnvironment$(testUser));
expect(env.getHostname()).toBe(expectedHost);
},
);
@@ -355,7 +355,7 @@ describe("EnvironmentService", () => {
await switchUser(testUser);
- const env = await sut.getEnvironment(alternateTestUser);
+ const env = await firstValueFrom(sut.getEnvironment$(alternateTestUser));
expect(env.getHostname()).toBe(expectedHost);
},
);
@@ -366,7 +366,7 @@ describe("EnvironmentService", () => {
setGlobalData(Region.SelfHosted, globalSelfHostUrls);
setUserData(Region.EU, new EnvironmentUrls());
- const env = await sut.getEnvironment();
+ const env = await firstValueFrom(sut.getEnvironment$());
expect(env.getHostname()).toBe("base.example.com");
});
@@ -377,7 +377,7 @@ describe("EnvironmentService", () => {
setGlobalData(Region.SelfHosted, globalSelfHostUrls);
setUserData(Region.EU, new EnvironmentUrls());
- const env = await sut.getEnvironment();
+ const env = await firstValueFrom(sut.getEnvironment$());
expect(env.getHostname()).toBe("vault.example.com");
});
@@ -391,7 +391,7 @@ describe("EnvironmentService", () => {
await switchUser(testUser);
- const env = await sut.getEnvironment(alternateTestUser);
+ const env = await firstValueFrom(sut.getEnvironment$(alternateTestUser));
expect(env.getHostname()).toBe("base.example.com");
});
});
diff --git a/libs/common/src/platform/services/default-environment.service.ts b/libs/common/src/platform/services/default-environment.service.ts
index 69d990ce691..ac3e39b2bb3 100644
--- a/libs/common/src/platform/services/default-environment.service.ts
+++ b/libs/common/src/platform/services/default-environment.service.ts
@@ -271,23 +271,30 @@ export class DefaultEnvironmentService implements EnvironmentService {
}
}
- async getEnvironment(userId?: UserId): Promise {
+ getEnvironment$(userId?: UserId): Observable {
if (userId == null) {
- return await firstValueFrom(this.environment$);
+ return this.environment$;
}
- const state = await this.getEnvironmentState(userId);
- return this.buildEnvironment(state.region, state.urls);
+ return this.activeAccountId$.pipe(
+ switchMap((activeUserId) => {
+ // Previous rules dictated that we only get from user scoped state if there is an active user.
+ if (activeUserId == null) {
+ return this.globalState.state$;
+ }
+ return this.stateProvider.getUser(userId ?? activeUserId, USER_ENVIRONMENT_KEY).state$;
+ }),
+ map((state) => {
+ return this.buildEnvironment(state?.region, state?.urls);
+ }),
+ );
}
- private async getEnvironmentState(userId: UserId | null) {
- // Previous rules dictated that we only get from user scoped state if there is an active user.
- const activeUserId = await firstValueFrom(this.activeAccountId$);
- return activeUserId == null
- ? await firstValueFrom(this.globalState.state$)
- : await firstValueFrom(
- this.stateProvider.getUser(userId ?? activeUserId, USER_ENVIRONMENT_KEY).state$,
- );
+ /**
+ * @deprecated Use getEnvironment$ instead.
+ */
+ async getEnvironment(userId?: UserId): Promise {
+ return firstValueFrom(this.getEnvironment$(userId));
}
async seedUserEnvironment(userId: UserId) {
diff --git a/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts
index e3f79ff9d58..226f4c2cfe9 100644
--- a/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts
+++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts
@@ -30,6 +30,8 @@ import { parseCredentialId } from "./credential-id-utils";
import { AAGUID, Fido2AuthenticatorService } from "./fido2-authenticator.service";
import { Fido2Utils } from "./fido2-utils";
+type ParentWindowReference = string;
+
const RpId = "bitwarden.com";
describe("FidoAuthenticatorService", () => {
@@ -41,16 +43,16 @@ describe("FidoAuthenticatorService", () => {
});
let cipherService!: MockProxy;
- let userInterface!: MockProxy;
+ let userInterface!: MockProxy>;
let userInterfaceSession!: MockProxy;
let syncService!: MockProxy;
let accountService!: MockProxy;
- let authenticator!: Fido2AuthenticatorService;
- let tab!: chrome.tabs.Tab;
+ let authenticator!: Fido2AuthenticatorService;
+ let windowReference!: ParentWindowReference;
beforeEach(async () => {
cipherService = mock();
- userInterface = mock();
+ userInterface = mock>();
userInterfaceSession = mock();
userInterface.newSession.mockResolvedValue(userInterfaceSession);
syncService = mock({
@@ -63,7 +65,7 @@ describe("FidoAuthenticatorService", () => {
syncService,
accountService,
);
- tab = { id: 123, windowId: 456 } as chrome.tabs.Tab;
+ windowReference = Utils.newGuid();
accountService.activeAccount$ = activeAccountSubject;
});
@@ -78,19 +80,21 @@ describe("FidoAuthenticatorService", () => {
// Spec: Check if at least one of the specified combinations of PublicKeyCredentialType and cryptographic parameters in credTypesAndPubKeyAlgs is supported. If not, return an error code equivalent to "NotSupportedError" and terminate the operation.
it("should throw error when input does not contain any supported algorithms", async () => {
const result = async () =>
- await authenticator.makeCredential(invalidParams.unsupportedAlgorithm, tab);
+ await authenticator.makeCredential(invalidParams.unsupportedAlgorithm, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.NotSupported);
});
it("should throw error when requireResidentKey has invalid value", async () => {
- const result = async () => await authenticator.makeCredential(invalidParams.invalidRk, tab);
+ const result = async () =>
+ await authenticator.makeCredential(invalidParams.invalidRk, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Unknown);
});
it("should throw error when requireUserVerification has invalid value", async () => {
- const result = async () => await authenticator.makeCredential(invalidParams.invalidUv, tab);
+ const result = async () =>
+ await authenticator.makeCredential(invalidParams.invalidUv, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Unknown);
});
@@ -103,7 +107,7 @@ describe("FidoAuthenticatorService", () => {
it.skip("should throw error if requireUserVerification is set to true", async () => {
const params = await createParams({ requireUserVerification: true });
- const result = async () => await authenticator.makeCredential(params, tab);
+ const result = async () => await authenticator.makeCredential(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Constraint);
});
@@ -117,7 +121,7 @@ describe("FidoAuthenticatorService", () => {
for (const p of Object.values(invalidParams)) {
try {
- await authenticator.makeCredential(p, tab);
+ await authenticator.makeCredential(p, windowReference);
// eslint-disable-next-line no-empty
} catch {}
}
@@ -158,7 +162,7 @@ describe("FidoAuthenticatorService", () => {
userInterfaceSession.informExcludedCredential.mockResolvedValue();
try {
- await authenticator.makeCredential(params, tab);
+ await authenticator.makeCredential(params, windowReference);
// eslint-disable-next-line no-empty
} catch {}
@@ -169,7 +173,7 @@ describe("FidoAuthenticatorService", () => {
it("should throw error", async () => {
userInterfaceSession.informExcludedCredential.mockResolvedValue();
- const result = async () => await authenticator.makeCredential(params, tab);
+ const result = async () => await authenticator.makeCredential(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.NotAllowed);
});
@@ -180,7 +184,7 @@ describe("FidoAuthenticatorService", () => {
excludedCipher.organizationId = "someOrganizationId";
try {
- await authenticator.makeCredential(params, tab);
+ await authenticator.makeCredential(params, windowReference);
// eslint-disable-next-line no-empty
} catch {}
@@ -193,7 +197,7 @@ describe("FidoAuthenticatorService", () => {
for (const p of Object.values(invalidParams)) {
try {
- await authenticator.makeCredential(p, tab);
+ await authenticator.makeCredential(p, windowReference);
// eslint-disable-next-line no-empty
} catch {}
}
@@ -230,7 +234,7 @@ describe("FidoAuthenticatorService", () => {
userVerified: userVerification,
});
- await authenticator.makeCredential(params, tab);
+ await authenticator.makeCredential(params, windowReference);
expect(userInterfaceSession.confirmNewCredential).toHaveBeenCalledWith({
credentialName: params.rpEntity.name,
@@ -250,7 +254,7 @@ describe("FidoAuthenticatorService", () => {
});
cipherService.encrypt.mockResolvedValue(encryptedCipher as unknown as Cipher);
- await authenticator.makeCredential(params, tab);
+ await authenticator.makeCredential(params, windowReference);
const saved = cipherService.encrypt.mock.lastCall?.[0];
expect(saved).toEqual(
@@ -288,7 +292,7 @@ describe("FidoAuthenticatorService", () => {
});
const params = await createParams();
- const result = async () => await authenticator.makeCredential(params, tab);
+ const result = async () => await authenticator.makeCredential(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.NotAllowed);
});
@@ -302,7 +306,7 @@ describe("FidoAuthenticatorService", () => {
const encryptedCipher = { ...existingCipher, reprompt: CipherRepromptType.Password };
cipherService.get.mockResolvedValue(encryptedCipher as unknown as Cipher);
- const result = async () => await authenticator.makeCredential(params, tab);
+ const result = async () => await authenticator.makeCredential(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Unknown);
});
@@ -317,7 +321,7 @@ describe("FidoAuthenticatorService", () => {
cipherService.encrypt.mockResolvedValue(encryptedCipher as unknown as Cipher);
cipherService.updateWithServer.mockRejectedValue(new Error("Internal error"));
- const result = async () => await authenticator.makeCredential(params, tab);
+ const result = async () => await authenticator.makeCredential(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Unknown);
});
@@ -358,7 +362,7 @@ describe("FidoAuthenticatorService", () => {
});
it("should return attestation object", async () => {
- const result = await authenticator.makeCredential(params, tab);
+ const result = await authenticator.makeCredential(params, windowReference);
const attestationObject = CBOR.decode(
Fido2Utils.bufferSourceToUint8Array(result.attestationObject).buffer,
@@ -455,7 +459,8 @@ describe("FidoAuthenticatorService", () => {
describe("invalid input parameters", () => {
it("should throw error when requireUserVerification has invalid value", async () => {
- const result = async () => await authenticator.getAssertion(invalidParams.invalidUv, tab);
+ const result = async () =>
+ await authenticator.getAssertion(invalidParams.invalidUv, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Unknown);
});
@@ -468,7 +473,7 @@ describe("FidoAuthenticatorService", () => {
it.skip("should throw error if requireUserVerification is set to true", async () => {
const params = await createParams({ requireUserVerification: true });
- const result = async () => await authenticator.getAssertion(params, tab);
+ const result = async () => await authenticator.getAssertion(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Constraint);
});
@@ -498,7 +503,7 @@ describe("FidoAuthenticatorService", () => {
userInterfaceSession.informCredentialNotFound.mockResolvedValue();
try {
- await authenticator.getAssertion(params, tab);
+ await authenticator.getAssertion(params, windowReference);
// eslint-disable-next-line no-empty
} catch {}
@@ -513,7 +518,7 @@ describe("FidoAuthenticatorService", () => {
userInterfaceSession.informCredentialNotFound.mockResolvedValue();
try {
- await authenticator.getAssertion(params, tab);
+ await authenticator.getAssertion(params, windowReference);
// eslint-disable-next-line no-empty
} catch {}
@@ -534,7 +539,7 @@ describe("FidoAuthenticatorService", () => {
/** Spec: If credentialOptions is now empty, return an error code equivalent to "NotAllowedError" and terminate the operation. */
it("should throw error", async () => {
- const result = async () => await authenticator.getAssertion(params, tab);
+ const result = async () => await authenticator.getAssertion(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.NotAllowed);
});
@@ -573,7 +578,7 @@ describe("FidoAuthenticatorService", () => {
userVerified: false,
});
- await authenticator.getAssertion(params, tab);
+ await authenticator.getAssertion(params, windowReference);
expect(userInterfaceSession.pickCredential).toHaveBeenCalledWith({
cipherIds: ciphers.map((c) => c.id),
@@ -590,7 +595,7 @@ describe("FidoAuthenticatorService", () => {
userVerified: false,
});
- await authenticator.getAssertion(params, tab);
+ await authenticator.getAssertion(params, windowReference);
expect(userInterfaceSession.pickCredential).toHaveBeenCalledWith({
cipherIds: [discoverableCiphers[0].id],
@@ -608,7 +613,7 @@ describe("FidoAuthenticatorService", () => {
userVerified: userVerification,
});
- await authenticator.getAssertion(params, tab);
+ await authenticator.getAssertion(params, windowReference);
expect(userInterfaceSession.pickCredential).toHaveBeenCalledWith({
cipherIds: ciphers.map((c) => c.id),
@@ -625,7 +630,7 @@ describe("FidoAuthenticatorService", () => {
userVerified: false,
});
- const result = async () => await authenticator.getAssertion(params, tab);
+ const result = async () => await authenticator.getAssertion(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.NotAllowed);
});
@@ -637,7 +642,7 @@ describe("FidoAuthenticatorService", () => {
userVerified: false,
});
- const result = async () => await authenticator.getAssertion(params, tab);
+ const result = async () => await authenticator.getAssertion(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.NotAllowed);
});
@@ -686,7 +691,7 @@ describe("FidoAuthenticatorService", () => {
cipherService.encrypt.mockResolvedValue(encrypted as any);
ciphers[0].login.fido2Credentials[0].counter = 9000;
- await authenticator.getAssertion(params, tab);
+ await authenticator.getAssertion(params, windowReference);
expect(cipherService.updateWithServer).toHaveBeenCalledWith(encrypted);
expect(cipherService.encrypt).toHaveBeenCalledWith(
@@ -710,13 +715,13 @@ describe("FidoAuthenticatorService", () => {
cipherService.encrypt.mockResolvedValue(encrypted as any);
ciphers[0].login.fido2Credentials[0].counter = 0;
- await authenticator.getAssertion(params, tab);
+ await authenticator.getAssertion(params, windowReference);
expect(cipherService.updateWithServer).not.toHaveBeenCalled();
});
it("should return an assertion result", async () => {
- const result = await authenticator.getAssertion(params, tab);
+ const result = await authenticator.getAssertion(params, windowReference);
const encAuthData = result.authenticatorData;
const rpIdHash = encAuthData.slice(0, 32);
@@ -757,7 +762,7 @@ describe("FidoAuthenticatorService", () => {
for (let i = 0; i < 10; ++i) {
await init(); // Reset inputs
- const result = await authenticator.getAssertion(params, tab);
+ const result = await authenticator.getAssertion(params, windowReference);
const counter = result.authenticatorData.slice(33, 37);
expect(counter).toEqual(new Uint8Array([0, 0, 0x23, 0x29])); // double check that the counter doesn't change
@@ -774,7 +779,7 @@ describe("FidoAuthenticatorService", () => {
it("should throw unkown error if creation fails", async () => {
cipherService.updateWithServer.mockRejectedValue(new Error("Internal error"));
- const result = async () => await authenticator.getAssertion(params, tab);
+ const result = async () => await authenticator.getAssertion(params, windowReference);
await expect(result).rejects.toThrowError(Fido2AuthenticatorErrorCode.Unknown);
});
diff --git a/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts
index 34117e852ea..376f4dcdced 100644
--- a/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts
+++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts
@@ -43,10 +43,12 @@ const KeyUsages: KeyUsage[] = ["sign"];
*
* It is highly recommended that the W3C specification is used a reference when reading this code.
*/
-export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstraction {
+export class Fido2AuthenticatorService
+ implements Fido2AuthenticatorServiceAbstraction
+{
constructor(
private cipherService: CipherService,
- private userInterface: Fido2UserInterfaceService,
+ private userInterface: Fido2UserInterfaceService,
private syncService: SyncService,
private accountService: AccountService,
private logService?: LogService,
@@ -54,12 +56,12 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
async makeCredential(
params: Fido2AuthenticatorMakeCredentialsParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController?: AbortController,
): Promise {
const userInterfaceSession = await this.userInterface.newSession(
params.fallbackSupported,
- tab,
+ window,
abortController,
);
@@ -209,12 +211,12 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
async getAssertion(
params: Fido2AuthenticatorGetAssertionParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController?: AbortController,
): Promise {
const userInterfaceSession = await this.userInterface.newSession(
params.fallbackSupported,
- tab,
+ window,
abortController,
);
try {
diff --git a/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts b/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
index 7ef705b95f9..31f6ce10e01 100644
--- a/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
+++ b/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
@@ -3,6 +3,9 @@
import { CipherType } from "../../../vault/enums";
import { CipherView } from "../../../vault/models/view/cipher.view";
import { Fido2CredentialAutofillView } from "../../../vault/models/view/fido2-credential-autofill.view";
+import { Utils } from "../../misc/utils";
+
+import { parseCredentialId } from "./credential-id-utils";
// TODO: Move into Fido2AuthenticatorService
export async function getCredentialsForAutofill(
@@ -15,9 +18,14 @@ export async function getCredentialsForAutofill(
)
.map((cipher) => {
const credential = cipher.login.fido2Credentials[0];
+
+ // Credentials are stored as a GUID or b64 string with `b64.` prepended,
+ // but we need to return them as a URL-safe base64 string
+ const credId = Utils.fromBufferToUrlB64(parseCredentialId(credential.credentialId));
+
return {
cipherId: cipher.id,
- credentialId: credential.credentialId,
+ credentialId: credId,
rpId: credential.rpId,
userHandle: credential.userHandle,
userName: credential.userName,
diff --git a/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts
index 582849ebc12..51c3d8617ab 100644
--- a/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts
+++ b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts
@@ -32,12 +32,14 @@ import { Fido2ClientService } from "./fido2-client.service";
import { Fido2Utils } from "./fido2-utils";
import { guidToRawFormat } from "./guid-utils";
+type ParentWindowReference = string;
+
const RpId = "bitwarden.com";
const Origin = "https://bitwarden.com";
const VaultUrl = "https://vault.bitwarden.com";
describe("FidoAuthenticatorService", () => {
- let authenticator!: MockProxy;
+ let authenticator!: MockProxy>;
let configService!: MockProxy;
let authService!: MockProxy;
let vaultSettingsService: MockProxy;
@@ -45,12 +47,12 @@ describe("FidoAuthenticatorService", () => {
let taskSchedulerService: MockProxy;
let activeRequest!: MockProxy;
let requestManager!: MockProxy;
- let client!: Fido2ClientService;
- let tab!: chrome.tabs.Tab;
+ let client!: Fido2ClientService;
+ let windowReference!: ParentWindowReference;
let isValidRpId!: jest.SpyInstance;
beforeEach(async () => {
- authenticator = mock();
+ authenticator = mock>();
configService = mock();
authService = mock();
vaultSettingsService = mock();
@@ -82,7 +84,7 @@ describe("FidoAuthenticatorService", () => {
vaultSettingsService.enablePasskeys$ = of(true);
domainSettingsService.neverDomains$ = of({});
authService.activeAccountStatus$ = of(AuthenticationStatus.Unlocked);
- tab = { id: 123, windowId: 456 } as chrome.tabs.Tab;
+ windowReference = Utils.newGuid();
});
afterEach(() => {
@@ -95,7 +97,7 @@ describe("FidoAuthenticatorService", () => {
it("should throw error if sameOriginWithAncestors is false", async () => {
const params = createParams({ sameOriginWithAncestors: false });
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "NotAllowedError" });
@@ -106,7 +108,7 @@ describe("FidoAuthenticatorService", () => {
it("should throw error if user.id is too small", async () => {
const params = createParams({ user: { id: "", displayName: "displayName", name: "name" } });
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
await expect(result).rejects.toBeInstanceOf(TypeError);
});
@@ -121,7 +123,7 @@ describe("FidoAuthenticatorService", () => {
},
});
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
await expect(result).rejects.toBeInstanceOf(TypeError);
});
@@ -136,7 +138,7 @@ describe("FidoAuthenticatorService", () => {
origin: "invalid-domain-name",
});
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -151,7 +153,7 @@ describe("FidoAuthenticatorService", () => {
rp: { id: "bitwarden.com", name: "Bitwarden" },
});
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -165,7 +167,7 @@ describe("FidoAuthenticatorService", () => {
// `params` actually has a valid rp.id, but we're mocking the function to return false
isValidRpId.mockReturnValue(false);
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -179,7 +181,7 @@ describe("FidoAuthenticatorService", () => {
});
domainSettingsService.neverDomains$ = of({ "bitwarden.com": null });
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
await expect(result).rejects.toThrow(FallbackRequestedError);
});
@@ -190,7 +192,7 @@ describe("FidoAuthenticatorService", () => {
rp: { id: "bitwarden.com", name: "Bitwarden" },
});
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -204,7 +206,7 @@ describe("FidoAuthenticatorService", () => {
});
authenticator.makeCredential.mockResolvedValue(createAuthenticatorMakeResult());
- await client.createCredential(params, tab);
+ await client.createCredential(params, windowReference);
});
// Spec: If credTypesAndPubKeyAlgs is empty, return a DOMException whose name is "NotSupportedError", and terminate this algorithm.
@@ -216,7 +218,7 @@ describe("FidoAuthenticatorService", () => {
],
});
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "NotSupportedError" });
@@ -231,7 +233,8 @@ describe("FidoAuthenticatorService", () => {
const abortController = new AbortController();
abortController.abort();
- const result = async () => await client.createCredential(params, tab, abortController);
+ const result = async () =>
+ await client.createCredential(params, windowReference, abortController);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "AbortError" });
@@ -246,7 +249,7 @@ describe("FidoAuthenticatorService", () => {
});
authenticator.makeCredential.mockResolvedValue(createAuthenticatorMakeResult());
- await client.createCredential(params, tab);
+ await client.createCredential(params, windowReference);
expect(authenticator.makeCredential).toHaveBeenCalledWith(
expect.objectContaining({
@@ -259,7 +262,7 @@ describe("FidoAuthenticatorService", () => {
displayName: params.user.displayName,
}),
}),
- tab,
+ windowReference,
expect.anything(),
);
});
@@ -271,7 +274,7 @@ describe("FidoAuthenticatorService", () => {
});
authenticator.makeCredential.mockResolvedValue(createAuthenticatorMakeResult());
- const result = await client.createCredential(params, tab);
+ const result = await client.createCredential(params, windowReference);
expect(result.extensions.credProps?.rk).toBe(true);
});
@@ -283,7 +286,7 @@ describe("FidoAuthenticatorService", () => {
});
authenticator.makeCredential.mockResolvedValue(createAuthenticatorMakeResult());
- const result = await client.createCredential(params, tab);
+ const result = await client.createCredential(params, windowReference);
expect(result.extensions.credProps?.rk).toBe(false);
});
@@ -295,7 +298,7 @@ describe("FidoAuthenticatorService", () => {
});
authenticator.makeCredential.mockResolvedValue(createAuthenticatorMakeResult());
- const result = await client.createCredential(params, tab);
+ const result = await client.createCredential(params, windowReference);
expect(result.extensions.credProps).toBeUndefined();
});
@@ -307,7 +310,7 @@ describe("FidoAuthenticatorService", () => {
new Fido2AuthenticatorError(Fido2AuthenticatorErrorCode.InvalidState),
);
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "InvalidStateError" });
@@ -319,7 +322,7 @@ describe("FidoAuthenticatorService", () => {
const params = createParams();
authenticator.makeCredential.mockRejectedValue(new Error("unknown error"));
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "NotAllowedError" });
@@ -330,7 +333,7 @@ describe("FidoAuthenticatorService", () => {
const params = createParams();
vaultSettingsService.enablePasskeys$ = of(false);
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toThrow(FallbackRequestedError);
@@ -340,7 +343,7 @@ describe("FidoAuthenticatorService", () => {
const params = createParams();
authService.getAuthStatus.mockResolvedValue(AuthenticationStatus.LoggedOut);
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toThrow(FallbackRequestedError);
@@ -349,7 +352,7 @@ describe("FidoAuthenticatorService", () => {
it("should throw FallbackRequestedError if origin equals the bitwarden vault", async () => {
const params = createParams({ origin: VaultUrl });
- const result = async () => await client.createCredential(params, tab);
+ const result = async () => await client.createCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toThrow(FallbackRequestedError);
@@ -408,7 +411,7 @@ describe("FidoAuthenticatorService", () => {
origin: "invalid-domain-name",
});
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -423,7 +426,7 @@ describe("FidoAuthenticatorService", () => {
rpId: "bitwarden.com",
});
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -437,7 +440,7 @@ describe("FidoAuthenticatorService", () => {
// `params` actually has a valid rp.id, but we're mocking the function to return false
isValidRpId.mockReturnValue(false);
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -451,7 +454,7 @@ describe("FidoAuthenticatorService", () => {
domainSettingsService.neverDomains$ = of({ "bitwarden.com": null });
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
await expect(result).rejects.toThrow(FallbackRequestedError);
});
@@ -462,7 +465,7 @@ describe("FidoAuthenticatorService", () => {
rpId: "bitwarden.com",
});
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "SecurityError" });
@@ -477,7 +480,8 @@ describe("FidoAuthenticatorService", () => {
const abortController = new AbortController();
abortController.abort();
- const result = async () => await client.assertCredential(params, tab, abortController);
+ const result = async () =>
+ await client.assertCredential(params, windowReference, abortController);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "AbortError" });
@@ -493,7 +497,7 @@ describe("FidoAuthenticatorService", () => {
new Fido2AuthenticatorError(Fido2AuthenticatorErrorCode.InvalidState),
);
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "InvalidStateError" });
@@ -505,7 +509,7 @@ describe("FidoAuthenticatorService", () => {
const params = createParams();
authenticator.getAssertion.mockRejectedValue(new Error("unknown error"));
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toMatchObject({ name: "NotAllowedError" });
@@ -516,7 +520,7 @@ describe("FidoAuthenticatorService", () => {
const params = createParams();
vaultSettingsService.enablePasskeys$ = of(false);
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toThrow(FallbackRequestedError);
@@ -526,7 +530,7 @@ describe("FidoAuthenticatorService", () => {
const params = createParams();
authService.getAuthStatus.mockResolvedValue(AuthenticationStatus.LoggedOut);
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toThrow(FallbackRequestedError);
@@ -535,7 +539,7 @@ describe("FidoAuthenticatorService", () => {
it("should throw FallbackRequestedError if origin equals the bitwarden vault", async () => {
const params = createParams({ origin: VaultUrl });
- const result = async () => await client.assertCredential(params, tab);
+ const result = async () => await client.assertCredential(params, windowReference);
const rejects = expect(result).rejects;
await rejects.toThrow(FallbackRequestedError);
@@ -555,7 +559,7 @@ describe("FidoAuthenticatorService", () => {
});
authenticator.getAssertion.mockResolvedValue(createAuthenticatorAssertResult());
- await client.assertCredential(params, tab);
+ await client.assertCredential(params, windowReference);
expect(authenticator.getAssertion).toHaveBeenCalledWith(
expect.objectContaining({
@@ -573,7 +577,7 @@ describe("FidoAuthenticatorService", () => {
}),
],
}),
- tab,
+ windowReference,
expect.anything(),
);
});
@@ -585,7 +589,7 @@ describe("FidoAuthenticatorService", () => {
params.rpId = undefined;
authenticator.getAssertion.mockResolvedValue(createAuthenticatorAssertResult());
- await client.assertCredential(params, tab);
+ await client.assertCredential(params, windowReference);
});
});
@@ -597,7 +601,7 @@ describe("FidoAuthenticatorService", () => {
});
authenticator.getAssertion.mockResolvedValue(createAuthenticatorAssertResult());
- await client.assertCredential(params, tab);
+ await client.assertCredential(params, windowReference);
expect(authenticator.getAssertion).toHaveBeenCalledWith(
expect.objectContaining({
@@ -605,7 +609,7 @@ describe("FidoAuthenticatorService", () => {
rpId: RpId,
allowCredentialDescriptorList: [],
}),
- tab,
+ windowReference,
expect.anything(),
);
});
@@ -627,7 +631,7 @@ describe("FidoAuthenticatorService", () => {
});
it("creates an active mediated conditional request", async () => {
- await client.assertCredential(params, tab);
+ await client.assertCredential(params, windowReference);
expect(requestManager.newActiveRequest).toHaveBeenCalled();
expect(authenticator.getAssertion).toHaveBeenCalledWith(
@@ -635,14 +639,14 @@ describe("FidoAuthenticatorService", () => {
assumeUserPresence: true,
rpId: RpId,
}),
- tab,
+ windowReference,
);
});
it("restarts the mediated conditional request if a user aborts the request", async () => {
authenticator.getAssertion.mockRejectedValueOnce(new Error());
- await client.assertCredential(params, tab);
+ await client.assertCredential(params, windowReference);
expect(authenticator.getAssertion).toHaveBeenCalledTimes(2);
});
@@ -652,7 +656,7 @@ describe("FidoAuthenticatorService", () => {
abortController.abort();
authenticator.getAssertion.mockRejectedValueOnce(new DOMException("AbortError"));
- await client.assertCredential(params, tab);
+ await client.assertCredential(params, windowReference);
expect(authenticator.getAssertion).toHaveBeenCalledTimes(2);
});
diff --git a/libs/common/src/platform/services/fido2/fido2-client.service.ts b/libs/common/src/platform/services/fido2/fido2-client.service.ts
index d08d1e2a42d..4bf30ef6537 100644
--- a/libs/common/src/platform/services/fido2/fido2-client.service.ts
+++ b/libs/common/src/platform/services/fido2/fido2-client.service.ts
@@ -47,7 +47,9 @@ import { guidToRawFormat } from "./guid-utils";
*
* It is highly recommended that the W3C specification is used a reference when reading this code.
*/
-export class Fido2ClientService implements Fido2ClientServiceAbstraction {
+export class Fido2ClientService
+ implements Fido2ClientServiceAbstraction
+{
private timeoutAbortController: AbortController;
private readonly TIMEOUTS = {
NO_VERIFICATION: {
@@ -63,7 +65,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
};
constructor(
- private authenticator: Fido2AuthenticatorService,
+ private authenticator: Fido2AuthenticatorService,
private configService: ConfigService,
private authService: AuthService,
private vaultSettingsService: VaultSettingsService,
@@ -102,7 +104,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
async createCredential(
params: CreateCredentialParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController = new AbortController(),
): Promise {
const parsedOrigin = parse(params.origin, { allowPrivateDomains: true });
@@ -201,7 +203,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
try {
makeCredentialResult = await this.authenticator.makeCredential(
makeCredentialParams,
- tab,
+ window,
abortController,
);
} catch (error) {
@@ -256,7 +258,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
async assertCredential(
params: AssertCredentialParams,
- tab: chrome.tabs.Tab,
+ window: ParentWindowReference,
abortController = new AbortController(),
): Promise {
const parsedOrigin = parse(params.origin, { allowPrivateDomains: true });
@@ -300,7 +302,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
if (params.mediation === "conditional") {
return this.handleMediatedConditionalRequest(
params,
- tab,
+ window,
abortController,
clientDataJSONBytes,
);
@@ -324,7 +326,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
try {
getAssertionResult = await this.authenticator.getAssertion(
getAssertionParams,
- tab,
+ window,
abortController,
);
} catch (error) {
@@ -363,7 +365,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
private async handleMediatedConditionalRequest(
params: AssertCredentialParams,
- tab: chrome.tabs.Tab,
+ tab: ParentWindowReference,
abortController: AbortController,
clientDataJSONBytes: Uint8Array,
): Promise {
@@ -379,7 +381,10 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
`[Fido2Client] started mediated request, available credentials: ${availableCredentials.length}`,
);
const requestResult = await this.requestManager.newActiveRequest(
- tab.id,
+ // TODO: This isn't correct, but this.requestManager.newActiveRequest expects a number,
+ // while this class is currently generic over ParentWindowReference.
+ // Consider moving requestManager into browser and adding support for ParentWindowReference => tab.id
+ (tab as any).id,
availableCredentials,
abortController,
);
diff --git a/libs/common/src/platform/services/fido2/noop-fido2-user-interface.service.ts b/libs/common/src/platform/services/fido2/noop-fido2-user-interface.service.ts
index 440bd519002..14b4da0ef1b 100644
--- a/libs/common/src/platform/services/fido2/noop-fido2-user-interface.service.ts
+++ b/libs/common/src/platform/services/fido2/noop-fido2-user-interface.service.ts
@@ -7,7 +7,7 @@ import {
* Noop implementation of the {@link Fido2UserInterfaceService}.
* This implementation does not provide any user interface.
*/
-export class Fido2UserInterfaceService implements Fido2UserInterfaceServiceAbstraction {
+export class Fido2UserInterfaceService implements Fido2UserInterfaceServiceAbstraction {
newSession(): Promise {
throw new Error("Not implemented exception");
}
diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
index de8b079621a..c5917e0230f 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
@@ -4,7 +4,6 @@ import { BehaviorSubject, firstValueFrom, of } from "rxjs";
import { KdfConfigService, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
import { BitwardenClient } from "@bitwarden/sdk-internal";
-import { ApiService } from "../../../abstractions/api.service";
import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service";
import { UserId } from "../../../types/guid";
import { UserKey } from "../../../types/key";
@@ -24,7 +23,6 @@ describe("DefaultSdkService", () => {
let accountService!: MockProxy;
let kdfConfigService!: MockProxy;
let keyService!: MockProxy;
- let apiService!: MockProxy;
let service!: DefaultSdkService;
let mockClient!: MockProxy;
@@ -36,7 +34,6 @@ describe("DefaultSdkService", () => {
accountService = mock();
kdfConfigService = mock();
keyService = mock();
- apiService = mock();
// Can't use `of(mock())` for some reason
environmentService.environment$ = new BehaviorSubject(mock());
@@ -48,7 +45,6 @@ describe("DefaultSdkService", () => {
accountService,
kdfConfigService,
keyService,
- apiService,
);
mockClient = mock();
@@ -60,6 +56,9 @@ describe("DefaultSdkService", () => {
const userId = "user-id" as UserId;
beforeEach(() => {
+ environmentService.getEnvironment$
+ .calledWith(userId)
+ .mockReturnValue(new BehaviorSubject(mock()));
accountService.accounts$ = of({
[userId]: { email: "email", emailVerified: true, name: "name" } as AccountInfo,
});
diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.ts b/libs/common/src/platform/services/sdk/default-sdk.service.ts
index be6f99ab040..e9cecbb15dc 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.ts
@@ -3,7 +3,6 @@
import {
combineLatest,
concatMap,
- firstValueFrom,
Observable,
shareReplay,
map,
@@ -21,7 +20,6 @@ import {
DeviceType as SdkDeviceType,
} from "@bitwarden/sdk-internal";
-import { ApiService } from "../../../abstractions/api.service";
import { EncryptedOrganizationKeyData } from "../../../admin-console/models/data/encrypted-organization-key.data";
import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service";
import { DeviceType } from "../../../enums/device-type.enum";
@@ -34,43 +32,17 @@ import { SdkService } from "../../abstractions/sdk/sdk.service";
import { compareValues } from "../../misc/compare-values";
import { EncryptedString } from "../../models/domain/enc-string";
-export class RecoverableSDKError extends Error {
- sdk: BitwardenClient;
- timeout: number;
-
- constructor(sdk: BitwardenClient, timeout: number) {
- super(`SDK took ${timeout}s to initialize`);
-
- this.sdk = sdk;
- this.timeout = timeout;
- }
-}
-
export class DefaultSdkService implements SdkService {
private sdkClientCache = new Map>();
client$ = this.environmentService.environment$.pipe(
concatMap(async (env) => {
const settings = this.toSettings(env);
- try {
- return await this.sdkClientFactory.createSdkClient(settings, LogLevel.Info);
- } catch (e) {
- if (e instanceof RecoverableSDKError) {
- await this.failedToInitialize("sdk", e);
- return e.sdk;
- }
- throw e;
- }
+ return await this.sdkClientFactory.createSdkClient(settings, LogLevel.Info);
}),
shareReplay({ refCount: true, bufferSize: 1 }),
);
- supported$ = this.client$.pipe(
- concatMap(async (client) => {
- return client.echo("bitwarden wasm!") === "bitwarden wasm!";
- }),
- );
-
version$ = this.client$.pipe(
map((client) => client.version()),
catchError(() => "Unsupported"),
@@ -83,7 +55,6 @@ export class DefaultSdkService implements SdkService {
private accountService: AccountService,
private kdfConfigService: KdfConfigService,
private keyService: KeyService,
- private apiService: ApiService, // Yes we shouldn't import ApiService, but it's temporary
private userAgent: string = null,
) {}
@@ -107,7 +78,7 @@ export class DefaultSdkService implements SdkService {
);
const client$ = combineLatest([
- this.environmentService.environment$,
+ this.environmentService.getEnvironment$(userId),
account$,
kdfParams$,
privateKey$,
@@ -155,31 +126,6 @@ export class DefaultSdkService implements SdkService {
return client$;
}
- async failedToInitialize(category: string, error?: Error): Promise {
- // Only log on cloud instances
- if (
- this.platformUtilsService.isDev() ||
- !(await firstValueFrom(this.environmentService.environment$)).isCloud
- ) {
- return;
- }
-
- return this.apiService.send(
- "POST",
- "/wasm-debug",
- {
- category: category,
- error: error?.message,
- },
- false,
- false,
- null,
- (headers) => {
- headers.append("SDK-Version", "1.0.0");
- },
- );
- }
-
private async initializeClient(
client: BitwardenClient,
account: AccountInfo,
diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts
index e240886cf29..6f7c5c9f262 100644
--- a/libs/common/src/services/notifications.service.ts
+++ b/libs/common/src/services/notifications.service.ts
@@ -218,6 +218,11 @@ export class NotificationsService implements NotificationsServiceAbstraction {
});
}
break;
+ case NotificationType.SyncOrganizationStatusChanged:
+ if (isAuthenticated) {
+ await this.syncService.fullSync(true);
+ }
+ break;
default:
break;
}
diff --git a/libs/common/src/vault/abstractions/vault-settings/vault-settings.service.ts b/libs/common/src/vault/abstractions/vault-settings/vault-settings.service.ts
index 9b3fde47a15..ea1e73c2685 100644
--- a/libs/common/src/vault/abstractions/vault-settings/vault-settings.service.ts
+++ b/libs/common/src/vault/abstractions/vault-settings/vault-settings.service.ts
@@ -19,6 +19,12 @@ export abstract class VaultSettingsService {
*/
showIdentitiesCurrentTab$: Observable;
/**
+ /**
+ * An observable monitoring the state of the click items on the Vault view
+ * for Autofill suggestions.
+ */
+ clickItemsToAutofillVaultView$: Observable;
+ /**
/**
* Saves the enable passkeys setting to disk.
@@ -35,4 +41,10 @@ export abstract class VaultSettingsService {
* @param value The new value for the show identities on tab page setting.
*/
setShowIdentitiesCurrentTab: (value: boolean) => Promise;
+ /**
+ * Saves the click items on vault View for Autofill suggestions to disk.
+ * @param value The new value for the click items on vault View for
+ * Autofill suggestions setting.
+ */
+ setClickItemsToAutofillVaultView: (value: boolean) => Promise;
}
diff --git a/libs/common/src/vault/abstractions/view-password-history.service.ts b/libs/common/src/vault/abstractions/view-password-history.service.ts
index d9b1306eacb..2e47a456ff2 100644
--- a/libs/common/src/vault/abstractions/view-password-history.service.ts
+++ b/libs/common/src/vault/abstractions/view-password-history.service.ts
@@ -1,8 +1,8 @@
-import { CipherId } from "../../types/guid";
+import { CipherView } from "../models/view/cipher.view";
/**
* The ViewPasswordHistoryService is responsible for displaying the password history for a cipher.
*/
export abstract class ViewPasswordHistoryService {
- abstract viewPasswordHistory(cipherId?: CipherId): Promise;
+ abstract viewPasswordHistory(cipher: CipherView): Promise;
}
diff --git a/libs/common/src/vault/services/key-state/vault-settings.state.ts b/libs/common/src/vault/services/key-state/vault-settings.state.ts
index 21364bbbf8e..35bb776cc96 100644
--- a/libs/common/src/vault/services/key-state/vault-settings.state.ts
+++ b/libs/common/src/vault/services/key-state/vault-settings.state.ts
@@ -25,3 +25,12 @@ export const SHOW_IDENTITIES_CURRENT_TAB = new UserKeyDefinition(
clearOn: [], // do not clear user settings
},
);
+
+export const CLICK_ITEMS_AUTOFILL_VAULT_VIEW = new UserKeyDefinition(
+ VAULT_SETTINGS_DISK,
+ "clickItemsToAutofillOnVaultView",
+ {
+ deserializer: (obj) => obj,
+ clearOn: [], // do not clear user settings
+ },
+);
diff --git a/libs/common/src/vault/services/vault-settings/vault-settings.service.ts b/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
index 39b96318217..85ab3914158 100644
--- a/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
+++ b/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
@@ -6,6 +6,7 @@ import {
SHOW_CARDS_CURRENT_TAB,
SHOW_IDENTITIES_CURRENT_TAB,
USER_ENABLE_PASSKEYS,
+ CLICK_ITEMS_AUTOFILL_VAULT_VIEW,
} from "../key-state/vault-settings.state";
/**
@@ -39,6 +40,14 @@ export class VaultSettingsService implements VaultSettingsServiceAbstraction {
readonly showIdentitiesCurrentTab$: Observable =
this.showIdentitiesCurrentTabState.state$.pipe(map((x) => x ?? true));
+ private clickItemsToAutofillVaultViewState: ActiveUserState =
+ this.stateProvider.getActive(CLICK_ITEMS_AUTOFILL_VAULT_VIEW);
+ /**
+ * {@link VaultSettingsServiceAbstraction.clickItemsToAutofillVaultView$$}
+ */
+ readonly clickItemsToAutofillVaultView$: Observable =
+ this.clickItemsToAutofillVaultViewState.state$.pipe(map((x) => x ?? false));
+
constructor(private stateProvider: StateProvider) {}
/**
@@ -55,6 +64,13 @@ export class VaultSettingsService implements VaultSettingsServiceAbstraction {
await this.showIdentitiesCurrentTabState.update(() => value);
}
+ /**
+ * {@link VaultSettingsServiceAbstraction.setClickItemsToAutofillVaultView}
+ */
+ async setClickItemsToAutofillVaultView(value: boolean): Promise {
+ await this.clickItemsToAutofillVaultViewState.update(() => value);
+ }
+
/**
* {@link VaultSettingsServiceAbstraction.setEnablePasskeys}
*/
diff --git a/libs/components/src/async-actions/async-actions.module.ts b/libs/components/src/async-actions/async-actions.module.ts
index 8ff1deb2784..bff4286f890 100644
--- a/libs/components/src/async-actions/async-actions.module.ts
+++ b/libs/components/src/async-actions/async-actions.module.ts
@@ -1,14 +1,11 @@
import { NgModule } from "@angular/core";
-import { SharedModule } from "../shared";
-
import { BitActionDirective } from "./bit-action.directive";
import { BitSubmitDirective } from "./bit-submit.directive";
import { BitFormButtonDirective } from "./form-button.directive";
@NgModule({
- imports: [SharedModule],
- declarations: [BitActionDirective, BitFormButtonDirective, BitSubmitDirective],
+ imports: [BitActionDirective, BitFormButtonDirective, BitSubmitDirective],
exports: [BitActionDirective, BitFormButtonDirective, BitSubmitDirective],
})
export class AsyncActionsModule {}
diff --git a/libs/components/src/async-actions/bit-action.directive.ts b/libs/components/src/async-actions/bit-action.directive.ts
index 32ac73f418d..3e793ae2ecd 100644
--- a/libs/components/src/async-actions/bit-action.directive.ts
+++ b/libs/components/src/async-actions/bit-action.directive.ts
@@ -15,6 +15,7 @@ import { FunctionReturningAwaitable, functionToObservable } from "../utils/funct
*/
@Directive({
selector: "[bitAction]",
+ standalone: true,
})
export class BitActionDirective implements OnDestroy {
private destroy$ = new Subject();
diff --git a/libs/components/src/async-actions/bit-submit.directive.ts b/libs/components/src/async-actions/bit-submit.directive.ts
index 838d78af8b2..a38e76aaca6 100644
--- a/libs/components/src/async-actions/bit-submit.directive.ts
+++ b/libs/components/src/async-actions/bit-submit.directive.ts
@@ -14,6 +14,7 @@ import { FunctionReturningAwaitable, functionToObservable } from "../utils/funct
*/
@Directive({
selector: "[formGroup][bitSubmit]",
+ standalone: true,
})
export class BitSubmitDirective implements OnInit, OnDestroy {
private destroy$ = new Subject();
diff --git a/libs/components/src/async-actions/form-button.directive.ts b/libs/components/src/async-actions/form-button.directive.ts
index e4685188693..7c92865b984 100644
--- a/libs/components/src/async-actions/form-button.directive.ts
+++ b/libs/components/src/async-actions/form-button.directive.ts
@@ -25,6 +25,7 @@ import { BitSubmitDirective } from "./bit-submit.directive";
*/
@Directive({
selector: "button[bitFormButton]",
+ standalone: true,
})
export class BitFormButtonDirective implements OnDestroy {
private destroy$ = new Subject();
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index ec6005dd607..fb94e43b196 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -109,20 +109,17 @@ export default {
title: "Component Library/Async Actions/In Forms",
decorators: [
moduleMetadata({
- declarations: [
+ declarations: [PromiseExampleComponent, ObservableExampleComponent],
+ imports: [
BitSubmitDirective,
BitFormButtonDirective,
- PromiseExampleComponent,
- ObservableExampleComponent,
- BitActionDirective,
- ],
- imports: [
FormsModule,
ReactiveFormsModule,
FormFieldModule,
InputModule,
ButtonModule,
IconButtonModule,
+ BitActionDirective,
],
providers: [
{
diff --git a/libs/components/src/async-actions/standalone.stories.ts b/libs/components/src/async-actions/standalone.stories.ts
index 5e15135dc5d..f658dfb0f01 100644
--- a/libs/components/src/async-actions/standalone.stories.ts
+++ b/libs/components/src/async-actions/standalone.stories.ts
@@ -56,12 +56,11 @@ export default {
decorators: [
moduleMetadata({
declarations: [
- BitActionDirective,
PromiseExampleComponent,
ObservableExampleComponent,
RejectedPromiseExampleComponent,
],
- imports: [ButtonModule, IconButtonModule],
+ imports: [ButtonModule, IconButtonModule, BitActionDirective],
providers: [
{
provide: ValidationService,
diff --git a/libs/components/src/avatar/avatar.component.ts b/libs/components/src/avatar/avatar.component.ts
index e1758d795d6..76ff702e88b 100644
--- a/libs/components/src/avatar/avatar.component.ts
+++ b/libs/components/src/avatar/avatar.component.ts
@@ -1,5 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { NgIf, NgClass } from "@angular/common";
import { Component, Input, OnChanges } from "@angular/core";
import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
@@ -18,6 +19,8 @@ const SizeClasses: Record = {
@Component({
selector: "bit-avatar",
template: `![]( "{{ title || text }}")
`,
+ standalone: true,
+ imports: [NgIf, NgClass],
})
export class AvatarComponent implements OnChanges {
@Input() border = false;
diff --git a/libs/components/src/avatar/avatar.module.ts b/libs/components/src/avatar/avatar.module.ts
index ea78ff3a1d2..4ef0978cbec 100644
--- a/libs/components/src/avatar/avatar.module.ts
+++ b/libs/components/src/avatar/avatar.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { AvatarComponent } from "./avatar.component";
@NgModule({
- imports: [CommonModule],
+ imports: [AvatarComponent],
exports: [AvatarComponent],
- declarations: [AvatarComponent],
})
export class AvatarModule {}
diff --git a/libs/components/src/badge-list/badge-list.component.ts b/libs/components/src/badge-list/badge-list.component.ts
index 9270e5e1238..ac8cb3281ab 100644
--- a/libs/components/src/badge-list/badge-list.component.ts
+++ b/libs/components/src/badge-list/badge-list.component.ts
@@ -1,12 +1,16 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { CommonModule } from "@angular/common";
import { Component, Input, OnChanges } from "@angular/core";
-import { BadgeVariant } from "../badge";
+import { BadgeModule, BadgeVariant } from "../badge";
+import { I18nPipe } from "../shared/i18n.pipe";
@Component({
selector: "bit-badge-list",
templateUrl: "badge-list.component.html",
+ standalone: true,
+ imports: [CommonModule, BadgeModule, I18nPipe],
})
export class BadgeListComponent implements OnChanges {
private _maxItems: number;
diff --git a/libs/components/src/badge-list/badge-list.module.ts b/libs/components/src/badge-list/badge-list.module.ts
index d2a4ce211b1..9359fe2c5c5 100644
--- a/libs/components/src/badge-list/badge-list.module.ts
+++ b/libs/components/src/badge-list/badge-list.module.ts
@@ -1,13 +1,9 @@
import { NgModule } from "@angular/core";
-import { BadgeModule } from "../badge";
-import { SharedModule } from "../shared";
-
import { BadgeListComponent } from "./badge-list.component";
@NgModule({
- imports: [SharedModule, BadgeModule],
+ imports: [BadgeListComponent],
exports: [BadgeListComponent],
- declarations: [BadgeListComponent],
})
export class BadgeListModule {}
diff --git a/libs/components/src/badge/badge.component.html b/libs/components/src/badge/badge.component.html
new file mode 100644
index 00000000000..6f586ec3523
--- /dev/null
+++ b/libs/components/src/badge/badge.component.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/libs/components/src/badge/badge.directive.ts b/libs/components/src/badge/badge.component.ts
similarity index 86%
rename from libs/components/src/badge/badge.directive.ts
rename to libs/components/src/badge/badge.component.ts
index f39f8f87639..0f8a64ee998 100644
--- a/libs/components/src/badge/badge.directive.ts
+++ b/libs/components/src/badge/badge.component.ts
@@ -1,6 +1,7 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { Directive, ElementRef, HostBinding, Input } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { Component, ElementRef, HostBinding, Input } from "@angular/core";
import { FocusableElement } from "../shared/focusable-element";
@@ -28,11 +29,14 @@ const hoverStyles: Record = {
info: ["hover:tw-bg-info-600", "hover:tw-border-info-600", "hover:!tw-text-black"],
};
-@Directive({
+@Component({
selector: "span[bitBadge], a[bitBadge], button[bitBadge]",
- providers: [{ provide: FocusableElement, useExisting: BadgeDirective }],
+ providers: [{ provide: FocusableElement, useExisting: BadgeComponent }],
+ imports: [CommonModule],
+ templateUrl: "badge.component.html",
+ standalone: true,
})
-export class BadgeDirective implements FocusableElement {
+export class BadgeComponent implements FocusableElement {
@HostBinding("class") get classList() {
return [
"tw-inline-block",
@@ -61,8 +65,8 @@ export class BadgeDirective implements FocusableElement {
"disabled:tw-cursor-not-allowed",
]
.concat(styles[this.variant])
- .concat(this.hasHoverEffects ? hoverStyles[this.variant] : [])
- .concat(this.truncate ? ["tw-truncate", this.maxWidthClass] : []);
+ .concat(this.hasHoverEffects ? [...hoverStyles[this.variant], "tw-min-w-10"] : [])
+ .concat(this.truncate ? this.maxWidthClass : []);
}
@HostBinding("attr.title") get titleAttr() {
if (this.title !== undefined) {
diff --git a/libs/components/src/badge/badge.module.ts b/libs/components/src/badge/badge.module.ts
index e1b8292363f..d9a6e712820 100644
--- a/libs/components/src/badge/badge.module.ts
+++ b/libs/components/src/badge/badge.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
-import { BadgeDirective } from "./badge.directive";
+import { BadgeComponent } from "./badge.component";
@NgModule({
- imports: [CommonModule],
- exports: [BadgeDirective],
- declarations: [BadgeDirective],
+ imports: [BadgeComponent],
+ exports: [BadgeComponent],
})
export class BadgeModule {}
diff --git a/libs/components/src/badge/badge.stories.ts b/libs/components/src/badge/badge.stories.ts
index 6c57bc0cbfb..5d697f8ad8f 100644
--- a/libs/components/src/badge/badge.stories.ts
+++ b/libs/components/src/badge/badge.stories.ts
@@ -1,15 +1,14 @@
import { CommonModule } from "@angular/common";
import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
-import { BadgeDirective } from "./badge.directive";
+import { BadgeComponent } from "./badge.component";
export default {
title: "Component Library/Badge",
- component: BadgeDirective,
+ component: BadgeComponent,
decorators: [
moduleMetadata({
- imports: [CommonModule],
- declarations: [BadgeDirective],
+ imports: [CommonModule, BadgeComponent],
}),
],
args: {
@@ -22,9 +21,9 @@ export default {
url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A16956",
},
},
-} as Meta;
+} as Meta;
-type Story = StoryObj;
+type Story = StoryObj;
export const Variants: Story = {
render: (args) => ({
diff --git a/libs/components/src/badge/index.ts b/libs/components/src/badge/index.ts
index a8f5babda91..ae19f4df288 100644
--- a/libs/components/src/badge/index.ts
+++ b/libs/components/src/badge/index.ts
@@ -1,2 +1,2 @@
-export { BadgeDirective, BadgeVariant } from "./badge.directive";
+export { BadgeComponent, BadgeVariant } from "./badge.component";
export * from "./badge.module";
diff --git a/libs/components/src/banner/banner.component.spec.ts b/libs/components/src/banner/banner.component.spec.ts
index 29f10016a15..2bbc7965642 100644
--- a/libs/components/src/banner/banner.component.spec.ts
+++ b/libs/components/src/banner/banner.component.spec.ts
@@ -2,7 +2,6 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SharedModule } from "../shared/shared.module";
import { I18nMockService } from "../utils/i18n-mock.service";
import { BannerComponent } from "./banner.component";
@@ -13,8 +12,7 @@ describe("BannerComponent", () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [SharedModule],
- declarations: [BannerComponent],
+ imports: [BannerComponent],
providers: [
{
provide: I18nService,
diff --git a/libs/components/src/banner/banner.component.ts b/libs/components/src/banner/banner.component.ts
index 7d59ceb0ee9..d3f64329978 100644
--- a/libs/components/src/banner/banner.component.ts
+++ b/libs/components/src/banner/banner.component.ts
@@ -1,7 +1,11 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { CommonModule } from "@angular/common";
import { Component, Input, OnInit, Output, EventEmitter } from "@angular/core";
+import { IconButtonModule } from "../icon-button";
+import { I18nPipe } from "../shared/i18n.pipe";
+
type BannerTypes = "premium" | "info" | "warning" | "danger";
const defaultIcon: Record = {
@@ -14,6 +18,8 @@ const defaultIcon: Record = {
@Component({
selector: "bit-banner",
templateUrl: "./banner.component.html",
+ standalone: true,
+ imports: [CommonModule, IconButtonModule, I18nPipe],
})
export class BannerComponent implements OnInit {
@Input("bannerType") bannerType: BannerTypes = "info";
diff --git a/libs/components/src/banner/banner.module.ts b/libs/components/src/banner/banner.module.ts
index 2c819fbc5b4..3301218ed1a 100644
--- a/libs/components/src/banner/banner.module.ts
+++ b/libs/components/src/banner/banner.module.ts
@@ -1,14 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
-import { IconButtonModule } from "../icon-button";
-import { SharedModule } from "../shared/shared.module";
-
import { BannerComponent } from "./banner.component";
@NgModule({
- imports: [CommonModule, SharedModule, IconButtonModule],
+ imports: [BannerComponent],
exports: [BannerComponent],
- declarations: [BannerComponent],
})
export class BannerModule {}
diff --git a/libs/components/src/breadcrumbs/breadcrumb.component.ts b/libs/components/src/breadcrumbs/breadcrumb.component.ts
index d6128540442..ce18bde171f 100644
--- a/libs/components/src/breadcrumbs/breadcrumb.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumb.component.ts
@@ -1,11 +1,14 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { NgIf } from "@angular/common";
import { Component, EventEmitter, Input, Output, TemplateRef, ViewChild } from "@angular/core";
import { QueryParamsHandling } from "@angular/router";
@Component({
selector: "bit-breadcrumb",
templateUrl: "./breadcrumb.component.html",
+ standalone: true,
+ imports: [NgIf],
})
export class BreadcrumbComponent {
@Input()
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
index 64ca8146c80..6e8fbf5c25a 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
@@ -1,10 +1,18 @@
+import { CommonModule } from "@angular/common";
import { Component, ContentChildren, Input, QueryList } from "@angular/core";
+import { RouterModule } from "@angular/router";
+
+import { IconButtonModule } from "../icon-button";
+import { LinkModule } from "../link";
+import { MenuModule } from "../menu";
import { BreadcrumbComponent } from "./breadcrumb.component";
@Component({
selector: "bit-breadcrumbs",
templateUrl: "./breadcrumbs.component.html",
+ standalone: true,
+ imports: [CommonModule, LinkModule, RouterModule, IconButtonModule, MenuModule],
})
export class BreadcrumbsComponent {
@Input()
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.module.ts b/libs/components/src/breadcrumbs/breadcrumbs.module.ts
index 0812b552f9a..89b57fd19b5 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.module.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.module.ts
@@ -1,17 +1,10 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
-import { RouterModule } from "@angular/router";
-
-import { IconButtonModule } from "../icon-button";
-import { LinkModule } from "../link";
-import { MenuModule } from "../menu";
import { BreadcrumbComponent } from "./breadcrumb.component";
import { BreadcrumbsComponent } from "./breadcrumbs.component";
@NgModule({
- imports: [CommonModule, LinkModule, IconButtonModule, MenuModule, RouterModule],
- declarations: [BreadcrumbsComponent, BreadcrumbComponent],
+ imports: [BreadcrumbsComponent, BreadcrumbComponent],
exports: [BreadcrumbsComponent, BreadcrumbComponent],
})
export class BreadcrumbsModule {}
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
index 300369f2454..9c8ccbccd3f 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
@@ -25,8 +25,7 @@ export default {
component: BreadcrumbsComponent,
decorators: [
moduleMetadata({
- declarations: [BreadcrumbComponent],
- imports: [LinkModule, MenuModule, IconButtonModule, RouterModule],
+ imports: [LinkModule, MenuModule, IconButtonModule, RouterModule, BreadcrumbComponent],
}),
applicationConfig({
providers: [
diff --git a/libs/components/src/button/button.component.ts b/libs/components/src/button/button.component.ts
index 67b57d576ab..96311f91529 100644
--- a/libs/components/src/button/button.component.ts
+++ b/libs/components/src/button/button.component.ts
@@ -1,6 +1,7 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { coerceBooleanProperty } from "@angular/cdk/coercion";
+import { NgClass } from "@angular/common";
import { Input, HostBinding, Component } from "@angular/core";
import { ButtonLikeAbstraction, ButtonType } from "../shared/button-like.abstraction";
@@ -46,6 +47,8 @@ const buttonStyles: Record = {
selector: "button[bitButton], a[bitButton]",
templateUrl: "button.component.html",
providers: [{ provide: ButtonLikeAbstraction, useExisting: ButtonComponent }],
+ standalone: true,
+ imports: [NgClass],
})
export class ButtonComponent implements ButtonLikeAbstraction {
@HostBinding("class") get classList() {
diff --git a/libs/components/src/button/button.module.ts b/libs/components/src/button/button.module.ts
index 448e7c9dcf6..f1a86eff3ab 100644
--- a/libs/components/src/button/button.module.ts
+++ b/libs/components/src/button/button.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { ButtonComponent } from "./button.component";
@NgModule({
- imports: [CommonModule],
+ imports: [ButtonComponent],
exports: [ButtonComponent],
- declarations: [ButtonComponent],
})
export class ButtonModule {}
diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts
index 1ca27e84b82..0ce6f1889b5 100644
--- a/libs/components/src/checkbox/checkbox.component.ts
+++ b/libs/components/src/checkbox/checkbox.component.ts
@@ -9,6 +9,7 @@ import { BitFormControlAbstraction } from "../form-control";
selector: "input[type=checkbox][bitCheckbox]",
template: "",
providers: [{ provide: BitFormControlAbstraction, useExisting: CheckboxComponent }],
+ standalone: true,
})
export class CheckboxComponent implements BitFormControlAbstraction {
@HostBinding("class")
diff --git a/libs/components/src/checkbox/checkbox.module.ts b/libs/components/src/checkbox/checkbox.module.ts
index d03b9cf5050..3abfb4b1bfd 100644
--- a/libs/components/src/checkbox/checkbox.module.ts
+++ b/libs/components/src/checkbox/checkbox.module.ts
@@ -1,14 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
-import { FormControlModule } from "../form-control";
-import { SharedModule } from "../shared";
-
import { CheckboxComponent } from "./checkbox.component";
@NgModule({
- imports: [SharedModule, CommonModule, FormControlModule],
- declarations: [CheckboxComponent],
+ imports: [CheckboxComponent],
exports: [CheckboxComponent],
})
export class CheckboxModule {}
diff --git a/libs/components/src/color-password/color-password.component.ts b/libs/components/src/color-password/color-password.component.ts
index 35732760ac7..cbf746e9d73 100644
--- a/libs/components/src/color-password/color-password.component.ts
+++ b/libs/components/src/color-password/color-password.component.ts
@@ -1,5 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { NgFor, NgIf } from "@angular/common";
import { Component, HostBinding, Input } from "@angular/core";
import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -23,6 +24,8 @@ enum CharacterType {
}}
`,
preserveWhitespaces: false,
+ standalone: true,
+ imports: [NgFor, NgIf],
})
export class ColorPasswordComponent {
@Input() password: string = null;
diff --git a/libs/components/src/color-password/color-password.module.ts b/libs/components/src/color-password/color-password.module.ts
index 692c206bb4c..3ebc1c80e12 100644
--- a/libs/components/src/color-password/color-password.module.ts
+++ b/libs/components/src/color-password/color-password.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { ColorPasswordComponent } from "./color-password.component";
@NgModule({
- imports: [CommonModule],
+ imports: [ColorPasswordComponent],
exports: [ColorPasswordComponent],
- declarations: [ColorPasswordComponent],
})
export class ColorPasswordModule {}
diff --git a/libs/components/src/dialog/dialog.module.ts b/libs/components/src/dialog/dialog.module.ts
index bc37f749c05..f31fdd52060 100644
--- a/libs/components/src/dialog/dialog.module.ts
+++ b/libs/components/src/dialog/dialog.module.ts
@@ -1,44 +1,25 @@
import { DialogModule as CdkDialogModule } from "@angular/cdk/dialog";
import { NgModule } from "@angular/core";
-import { ReactiveFormsModule } from "@angular/forms";
-
-import { AsyncActionsModule } from "../async-actions";
-import { ButtonModule } from "../button";
-import { IconButtonModule } from "../icon-button";
-import { SharedModule } from "../shared";
-import { TypographyModule } from "../typography";
import { DialogComponent } from "./dialog/dialog.component";
import { DialogService } from "./dialog.service";
import { DialogCloseDirective } from "./directives/dialog-close.directive";
-import { DialogTitleContainerDirective } from "./directives/dialog-title-container.directive";
-import { SimpleConfigurableDialogComponent } from "./simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component";
import { IconDirective, SimpleDialogComponent } from "./simple-dialog/simple-dialog.component";
@NgModule({
imports: [
- SharedModule,
- AsyncActionsModule,
- ButtonModule,
CdkDialogModule,
- IconButtonModule,
- ReactiveFormsModule,
- TypographyModule,
- ],
- declarations: [
DialogCloseDirective,
- DialogTitleContainerDirective,
DialogComponent,
SimpleDialogComponent,
- SimpleConfigurableDialogComponent,
IconDirective,
],
exports: [
CdkDialogModule,
- DialogComponent,
- SimpleDialogComponent,
DialogCloseDirective,
+ DialogComponent,
IconDirective,
+ SimpleDialogComponent,
],
providers: [DialogService],
})
diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts
index e28f0ac4b19..5e938412804 100644
--- a/libs/components/src/dialog/dialog.service.stories.ts
+++ b/libs/components/src/dialog/dialog.service.stories.ts
@@ -64,13 +64,16 @@ export default {
component: StoryDialogComponent,
decorators: [
moduleMetadata({
- declarations: [
+ declarations: [StoryDialogContentComponent],
+ imports: [
+ SharedModule,
+ ButtonModule,
+ DialogModule,
+ IconButtonModule,
DialogCloseDirective,
DialogComponent,
DialogTitleContainerDirective,
- StoryDialogContentComponent,
],
- imports: [SharedModule, ButtonModule, DialogModule, IconButtonModule],
providers: [
DialogService,
{
diff --git a/libs/components/src/dialog/dialog/dialog.component.ts b/libs/components/src/dialog/dialog/dialog.component.ts
index 2f901d10d2d..ed47201805a 100644
--- a/libs/components/src/dialog/dialog/dialog.component.ts
+++ b/libs/components/src/dialog/dialog/dialog.component.ts
@@ -1,14 +1,29 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { coerceBooleanProperty } from "@angular/cdk/coercion";
+import { CommonModule } from "@angular/common";
import { Component, HostBinding, Input } from "@angular/core";
+import { BitIconButtonComponent } from "../../icon-button/icon-button.component";
+import { I18nPipe } from "../../shared/i18n.pipe";
+import { TypographyDirective } from "../../typography/typography.directive";
import { fadeIn } from "../animations";
+import { DialogCloseDirective } from "../directives/dialog-close.directive";
+import { DialogTitleContainerDirective } from "../directives/dialog-title-container.directive";
@Component({
selector: "bit-dialog",
templateUrl: "./dialog.component.html",
animations: [fadeIn],
+ standalone: true,
+ imports: [
+ CommonModule,
+ DialogTitleContainerDirective,
+ TypographyDirective,
+ BitIconButtonComponent,
+ DialogCloseDirective,
+ I18nPipe,
+ ],
})
export class DialogComponent {
/** Background color */
diff --git a/libs/components/src/dialog/directives/dialog-close.directive.ts b/libs/components/src/dialog/directives/dialog-close.directive.ts
index 5e44ced7c21..5e5fda3e014 100644
--- a/libs/components/src/dialog/directives/dialog-close.directive.ts
+++ b/libs/components/src/dialog/directives/dialog-close.directive.ts
@@ -3,6 +3,7 @@ import { Directive, HostBinding, HostListener, Input, Optional } from "@angular/
@Directive({
selector: "[bitDialogClose]",
+ standalone: true,
})
export class DialogCloseDirective {
@Input("bitDialogClose") dialogResult: any;
diff --git a/libs/components/src/dialog/directives/dialog-title-container.directive.ts b/libs/components/src/dialog/directives/dialog-title-container.directive.ts
index e17487f2780..cf46396967b 100644
--- a/libs/components/src/dialog/directives/dialog-title-container.directive.ts
+++ b/libs/components/src/dialog/directives/dialog-title-container.directive.ts
@@ -6,6 +6,7 @@ let nextId = 0;
@Directive({
selector: "[bitDialogTitleContainer]",
+ standalone: true,
})
export class DialogTitleContainerDirective implements OnInit {
@HostBinding("id") id = `bit-dialog-title-${nextId++}`;
diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
index 29d52e9cf07..60b2e1c3a3f 100644
--- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
@@ -1,12 +1,17 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
+import { NgIf } from "@angular/common";
import { Component, Inject } from "@angular/core";
-import { FormGroup } from "@angular/forms";
+import { FormGroup, ReactiveFormsModule } from "@angular/forms";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { SimpleDialogOptions, SimpleDialogType, Translation } from "../..";
+import { BitSubmitDirective } from "../../../async-actions/bit-submit.directive";
+import { BitFormButtonDirective } from "../../../async-actions/form-button.directive";
+import { ButtonComponent } from "../../../button/button.component";
+import { SimpleDialogComponent, IconDirective } from "../simple-dialog.component";
const DEFAULT_ICON: Record = {
primary: "bwi-business",
@@ -26,6 +31,16 @@ const DEFAULT_COLOR: Record = {
@Component({
templateUrl: "./simple-configurable-dialog.component.html",
+ standalone: true,
+ imports: [
+ ReactiveFormsModule,
+ BitSubmitDirective,
+ SimpleDialogComponent,
+ IconDirective,
+ ButtonComponent,
+ BitFormButtonDirective,
+ NgIf,
+ ],
})
export class SimpleConfigurableDialogComponent {
get iconClasses() {
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
index 912b0299f66..c02a13bd150 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
@@ -1,14 +1,22 @@
+import { NgIf } from "@angular/common";
import { Component, ContentChild, Directive } from "@angular/core";
+import { TypographyDirective } from "../../typography/typography.directive";
import { fadeIn } from "../animations";
+import { DialogTitleContainerDirective } from "../directives/dialog-title-container.directive";
-@Directive({ selector: "[bitDialogIcon]" })
+@Directive({
+ selector: "[bitDialogIcon]",
+ standalone: true,
+})
export class IconDirective {}
@Component({
selector: "bit-simple-dialog",
templateUrl: "./simple-dialog.component.html",
animations: [fadeIn],
+ standalone: true,
+ imports: [NgIf, DialogTitleContainerDirective, TypographyDirective],
})
export class SimpleDialogComponent {
@ContentChild(IconDirective) icon!: IconDirective;
diff --git a/libs/components/src/form-control/form-control.component.ts b/libs/components/src/form-control/form-control.component.ts
index 6c24e7a53e6..9b87c44157a 100644
--- a/libs/components/src/form-control/form-control.component.ts
+++ b/libs/components/src/form-control/form-control.component.ts
@@ -1,15 +1,21 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { coerceBooleanProperty } from "@angular/cdk/coercion";
+import { NgClass, NgIf } from "@angular/common";
import { Component, ContentChild, HostBinding, Input } from "@angular/core";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { I18nPipe } from "../shared/i18n.pipe";
+import { TypographyDirective } from "../typography/typography.directive";
+
import { BitFormControlAbstraction } from "./form-control.abstraction";
@Component({
selector: "bit-form-control",
templateUrl: "form-control.component.html",
+ standalone: true,
+ imports: [NgClass, TypographyDirective, NgIf, I18nPipe],
})
export class FormControlComponent {
@Input() label: string;
diff --git a/libs/components/src/form-control/form-control.module.ts b/libs/components/src/form-control/form-control.module.ts
index f6969a97e9c..df168d8e98f 100644
--- a/libs/components/src/form-control/form-control.module.ts
+++ b/libs/components/src/form-control/form-control.module.ts
@@ -1,15 +1,11 @@
import { NgModule } from "@angular/core";
-import { SharedModule } from "../shared";
-import { TypographyModule } from "../typography";
-
import { FormControlComponent } from "./form-control.component";
import { BitHintComponent } from "./hint.component";
import { BitLabel } from "./label.component";
@NgModule({
- imports: [SharedModule, BitLabel, TypographyModule],
- declarations: [FormControlComponent, BitHintComponent],
+ imports: [BitLabel, FormControlComponent, BitHintComponent],
exports: [FormControlComponent, BitLabel, BitHintComponent],
})
export class FormControlModule {}
diff --git a/libs/components/src/form-control/hint.component.ts b/libs/components/src/form-control/hint.component.ts
index c1f21bf2545..4fee0d4560f 100644
--- a/libs/components/src/form-control/hint.component.ts
+++ b/libs/components/src/form-control/hint.component.ts
@@ -8,6 +8,7 @@ let nextId = 0;
host: {
class: "tw-text-muted tw-font-normal tw-inline-block tw-mt-1 tw-text-xs",
},
+ standalone: true,
})
export class BitHintComponent {
@HostBinding() id = `bit-hint-${nextId++}`;
diff --git a/libs/components/src/form-field/error-summary.component.ts b/libs/components/src/form-field/error-summary.component.ts
index f374740b20e..beed32a88ac 100644
--- a/libs/components/src/form-field/error-summary.component.ts
+++ b/libs/components/src/form-field/error-summary.component.ts
@@ -1,8 +1,11 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { NgIf } from "@angular/common";
import { Component, Input } from "@angular/core";
import { AbstractControl, UntypedFormGroup } from "@angular/forms";
+import { I18nPipe } from "../shared/i18n.pipe";
+
@Component({
selector: "bit-error-summary",
template: `
@@ -12,6 +15,8 @@ import { AbstractControl, UntypedFormGroup } from "@angular/forms";
class: "tw-block tw-text-danger tw-mt-2",
"aria-live": "assertive",
},
+ standalone: true,
+ imports: [NgIf, I18nPipe],
})
export class BitErrorSummary {
@Input()
diff --git a/libs/components/src/form-field/error.component.ts b/libs/components/src/form-field/error.component.ts
index a0f7906b366..27adbf7d313 100644
--- a/libs/components/src/form-field/error.component.ts
+++ b/libs/components/src/form-field/error.component.ts
@@ -14,6 +14,7 @@ let nextId = 0;
class: "tw-block tw-mt-1 tw-text-danger tw-text-xs",
"aria-live": "assertive",
},
+ standalone: true,
})
export class BitErrorComponent {
@HostBinding() id = `bit-error-${nextId++}`;
diff --git a/libs/components/src/form-field/form-field.component.ts b/libs/components/src/form-field/form-field.component.ts
index 6f425e41496..9f41c6cf6ac 100644
--- a/libs/components/src/form-field/form-field.component.ts
+++ b/libs/components/src/form-field/form-field.component.ts
@@ -1,5 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { CommonModule } from "@angular/common";
import {
AfterContentChecked,
booleanAttribute,
@@ -16,6 +17,7 @@ import {
import { BitHintComponent } from "../form-control/hint.component";
import { BitLabel } from "../form-control/label.component";
import { inputBorderClasses } from "../input/input.directive";
+import { I18nPipe } from "../shared/i18n.pipe";
import { BitErrorComponent } from "./error.component";
import { BitFormFieldControl } from "./form-field-control";
@@ -23,6 +25,8 @@ import { BitFormFieldControl } from "./form-field-control";
@Component({
selector: "bit-form-field",
templateUrl: "./form-field.component.html",
+ standalone: true,
+ imports: [CommonModule, BitErrorComponent, I18nPipe],
})
export class BitFormFieldComponent implements AfterContentChecked {
@ContentChild(BitFormFieldControl) input: BitFormFieldControl;
diff --git a/libs/components/src/form-field/form-field.module.ts b/libs/components/src/form-field/form-field.module.ts
index 989375167d4..88d7ffcc78b 100644
--- a/libs/components/src/form-field/form-field.module.ts
+++ b/libs/components/src/form-field/form-field.module.ts
@@ -1,11 +1,8 @@
import { NgModule } from "@angular/core";
import { FormControlModule } from "../form-control";
-import { BitInputDirective } from "../input/input.directive";
import { InputModule } from "../input/input.module";
-import { MultiSelectComponent } from "../multi-select/multi-select.component";
import { MultiSelectModule } from "../multi-select/multi-select.module";
-import { SharedModule } from "../shared";
import { BitErrorSummary } from "./error-summary.component";
import { BitErrorComponent } from "./error.component";
@@ -15,8 +12,11 @@ import { BitPrefixDirective } from "./prefix.directive";
import { BitSuffixDirective } from "./suffix.directive";
@NgModule({
- imports: [SharedModule, FormControlModule, InputModule, MultiSelectModule],
- declarations: [
+ imports: [
+ FormControlModule,
+ InputModule,
+ MultiSelectModule,
+
BitErrorComponent,
BitErrorSummary,
BitFormFieldComponent,
@@ -25,15 +25,16 @@ import { BitSuffixDirective } from "./suffix.directive";
BitSuffixDirective,
],
exports: [
+ FormControlModule,
+ InputModule,
+ MultiSelectModule,
+
BitErrorComponent,
BitErrorSummary,
BitFormFieldComponent,
- BitInputDirective,
BitPasswordInputToggleDirective,
BitPrefixDirective,
BitSuffixDirective,
- MultiSelectComponent,
- FormControlModule,
],
})
export class FormFieldModule {}
diff --git a/libs/components/src/form-field/password-input-toggle.directive.ts b/libs/components/src/form-field/password-input-toggle.directive.ts
index a696a88c468..933722db5b4 100644
--- a/libs/components/src/form-field/password-input-toggle.directive.ts
+++ b/libs/components/src/form-field/password-input-toggle.directive.ts
@@ -18,6 +18,7 @@ import { BitFormFieldComponent } from "./form-field.component";
@Directive({
selector: "[bitPasswordInputToggle]",
+ standalone: true,
})
export class BitPasswordInputToggleDirective implements AfterContentInit, OnChanges {
/**
diff --git a/libs/components/src/form-field/prefix.directive.ts b/libs/components/src/form-field/prefix.directive.ts
index 34fcbf85233..b44e90cbaad 100644
--- a/libs/components/src/form-field/prefix.directive.ts
+++ b/libs/components/src/form-field/prefix.directive.ts
@@ -4,6 +4,7 @@ import { BitIconButtonComponent } from "../icon-button/icon-button.component";
@Directive({
selector: "[bitPrefix]",
+ standalone: true,
})
export class BitPrefixDirective implements OnInit {
@HostBinding("class") @Input() get classList() {
diff --git a/libs/components/src/form-field/suffix.directive.ts b/libs/components/src/form-field/suffix.directive.ts
index 28736ce78a9..baf1afce763 100644
--- a/libs/components/src/form-field/suffix.directive.ts
+++ b/libs/components/src/form-field/suffix.directive.ts
@@ -4,6 +4,7 @@ import { BitIconButtonComponent } from "../icon-button/icon-button.component";
@Directive({
selector: "[bitSuffix]",
+ standalone: true,
})
export class BitSuffixDirective implements OnInit {
@HostBinding("class") @Input() get classList() {
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index 97016f9fd0c..ac7dff0408b 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -1,5 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { NgClass } from "@angular/common";
import { Component, ElementRef, HostBinding, Input } from "@angular/core";
import { ButtonLikeAbstraction, ButtonType } from "../shared/button-like.abstraction";
@@ -134,6 +135,8 @@ const sizes: Record = {
{ provide: ButtonLikeAbstraction, useExisting: BitIconButtonComponent },
{ provide: FocusableElement, useExisting: BitIconButtonComponent },
],
+ standalone: true,
+ imports: [NgClass],
})
export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableElement {
@Input("bitIconButton") icon: string;
diff --git a/libs/components/src/icon-button/icon-button.module.ts b/libs/components/src/icon-button/icon-button.module.ts
index fb4e8589717..26f48cdb177 100644
--- a/libs/components/src/icon-button/icon-button.module.ts
+++ b/libs/components/src/icon-button/icon-button.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { BitIconButtonComponent } from "./icon-button.component";
@NgModule({
- imports: [CommonModule],
- declarations: [BitIconButtonComponent],
+ imports: [BitIconButtonComponent],
exports: [BitIconButtonComponent],
})
export class IconButtonModule {}
diff --git a/libs/components/src/icon/icon.component.ts b/libs/components/src/icon/icon.component.ts
index 55615d4dae3..2382d197bec 100644
--- a/libs/components/src/icon/icon.component.ts
+++ b/libs/components/src/icon/icon.component.ts
@@ -8,6 +8,7 @@ import { Icon, isIcon } from "./icon";
@Component({
selector: "bit-icon",
template: ``,
+ standalone: true,
})
export class BitIconComponent {
@Input() set icon(icon: Icon) {
diff --git a/libs/components/src/icon/icon.components.spec.ts b/libs/components/src/icon/icon.components.spec.ts
index 351ed5f0218..7d499cdd419 100644
--- a/libs/components/src/icon/icon.components.spec.ts
+++ b/libs/components/src/icon/icon.components.spec.ts
@@ -9,7 +9,7 @@ describe("IconComponent", () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [BitIconComponent],
+ imports: [BitIconComponent],
}).compileComponents();
fixture = TestBed.createComponent(BitIconComponent);
diff --git a/libs/components/src/icon/icon.module.ts b/libs/components/src/icon/icon.module.ts
index 32e95fd0468..3d15b5bb3c3 100644
--- a/libs/components/src/icon/icon.module.ts
+++ b/libs/components/src/icon/icon.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { BitIconComponent } from "./icon.component";
@NgModule({
- imports: [CommonModule],
- declarations: [BitIconComponent],
+ imports: [BitIconComponent],
exports: [BitIconComponent],
})
export class IconModule {}
diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts
index 4a6a03295d4..f6c6c3d542e 100644
--- a/libs/components/src/input/input.directive.ts
+++ b/libs/components/src/input/input.directive.ts
@@ -30,6 +30,7 @@ export function inputBorderClasses(error: boolean) {
@Directive({
selector: "input[bitInput], select[bitInput], textarea[bitInput]",
providers: [{ provide: BitFormFieldControl, useExisting: BitInputDirective }],
+ standalone: true,
})
export class BitInputDirective implements BitFormFieldControl {
@HostBinding("class") @Input() get classList() {
diff --git a/libs/components/src/input/input.module.ts b/libs/components/src/input/input.module.ts
index cfc49cefb7d..9399cb06517 100644
--- a/libs/components/src/input/input.module.ts
+++ b/libs/components/src/input/input.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { BitInputDirective } from "./input.directive";
@NgModule({
- imports: [CommonModule],
- declarations: [BitInputDirective],
+ imports: [BitInputDirective],
exports: [BitInputDirective],
})
export class InputModule {}
diff --git a/libs/components/src/item/item-action.component.ts b/libs/components/src/item/item-action.component.ts
index 8cabf5c5c23..ae8cb719724 100644
--- a/libs/components/src/item/item-action.component.ts
+++ b/libs/components/src/item/item-action.component.ts
@@ -8,5 +8,13 @@ import { A11yCellDirective } from "../a11y/a11y-cell.directive";
imports: [],
template: ``,
providers: [{ provide: A11yCellDirective, useExisting: ItemActionComponent }],
+ host: {
+ class:
+ /**
+ * `top` and `bottom` units should be kept in sync with `item-content.component.ts`'s y-axis padding.
+ * we want this `:after` element to be the same height as the `item-content`
+ */
+ "[&>button]:tw-relative [&>button:not([bit-item-content])]:after:tw-content-[''] [&>button]:after:tw-absolute [&>button]:after:tw-block bit-compact:[&>button]:after:tw-top-[-0.8rem] bit-compact:[&>button]:after:tw-bottom-[-0.8rem] [&>button]:after:tw-top-[-0.85rem] [&>button]:after:tw-bottom-[-0.85rem] [&>button]:after:tw-right-[-0.25rem] [&>button]:after:tw-left-[-0.25rem]",
+ },
})
export class ItemActionComponent extends A11yCellDirective {}
diff --git a/libs/components/src/item/item-content.component.ts b/libs/components/src/item/item-content.component.ts
index 824b6a596a0..f6cc3f133ad 100644
--- a/libs/components/src/item/item-content.component.ts
+++ b/libs/components/src/item/item-content.component.ts
@@ -19,6 +19,10 @@ import { TypographyModule } from "../typography";
templateUrl: `item-content.component.html`,
host: {
class:
+ /**
+ * y-axis padding should be kept in sync with `item-action.component.ts`'s `top` and `bottom` units.
+ * we want this to be the same height as the `item-action`'s `:after` element
+ */
"fvw-target tw-outline-none tw-text-main hover:tw-text-main tw-no-underline hover:tw-no-underline tw-text-base tw-py-2 tw-px-4 bit-compact:tw-py-1.5 bit-compact:tw-px-2 tw-bg-transparent tw-w-full tw-border-none tw-flex tw-gap-4 tw-items-center tw-justify-between",
},
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/components/src/item/item.stories.ts b/libs/components/src/item/item.stories.ts
index 675172565f1..5adf9d3c49d 100644
--- a/libs/components/src/item/item.stories.ts
+++ b/libs/components/src/item/item.stories.ts
@@ -70,7 +70,7 @@ export const Default: Story = {
-
+
@@ -163,7 +163,7 @@ const multipleActionListTemplate = /*html*/ `
-
+
@@ -182,7 +182,7 @@ const multipleActionListTemplate = /*html*/ `
-
+
@@ -201,7 +201,7 @@ const multipleActionListTemplate = /*html*/ `
-
+
@@ -220,7 +220,7 @@ const multipleActionListTemplate = /*html*/ `
-
+
@@ -239,7 +239,7 @@ const multipleActionListTemplate = /*html*/ `
-
+
@@ -258,7 +258,7 @@ const multipleActionListTemplate = /*html*/ `
-
+
@@ -332,14 +332,14 @@ export const SingleActionWithBadge: Story = {
Foobar
- Auto-fill
+ Fill
Helloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo!
- Auto-fill
+ Fill
@@ -375,7 +375,7 @@ export const VirtualScrolling: Story = {
-
+
@@ -405,7 +405,7 @@ export const WithoutBorderRadius: Story = {
-
+
diff --git a/libs/components/src/link/link.directive.ts b/libs/components/src/link/link.directive.ts
index b127d80fedf..52aba557661 100644
--- a/libs/components/src/link/link.directive.ts
+++ b/libs/components/src/link/link.directive.ts
@@ -68,6 +68,7 @@ abstract class LinkDirective {
@Directive({
selector: "a[bitLink]",
+ standalone: true,
})
export class AnchorLinkDirective extends LinkDirective {
@HostBinding("class") get classList() {
@@ -79,6 +80,7 @@ export class AnchorLinkDirective extends LinkDirective {
@Directive({
selector: "button[bitLink]",
+ standalone: true,
})
export class ButtonLinkDirective extends LinkDirective {
@HostBinding("class") get classList() {
diff --git a/libs/components/src/link/link.module.ts b/libs/components/src/link/link.module.ts
index b8b54d57c00..52d2f29e53c 100644
--- a/libs/components/src/link/link.module.ts
+++ b/libs/components/src/link/link.module.ts
@@ -1,11 +1,9 @@
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { AnchorLinkDirective, ButtonLinkDirective } from "./link.directive";
@NgModule({
- imports: [CommonModule],
+ imports: [AnchorLinkDirective, ButtonLinkDirective],
exports: [AnchorLinkDirective, ButtonLinkDirective],
- declarations: [AnchorLinkDirective, ButtonLinkDirective],
})
export class LinkModule {}
diff --git a/libs/components/src/menu/menu-divider.component.ts b/libs/components/src/menu/menu-divider.component.ts
index 194506ee50f..55b5c013c93 100644
--- a/libs/components/src/menu/menu-divider.component.ts
+++ b/libs/components/src/menu/menu-divider.component.ts
@@ -3,5 +3,6 @@ import { Component } from "@angular/core";
@Component({
selector: "bit-menu-divider",
templateUrl: "./menu-divider.component.html",
+ standalone: true,
})
export class MenuDividerComponent {}
diff --git a/libs/components/src/menu/menu-item.directive.ts b/libs/components/src/menu/menu-item.directive.ts
index 5fdc8fabfce..d0975e8e391 100644
--- a/libs/components/src/menu/menu-item.directive.ts
+++ b/libs/components/src/menu/menu-item.directive.ts
@@ -1,10 +1,13 @@
import { FocusableOption } from "@angular/cdk/a11y";
import { coerceBooleanProperty } from "@angular/cdk/coercion";
+import { NgClass } from "@angular/common";
import { Component, ElementRef, HostBinding, Input } from "@angular/core";
@Component({
selector: "[bitMenuItem]",
templateUrl: "menu-item.component.html",
+ standalone: true,
+ imports: [NgClass],
})
export class MenuItemDirective implements FocusableOption {
@HostBinding("class") classList = [
diff --git a/libs/components/src/menu/menu-trigger-for.directive.ts b/libs/components/src/menu/menu-trigger-for.directive.ts
index d318a77ef00..786554e981c 100644
--- a/libs/components/src/menu/menu-trigger-for.directive.ts
+++ b/libs/components/src/menu/menu-trigger-for.directive.ts
@@ -19,6 +19,7 @@ import { MenuComponent } from "./menu.component";
@Directive({
selector: "[bitMenuTriggerFor]",
exportAs: "menuTrigger",
+ standalone: true,
})
export class MenuTriggerForDirective implements OnDestroy {
@HostBinding("attr.aria-expanded") isOpen = false;
diff --git a/libs/components/src/menu/menu.component.ts b/libs/components/src/menu/menu.component.ts
index f0bf4f81df9..a39dceb4454 100644
--- a/libs/components/src/menu/menu.component.ts
+++ b/libs/components/src/menu/menu.component.ts
@@ -1,6 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { FocusKeyManager } from "@angular/cdk/a11y";
+import { FocusKeyManager, CdkTrapFocus } from "@angular/cdk/a11y";
import {
Component,
Output,
@@ -19,6 +19,8 @@ import { MenuItemDirective } from "./menu-item.directive";
selector: "bit-menu",
templateUrl: "./menu.component.html",
exportAs: "menuComponent",
+ standalone: true,
+ imports: [CdkTrapFocus],
})
export class MenuComponent implements AfterContentInit {
@ViewChild(TemplateRef) templateRef: TemplateRef;
diff --git a/libs/components/src/menu/menu.module.ts b/libs/components/src/menu/menu.module.ts
index b165629e6c5..117460df559 100644
--- a/libs/components/src/menu/menu.module.ts
+++ b/libs/components/src/menu/menu.module.ts
@@ -1,6 +1,3 @@
-import { A11yModule } from "@angular/cdk/a11y";
-import { OverlayModule } from "@angular/cdk/overlay";
-import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { MenuDividerComponent } from "./menu-divider.component";
@@ -9,8 +6,7 @@ import { MenuTriggerForDirective } from "./menu-trigger-for.directive";
import { MenuComponent } from "./menu.component";
@NgModule({
- imports: [A11yModule, CommonModule, OverlayModule],
- declarations: [MenuComponent, MenuTriggerForDirective, MenuItemDirective, MenuDividerComponent],
+ imports: [MenuComponent, MenuTriggerForDirective, MenuItemDirective, MenuDividerComponent],
exports: [MenuComponent, MenuTriggerForDirective, MenuItemDirective, MenuDividerComponent],
})
export class MenuModule {}
diff --git a/libs/components/src/menu/menu.stories.ts b/libs/components/src/menu/menu.stories.ts
index c5d232b2057..65fafd2d04d 100644
--- a/libs/components/src/menu/menu.stories.ts
+++ b/libs/components/src/menu/menu.stories.ts
@@ -3,23 +3,15 @@ import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
import { ButtonModule } from "../button/button.module";
-import { MenuDividerComponent } from "./menu-divider.component";
-import { MenuItemDirective } from "./menu-item.directive";
import { MenuTriggerForDirective } from "./menu-trigger-for.directive";
-import { MenuComponent } from "./menu.component";
+import { MenuModule } from "./menu.module";
export default {
title: "Component Library/Menu",
component: MenuTriggerForDirective,
decorators: [
moduleMetadata({
- declarations: [
- MenuTriggerForDirective,
- MenuComponent,
- MenuItemDirective,
- MenuDividerComponent,
- ],
- imports: [OverlayModule, ButtonModule],
+ imports: [MenuModule, OverlayModule, ButtonModule],
}),
],
parameters: {
@@ -51,7 +43,7 @@ export const OpenMenu: Story = {
Disabled button
-
+