return share information with cipher API response

src/Api/Controllers/CiphersController.cs

@@ -31,27 +31,28 @@ namespace Bit.Api.Controllers
         }
 
         [HttpGet("{id}")]
-        public async Task<CipherResponseModel> Get(string id)
+        public async Task<CipherShareResponseModel> Get(string id)
         {
             var userId = _userService.GetProperUserId(User).Value;
-            var cipher = await _cipherRepository.GetByIdAsync(new Guid(id), userId);
+            var cipher = await _cipherRepository.GetShareByIdAsync(new Guid(id), userId);
             if(cipher == null)
             {
                 throw new NotFoundException();
             }
 
-            return new CipherResponseModel(cipher, userId);
+            return new CipherShareResponseModel(cipher, userId);
         }
 
         [HttpGet("")]
-        public async Task<ListResponseModel<CipherResponseModel>> Get()
+        public async Task<ListResponseModel<CipherShareResponseModel>> Get()
         {
             var userId = _userService.GetProperUserId(User).Value;
-            var ciphers = await _cipherRepository.GetManyByUserIdAsync(userId);
-            var responses = ciphers.Select(c => new CipherResponseModel(c, userId));
-            return new ListResponseModel<CipherResponseModel>(responses);
+            var ciphers = await _cipherRepository.GetManyShareByUserIdAsync(userId);
+            var responses = ciphers.Select(c => new CipherShareResponseModel(c, userId));
+            return new ListResponseModel<CipherShareResponseModel>(responses);
         }
 
+        [Obsolete]
         [HttpGet("history")]
         public async Task<CipherHistoryResponseModel> Get(DateTime since)
         {

src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs

@@ -118,13 +118,16 @@ namespace Bit.Api.IdentityServer
                 claims.Add(new Claim("device", device.Identifier));
             }
 
+            var customResponse = new Dictionary<string, object>();
+            if(!string.IsNullOrWhiteSpace(user.PrivateKey))
+            {
+                customResponse.Add("EncryptedPrivateKey", user.PrivateKey);
+            }
+
             context.Result = new GrantValidationResult(user.Id.ToString(), "Application",
                 identityProvider: "bitwarden",
                 claims: claims.Count > 0 ? claims : null,
-                customResponse: new Dictionary<string, object>
-                {
-                    { "EncryptedPrivateKey", user.PrivateKey }
-                });
+                customResponse: customResponse);
         }
 
         private void BuildTwoFactorResult(User user, ResourceOwnerPasswordValidationContext context)

src/Api/Models/Response/CipherResponseModel.cs

@@ -1,15 +1,15 @@
 using System;
 using Bit.Core.Domains;
+using Bit.Core.Models.Data;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using System.Linq;
 
 namespace Bit.Api.Models
 {
     public class CipherResponseModel : ResponseModel
     {
-        public CipherResponseModel(Cipher cipher, Guid userId)
-            : base("cipher")
+        public CipherResponseModel(Cipher cipher, Guid userId, string obj = "cipher")
+            : base(obj)
         {
             if(cipher == null)
             {
@@ -40,7 +40,22 @@ namespace Bit.Api.Models
         public Core.Enums.CipherType Type { get; set; }
         public bool Favorite { get; set; }
         public dynamic Data { get; set; }
-        public string Key { get; set; }
         public DateTime RevisionDate { get; set; }
     }
+
+    public class CipherShareResponseModel : CipherResponseModel
+    {
+        public CipherShareResponseModel(CipherShare cipherShare, Guid userId)
+            : base(cipherShare, userId, "cipherShare")
+        {
+            Key = cipherShare.Key;
+            Permissions = cipherShare.Permissions == null ? null :
+                JsonConvert.DeserializeObject<IEnumerable<Core.Enums.SharePermissionType>>(cipherShare.Permissions);
+            Status = cipherShare.Status;
+        }
+
+        public string Key { get; set; }
+        public IEnumerable<Core.Enums.SharePermissionType> Permissions { get; set; }
+        public Core.Enums.ShareStatusType? Status { get; set; }
+    }
 }

src/Core/Enums/SharePermissionType.cs

@@ -0,0 +1,8 @@
+namespace Bit.Core.Enums
+{
+    public enum SharePermissionType : byte
+    {
+        Reshare = 0,
+        Edit = 1
+    }
+}

src/Core/Models/Data/CipherShare.cs

@@ -0,0 +1,11 @@
+using Bit.Core.Domains;
+
+namespace Bit.Core.Models.Data
+{
+    public class CipherShare : Cipher
+    {
+        public string Key { get; internal set; }
+        public string Permissions { get; internal set; }
+        public Enums.ShareStatusType? Status { get; internal set; }
+    }
+}

src/Core/Repositories/ICipherRepository.cs

@@ -2,13 +2,16 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.Core.Domains;
+using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories
 {
     public interface ICipherRepository : IRepository<Cipher, Guid>
     {
         Task<Cipher> GetByIdAsync(Guid id, Guid userId);
+        Task<CipherShare> GetShareByIdAsync(Guid id, Guid userId);
         Task<ICollection<Cipher>> GetManyByUserIdAsync(Guid userId);
+        Task<ICollection<CipherShare>> GetManyShareByUserIdAsync(Guid userId);
         Task<ICollection<Cipher>> GetManyByTypeAndUserIdAsync(Enums.CipherType type, Guid userId);
         Task<Tuple<ICollection<Cipher>, ICollection<Guid>>>
             GetManySinceRevisionDateAndUserIdWithDeleteHistoryAsync(DateTime sinceRevisionDate, Guid userId);

src/Core/Repositories/SqlServer/CipherRepository.cs

@@ -7,6 +7,7 @@ using DataTableProxy;
 using Bit.Core.Domains;
 using System.Data;
 using Dapper;
+using Bit.Core.Models.Data;
 
 namespace Bit.Core.Repositories.SqlServer
 {
@@ -31,6 +32,19 @@ namespace Bit.Core.Repositories.SqlServer
             return cipher;
         }
 
+        public async Task<CipherShare> GetShareByIdAsync(Guid id, Guid userId)
+        {
+            using(var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<CipherShare>(
+                    $"[{Schema}].[CipherShare_ReadById]",
+                    new { UserId = userId },
+                    commandType: CommandType.StoredProcedure);
+
+                return results.FirstOrDefault(c => c.UserId == userId);
+            }
+        }
+
         public async Task<ICollection<Cipher>> GetManyByUserIdAsync(Guid userId)
         {
             using(var connection = new SqlConnection(ConnectionString))
@@ -44,6 +58,19 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
+        public async Task<ICollection<CipherShare>> GetManyShareByUserIdAsync(Guid userId)
+        {
+            using(var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<CipherShare>(
+                    $"[{Schema}].[CipherShare_ReadByUserId]",
+                    new { UserId = userId },
+                    commandType: CommandType.StoredProcedure);
+
+                return results.ToList();
+            }
+        }
+
         public async Task<ICollection<Cipher>> GetManyByTypeAndUserIdAsync(Enums.CipherType type, Guid userId)
         {
             using(var connection = new SqlConnection(ConnectionString))

src/Sql/Sql.sqlproj

@@ -109,5 +109,8 @@
     <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\CipherShareView.sql" />
+    <Build Include="dbo\Stored Procedures\CipherShare_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherShare_ReadById.sql" />
   </ItemGroup>
 </Project>

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

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

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

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

src/Sql/dbo/Views/CipherShareView.sql

@@ -0,0 +1,11 @@
+CREATE VIEW [dbo].[CipherShareView]
+AS
+SELECT
+    C.*,
+    S.[Key],
+    S.[Permissions],
+    S.[Status]
+FROM
+    [dbo].[Cipher] C
+LEFT JOIN
+    [dbo].[Share] S ON C.[Id] = S.[CipherId]