From 7365ca09250c906843f83d6b5332bf3320319c38 Mon Sep 17 00:00:00 2001
From: Brandon Maharaj <bmaharaj@bitwarden.com>
Date: Tue, 21 Feb 2023 15:59:50 -0500
Subject: [PATCH] [SG-783] Change organization user list to pull the user's
 selected color and display it in the avatar (#2630)

* work: baseline for org stuff

* fix: missed view as usual oops

* fix: refresh using sp_refreshsqlmodule
---
 .../OrganizationUserResponseModel.cs          |  3 ++
 .../OrganizationUserUserDetails.cs            |  1 +
 .../Queries/OrganizationUserUserViewQuery.cs  |  1 +
 .../Views/OrganizationUserUserDetailsView.sql |  1 +
 ...-01-23_00_AddAvatarToOrganizationUsers.sql | 32 +++++++++++++++++++
 5 files changed, 38 insertions(+)
 create mode 100644 util/Migrator/DbScripts/2023-01-23_00_AddAvatarToOrganizationUsers.sql

diff --git a/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs
index 13c1aaf658..1ce055a869 100644
--- a/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs
+++ b/src/Api/Models/Response/Organizations/OrganizationUserResponseModel.cs
@@ -89,6 +89,7 @@ public class OrganizationUserUserDetailsResponseModel : OrganizationUserResponse
 
         Name = organizationUser.Name;
         Email = organizationUser.Email;
+        AvatarColor = organizationUser.AvatarColor;
         TwoFactorEnabled = twoFactorEnabled;
         SsoBound = !string.IsNullOrWhiteSpace(organizationUser.SsoExternalId);
         Collections = organizationUser.Collections.Select(c => new SelectionReadOnlyResponseModel(c));
@@ -97,8 +98,10 @@ public class OrganizationUserUserDetailsResponseModel : OrganizationUserResponse
         ResetPasswordEnrolled = ResetPasswordEnrolled && !organizationUser.UsesKeyConnector;
     }
 
+
     public string Name { get; set; }
     public string Email { get; set; }
+    public string AvatarColor { get; set; }
     public bool TwoFactorEnabled { get; set; }
     public bool SsoBound { get; set; }
     public IEnumerable<SelectionReadOnlyResponseModel> Collections { get; set; }
diff --git a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
index 0576904cd0..3bb9416813 100644
--- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
+++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserUserDetails.cs
@@ -12,6 +12,7 @@ public class OrganizationUserUserDetails : IExternal, ITwoFactorProvidersUser
     public Guid? UserId { get; set; }
     public string Name { get; set; }
     public string Email { get; set; }
+    public string AvatarColor { get; set; }
     public string TwoFactorProviders { get; set; }
     public bool? Premium { get; set; }
     public OrganizationUserStatusType Status { get; set; }
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs
index 49dc3a385d..2f36743dc0 100644
--- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs
@@ -19,6 +19,7 @@ public class OrganizationUserUserDetailsViewQuery : IQuery<OrganizationUserUserD
             OrganizationId = x.ou.OrganizationId,
             Name = x.u.Name,
             Email = x.u.Email ?? x.ou.Email,
+            AvatarColor = x.u.AvatarColor,
             TwoFactorProviders = x.u.TwoFactorProviders,
             Premium = x.u.Premium,
             Status = x.ou.Status,
diff --git a/src/Sql/dbo/Views/OrganizationUserUserDetailsView.sql b/src/Sql/dbo/Views/OrganizationUserUserDetailsView.sql
index 4bc43f79ae..f2d7739769 100644
--- a/src/Sql/dbo/Views/OrganizationUserUserDetailsView.sql
+++ b/src/Sql/dbo/Views/OrganizationUserUserDetailsView.sql
@@ -6,6 +6,7 @@ SELECT
     OU.[OrganizationId],
     U.[Name],
     ISNULL(U.[Email], OU.[Email]) Email,
+    U.[AvatarColor],
     U.[TwoFactorProviders],
     U.[Premium],
     OU.[Status],
diff --git a/util/Migrator/DbScripts/2023-01-23_00_AddAvatarToOrganizationUsers.sql b/util/Migrator/DbScripts/2023-01-23_00_AddAvatarToOrganizationUsers.sql
new file mode 100644
index 0000000000..b96b0fa9b0
--- /dev/null
+++ b/util/Migrator/DbScripts/2023-01-23_00_AddAvatarToOrganizationUsers.sql
@@ -0,0 +1,32 @@
+CREATE OR ALTER VIEW [dbo].[OrganizationUserUserDetailsView]
+AS
+SELECT
+    OU.[Id],
+    OU.[UserId],
+    OU.[OrganizationId],
+    U.[Name],
+    ISNULL(U.[Email], OU.[Email]) Email,
+    U.[AvatarColor],
+    U.[TwoFactorProviders],
+    U.[Premium],
+    OU.[Status],
+    OU.[Type],
+    OU.[AccessAll],
+    OU.[ExternalId],
+    SU.[ExternalId] SsoExternalId,
+    OU.[Permissions],
+    OU.[ResetPasswordKey],
+    U.[UsesKeyConnector]
+FROM
+    [dbo].[OrganizationUser] OU
+LEFT JOIN
+    [dbo].[User] U ON U.[Id] = OU.[UserId]
+LEFT JOIN
+    [dbo].[SsoUser] SU ON SU.[UserId] = OU.[UserId] AND SU.[OrganizationId] = OU.[OrganizationId]
+GO
+
+IF OBJECT_ID('[dbo].[OrganizationUserUserDetails_ReadByOrganizationId]') IS NOT NULL
+BEGIN
+    EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationUserUserDetails_ReadByOrganizationId]';
+END
+GO