GraphQL API changes

Author: tonkku107

Cargo.lock

@@ -152,6 +152,7 @@ impl Options {
             &config.passwords,
             &config.account,
             &config.captcha,
+            &config.http,
         )?;
 
         // Load and compile the templates

crates/cli/src/commands/server.rs

@@ -10,7 +10,7 @@ use clap::Parser;
 use figment::Figment;
 use mas_config::{
     AccountConfig, BrandingConfig, CaptchaConfig, ConfigurationSection, ConfigurationSectionExt,
-    ExperimentalConfig, MatrixConfig, PasswordsConfig, TemplatesConfig,
+    ExperimentalConfig, HttpConfig, MatrixConfig, PasswordsConfig, TemplatesConfig,
 };
 use mas_storage::{Clock, SystemClock};
 use rand::SeedableRng;
@@ -44,6 +44,7 @@ impl Options {
                 let password_config = PasswordsConfig::extract_or_default(figment)?;
                 let account_config = AccountConfig::extract_or_default(figment)?;
                 let captcha_config = CaptchaConfig::extract_or_default(figment)?;
+                let http_config = HttpConfig::extract_or_default(figment)?;
 
                 let clock = SystemClock::default();
                 // XXX: we should disallow SeedableRng::from_entropy
@@ -57,6 +58,7 @@ impl Options {
                     &password_config,
                     &account_config,
                     &captcha_config,
+                    &http_config,
                 )?;
                 let templates =
                     templates_from_config(&template_config, &site_config, &url_builder).await?;

crates/cli/src/commands/templates.rs

@@ -47,6 +47,7 @@ impl Options {
             &config.passwords,
             &config.account,
             &config.captcha,
+            &config.http,
         )?;
 
         // Load and compile the templates

crates/cli/src/commands/worker.rs

@@ -9,8 +9,8 @@ use std::{sync::Arc, time::Duration};
 use anyhow::Context;
 use mas_config::{
     AccountConfig, BrandingConfig, CaptchaConfig, DatabaseConfig, EmailConfig, EmailSmtpMode,
-    EmailTransportKind, ExperimentalConfig, HomeserverKind, MatrixConfig, PasswordsConfig,
-    PolicyConfig, TemplatesConfig,
+    EmailTransportKind, ExperimentalConfig, HomeserverKind, HttpConfig, MatrixConfig,
+    PasswordsConfig, PolicyConfig, TemplatesConfig,
 };
 use mas_data_model::{SessionExpirationConfig, SiteConfig};
 use mas_email::{MailTransport, Mailer};
@@ -183,6 +183,7 @@ pub fn site_config_from_config(
     password_config: &PasswordsConfig,
     account_config: &AccountConfig,
     captcha_config: &CaptchaConfig,
+    http_config: &HttpConfig,
 ) -> Result<SiteConfig, anyhow::Error> {
     let captcha = captcha_config_from_config(captcha_config)?;
     let session_expiration = experimental_config
@@ -198,6 +199,7 @@ pub fn site_config_from_config(
         access_token_ttl: experimental_config.access_token_ttl,
         compat_token_ttl: experimental_config.compat_token_ttl,
         server_name: matrix_config.homeserver.clone(),
+        public_base: http_config.public_base.clone(),
         policy_uri: branding_config.policy_uri.clone(),
         tos_uri: branding_config.tos_uri.clone(),
         imprint: branding_config.imprint.clone(),

crates/cli/src/util.rs

@@ -49,6 +49,9 @@ pub struct SiteConfig {
     /// The server name, e.g. "matrix.org".
     pub server_name: String,
 
+    /// Public base URL
+    pub public_base: Url,
+
     /// The URL to the privacy policy.
     pub policy_uri: Option<Url>,
 

crates/data-model/src/site_config.rs

@@ -85,6 +85,8 @@ rand.workspace = true
 rand_chacha.workspace = true
 headers.workspace = true
 ulid.workspace = true
+webauthn-rs = { version = "0.5.1", features = ["danger-allow-state-serialisation"]}
+webauthn-rs-proto = "0.5.1"
 
 mas-axum-utils.workspace = true
 mas-config.workspace = true

crates/handlers/Cargo.toml

@@ -512,6 +512,12 @@ impl OwnerId for mas_data_model::UpstreamOAuthLink {
     }
 }
 
+impl OwnerId for mas_data_model::UserPasskey {
+    fn owner_id(&self) -> Option<Ulid> {
+        Some(self.user_id)
+    }
+}
+
 /// A dumb wrapper around a `Ulid` to implement `OwnerId` for it.
 pub struct UserId(Ulid);
 

crates/handlers/src/graphql/mod.rs

@@ -26,7 +26,9 @@ pub use self::{
     oauth::{OAuth2Client, OAuth2Session},
     site_config::{SITE_CONFIG_ID, SiteConfig},
     upstream_oauth::{UpstreamOAuth2Link, UpstreamOAuth2Provider},
-    users::{AppSession, User, UserEmail, UserEmailAuthentication, UserRecoveryTicket},
+    users::{
+        AppSession, User, UserEmail, UserEmailAuthentication, UserPasskey, UserRecoveryTicket,
+    },
     viewer::{Anonymous, Viewer, ViewerSession},
 };
 

crates/handlers/src/graphql/model/mod.rs

@@ -29,6 +29,8 @@ pub enum NodeType {
     UserEmail,
     UserEmailAuthentication,
     UserRecoveryTicket,
+    UserPasskey,
+    UserPasskeyChallenge,
 }
 
 #[derive(Debug, Error)]
@@ -55,6 +57,8 @@ impl NodeType {
             NodeType::UserEmail => "user_email",
             NodeType::UserEmailAuthentication => "user_email_authentication",
             NodeType::UserRecoveryTicket => "user_recovery_ticket",
+            NodeType::UserPasskey => "user_passkey",
+            NodeType::UserPasskeyChallenge => "user_passkey_challenge",
         }
     }
 
@@ -72,6 +76,8 @@ impl NodeType {
             "user_email" => Some(NodeType::UserEmail),
             "user_email_authentication" => Some(NodeType::UserEmailAuthentication),
             "user_recovery_ticket" => Some(NodeType::UserRecoveryTicket),
+            "user_passkey" => Some(NodeType::UserPasskey),
+            "user_passkey_challenge" => Some(NodeType::UserPasskeyChallenge),
             _ => None,
         }
     }