mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-10-23 22:38:09 +03:00
User key id (#7693)
Co-authored-by: Timshel <timshel@users.noreply.github.com>
This commit is contained in:
1 parent
8719f86fcf
commit
9c8aa2359f
13 files changed
+74
-5
No files matched your search
@@ -69,6 +69,8 @@ pub struct User {
|
||||
pub avatar_color: Option<String>,
|
||||
|
||||
pub external_id: Option<String>, // Todo: Needs to be removed in the future, this is not used anymore.
|
||||
|
||||
pub key_id: Option<KeyId>,
|
||||
}
|
||||
|
||||
#[derive(Identifiable, Queryable, Insertable)]
|
||||
@@ -154,6 +156,8 @@ impl User {
|
||||
avatar_color: None,
|
||||
|
||||
external_id: None, // Todo: Needs to be removed in the future, this is not used anymore.
|
||||
|
||||
key_id: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -527,6 +531,26 @@ impl Invitation {
|
||||
#[from(forward)]
|
||||
pub struct UserId(String);
|
||||
|
||||
#[derive(
|
||||
Clone,
|
||||
Debug,
|
||||
DieselNewType,
|
||||
FromForm,
|
||||
PartialEq,
|
||||
Eq,
|
||||
Hash,
|
||||
Serialize,
|
||||
Deserialize,
|
||||
AsRef,
|
||||
Deref,
|
||||
Display,
|
||||
From,
|
||||
UuidFromParam,
|
||||
)]
|
||||
#[deref(forward)]
|
||||
#[from(forward)]
|
||||
pub struct KeyId(String);
|
||||
|
||||
impl SsoUser {
|
||||
pub async fn save(&self, conn: &DbConn) -> EmptyResult {
|
||||
db_run! { conn:
|
||||
|
||||
Reference in new issue
Block a user