From c0c2c55c228438fc475718b4327a9e20d3056305 Mon Sep 17 00:00:00 2001
From: fer <21882+fer@users.noreply.github.com>
Date: Fri, 3 Oct 2025 18:05:46 +0200
Subject: [PATCH] adding userId and avatarColor where missing in member access
 report component

---
 .../member-access-report.component.html                   | 8 +++++++-
 .../response/member-access-report.response.ts             | 4 ++++
 .../services/member-access-report.service.ts              | 2 ++
 .../view/member-access-report.view.ts                     | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html
index 0200e2063279..2138b7fb4c77 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html
@@ -44,7 +44,13 @@ <h2 bitTypography="h1">{{ "loading" | i18n }}</h2>
   <ng-template bitRowDef let-row>
     <td bitCell>
       <div class="tw-flex tw-items-center">
-        <bit-avatar size="small" [text]="row.name" class="tw-mr-3"></bit-avatar>
+        <bit-avatar
+          size="small"
+          [text]="row.name || row.email"
+          [id]="row.userId"
+          [color]="row.avatarColor"
+          class="tw-mr-3"
+        ></bit-avatar>
         <div class="tw-flex tw-flex-col">
           <button type="button" bitLink (click)="edit(row)">
             {{ row.name }}
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts
index 9440d922040b..523e30ffe201 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts
@@ -8,6 +8,8 @@ export class MemberAccessResponse extends BaseResponse {
   twoFactorEnabled: boolean;
   accountRecoveryEnabled: boolean;
   userGuid: Guid;
+  userId?: string;
+  avatarColor?: string;
   usesKeyConnector: boolean;
 
   cipherIds: Guid[] = [];
@@ -27,6 +29,8 @@ export class MemberAccessResponse extends BaseResponse {
     this.twoFactorEnabled = this.getResponseProperty("TwoFactorEnabled");
     this.accountRecoveryEnabled = this.getResponseProperty("AccountRecoveryEnabled");
     this.userGuid = this.getResponseProperty("UserGuid");
+    this.userId = this.getResponseProperty("UserId");
+    this.avatarColor = this.getResponseProperty("AvatarColor");
     this.usesKeyConnector = this.getResponseProperty("UsesKeyConnector");
 
     this.cipherIds = this.getResponseProperty("CipherIds") || [];
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
index caa27a75b829..c37a42091ca3 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
@@ -61,6 +61,8 @@ export class MemberAccessReportService {
       );
       const aggregatedData = {
         userGuid: userGuid,
+        userId: userDataArray[0].userId ?? undefined,
+        avatarColor: userDataArray[0].avatarColor ?? undefined,
         name: userDataArray[0].userName,
         email: userDataArray[0].email,
         collectionsCount: collectionCount,
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/view/member-access-report.view.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/view/member-access-report.view.ts
index 5412babc0e41..9ecf17435608 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/view/member-access-report.view.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/view/member-access-report.view.ts
@@ -7,5 +7,7 @@ export type MemberAccessReportView = {
   groupsCount: number;
   itemsCount: number;
   userGuid: Guid;
+  userId?: string;
+  avatarColor?: string;
   usesKeyConnector: boolean;
 };