server: extract graphql crate

Cargo.lock

@@ -2544,6 +2544,7 @@ dependencies = [
  "lldap_domain_handlers",
  "lldap_domain_model",
  "lldap_frontend_options",
+ "lldap_graphql_server",
  "lldap_ldap",
  "lldap_opaque_handler",
  "lldap_sql_backend_handler",
@@ -2712,6 +2713,32 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "lldap_graphql_server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "juniper",
+ "lldap_access_control",
+ "lldap_auth",
+ "lldap_domain",
+ "lldap_domain_handlers",
+ "lldap_domain_model",
+ "lldap_ldap",
+ "lldap_sql_backend_handler",
+ "lldap_test_utils",
+ "lldap_validation",
+ "mockall",
+ "pretty_assertions",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "urlencoding",
+ "uuid 1.11.0",
+]
+
 [[package]]
 name = "lldap_ldap"
 version = "0.1.0"

crates/graphql-server/Cargo.toml

@@ -0,0 +1,75 @@
+[package]
+name = "lldap_graphql_server"
+version = "0.1.0"
+description = "GraphQL server for LLDAP"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[dependencies]
+anyhow = "*"
+juniper = "0.15"
+serde_json = "1"
+tracing = "*"
+urlencoding = "2"
+
+[dependencies.chrono]
+features = ["serde"]
+version = "*"
+
+[dependencies.lldap_access_control]
+path = "../access-control"
+
+[dependencies.lldap_auth]
+path = "../auth"
+features = ["opaque_server", "opaque_client", "sea_orm"]
+
+[dependencies.lldap_domain]
+path = "../domain"
+
+[dependencies.lldap_domain_model]
+path = "../domain-model"
+
+[dependencies.lldap_domain_handlers]
+path = "../domain-handlers"
+
+[dependencies.lldap_ldap]
+path = "../ldap"
+
+[dependencies.lldap_sql_backend_handler]
+path = "../sql-backend-handler"
+
+[dependencies.lldap_validation]
+path = "../validation"
+
+[dependencies.serde]
+workspace = true
+
+[dependencies.uuid]
+features = ["v1", "v3"]
+version = "1"
+
+[dev-dependencies]
+mockall = "0.11.4"
+pretty_assertions = "1"
+
+#[dev-dependencies.lldap_auth]
+#path = "../auth"
+#features = ["test"]
+#
+#[dev-dependencies.lldap_opaque_handler]
+#path = "../opaque-handler"
+#features = ["test"]
+
+[dev-dependencies.lldap_test_utils]
+path = "../test-utils"
+#
+#[dev-dependencies.lldap_sql_backend_handler]
+#path = "../sql-backend-handler"
+#features = ["test"]
+
+[dev-dependencies.tokio]
+features = ["full"]
+version = "1.25"

crates/graphql-server/src/api.rs

@@ -0,0 +1,91 @@
+use crate::{mutation::Mutation, query::Query};
+use juniper::{EmptySubscription, FieldError, RootNode};
+use lldap_access_control::{
+    AccessControlledBackendHandler, AdminBackendHandler, ReadonlyBackendHandler,
+    UserReadableBackendHandler, UserWriteableBackendHandler,
+};
+use lldap_auth::{access_control::ValidationResults, types::UserId};
+use lldap_domain_handlers::handler::BackendHandler;
+use tracing::debug;
+
+pub struct Context<Handler: BackendHandler> {
+    pub handler: AccessControlledBackendHandler<Handler>,
+    pub validation_result: ValidationResults,
+}
+
+pub fn field_error_callback<'a>(
+    span: &'a tracing::Span,
+    error_message: &'a str,
+) -> impl 'a + FnOnce() -> FieldError {
+    move || {
+        span.in_scope(|| debug!("Unauthorized"));
+        FieldError::from(error_message)
+    }
+}
+
+impl<Handler: BackendHandler> Context<Handler> {
+    #[cfg(test)]
+    pub fn new_for_tests(handler: Handler, validation_result: ValidationResults) -> Self {
+        Self {
+            handler: AccessControlledBackendHandler::new(handler),
+            validation_result,
+        }
+    }
+
+    pub fn get_admin_handler(&self) -> Option<&(impl AdminBackendHandler + use<Handler>)> {
+        self.handler.get_admin_handler(&self.validation_result)
+    }
+
+    pub fn get_readonly_handler(&self) -> Option<&(impl ReadonlyBackendHandler + use<Handler>)> {
+        self.handler.get_readonly_handler(&self.validation_result)
+    }
+
+    pub fn get_writeable_handler(
+        &self,
+        user_id: &UserId,
+    ) -> Option<&(impl UserWriteableBackendHandler + use<Handler>)> {
+        self.handler
+            .get_writeable_handler(&self.validation_result, user_id)
+    }
+
+    pub fn get_readable_handler(
+        &self,
+        user_id: &UserId,
+    ) -> Option<&(impl UserReadableBackendHandler + use<Handler>)> {
+        self.handler
+            .get_readable_handler(&self.validation_result, user_id)
+    }
+}
+
+impl<Handler: BackendHandler> juniper::Context for Context<Handler> {}
+
+type Schema<Handler> =
+    RootNode<'static, Query<Handler>, Mutation<Handler>, EmptySubscription<Context<Handler>>>;
+
+pub fn schema<Handler: BackendHandler>() -> Schema<Handler> {
+    Schema::new(
+        Query::<Handler>::new(),
+        Mutation::<Handler>::new(),
+        EmptySubscription::<Context<Handler>>::new(),
+    )
+}
+
+pub fn export_schema(output_file: Option<String>) -> anyhow::Result<()> {
+    use anyhow::Context;
+    use lldap_sql_backend_handler::SqlBackendHandler;
+    let output = schema::<SqlBackendHandler>().as_schema_language();
+    match output_file {
+        None => println!("{}", output),
+        Some(path) => {
+            use std::fs::File;
+            use std::io::prelude::*;
+            use std::path::Path;
+            let path = Path::new(&path);
+            let mut file =
+                File::create(path).context(format!("unable to open '{}'", path.display()))?;
+            file.write_all(output.as_bytes())
+                .context(format!("unable to write in '{}'", path.display()))?;
+        }
+    }
+    Ok(())
+}

crates/graphql-server/src/mutation.rs

@@ -1,4 +1,4 @@
-use crate::infra::graphql::api::{Context, field_error_callback};
+use crate::api::{Context, field_error_callback};
 use anyhow::{Context as AnyhowContext, anyhow};
 use juniper::{FieldError, FieldResult, GraphQLInputObject, GraphQLObject, graphql_object};
 use lldap_access_control::{
@@ -29,6 +29,12 @@ pub struct Mutation<Handler: BackendHandler> {
     _phantom: std::marker::PhantomData<Box<Handler>>,
 }
 
+impl<Handler: BackendHandler> Default for Mutation<Handler> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl<Handler: BackendHandler> Mutation<Handler> {
     pub fn new() -> Self {
         Self {
@@ -778,7 +784,7 @@ fn deserialize_attribute(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::infra::graphql::query::Query;
+    use crate::query::Query;
     use juniper::{
         DefaultScalarValue, EmptySubscription, GraphQLType, InputValue, RootNode, Variables,
         execute, graphql_value,

crates/graphql-server/src/query.rs

@@ -1,4 +1,4 @@
-use crate::infra::graphql::api::{Context, field_error_callback};
+use crate::api::{Context, field_error_callback};
 use anyhow::Context as AnyhowContext;
 use chrono::TimeZone;
 use juniper::{FieldResult, GraphQLInputObject, graphql_object};
@@ -110,6 +110,12 @@ pub struct Query<Handler: BackendHandler> {
     _phantom: std::marker::PhantomData<Box<Handler>>,
 }
 
+impl<Handler: BackendHandler> Default for Query<Handler> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl<Handler: BackendHandler> Query<Handler> {
     pub fn new() -> Self {
         Self {

server/Cargo.toml

@@ -98,6 +98,9 @@ path = "../crates/domain-handlers"
 [dependencies.lldap_frontend_options]
 path = "../crates/frontend-options"
 
+[dependencies.lldap_graphql_server]
+path = "../crates/graphql-server"
+
 [dependencies.lldap_ldap]
 path = "../crates/ldap"
 

server/src/infra/graphql_server.rs

@@ -1,109 +1,18 @@
-use crate::infra::{
-    auth_service::check_if_token_is_valid,
-    cli::ExportGraphQLSchemaOpts,
-    graphql::{mutation::Mutation, query::Query},
-    tcp_server::AppState,
-};
+use crate::infra::{auth_service::check_if_token_is_valid, tcp_server::AppState};
 use actix_web::FromRequest;
 use actix_web::HttpMessage;
 use actix_web::{Error, HttpRequest, HttpResponse, error::JsonPayloadError, web};
 use actix_web_httpauth::extractors::bearer::BearerAuth;
 use juniper::{
-    EmptySubscription, FieldError, RootNode, ScalarValue,
+    ScalarValue,
     http::{
         GraphQLBatchRequest, GraphQLRequest, graphiql::graphiql_source,
         playground::playground_source,
     },
 };
-use lldap_access_control::{
-    AccessControlledBackendHandler, AdminBackendHandler, ReadonlyBackendHandler,
-    UserReadableBackendHandler, UserWriteableBackendHandler,
-};
-use lldap_auth::{access_control::ValidationResults, types::UserId};
 use lldap_domain_handlers::handler::BackendHandler;
-use tracing::debug;
-
-pub struct Context<Handler: BackendHandler> {
-    pub handler: AccessControlledBackendHandler<Handler>,
-    pub validation_result: ValidationResults,
-}
-
-pub fn field_error_callback<'a>(
-    span: &'a tracing::Span,
-    error_message: &'a str,
-) -> impl 'a + FnOnce() -> FieldError {
-    move || {
-        span.in_scope(|| debug!("Unauthorized"));
-        FieldError::from(error_message)
-    }
-}
-
-impl<Handler: BackendHandler> Context<Handler> {
-    #[cfg(test)]
-    pub fn new_for_tests(handler: Handler, validation_result: ValidationResults) -> Self {
-        Self {
-            handler: AccessControlledBackendHandler::new(handler),
-            validation_result,
-        }
-    }
-
-    pub fn get_admin_handler(&self) -> Option<&(impl AdminBackendHandler + use<Handler>)> {
-        self.handler.get_admin_handler(&self.validation_result)
-    }
-
-    pub fn get_readonly_handler(&self) -> Option<&(impl ReadonlyBackendHandler + use<Handler>)> {
-        self.handler.get_readonly_handler(&self.validation_result)
-    }
-
-    pub fn get_writeable_handler(
-        &self,
-        user_id: &UserId,
-    ) -> Option<&(impl UserWriteableBackendHandler + use<Handler>)> {
-        self.handler
-            .get_writeable_handler(&self.validation_result, user_id)
-    }
-
-    pub fn get_readable_handler(
-        &self,
-        user_id: &UserId,
-    ) -> Option<&(impl UserReadableBackendHandler + use<Handler>)> {
-        self.handler
-            .get_readable_handler(&self.validation_result, user_id)
-    }
-}
-
-impl<Handler: BackendHandler> juniper::Context for Context<Handler> {}
-
-type Schema<Handler> =
-    RootNode<'static, Query<Handler>, Mutation<Handler>, EmptySubscription<Context<Handler>>>;
-
-fn schema<Handler: BackendHandler>() -> Schema<Handler> {
-    Schema::new(
-        Query::<Handler>::new(),
-        Mutation::<Handler>::new(),
-        EmptySubscription::<Context<Handler>>::new(),
-    )
-}
-
-pub fn export_schema(opts: ExportGraphQLSchemaOpts) -> anyhow::Result<()> {
-    use anyhow::Context;
-    use lldap_sql_backend_handler::SqlBackendHandler;
-    let output = schema::<SqlBackendHandler>().as_schema_language();
-    match opts.output_file {
-        None => println!("{}", output),
-        Some(path) => {
-            use std::fs::File;
-            use std::io::prelude::*;
-            use std::path::Path;
-            let path = Path::new(&path);
-            let mut file =
-                File::create(path).context(format!("unable to open '{}'", path.display()))?;
-            file.write_all(output.as_bytes())
-                .context(format!("unable to write in '{}'", path.display()))?;
-        }
-    }
-    Ok(())
-}
+use lldap_graphql_server::api::Context;
+use lldap_graphql_server::api::schema;
 
 async fn graphiql_route() -> Result<HttpResponse, Error> {
     let html = graphiql_source("/api/graphql", None);

server/src/infra/mod.rs

@@ -3,7 +3,7 @@ pub mod cli;
 pub mod configuration;
 pub mod database_string;
 pub mod db_cleaner;
-pub mod graphql;
+pub mod graphql_server;
 pub mod healthcheck;
 pub mod jwt_sql_tables;
 pub mod ldap_server;

server/src/infra/tcp_server.rs

@@ -145,7 +145,7 @@ fn http_config<Backend>(
     .service(
         web::scope("/api")
             .wrap(auth_service::CookieToHeaderTranslatorFactory)
-            .configure(super::graphql::api::configure_endpoint::<Backend>),
+            .configure(crate::infra::graphql_server::configure_endpoint::<Backend>),
     )
     .service(
         web::resource("/pkg/lldap_app_bg.wasm.gz")

server/src/main.rs

@@ -274,7 +274,9 @@ async fn create_schema_command(opts: RunOpts) -> Result<()> {
 async fn main() -> Result<()> {
     let cli_opts = infra::cli::init();
     match cli_opts.command {
-        Command::ExportGraphQLSchema(opts) => infra::graphql::api::export_schema(opts),
+        Command::ExportGraphQLSchema(opts) => {
+            lldap_graphql_server::api::export_schema(opts.output_file)
+        }
         Command::Run(opts) => run_server_command(opts).await,
         Command::HealthCheck(opts) => run_healthcheck(opts).await,
         Command::SendTestEmail(opts) => send_test_email_command(opts).await,