bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-07 04:03:29 +00:00
Code Issues Releases Wiki Activity

[Account Recovery][PM-18721] move error handling within flag, and revert changes that leaked outside of flag

Browse Source
This commit is contained in:
rr-bw
2025-06-04 10:28:56 -07:00
parent 1ae47e41e8
commit d562acca17
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/admin-console/common/base-members.component.ts
View File

@@ -86,7 +86,7 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
protected i18nService: I18nService,
protected keyService: KeyService,
protected validationService: ValidationService,
private logService: LogService,
protected logService: LogService,
protected userNamePipe: UserNamePipe,
protected dialogService: DialogService,
protected organizationManagementPreferencesService: OrganizationManagementPreferencesService,

25
apps/web/src/app/admin-console/organizations/members/members.component.ts
View File

@@ -746,17 +746,18 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
);
if (!user || !user.email || !user.id) {
this.toastService.showToast({
variant: "error",
title: this.i18nService.t("errorOccurred"),
message: this.i18nService.t("orgUserDetailsNotFound"),
});
return;
}
if (changePasswordRefactorFlag) {
if (!user || !user.email || !user.id) {
this.toastService.showToast({
variant: "error",
title: this.i18nService.t("errorOccurred"),
message: this.i18nService.t("orgUserDetailsNotFound"),
});
this.logService.error("Org user details not found when attempting account recovery");
return;
}
const dialogRef = AccountRecoveryDialogComponent.open(this.dialogService, {
data: {
name: this.userNamePipe.transform(user),
@@ -777,9 +778,9 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
const dialogRef = ResetPasswordComponent.open(this.dialogService, {
data: {
name: this.userNamePipe.transform(user),
email: user.email,
email: user != null ? user.email : null,
organizationId: this.organization.id as OrganizationId,
id: user.id,
id: user != null ? user.id : null,
},
});