From d562acca176625d3dfd28461134fb1b661e4b5d1 Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Wed, 4 Jun 2025 10:28:56 -0700
Subject: [PATCH] [Account Recovery][PM-18721] move error handling within flag,
 and revert changes that leaked outside of flag

---
 .../common/base-members.component.ts          |  2 +-
 .../members/members.component.ts              | 25 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/web/src/app/admin-console/common/base-members.component.ts b/apps/web/src/app/admin-console/common/base-members.component.ts
index 488af7ee518..624615edd6a 100644
--- a/apps/web/src/app/admin-console/common/base-members.component.ts
+++ b/apps/web/src/app/admin-console/common/base-members.component.ts
@@ -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,
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index 4b0d9c421ea..dad6761b891 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -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,
       },
     });