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

Merge the mas_graphql crate into the mas_handlers crate (#2783)

Browse Source
This commit is contained in:
reivilibre
2024-05-17 17:22:34 +01:00
committed by GitHub
parent 37a10aea96
commit 206d45bb31
35 changed files with 199 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cli/src/app_state.rs
View File

@@ -22,7 +22,7 @@ use ipnetwork::IpNetwork;
use mas_data_model::SiteConfig;
use mas_handlers::{
passwords::PasswordManager, ActivityTracker, BoundActivityTracker, CookieManager, ErrorWrapper,
HttpClientFactory, MetadataCache,
GraphQLSchema, HttpClientFactory, MetadataCache,
};
use mas_i18n::Translator;
use mas_keystore::{Encrypter, Keystore};
@@ -50,7 +50,7 @@ pub struct AppState {
pub url_builder: UrlBuilder,
pub homeserver_connection: SynapseConnection,
pub policy_factory: Arc<PolicyFactory>,
pub graphql_schema: mas_graphql::Schema,
pub graphql_schema: GraphQLSchema,
pub http_client_factory: HttpClientFactory,
pub password_manager: PasswordManager,
pub metadata_cache: MetadataCache,
@@ -144,7 +144,7 @@ impl FromRef<AppState> for PgPool {
}
}
impl FromRef<AppState> for mas_graphql::Schema {
impl FromRef<AppState> for GraphQLSchema {
fn from_ref(input: &AppState) -> Self {
input.graphql_schema.clone()
}