matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-09 04:22:45 +03:00
Code Activity

Move the account-related options out of experimental

Browse Source
This commit is contained in:
Quentin Gliech
2024-07-31 16:05:53 +02:00
parent cb8bfa466b
commit 8b3451d66f
8 changed files with 163 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/cli/src/commands/server.rs
View File

@@ -145,6 +145,7 @@ impl Options {
&config.matrix,
&config.experimental,
&config.passwords,
&config.account,
&config.captcha,
)?;

6
crates/cli/src/commands/templates.rs
View File

@@ -17,8 +17,8 @@ use std::process::ExitCode;
use clap::Parser;
use figment::Figment;
use mas_config::{
BrandingConfig, CaptchaConfig, ConfigurationSection, ExperimentalConfig, MatrixConfig,
PasswordsConfig, TemplatesConfig,
AccountConfig, BrandingConfig, CaptchaConfig, ConfigurationSection, ExperimentalConfig,
MatrixConfig, PasswordsConfig, TemplatesConfig,
};
use mas_storage::{Clock, SystemClock};
use rand::SeedableRng;
@@ -50,6 +50,7 @@ impl Options {
let matrix_config = MatrixConfig::extract(figment)?;
let experimental_config = ExperimentalConfig::extract(figment)?;
let password_config = PasswordsConfig::extract(figment)?;
let account_config = AccountConfig::extract(figment)?;
let captcha_config = CaptchaConfig::extract(figment)?;
let clock = SystemClock::default();
@@ -62,6 +63,7 @@ impl Options {
&matrix_config,
&experimental_config,
&password_config,
&account_config,
&captcha_config,
)?;
let templates =

1
crates/cli/src/commands/worker.rs
View File

@@ -54,6 +54,7 @@ impl Options {
&config.matrix,
&config.experimental,
&config.passwords,
&config.account,
&config.captcha,
)?;

16
crates/cli/src/util.rs
View File

@@ -16,8 +16,9 @@ use std::time::Duration;
use anyhow::Context;
use mas_config::{
BrandingConfig, CaptchaConfig, DatabaseConfig, EmailConfig, EmailSmtpMode, EmailTransportKind,
ExperimentalConfig, MatrixConfig, PasswordsConfig, PolicyConfig, TemplatesConfig,
AccountConfig, BrandingConfig, CaptchaConfig, DatabaseConfig, EmailConfig, EmailSmtpMode,
EmailTransportKind, ExperimentalConfig, MatrixConfig, PasswordsConfig, PolicyConfig,
TemplatesConfig,
};
use mas_data_model::SiteConfig;
use mas_email::{MailTransport, Mailer};
@@ -152,6 +153,7 @@ pub fn site_config_from_config(
matrix_config: &MatrixConfig,
experimental_config: &ExperimentalConfig,
password_config: &PasswordsConfig,
account_config: &AccountConfig,
captcha_config: &CaptchaConfig,
) -> Result<SiteConfig, anyhow::Error> {
let captcha = captcha_config_from_config(captcha_config)?;
@@ -164,13 +166,13 @@ pub fn site_config_from_config(
imprint: branding_config.imprint.clone(),
password_login_enabled: password_config.enabled(),
password_registration_enabled: password_config.enabled()
&& experimental_config.password_registration_enabled,
email_change_allowed: experimental_config.email_change_allowed,
displayname_change_allowed: experimental_config.displayname_change_allowed,
&& account_config.password_registration_enabled,
email_change_allowed: account_config.email_change_allowed,
displayname_change_allowed: account_config.displayname_change_allowed,
password_change_allowed: password_config.enabled()
&& experimental_config.password_change_allowed,
&& account_config.password_change_allowed,
account_recovery_allowed: password_config.enabled()
&& experimental_config.account_recovery_enabled,
&& account_config.password_recovery_enabled,
captcha,
minimum_password_complexity: password_config.minimum_complexity(),
})