filter status

src/Api/Controllers/AccountsController.cs

@@ -160,7 +160,8 @@ namespace Bit.Api.Controllers
         public async Task<ProfileResponseModel> GetProfile()
         {
             var user = await _userService.GetUserByPrincipalAsync(User);
-            var organizationUserDetails = await _organizationUserRepository.GetManyDetailsByUserAsync(user.Id);
+            var organizationUserDetails = await _organizationUserRepository.GetManyDetailsByUserAsync(user.Id,
+                OrganizationUserStatusType.Confirmed);
             var response = new ProfileResponseModel(user, organizationUserDetails);
             return response;
         }
@@ -169,7 +170,8 @@ namespace Bit.Api.Controllers
         public async Task<ListResponseModel<ProfileOrganizationResponseModel>> GetOrganizations()
         {
             var userId = _userService.GetProperUserId(User);
-            var organizationUserDetails = await _organizationUserRepository.GetManyDetailsByUserAsync(userId.Value);
+            var organizationUserDetails = await _organizationUserRepository.GetManyDetailsByUserAsync(userId.Value,
+                OrganizationUserStatusType.Confirmed);
             var responseData = organizationUserDetails.Select(o => new ProfileOrganizationResponseModel(o));
             return new ListResponseModel<ProfileOrganizationResponseModel>(responseData);
         }

src/Core/Repositories/IOrganizationUserRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.Core.Models.Table;
 using Bit.Core.Models.Data;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Repositories
 {
@@ -11,6 +12,7 @@ namespace Bit.Core.Repositories
         Task<OrganizationUser> GetByOrganizationAsync(Guid organizationId, Guid userId);
         Task<Tuple<OrganizationUserUserDetails, ICollection<SubvaultUserDetails>>> GetDetailsByIdAsync(Guid id);
         Task<ICollection<OrganizationUserUserDetails>> GetManyDetailsByOrganizationAsync(Guid organizationId);
-        Task<ICollection<OrganizationUserOrganizationDetails>> GetManyDetailsByUserAsync(Guid userId);
+        Task<ICollection<OrganizationUserOrganizationDetails>> GetManyDetailsByUserAsync(Guid userId,
+            OrganizationUserStatusType? status = null);
     }
 }

src/Core/Repositories/SqlServer/OrganizationUserRepository.cs

@@ -7,6 +7,7 @@ using Dapper;
 using System.Linq;
 using Bit.Core.Models.Data;
 using System.Collections.Generic;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Repositories.SqlServer
 {
@@ -61,13 +62,14 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
-        public async Task<ICollection<OrganizationUserOrganizationDetails>> GetManyDetailsByUserAsync(Guid userId)
+        public async Task<ICollection<OrganizationUserOrganizationDetails>> GetManyDetailsByUserAsync(Guid userId, 
+            OrganizationUserStatusType? status = null)
         {
             using(var connection = new SqlConnection(ConnectionString))
             {
                 var results = await connection.QueryAsync<OrganizationUserOrganizationDetails>(
-                    "[dbo].[OrganizationUserOrganizationDetails_ReadByUserId]",
+                    "[dbo].[OrganizationUserOrganizationDetails_ReadByUserIdStatus]",
-                    new { UserId = userId },
+                    new { UserId = userId, Status = status },
                     commandType: CommandType.StoredProcedure);
 
                 return results.ToList();

src/Sql/Sql.sqlproj

@@ -168,7 +168,7 @@
     <Build Include="dbo\Stored Procedures\Grant_Save.sql" />
     <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
     <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatus.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadById.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadByOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\Subvault_ReadByOrganizationIdAdminUserId.sql" />

src/Sql/dbo/Stored Procedures/OrganizationUserOrganizationDetails_ReadByUserIdStatus.sql

@@ -1,5 +1,6 @@
-CREATE PROCEDURE [dbo].[OrganizationUserOrganizationDetails_ReadByUserId]
+CREATE PROCEDURE [dbo].[OrganizationUserOrganizationDetails_ReadByUserIdStatus]
-    @UserId UNIQUEIDENTIFIER
+    @UserId UNIQUEIDENTIFIER,
+    @Status TINYINT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -10,4 +11,5 @@ BEGIN
         [dbo].[OrganizationUserOrganizationDetailsView]
     WHERE
         [UserId] = @UserId
+        AND (@Status IS NULL OR [Status] = @Status)
 END