1
0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-07 17:03:01 +03:00

Finish moving the site config

This commit is contained in:
Quentin Gliech
2024-03-29 13:19:17 +01:00
parent f0899f17bd
commit aa2e2229bc
10 changed files with 36 additions and 25 deletions

View File

@@ -19,9 +19,10 @@ use axum::{
extract::{FromRef, FromRequestParts},
};
use ipnetwork::IpNetwork;
use mas_data_model::SiteConfig;
use mas_handlers::{
passwords::PasswordManager, ActivityTracker, BoundActivityTracker, CookieManager, ErrorWrapper,
HttpClientFactory, MetadataCache, SiteConfig,
HttpClientFactory, MetadataCache,
};
use mas_i18n::Translator;
use mas_keystore::{Encrypter, Keystore};

View File

@@ -19,11 +19,12 @@ use mas_config::{
BrandingConfig, DatabaseConfig, EmailConfig, EmailSmtpMode, EmailTransportKind,
ExperimentalConfig, MatrixConfig, PasswordsConfig, PolicyConfig, TemplatesConfig,
};
use mas_data_model::SiteConfig;
use mas_email::{MailTransport, Mailer};
use mas_handlers::{passwords::PasswordManager, ActivityTracker, SiteConfig, SiteConfigExt};
use mas_handlers::{passwords::PasswordManager, ActivityTracker};
use mas_policy::PolicyFactory;
use mas_router::UrlBuilder;
use mas_templates::{TemplateLoadingError, Templates};
use mas_templates::{SiteConfigExt, TemplateLoadingError, Templates};
use sqlx::{
postgres::{PgConnectOptions, PgPoolOptions},
ConnectOptions, PgConnection, PgPool,