mirror of
https://github.com/bitwarden/browser.git
synced 2025-03-11 13:30:39 +01:00
[PM-11406] Account Management: Prevent a verified user from deleting their account (#11505)
* Update AccountService to include a method for setting the managedByOrganizationId * Update AccountComponent to conditionally show the purgeVault button based on a feature flag and if the user is managed by an organization * Add missing method to FakeAccountService * Remove the setAccountManagedByOrganizationId method from the AccountService abstract class. * Refactor AccountComponent to use OrganizationService to check for managing organization * Rename managesActiveUser to userIsManagedByOrganization * Hide the change email section if the user is managed by an organization * Refactor userIsManagedByOrganization property to be non-nullable in organization data and response models * Refactor organization.data.spec.ts to include non-nullable userIsManagedByOrganization property * Refactor account component to conditionally show delete account button based on user's organization management status * Add showDeleteAccount$ observable to AccountComponent
This commit is contained in:
parent
d669d2003f
commit
d804a78bfb
@ -21,7 +21,13 @@
|
|||||||
>
|
>
|
||||||
{{ "purgeVault" | i18n }}
|
{{ "purgeVault" | i18n }}
|
||||||
</button>
|
</button>
|
||||||
<button type="button" bitButton buttonType="danger" [bitAction]="deleteAccount">
|
<button
|
||||||
|
*ngIf="showDeleteAccount$ | async"
|
||||||
|
type="button"
|
||||||
|
bitButton
|
||||||
|
buttonType="danger"
|
||||||
|
[bitAction]="deleteAccount"
|
||||||
|
>
|
||||||
{{ "deleteAccount" | i18n }}
|
{{ "deleteAccount" | i18n }}
|
||||||
</button>
|
</button>
|
||||||
</app-danger-zone>
|
</app-danger-zone>
|
||||||
|
@ -23,6 +23,7 @@ export class AccountComponent implements OnInit {
|
|||||||
|
|
||||||
showChangeEmail$: Observable<boolean>;
|
showChangeEmail$: Observable<boolean>;
|
||||||
showPurgeVault$: Observable<boolean>;
|
showPurgeVault$: Observable<boolean>;
|
||||||
|
showDeleteAccount$: Observable<boolean>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalService: ModalService,
|
private modalService: ModalService,
|
||||||
@ -63,6 +64,16 @@ export class AccountComponent implements OnInit {
|
|||||||
!isAccountDeprovisioningEnabled || !userIsManagedByOrganization,
|
!isAccountDeprovisioningEnabled || !userIsManagedByOrganization,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
this.showDeleteAccount$ = combineLatest([
|
||||||
|
isAccountDeprovisioningEnabled$,
|
||||||
|
userIsManagedByOrganization$,
|
||||||
|
]).pipe(
|
||||||
|
map(
|
||||||
|
([isAccountDeprovisioningEnabled, userIsManagedByOrganization]) =>
|
||||||
|
!isAccountDeprovisioningEnabled || !userIsManagedByOrganization,
|
||||||
|
),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async deauthorizeSessions() {
|
async deauthorizeSessions() {
|
||||||
|
Loading…
Reference in New Issue
Block a user