Skip to content

[PM-22111] Migrate emergency access to standalone #14958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import { DialogConfig, DialogRef, DIALOG_DATA, DialogService } from "@bitwarden/components";
import { KeyService } from "@bitwarden/key-management";

import { SharedModule } from "../../../../shared";

Check warning on line 11 in apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts#L11

Added line #L11 was not covered by tests

// FIXME: update to use a const object instead of a typescript enum
// eslint-disable-next-line @bitwarden/platform/no-enums
export enum EmergencyAccessConfirmDialogResult {
Expand All @@ -24,9 +26,9 @@
publicKey: Uint8Array;
};
@Component({
selector: "emergency-access-confirm",
templateUrl: "emergency-access-confirm.component.html",
standalone: false,
standalone: true,
imports: [SharedModule],
})
export class EmergencyAccessConfirmComponent implements OnInit {
loading = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
ToastService,
} from "@bitwarden/components";

import { SharedModule } from "../../../shared/shared.module";
import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component";

Check warning on line 18 in apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts#L17-L18

Added lines #L17 - L18 were not covered by tests
import { EmergencyAccessService } from "../../emergency-access";
import { EmergencyAccessType } from "../../emergency-access/enums/emergency-access-type";

Expand All @@ -34,9 +36,9 @@
Deleted = "deleted",
}
@Component({
selector: "emergency-access-add-edit",
templateUrl: "emergency-access-add-edit.component.html",
standalone: false,
standalone: true,
imports: [SharedModule, PremiumBadgeComponent],
})
export class EmergencyAccessAddEditComponent implements OnInit {
loading = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { DialogService, ToastService } from "@bitwarden/components";

import { HeaderModule } from "../../../layouts/header/header.module";
import { SharedModule } from "../../../shared/shared.module";
import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component";

Check warning on line 23 in apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts#L21-L23

Added lines #L21 - L23 were not covered by tests
import { EmergencyAccessService } from "../../emergency-access";
import { EmergencyAccessStatusType } from "../../emergency-access/enums/emergency-access-status-type";
import { EmergencyAccessType } from "../../emergency-access/enums/emergency-access-type";
Expand All @@ -40,9 +43,9 @@
} from "./takeover/emergency-access-takeover.component";

@Component({
selector: "emergency-access",
templateUrl: "emergency-access.component.html",
standalone: false,
standalone: true,
imports: [SharedModule, HeaderModule, PremiumBadgeComponent],
})
export class EmergencyAccessComponent implements OnInit {
loaded = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import { switchMap, takeUntil } from "rxjs";

import { ChangePasswordComponent } from "@bitwarden/angular/auth/components/change-password.component";
import { PasswordCalloutComponent } from "@bitwarden/auth/angular";

Check warning on line 8 in apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts#L8

Added line #L8 was not covered by tests
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
Expand All @@ -22,6 +23,7 @@
} from "@bitwarden/components";
import { KdfType, KdfConfigService, KeyService } from "@bitwarden/key-management";

import { SharedModule } from "../../../../shared";

Check warning on line 26 in apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts#L26

Added line #L26 was not covered by tests
import { EmergencyAccessService } from "../../../emergency-access";

// FIXME: update to use a const object instead of a typescript enum
Expand All @@ -38,9 +40,9 @@
emergencyAccessId: string;
};
@Component({
selector: "emergency-access-takeover",
templateUrl: "emergency-access-takeover.component.html",
standalone: false,
standalone: true,
imports: [SharedModule, PasswordCalloutComponent],
})
export class EmergencyAccessTakeoverComponent
extends ChangePasswordComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
import { DialogService } from "@bitwarden/components";
import { CipherFormConfigService, DefaultCipherFormConfigService } from "@bitwarden/vault";

import { SharedModule } from "../../../../shared/shared.module";

Check warning on line 10 in apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts#L10

Added line #L10 was not covered by tests
import { EmergencyAccessService } from "../../../emergency-access";

import { EmergencyViewDialogComponent } from "./emergency-view-dialog.component";

@Component({
selector: "emergency-access-view",
templateUrl: "emergency-access-view.component.html",
providers: [{ provide: CipherFormConfigService, useClass: DefaultCipherFormConfigService }],
standalone: false,
standalone: true,
imports: [SharedModule],
})
export class EmergencyAccessViewComponent implements OnInit {
id: EmergencyAccessId | null = null;
Expand Down
18 changes: 2 additions & 16 deletions apps/web/src/app/shared/loose-components.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ import { RecoverDeleteComponent } from "../auth/recover-delete.component";
import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component";
import { SetPasswordComponent } from "../auth/set-password.component";
import { DangerZoneComponent } from "../auth/settings/account/danger-zone.component";
import { EmergencyAccessConfirmComponent } from "../auth/settings/emergency-access/confirm/emergency-access-confirm.component";
import { EmergencyAccessAddEditComponent } from "../auth/settings/emergency-access/emergency-access-add-edit.component";
import { EmergencyAccessComponent } from "../auth/settings/emergency-access/emergency-access.component";
import { EmergencyAccessTakeoverComponent } from "../auth/settings/emergency-access/takeover/emergency-access-takeover.component";
import { EmergencyAccessViewComponent } from "../auth/settings/emergency-access/view/emergency-access-view.component";
import { UserVerificationModule } from "../auth/shared/components/user-verification";
import { UpdatePasswordComponent } from "../auth/update-password.component";
import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
Expand Down Expand Up @@ -68,14 +63,10 @@ import { SharedModule } from "./shared.module";
OrganizationLayoutComponent,
VerifyRecoverDeleteOrgComponent,
VaultTimeoutInputComponent,
PremiumBadgeComponent,
],
declarations: [
AcceptFamilySponsorshipComponent,
EmergencyAccessAddEditComponent,
EmergencyAccessComponent,
EmergencyAccessConfirmComponent,
EmergencyAccessTakeoverComponent,
EmergencyAccessViewComponent,
FolderAddEditComponent,
OrgEventsComponent,
OrgExposedPasswordsReportComponent,
Expand All @@ -84,7 +75,6 @@ import { SharedModule } from "./shared.module";
OrgUnsecuredWebsitesReportComponent,
OrgUserConfirmComponent,
OrgWeakPasswordsReportComponent,
PremiumBadgeComponent,
PurgeVaultComponent,
RecoverDeleteComponent,
RecoverTwoFactorComponent,
Expand All @@ -101,11 +91,6 @@ import { SharedModule } from "./shared.module";
exports: [
UserVerificationModule,
PremiumBadgeComponent,
EmergencyAccessAddEditComponent,
EmergencyAccessComponent,
EmergencyAccessConfirmComponent,
EmergencyAccessTakeoverComponent,
EmergencyAccessViewComponent,
FolderAddEditComponent,
OrganizationLayoutComponent,
OrgEventsComponent,
Expand All @@ -130,6 +115,7 @@ import { SharedModule } from "./shared.module";
VerifyRecoverDeleteComponent,
HeaderModule,
DangerZoneComponent,
PremiumBadgeComponent,
],
})
export class LooseComponentsModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ import { Component } from "@angular/core";

import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";

import { SharedModule } from "../../shared";

@Component({
selector: "app-premium-badge",
template: `
<button type="button" *appNotPremium bitBadge variant="success" (click)="premiumRequired()">
{{ "premium" | i18n }}
</button>
`,
standalone: false,
standalone: true,
imports: [SharedModule],
})
export class PremiumBadgeComponent {
constructor(private messagingService: MessagingService) {}
Expand Down
Loading