Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-02 23:41:21 +01:00
Code Issues Projects Releases Wiki Activity

[PS-1938] Fix EF Password Reprompt (#2468)

Browse Source 
* Return Reprompt Property

* Return from CipherDetails
This commit is contained in:
Justin Baur 2022-12-04 22:15:12 -05:00 committed by GitHub
parent c39736c583
commit 9ce37e1eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs
View File

@ -345,6 +345,7 @@ public class CipherRepository : Repository<Core.Entities.Cipher, Cipher, Guid>,
Favorite = c.Favorite, Favorite = c.Favorite,
FolderId = c.FolderId, FolderId = c.FolderId,
Edit = true, Edit = true,
Reprompt = c.Reprompt,
ViewPassword = true, ViewPassword = true,
OrganizationUseTotp = false, OrganizationUseTotp = false,
}; };

1
src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs
View File

@ -26,6 +26,7 @@ public class CipherDetailsQuery : IQuery<CipherDetails>
CreationDate = c.CreationDate, CreationDate = c.CreationDate,
RevisionDate = c.RevisionDate, RevisionDate = c.RevisionDate,
DeletedDate = c.DeletedDate, DeletedDate = c.DeletedDate,
Reprompt = c.Reprompt,
Favorite = _userId.HasValue && c.Favorites != null && c.Favorites.Contains($"\"{_userId}\":true"), Favorite = _userId.HasValue && c.Favorites != null && c.Favorites.Contains($"\"{_userId}\":true"),
FolderId = (_ignoreFolders || !_userId.HasValue || c.Folders == null || !c.Folders.Contains(_userId.Value.ToString())) ? FolderId = (_ignoreFolders || !_userId.HasValue || c.Folders == null || !c.Folders.Contains(_userId.Value.ToString())) ?
null : null :

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

@ -69,6 +69,7 @@ public class UserCipherDetailsQuery : IQuery<CipherDetails>
Favorite = _userId.HasValue && c.Favorites != null && c.Favorites.Contains($"\"{_userId}\":true"), Favorite = _userId.HasValue && c.Favorites != null && c.Favorites.Contains($"\"{_userId}\":true"),
FolderId = GetFolderId(_userId, c), FolderId = GetFolderId(_userId, c),
Edit = true, Edit = true,
Reprompt = c.Reprompt,
ViewPassword = true, ViewPassword = true,
OrganizationUseTotp = false, OrganizationUseTotp = false,
}); });