nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

[AC-1330] [AC-1850] Deprecate AccessAll in UserCollectionDetails and related sprocs (#3505)

Browse Source
This commit is contained in:
Thomas Rittson
2023-12-14 10:22:30 +10:00
committed by GitHub
parent f527623318
commit 985c438f03
22 changed files with 5490 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
View File

@ -51,12 +51,16 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
}
public async Task<Tuple<CollectionDetails, CollectionAccessDetails>> GetByIdWithAccessAsync(
Guid id, Guid userId)
Guid id, Guid userId, bool useFlexibleCollections)
{
var sprocName = useFlexibleCollections
? $"[{Schema}].[Collection_ReadWithGroupsAndUsersByIdUserId_V2]"
: $"[{Schema}].[Collection_ReadWithGroupsAndUsersByIdUserId]";
using (var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryMultipleAsync(
$"[{Schema}].[Collection_ReadWithGroupsAndUsersByIdUserId]",
sprocName,
new { Id = id, UserId = userId },
commandType: CommandType.StoredProcedure);
@ -139,12 +143,16 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
}
}
public async Task<ICollection<Tuple<CollectionDetails, CollectionAccessDetails>>> GetManyByUserIdWithAccessAsync(Guid userId, Guid organizationId)
public async Task<ICollection<Tuple<CollectionDetails, CollectionAccessDetails>>> GetManyByUserIdWithAccessAsync(Guid userId, Guid organizationId, bool useFlexibleCollections)
{
var sprocName = useFlexibleCollections
? $"[{Schema}].[Collection_ReadWithGroupsAndUsersByUserId_V2]"
: $"[{Schema}].[Collection_ReadWithGroupsAndUsersByUserId]";
using (var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryMultipleAsync(
$"[{Schema}].[Collection_ReadWithGroupsAndUsersByUserId]",
sprocName,
new { UserId = userId },
commandType: CommandType.StoredProcedure);
@ -183,12 +191,16 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
}
}
public async Task<CollectionDetails> GetByIdAsync(Guid id, Guid userId)
public async Task<CollectionDetails> GetByIdAsync(Guid id, Guid userId, bool useFlexibleCollections)
{
var sprocName = useFlexibleCollections
? $"[{Schema}].[Collection_ReadByIdUserId_V2]"
: $"[{Schema}].[Collection_ReadByIdUserId]";
using (var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryAsync<CollectionDetails>(
$"[{Schema}].[Collection_ReadByIdUserId]",
sprocName,
new { Id = id, UserId = userId },
commandType: CommandType.StoredProcedure);
@ -196,12 +208,16 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
}
}
public async Task<ICollection<CollectionDetails>> GetManyByUserIdAsync(Guid userId)
public async Task<ICollection<CollectionDetails>> GetManyByUserIdAsync(Guid userId, bool useFlexibleCollections)
{
var sprocName = useFlexibleCollections
? $"[{Schema}].[Collection_ReadByUserId_V2]"
: $"[{Schema}].[Collection_ReadByUserId]";
using (var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryAsync<CollectionDetails>(
$"[{Schema}].[Collection_ReadByUserId]",
sprocName,
new { UserId = userId },
commandType: CommandType.StoredProcedure);