Database model changes

Author: tonkku107

Cargo.lock

@@ -462,6 +462,10 @@ features = ["serde"]
 version = "=1.1.4"   # Pinned to the latest version which used rand 0.8
 features = ["serde"]
 
+[workspace.dependencies.webauthn_rp]
+version = "0.3.0"
+features = ["bin", "serde_relaxed", "custom", "serializable_server_state"]
+
 # HTTP mock server
 [workspace.dependencies.wiremock]
 version = "0.6.3"

Cargo.toml

@@ -24,6 +24,7 @@ rand.workspace = true
 regex = "1.11.1"
 woothee = "0.13.0"
 ruma-common.workspace = true
+webauthn_rp.workspace = true
 
 mas-iana.workspace = true
 mas-jose.workspace = true

crates/data-model/Cargo.toml

@@ -49,7 +49,7 @@ pub use self::{
     user_agent::{DeviceType, UserAgent},
     users::{
         Authentication, AuthenticationMethod, BrowserSession, Password, User, UserEmail,
-        UserEmailAuthentication, UserEmailAuthenticationCode, UserRecoverySession,
-        UserRecoveryTicket, UserRegistration, UserRegistrationPassword,
+        UserEmailAuthentication, UserEmailAuthenticationCode, UserPasskey, UserPasskeyChallenge,
+        UserRecoverySession, UserRecoveryTicket, UserRegistration, UserRegistrationPassword,
     },
 };

crates/data-model/src/lib.rs

@@ -11,6 +11,7 @@ use rand::Rng;
 use serde::Serialize;
 use ulid::Ulid;
 use url::Url;
+use webauthn_rp::response::{AuthTransports, CredentialId};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub struct User {
@@ -67,6 +68,7 @@ pub struct Authentication {
 pub enum AuthenticationMethod {
     Password { user_password_id: Ulid },
     UpstreamOAuth2 { upstream_oauth2_session_id: Ulid },
+    Passkey { user_passkey_id: Ulid },
     Unknown,
 }
 
@@ -215,3 +217,26 @@ pub struct UserRegistration {
     pub created_at: DateTime<Utc>,
     pub completed_at: Option<DateTime<Utc>>,
 }
+
+#[derive(Debug, Clone, Serialize)]
+pub struct UserPasskey {
+    pub id: Ulid,
+    pub user_id: Ulid,
+    pub credential_id: CredentialId<Vec<u8>>,
+    pub name: String,
+    pub transports: AuthTransports,
+    pub static_state: Vec<u8>,
+    pub dynamic_state: Vec<u8>,
+    pub metadata: Vec<u8>,
+    pub last_used_at: Option<DateTime<Utc>>,
+    pub created_at: DateTime<Utc>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+pub struct UserPasskeyChallenge {
+    pub id: Ulid,
+    pub user_session_id: Option<Ulid>,
+    pub state: Vec<u8>,
+    pub created_at: DateTime<Utc>,
+    pub completed_at: Option<DateTime<Utc>>,
+}