refactor: [#1195] inject dependencies into authenticattion::Facade

The Facade will be replaced by its dependencies.

Author: josecelano

src/app_test.rs

@@ -3,8 +3,10 @@ use std::sync::Arc;
 
 use torrust_tracker_configuration::Configuration;
 
+use crate::core::authentication::handler::KeysHandler;
 use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
 use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+use crate::core::authentication::service;
 use crate::core::databases::Database;
 use crate::core::services::initialize_database;
 use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
@@ -29,11 +31,12 @@ 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 = Arc::new(authentication::Facade::new(
-        &config.core,
+    let authentication_service = Arc::new(service::Service::new(&config.core, &in_memory_key_repository));
+    let keys_handler = Arc::new(KeysHandler::new(
         &db_key_repository.clone(),
         &in_memory_key_repository.clone(),
     ));
+    let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
     (database, in_memory_whitelist, whitelist_authorization, authentication)
 }

src/bootstrap/app.rs

@@ -22,8 +22,10 @@ use tracing::instrument;
 use super::config::initialize_configuration;
 use crate::bootstrap;
 use crate::container::AppContainer;
+use crate::core::authentication::handler::KeysHandler;
 use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
 use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+use crate::core::authentication::service;
 use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
 use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
 use crate::core::{authentication, whitelist};
@@ -93,11 +95,12 @@ 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 = Arc::new(authentication::Facade::new(
-        &configuration.core,
+    let authentication_service = Arc::new(service::Service::new(&configuration.core, &in_memory_key_repository));
+    let keys_handler = Arc::new(KeysHandler::new(
         &db_key_repository.clone(),
         &in_memory_key_repository.clone(),
     ));
+    let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
     let tracker = Arc::new(initialize_tracker(
         configuration,

src/bootstrap/jobs/http_tracker.rs

@@ -100,8 +100,10 @@ mod tests {
 
     use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::http_tracker::start_job;
+    use crate::core::authentication::handler::KeysHandler;
     use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+    use crate::core::authentication::service;
     use crate::core::services::{initialize_database, initialize_tracker, statistics};
     use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::core::{authentication, whitelist};
@@ -127,11 +129,12 @@ mod tests {
         ));
         let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let authentication = Arc::new(authentication::Facade::new(
-            &cfg.core,
+        let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository));
+        let keys_handler = Arc::new(KeysHandler::new(
             &db_key_repository.clone(),
             &in_memory_key_repository.clone(),
         ));
+        let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
         let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization, &authentication));
 

src/bootstrap/jobs/tracker_apis.rs

@@ -149,8 +149,10 @@ mod tests {
 
     use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::tracker_apis::start_job;
+    use crate::core::authentication::handler::KeysHandler;
     use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+    use crate::core::authentication::service;
     use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
     use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::core::{authentication, whitelist};
@@ -180,11 +182,12 @@ 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 = Arc::new(authentication::Facade::new(
-            &cfg.core,
+        let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository));
+        let keys_handler = Arc::new(KeysHandler::new(
             &db_key_repository.clone(),
             &in_memory_key_repository.clone(),
         ));
+        let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
         let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization, &authentication));
 

src/core/authentication/mod.rs

@@ -1,10 +1,7 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use handler::{AddKeyRequest, KeysHandler};
-use key::repository::in_memory::InMemoryKeyRepository;
-use key::repository::persisted::DatabaseKeyRepository;
-use torrust_tracker_configuration::Core;
+use handler::AddKeyRequest;
 use torrust_tracker_primitives::DurationSinceUnixEpoch;
 
 use super::databases::{self};
@@ -21,22 +18,18 @@ pub type Error = key::Error;
 
 pub struct Facade {
     /// The authentication service.
-    authentication_service: service::Service,
+    authentication_service: Arc<service::Service>,
 
     /// The keys handler.
-    keys_handler: handler::KeysHandler,
+    keys_handler: Arc<handler::KeysHandler>,
 }
 
 impl Facade {
     #[must_use]
-    pub fn new(
-        config: &Core,
-        db_key_repository: &Arc<DatabaseKeyRepository>,
-        in_memory_key_repository: &Arc<InMemoryKeyRepository>,
-    ) -> Self {
+    pub fn new(authentication_service: &Arc<service::Service>, keys_handler: &Arc<handler::KeysHandler>) -> Self {
         Self {
-            authentication_service: service::Service::new(config, in_memory_key_repository),
-            keys_handler: KeysHandler::new(&db_key_repository.clone(), &in_memory_key_repository.clone()),
+            authentication_service: authentication_service.clone(),
+            keys_handler: keys_handler.clone(),
         }
     }
 
@@ -153,9 +146,10 @@ mod tests {
         use torrust_tracker_configuration::Configuration;
         use torrust_tracker_test_helpers::configuration;
 
-        use crate::core::authentication;
+        use crate::core::authentication::handler::KeysHandler;
         use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
         use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+        use crate::core::authentication::{self, service};
         use crate::core::services::initialize_database;
 
         fn instantiate_authentication_facade() -> authentication::Facade {
@@ -180,7 +174,13 @@ mod tests {
             let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
             let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
 
-            authentication::Facade::new(&config.core, &db_key_repository.clone(), &in_memory_key_repository.clone())
+            let authentication_service = Arc::new(service::Service::new(&config.core, &in_memory_key_repository));
+            let keys_handler = Arc::new(KeysHandler::new(
+                &db_key_repository.clone(),
+                &in_memory_key_repository.clone(),
+            ));
+
+            authentication::Facade::new(&authentication_service, &keys_handler)
         }
 
         #[tokio::test]

src/servers/apis/server.rs

@@ -342,8 +342,10 @@ mod tests {
 
     use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::make_rust_tls;
+    use crate::core::authentication::handler::KeysHandler;
     use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+    use crate::core::authentication::service;
     use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
     use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::core::{authentication, whitelist};
@@ -373,11 +375,12 @@ 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 = Arc::new(authentication::Facade::new(
-            &cfg.core,
+        let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository));
+        let keys_handler = Arc::new(KeysHandler::new(
             &db_key_repository.clone(),
             &in_memory_key_repository.clone(),
         ));
+        let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
         let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization, &authentication));
 

src/servers/http/server.rs

@@ -246,8 +246,10 @@ mod tests {
 
     use crate::bootstrap::app::initialize_global_services;
     use crate::bootstrap::jobs::make_rust_tls;
+    use crate::core::authentication::handler::KeysHandler;
     use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+    use crate::core::authentication::service;
     use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
     use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::core::{authentication, whitelist};
@@ -272,11 +274,12 @@ 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 = Arc::new(authentication::Facade::new(
-            &cfg.core,
+        let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository));
+        let keys_handler = Arc::new(KeysHandler::new(
             &db_key_repository.clone(),
             &in_memory_key_repository.clone(),
         ));
+        let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
         let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization, &authentication));
 

src/servers/udp/server/mod.rs

@@ -64,8 +64,10 @@ mod tests {
     use super::spawner::Spawner;
     use super::Server;
     use crate::bootstrap::app::initialize_global_services;
+    use crate::core::authentication::handler::KeysHandler;
     use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
+    use crate::core::authentication::service;
     use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
     use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::core::{authentication, whitelist};
@@ -92,11 +94,12 @@ 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 = Arc::new(authentication::Facade::new(
-            &cfg.core,
+        let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository));
+        let keys_handler = Arc::new(KeysHandler::new(
             &db_key_repository.clone(),
             &in_memory_key_repository.clone(),
         ));
+        let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
         let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization, &authentication));
 
@@ -144,11 +147,12 @@ mod tests {
         ));
         let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let authentication = Arc::new(authentication::Facade::new(
-            &cfg.core,
+        let authentication_service = Arc::new(service::Service::new(&cfg.core, &in_memory_key_repository));
+        let keys_handler = Arc::new(KeysHandler::new(
             &db_key_repository.clone(),
             &in_memory_key_repository.clone(),
         ));
+        let authentication = Arc::new(authentication::Facade::new(&authentication_service, &keys_handler));
 
         let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization, &authentication));