org user details apis

src/Api/Controllers/AccountsController.cs

@@ -10,6 +10,7 @@ using Bit.Core.Domains;
 using Bit.Core.Enums;
 using System.Linq;
 using Bit.Core.Repositories;
+using System.Collections;
 
 namespace Bit.Api.Controllers
 {
@@ -19,18 +20,18 @@ namespace Bit.Api.Controllers
     {
         private readonly IUserService _userService;
         private readonly ICipherService _cipherService;
-        private readonly IOrganizationRepository _organizationRepository;
+        private readonly IOrganizationUserRepository _organizationUserRepository;
         private readonly UserManager<User> _userManager;
 
         public AccountsController(
             IUserService userService,
             ICipherService cipherService,
-            IOrganizationRepository organizationRepository,
+            IOrganizationUserRepository organizationUserRepository,
             UserManager<User> userManager)
         {
             _userService = userService;
             _cipherService = cipherService;
-            _organizationRepository = organizationRepository;
+            _organizationUserRepository = organizationUserRepository;
             _userManager = userManager;
         }
 
@@ -159,11 +160,20 @@ namespace Bit.Api.Controllers
         public async Task<ProfileResponseModel> GetProfile()
         {
             var user = await _userService.GetUserByPrincipalAsync(User);
-            var organizations = await _organizationRepository.GetManyByUserIdAsync(user.Id);
+            var organizationUserDetails = await _organizationUserRepository.GetManyDetailsByUserAsync(user.Id);
-            var response = new ProfileResponseModel(user, organizations);
+            var response = new ProfileResponseModel(user, organizationUserDetails);
             return response;
         }
 
+        [HttpGet("organizations")]
+        public async Task<ListResponseModel<ProfileOrganizationResponseModel>> GetOrganizations()
+        {
+            var userId = _userService.GetProperUserId(User);
+            var organizationUserDetails = await _organizationUserRepository.GetManyDetailsByUserAsync(userId.Value);
+            var responseData = organizationUserDetails.Select(o => new ProfileOrganizationResponseModel(o));
+            return new ListResponseModel<ProfileOrganizationResponseModel>(responseData);
+        }
+
         [HttpPut("profile")]
         [HttpPost("profile")]
         public async Task<ProfileResponseModel> PutProfile([FromBody]UpdateProfileRequestModel model)

src/Api/Controllers/OrganizationUsersController.cs

@@ -46,7 +46,7 @@ namespace Bit.Api.Controllers
         [HttpGet("")]
         public async Task<ListResponseModel<OrganizationUserResponseModel>> Get(string orgId)
         {
-            var organizationUsers = await _organizationUserRepository.GetManyDetailsByOrganizationsAsync(new Guid(orgId));
+            var organizationUsers = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(new Guid(orgId));
             var responses = organizationUsers.Select(o => new OrganizationUserResponseModel(o));
             return new ListResponseModel<OrganizationUserResponseModel>(responses);
         }

src/Api/Models/Response/OrganizationUserResponseModel.cs

@@ -6,7 +6,7 @@ namespace Bit.Api.Models
 {
     public class OrganizationUserResponseModel : ResponseModel
     {
-        public OrganizationUserResponseModel(OrganizationUserDetails organizationUser, string obj = "organizationUser")
+        public OrganizationUserResponseModel(OrganizationUserUserDetails organizationUser, string obj = "organizationUser")
             : base(obj)
         {
             if(organizationUser == null)

src/Api/Models/Response/ProfileOrganizationResponseModel.cs

@@ -0,0 +1,22 @@
+using Bit.Core.Enums;
+using Bit.Core.Models.Data;
+
+namespace Bit.Api.Models
+{
+    public class ProfileOrganizationResponseModel : ResponseModel
+    {
+        public ProfileOrganizationResponseModel(OrganizationUserOrganizationDetails organization)
+            : base("profileOrganization")
+        {
+            Id = organization.OrganizationId.ToString();
+            Name = organization.Name;
+            Key = organization.Key;
+            Status = organization.Status;
+        }
+
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string Key { get; set; }
+        public OrganizationUserStatusType Status { get; set; }
+    }
+}

src/Api/Models/Response/ProfileResponseModel.cs

@@ -2,12 +2,14 @@
 using Bit.Core.Domains;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Models.Data;
+using Bit.Core.Enums;
 
 namespace Bit.Api.Models
 {
     public class ProfileResponseModel : ResponseModel
     {
-        public ProfileResponseModel(User user, IEnumerable<Organization> organizations)
+        public ProfileResponseModel(User user, IEnumerable<OrganizationUserOrganizationDetails> organizationsUserDetails)
             : base("profile")
         {
             if(user == null)
@@ -21,7 +23,7 @@ namespace Bit.Api.Models
             MasterPasswordHint = string.IsNullOrWhiteSpace(user.MasterPasswordHint) ? null : user.MasterPasswordHint;
             Culture = user.Culture;
             TwoFactorEnabled = user.TwoFactorEnabled;
-            Organizations = organizations?.Select(o => new OrganizationResponseModel(o));
+            Organizations = organizationsUserDetails?.Select(o => new ProfileOrganizationResponseModel(o));
         }
 
         public string Id { get; set; }
@@ -30,18 +32,6 @@ namespace Bit.Api.Models
         public string MasterPasswordHint { get; set; }
         public string Culture { get; set; }
         public bool TwoFactorEnabled { get; set; }
-        public IEnumerable<OrganizationResponseModel> Organizations { get; set; }
+        public IEnumerable<ProfileOrganizationResponseModel> Organizations { get; set; }
-
-        public class OrganizationResponseModel
-        {
-            public OrganizationResponseModel(Organization organization)
-            {
-                Id = organization.Id.ToString();
-                Name = organization.Name;
-            }
-
-            public string Id { get; set; }
-            public string Name { get; set; }
-        }
     }
 }

src/Core/Models/Data/OrganizationUserOrganizationDetails.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Bit.Core.Models.Data
+{
+    public class OrganizationUserOrganizationDetails
+    {
+        public Guid OrganizationId { get; set; }
+        public Guid? UserId { get; set; }
+        public string Name { get; set; }
+        public string Key { get; set; }
+        public Enums.OrganizationUserStatusType Status { get; set; }
+    }
+}

src/Core/Models/Data/OrganizationUserUserDetails.cs

@@ -2,9 +2,10 @@
 
 namespace Bit.Core.Models.Data
 {
-    public class OrganizationUserDetails
+    public class OrganizationUserUserDetails
     {
         public Guid Id { get; set; }
+        public Guid OrganizationId { get; set; }
         public Guid? UserId { get; set; }
         public string Name { get; set; }
         public string Email { get; set; }

src/Core/Repositories/IOrganizationUserRepository.cs

@@ -9,7 +9,8 @@ namespace Bit.Core.Repositories
     public interface IOrganizationUserRepository : IRepository<OrganizationUser, Guid>
     {
         Task<OrganizationUser> GetByOrganizationAsync(Guid organizationId, Guid userId);
-        Task<OrganizationUserDetails> GetDetailsByIdAsync(Guid id);
+        Task<OrganizationUserUserDetails> GetDetailsByIdAsync(Guid id);
-        Task<ICollection<OrganizationUserDetails>> GetManyDetailsByOrganizationsAsync(Guid organizationId);
+        Task<ICollection<OrganizationUserUserDetails>> GetManyDetailsByOrganizationAsync(Guid organizationId);
+        Task<ICollection<OrganizationUserOrganizationDetails>> GetManyDetailsByUserAsync(Guid userId);
     }
 }

src/Core/Repositories/SqlServer/OrganizationUserRepository.cs

@@ -33,12 +33,12 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
-        public async Task<OrganizationUserDetails> GetDetailsByIdAsync(Guid id)
+        public async Task<OrganizationUserUserDetails> GetDetailsByIdAsync(Guid id)
         {
             using(var connection = new SqlConnection(ConnectionString))
             {
-                var results = await connection.QueryAsync<OrganizationUserDetails>(
+                var results = await connection.QueryAsync<OrganizationUserUserDetails>(
-                    "[dbo].[OrganizationUserDetails_ReadById]",
+                    "[dbo].[OrganizationUserUserDetails_ReadById]",
                     new { Id = id },
                     commandType: CommandType.StoredProcedure);
 
@@ -46,17 +46,30 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
-        public async Task<ICollection<OrganizationUserDetails>> GetManyDetailsByOrganizationsAsync(Guid organizationId)
+        public async Task<ICollection<OrganizationUserUserDetails>> GetManyDetailsByOrganizationAsync(Guid organizationId)
         {
             using(var connection = new SqlConnection(ConnectionString))
             {
-                var results = await connection.QueryAsync<OrganizationUserDetails>(
+                var results = await connection.QueryAsync<OrganizationUserUserDetails>(
-                    "[dbo].[OrganizationUserDetails_ReadByOrganizationId]",
+                    "[dbo].[OrganizationUserUserDetails_ReadByOrganizationId]",
                     new { OrganizationId = organizationId },
                     commandType: CommandType.StoredProcedure);
 
                 return results.ToList();
             }
         }
+
+        public async Task<ICollection<OrganizationUserOrganizationDetails>> GetManyDetailsByUserAsync(Guid userId)
+        {
+            using(var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<OrganizationUserOrganizationDetails>(
+                    "[dbo].[OrganizationUserOrganizationDetails_ReadByUserId]",
+                    new { UserId = userId },
+                    commandType: CommandType.StoredProcedure);
+
+                return results.ToList();
+            }
+        }
     }
 }

src/Sql/Sql.sqlproj

@@ -142,9 +142,11 @@
     <Build Include="dbo\Stored Procedures\Grant_ReadBySubjectId.sql" />
     <Build Include="dbo\Stored Procedures\Grant_Save.sql" />
     <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
-    <Build Include="dbo\Views\OrganizationUserDetailsView.sql" />
+    <Build Include="dbo\Views\OrganizationUserUserDetailsView.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserDetails_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserDetails_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadByOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserId.sql" />
+    <Build Include="dbo\Views\OrganizationUserOrganizationDetailsView.sql" />
   </ItemGroup>
 </Project>

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

@@ -0,0 +1,13 @@
+CREATE PROCEDURE [dbo].[OrganizationUserOrganizationDetails_ReadByUserId]
+    @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        *
+    FROM
+        [dbo].[OrganizationUserOrganizationDetailsView]
+    WHERE
+        [UserId] = @UserId
+END

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

@@ -1,4 +1,4 @@
-CREATE PROCEDURE [dbo].[OrganizationUserDetails_ReadById]
+CREATE PROCEDURE [dbo].[OrganizationUserUserDetails_ReadById]
     @Id UNIQUEIDENTIFIER
 AS
 BEGIN
@@ -7,7 +7,7 @@ BEGIN
     SELECT
         *
     FROM
-        [dbo].[OrganizationUserDetailsView]
+        [dbo].[OrganizationUserUserDetailsView]
     WHERE
         [Id] = @Id
 END

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

@@ -1,4 +1,4 @@
-CREATE PROCEDURE [dbo].[OrganizationUserDetails_ReadByOrganizationId]
+CREATE PROCEDURE [dbo].[OrganizationUserUserDetails_ReadByOrganizationId]
     @OrganizationId UNIQUEIDENTIFIER
 AS
 BEGIN
@@ -7,7 +7,7 @@ BEGIN
     SELECT
         *
     FROM
-        [dbo].[OrganizationUserDetailsView]
+        [dbo].[OrganizationUserUserDetailsView]
     WHERE
         [OrganizationId] = @OrganizationId
 END

src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql

@@ -0,0 +1,12 @@
+CREATE VIEW [dbo].[OrganizationUserOrganizationDetailsView]
+AS
+SELECT
+    OU.[UserId],
+    OU.[OrganizationId],
+    O.[Name],
+    OU.[Key],
+    OU.[Status]
+FROM
+    [dbo].[OrganizationUser] OU
+INNER JOIN
+    [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]

src/Sql/dbo/Views/OrganizationUserUserDetailsView.sql

@@ -1,4 +1,4 @@
-CREATE VIEW [dbo].[OrganizationUserDetailsView]
+CREATE VIEW [dbo].[OrganizationUserUserDetailsView]
 AS
 SELECT
     OU.[Id],
@@ -11,4 +11,4 @@ SELECT
 FROM
     [dbo].[OrganizationUser] OU
 LEFT JOIN
-    [dbo].[User] U ON U.Id = OU.UserId
+    [dbo].[User] U ON U.[Id] = OU.[UserId]