From 9360bb086a59df5ffb72edd95e7c6e8ef2a0201c Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Wed, 14 May 2025 04:05:11 -0700
Subject: [PATCH] [Account Recovery][PM-18721] update property name/type

---
 .../account-recovery/account-recovery-dialog.component.ts  | 7 ++++---
 .../organizations/members/members.component.ts             | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
index 6baebbc507b..6f3d02c06fa 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
@@ -13,6 +13,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import {
   ButtonModule,
   CalloutModule,
@@ -45,12 +46,12 @@ export type AccountRecoveryDialogData = {
   /**
    * The `organizationUserId` for the user
    */
-  id: string;
+  organizationUserId: string;
 
   /**
    * The organization's `organizationId`
    */
-  organizationId: string;
+  organizationId: OrganizationId;
 };
 
 export const AccountRecoveryDialogResultTypes = {
@@ -133,7 +134,7 @@ export class AccountRecoveryDialogComponent implements OnInit {
       await this.resetPasswordService.resetMasterPassword(
         passwordInputResult.newPassword,
         this.dialogData.email,
-        this.dialogData.id,
+        this.dialogData.organizationUserId,
         this.dialogData.organizationId,
       );
 
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 bf76859719a..061f7908c38 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
@@ -52,6 +52,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService, SimpleDialogOptions, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
@@ -751,8 +752,8 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
         data: {
           name: this.userNamePipe.transform(user),
           email: user != null ? user.email : null,
-          organizationId: this.organization.id,
-          id: user != null ? user.id : null,
+          organizationId: this.organization.id as OrganizationId,
+          organizationUserId: user != null ? user.id : null,
         },
       });