mirror of
https://github.com/bitwarden/server
synced 2025-12-25 12:43:14 +00:00
[PM-19151] [PM-19161] Innovation/archive/server (#5672)
* Added the ArchivedDate to cipher entity and response model * Created migration scripts for sqlserver and ef core migration to add the ArchivedDate column --------- Co-authored-by: gbubemismith <gsmithwalter@gmail.com> Co-authored-by: SmithThe4th <gsmith@bitwarden.com> Co-authored-by: Shane <smelton@bitwarden.com> Co-authored-by: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com> Co-authored-by: jng <jng@bitwarden.com>
This commit is contained in:
committed by
GitHub
parent
18aed0bd79
commit
4e64d35f89
@@ -71,7 +71,8 @@ public class UserCipherDetailsQuery : IQuery<CipherDetails>
|
||||
Manage = cu == null ? (cg != null && cg.Manage == true) : cu.Manage == true,
|
||||
OrganizationUseTotp = o.UseTotp,
|
||||
c.Reprompt,
|
||||
c.Key
|
||||
c.Key,
|
||||
c.ArchivedDate
|
||||
};
|
||||
|
||||
var query2 = from c in dbContext.Ciphers
|
||||
@@ -94,7 +95,8 @@ public class UserCipherDetailsQuery : IQuery<CipherDetails>
|
||||
Manage = true,
|
||||
OrganizationUseTotp = false,
|
||||
c.Reprompt,
|
||||
c.Key
|
||||
c.Key,
|
||||
c.ArchivedDate
|
||||
};
|
||||
|
||||
var union = query.Union(query2).Select(c => new CipherDetails
|
||||
@@ -115,7 +117,8 @@ public class UserCipherDetailsQuery : IQuery<CipherDetails>
|
||||
ViewPassword = c.ViewPassword,
|
||||
Manage = c.Manage,
|
||||
OrganizationUseTotp = c.OrganizationUseTotp,
|
||||
Key = c.Key
|
||||
Key = c.Key,
|
||||
ArchivedDate = c.ArchivedDate
|
||||
});
|
||||
return union;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user