From 9ce37e1eb54b9bedd43bc89fb81c901e8b076673 Mon Sep 17 00:00:00 2001 From: Justin Baur <19896123+justindbaur@users.noreply.github.com> Date: Sun, 4 Dec 2022 22:15:12 -0500 Subject: [PATCH] [PS-1938] Fix EF Password Reprompt (#2468) * Return Reprompt Property * Return from CipherDetails --- .../Repositories/CipherRepository.cs | 1 + .../Repositories/Queries/CipherDetailsQuery.cs | 1 + .../Repositories/Queries/UserCipherDetailsQuery.cs | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs index 0f0f3018c7..096c905184 100644 --- a/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs +++ b/src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs @@ -345,6 +345,7 @@ public class CipherRepository : Repository, Favorite = c.Favorite, FolderId = c.FolderId, Edit = true, + Reprompt = c.Reprompt, ViewPassword = true, OrganizationUseTotp = false, }; diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs index 7d676c0210..02d95bce9f 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CipherDetailsQuery.cs @@ -26,6 +26,7 @@ public class CipherDetailsQuery : IQuery CreationDate = c.CreationDate, RevisionDate = c.RevisionDate, DeletedDate = c.DeletedDate, + Reprompt = c.Reprompt, Favorite = _userId.HasValue && c.Favorites != null && c.Favorites.Contains($"\"{_userId}\":true"), FolderId = (_ignoreFolders || !_userId.HasValue || c.Folders == null || !c.Folders.Contains(_userId.Value.ToString())) ? null : diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs index 3442ff303e..91e43f9050 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs @@ -69,6 +69,7 @@ public class UserCipherDetailsQuery : IQuery Favorite = _userId.HasValue && c.Favorites != null && c.Favorites.Contains($"\"{_userId}\":true"), FolderId = GetFolderId(_userId, c), Edit = true, + Reprompt = c.Reprompt, ViewPassword = true, OrganizationUseTotp = false, });