From 457d01b36b6bda0e8e8099a861a79bfaa883a2c1 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 22 Jan 2025 09:59:57 +0000 Subject: [PATCH] refactor: [#1195] rename service to AuthenticationService --- src/app_test.rs | 2 +- src/bootstrap/app.rs | 5 ++++- src/bootstrap/jobs/http_tracker.rs | 2 +- src/bootstrap/jobs/tracker_apis.rs | 2 +- src/core/authentication/mod.rs | 6 +++--- src/core/authentication/service.rs | 10 +++++----- src/servers/apis/server.rs | 2 +- src/servers/http/server.rs | 2 +- src/servers/udp/server/mod.rs | 4 ++-- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/app_test.rs b/src/app_test.rs index 6aa318e9..461a1875 100644 --- a/src/app_test.rs +++ b/src/app_test.rs @@ -31,7 +31,7 @@ pub fn initialize_tracker_dependencies( )); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&config.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&config.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), diff --git a/src/bootstrap/app.rs b/src/bootstrap/app.rs index 59b484cc..5c2d47c4 100644 --- a/src/bootstrap/app.rs +++ b/src/bootstrap/app.rs @@ -95,7 +95,10 @@ pub fn initialize_app_container(configuration: &Configuration) -> AppContainer { let whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone()); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&configuration.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new( + &configuration.core, + &in_memory_key_repository, + )); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), diff --git a/src/bootstrap/jobs/http_tracker.rs b/src/bootstrap/jobs/http_tracker.rs index a6868622..a26906fa 100644 --- a/src/bootstrap/jobs/http_tracker.rs +++ b/src/bootstrap/jobs/http_tracker.rs @@ -129,7 +129,7 @@ mod tests { )); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), diff --git a/src/bootstrap/jobs/tracker_apis.rs b/src/bootstrap/jobs/tracker_apis.rs index 9ddd095c..dfc5b108 100644 --- a/src/bootstrap/jobs/tracker_apis.rs +++ b/src/bootstrap/jobs/tracker_apis.rs @@ -182,7 +182,7 @@ mod tests { let whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone()); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), diff --git a/src/core/authentication/mod.rs b/src/core/authentication/mod.rs index 9ac3638f..ebc7b1fe 100644 --- a/src/core/authentication/mod.rs +++ b/src/core/authentication/mod.rs @@ -18,7 +18,7 @@ pub type Error = key::Error; pub struct Facade { /// The authentication service. - authentication_service: Arc, + authentication_service: Arc, /// The keys handler. keys_handler: Arc, @@ -26,7 +26,7 @@ pub struct Facade { impl Facade { #[must_use] - pub fn new(authentication_service: &Arc, keys_handler: &Arc) -> Self { + pub fn new(authentication_service: &Arc, keys_handler: &Arc) -> Self { Self { authentication_service: authentication_service.clone(), keys_handler: keys_handler.clone(), @@ -174,7 +174,7 @@ mod tests { let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&config.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&config.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), diff --git a/src/core/authentication/service.rs b/src/core/authentication/service.rs index d7572136..d100e3a7 100644 --- a/src/core/authentication/service.rs +++ b/src/core/authentication/service.rs @@ -7,7 +7,7 @@ use super::key::repository::in_memory::InMemoryKeyRepository; use super::{key, Error, Key}; #[derive(Debug)] -pub struct Service { +pub struct AuthenticationService { /// The tracker configuration. config: Core, @@ -15,7 +15,7 @@ pub struct Service { in_memory_key_repository: Arc, } -impl Service { +impl AuthenticationService { #[must_use] pub fn new(config: &Core, in_memory_key_repository: &Arc) -> Self { Self { @@ -81,14 +81,14 @@ mod tests { use crate::core::authentication; use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository; - use crate::core::authentication::service::Service; + use crate::core::authentication::service::AuthenticationService; - fn instantiate_authentication() -> Service { + fn instantiate_authentication() -> AuthenticationService { let config = configuration::ephemeral_private(); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - Service::new(&config.core, &in_memory_key_repository.clone()) + AuthenticationService::new(&config.core, &in_memory_key_repository.clone()) } #[tokio::test] diff --git a/src/servers/apis/server.rs b/src/servers/apis/server.rs index 956d5479..de7845eb 100644 --- a/src/servers/apis/server.rs +++ b/src/servers/apis/server.rs @@ -375,7 +375,7 @@ mod tests { let whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone()); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), diff --git a/src/servers/http/server.rs b/src/servers/http/server.rs index 751ac5d5..ef13a353 100644 --- a/src/servers/http/server.rs +++ b/src/servers/http/server.rs @@ -274,7 +274,7 @@ mod tests { let _whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone()); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), diff --git a/src/servers/udp/server/mod.rs b/src/servers/udp/server/mod.rs index cebeb9b0..9658b1bc 100644 --- a/src/servers/udp/server/mod.rs +++ b/src/servers/udp/server/mod.rs @@ -94,7 +94,7 @@ mod tests { let _whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone()); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(), @@ -147,7 +147,7 @@ mod tests { )); let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database)); let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default()); - let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository)); + let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository)); let keys_handler = Arc::new(KeysHandler::new( &db_key_repository.clone(), &in_memory_key_repository.clone(),