1
0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00

fix issues on cipher admin endpoints

This commit is contained in:
Kyle Spearrin
2019-05-01 09:38:13 -04:00
parent 044f21df29
commit b4148d3532
8 changed files with 56 additions and 18 deletions

View File

@ -1,13 +1,11 @@
using Bit.Core.Models.Table;
using System;
using System;
namespace Core.Models.Data
{
public class CipherDetails : Cipher
public class CipherDetails : CipherOrganizationDetails
{
public Guid? FolderId { get; set; }
public bool Favorite { get; set; }
public bool Edit { get; set; }
public bool OrganizationUseTotp { get; set; }
}
}

View File

@ -0,0 +1,9 @@
using Bit.Core.Models.Table;
namespace Core.Models.Data
{
public class CipherOrganizationDetails : Cipher
{
public bool OrganizationUseTotp { get; set; }
}
}

View File

@ -10,7 +10,7 @@ namespace Bit.Core.Repositories
public interface ICipherRepository : IRepository<Cipher, Guid>
{
Task<CipherDetails> GetByIdAsync(Guid id, Guid userId);
Task<CipherDetails> GetDetailsByIdAsync(Guid id);
Task<CipherOrganizationDetails> GetOrganizationDetailsByIdAsync(Guid id);
Task<bool> GetCanEditByIdAsync(Guid userId, Guid cipherId);
Task<ICollection<CipherDetails>> GetManyByUserIdAsync(Guid userId, bool withOrganizations = true);
Task<ICollection<Cipher>> GetManyByOrganizationIdAsync(Guid organizationId);

View File

@ -36,12 +36,12 @@ namespace Bit.Core.Repositories.SqlServer
}
}
public async Task<CipherDetails> GetDetailsByIdAsync(Guid id)
public async Task<CipherOrganizationDetails> GetOrganizationDetailsByIdAsync(Guid id)
{
using(var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryAsync<CipherDetails>(
$"[{Schema}].[CipherDetails_ReadById]",
$"[{Schema}].[CipherOrganizationDetails_ReadById]",
new { Id = id },
commandType: CommandType.StoredProcedure);