nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Handle Constant Expression Warning (#4613)

Browse Source 
* Add Collections Tests

* Update CollectionRepository Implementation

* Test Adding And Deleting Through Replace

* Format

* Fix Most Test Warnings

* Format

* Handle Constant Expression Warning

* Revert AccountRevisionDate Changes

* Revert RevisionData Changes More Exactly
This commit is contained in:
Justin Baur 2024-08-19 09:11:42 -04:00 committed by GitHub
parent 8e9d130574
commit 0e95f6752d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs
View File

@ -68,8 +68,8 @@ public static class DatabaseContextExtensions
from cg in cg_g.DefaultIfEmpty() from cg in cg_g.DefaultIfEmpty()
where ou.OrganizationId == organizationId && where ou.OrganizationId == organizationId &&
ou.Status == OrganizationUserStatusType.Confirmed && ou.Status == OrganizationUserStatusType.Confirmed &&
(cu.CollectionId != null || ((cu == null ? (Guid?)null : cu.CollectionId) != null ||
cg.CollectionId != null) (cg == null ? (Guid?)null : cg.CollectionId) != null)
select u; select u;
var users = await query.ToListAsync(); var users = await query.ToListAsync();
@ -99,8 +99,8 @@ public static class DatabaseContextExtensions
from cg in cg_g.DefaultIfEmpty() from cg in cg_g.DefaultIfEmpty()
where ou.OrganizationId == organizationId && collectionIds.Contains(c.Id) && where ou.OrganizationId == organizationId && collectionIds.Contains(c.Id) &&
ou.Status == OrganizationUserStatusType.Confirmed && ou.Status == OrganizationUserStatusType.Confirmed &&
(cu.CollectionId != null || ((cu == null ? (Guid?)null : cu.CollectionId) != null ||
cg.CollectionId != null) (cg == null ? (Guid?)null : cg.CollectionId) != null)
select u; select u;
var users = await query.ToListAsync(); var users = await query.ToListAsync();

2
src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs
View File

@ -43,7 +43,7 @@ public class CollectionCipherReadByUserIdQuery : IQuery<CollectionCipher>
from cg in cg_g.DefaultIfEmpty() from cg in cg_g.DefaultIfEmpty()
where ou.Status == OrganizationUserStatusType.Confirmed && where ou.Status == OrganizationUserStatusType.Confirmed &&
(cu.CollectionId != null || cg.CollectionId != null) ((cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null)
select cc; select cc;
return query; return query;
} }

4
src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs
View File

@ -46,8 +46,8 @@ public class UserBumpAccountRevisionDateByCipherIdQuery : IQuery<User>
where ou.OrganizationId == _organizationId && where ou.OrganizationId == _organizationId &&
ou.Status == OrganizationUserStatusType.Confirmed && ou.Status == OrganizationUserStatusType.Confirmed &&
(cu.CollectionId != null || ((cu == null ? (Guid?)null : cu.CollectionId) != null ||
cg.CollectionId != null) (cg == null ? (Guid?)null : cg.CollectionId) != null)
select u; select u;
return query; return query;
} }

2
src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs
View File

@ -48,7 +48,7 @@ public class UserCipherDetailsQuery : IQuery<CipherDetails>
new { cg.CollectionId, cg.GroupId } into cg_g new { cg.CollectionId, cg.GroupId } into cg_g
from cg in cg_g.DefaultIfEmpty() from cg in cg_g.DefaultIfEmpty()
where cu.CollectionId != null || cg.CollectionId != null where (cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null
select c; select c;

2
src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs
View File

@ -44,7 +44,7 @@ public class UserCollectionDetailsQuery : IQuery<CollectionDetails>
where ou.UserId == _userId && where ou.UserId == _userId &&
ou.Status == OrganizationUserStatusType.Confirmed && ou.Status == OrganizationUserStatusType.Confirmed &&
o.Enabled && o.Enabled &&
(cu.CollectionId != null || cg.CollectionId != null) ((cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null)
select new { c, ou, o, cu, gu, g, cg }; select new { c, ou, o, cu, gu, g, cg };
return query.Select(x => new CollectionDetails return query.Select(x => new CollectionDetails

2
src/Infrastructure.EntityFramework/Vault/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs
View File

@ -60,7 +60,7 @@ public class CipherReadCanEditByIdUserIdQuery : IQuery<Cipher>
c.UserId == _userId || c.UserId == _userId ||
( (
!c.UserId.HasValue && ou.Status == OrganizationUserStatusType.Confirmed && o.Enabled && !c.UserId.HasValue && ou.Status == OrganizationUserStatusType.Confirmed && o.Enabled &&
(cu.CollectionId != null || cg.CollectionId != null) ((cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null)
) )
) && ) &&
(c.UserId.HasValue || !cu.ReadOnly || !cg.ReadOnly) (c.UserId.HasValue || !cu.ReadOnly || !cg.ReadOnly)