From 44512bc61635d38415feb7e0bf0098677a184cf2 Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Mon, 6 May 2024 10:31:38 +0530 Subject: [PATCH] chore: mv src/forge/auth src/auth --- src/{forge => }/auth/adapter/input/mod.rs | 0 .../auth/adapter/input/web/login/adapter.rs | 10 +++++----- .../auth/adapter/input/web/login/handler.rs | 8 ++++---- src/{forge => }/auth/adapter/input/web/login/mod.rs | 0 src/{forge => }/auth/adapter/input/web/login/page.html | 0 .../auth/adapter/input/web/login/template.rs | 6 +++--- src/{forge => }/auth/adapter/input/web/mod.rs | 0 src/{forge => }/auth/adapter/input/web/routes.rs | 2 +- src/{forge => }/auth/adapter/input/web/template.rs | 2 +- src/{forge => }/auth/adapter/mod.rs | 0 src/{forge => }/auth/adapter/out/db/mod.rs | 2 +- src/{forge => }/auth/adapter/out/db/postgres/errors.rs | 2 +- src/{forge => }/auth/adapter/out/db/postgres/mod.rs | 2 +- .../auth/adapter/out/db/postgres/save_oauth_state.rs | 2 +- src/{forge => }/auth/adapter/out/forge/forgejo/mod.rs | 0 .../adapter/out/forge/forgejo/oauth_auth_req_uri.rs | 2 +- src/{forge => }/auth/adapter/out/forge/mod.rs | 2 +- src/{forge => }/auth/adapter/out/mod.rs | 0 .../auth/application/port/input/ui/errors.rs | 2 +- .../auth/application/port/input/ui/login.rs | 0 src/{forge => }/auth/application/port/input/ui/mod.rs | 0 .../auth/application/port/out/db/delete_oauth_state.rs | 0 src/{forge => }/auth/application/port/out/db/errors.rs | 0 .../auth/application/port/out/db/get_state.rs | 0 src/{forge => }/auth/application/port/out/db/mod.rs | 0 .../auth/application/port/out/db/oauth_state_exists.rs | 0 .../auth/application/port/out/db/save_oauth_state.rs | 0 .../auth/application/port/out/forge/errors.rs | 0 src/{forge => }/auth/application/port/out/forge/mod.rs | 0 .../application/port/out/forge/oauth_auth_req_uri.rs | 0 .../services/request_authorization/command.rs | 0 .../services/request_authorization/errors.rs | 4 ++-- .../application/services/request_authorization/mod.rs | 0 .../services/request_authorization/service.rs | 8 ++++---- src/main.rs | 6 +++--- 35 files changed, 30 insertions(+), 30 deletions(-) rename src/{forge => }/auth/adapter/input/mod.rs (100%) rename src/{forge => }/auth/adapter/input/web/login/adapter.rs (80%) rename src/{forge => }/auth/adapter/input/web/login/handler.rs (88%) rename src/{forge => }/auth/adapter/input/web/login/mod.rs (100%) rename src/{forge => }/auth/adapter/input/web/login/page.html (100%) rename src/{forge => }/auth/adapter/input/web/login/template.rs (88%) rename src/{forge => }/auth/adapter/input/web/mod.rs (100%) rename src/{forge => }/auth/adapter/input/web/routes.rs (93%) rename src/{forge => }/auth/adapter/input/web/template.rs (97%) rename src/{forge => }/auth/adapter/mod.rs (100%) rename src/{forge => }/auth/adapter/out/db/mod.rs (87%) rename src/{forge => }/auth/adapter/out/db/postgres/errors.rs (91%) rename src/{forge => }/auth/adapter/out/db/postgres/mod.rs (83%) rename src/{forge => }/auth/adapter/out/db/postgres/save_oauth_state.rs (96%) rename src/{forge => }/auth/adapter/out/forge/forgejo/mod.rs (100%) rename src/{forge => }/auth/adapter/out/forge/forgejo/oauth_auth_req_uri.rs (96%) rename src/{forge => }/auth/adapter/out/forge/mod.rs (96%) rename src/{forge => }/auth/adapter/out/mod.rs (100%) rename src/{forge => }/auth/application/port/input/ui/errors.rs (97%) rename src/{forge => }/auth/application/port/input/ui/login.rs (100%) rename src/{forge => }/auth/application/port/input/ui/mod.rs (100%) rename src/{forge => }/auth/application/port/out/db/delete_oauth_state.rs (100%) rename src/{forge => }/auth/application/port/out/db/errors.rs (100%) rename src/{forge => }/auth/application/port/out/db/get_state.rs (100%) rename src/{forge => }/auth/application/port/out/db/mod.rs (100%) rename src/{forge => }/auth/application/port/out/db/oauth_state_exists.rs (100%) rename src/{forge => }/auth/application/port/out/db/save_oauth_state.rs (100%) rename src/{forge => }/auth/application/port/out/forge/errors.rs (100%) rename src/{forge => }/auth/application/port/out/forge/mod.rs (100%) rename src/{forge => }/auth/application/port/out/forge/oauth_auth_req_uri.rs (100%) rename src/{forge => }/auth/application/services/request_authorization/command.rs (100%) rename src/{forge => }/auth/application/services/request_authorization/errors.rs (82%) rename src/{forge => }/auth/application/services/request_authorization/mod.rs (100%) rename src/{forge => }/auth/application/services/request_authorization/service.rs (91%) diff --git a/src/forge/auth/adapter/input/mod.rs b/src/auth/adapter/input/mod.rs similarity index 100% rename from src/forge/auth/adapter/input/mod.rs rename to src/auth/adapter/input/mod.rs diff --git a/src/forge/auth/adapter/input/web/login/adapter.rs b/src/auth/adapter/input/web/login/adapter.rs similarity index 80% rename from src/forge/auth/adapter/input/web/login/adapter.rs rename to src/auth/adapter/input/web/login/adapter.rs index 2930049..21345c0 100644 --- a/src/forge/auth/adapter/input/web/login/adapter.rs +++ b/src/auth/adapter/input/web/login/adapter.rs @@ -3,16 +3,16 @@ use std::sync::Arc; use actix_web::{http::header, HttpResponse}; use url::Url; -use crate::forge::auth::application::port::input::ui::{ +use crate::auth::application::port::input::ui::{ errors::*, login::RequestAuthorizationInterface, }; -use crate::forge::auth::application::port::out::db::save_oauth_state::SaveOAuthState; -use crate::forge::auth::application::port::out::forge::oauth_auth_req_uri::OAuthAuthReqUri; -use crate::forge::auth::application::services::request_authorization::{ +use crate::auth::application::port::out::db::save_oauth_state::SaveOAuthState; +use crate::auth::application::port::out::forge::oauth_auth_req_uri::OAuthAuthReqUri; +use crate::auth::application::services::request_authorization::{ command::RequestAuthorizationCommand, service::RequestAuthorizationService, RequestAuthorizationUserCase, }; -//use crate::forge::auth::application::services::request_authorization::command::RequestAuthorizationCommand; +//use crate::auth::application::services::request_authorization::command::RequestAuthorizationCommand; pub struct RequestAuthorizationHandler { save_oauth_state_adapter: Arc, diff --git a/src/forge/auth/adapter/input/web/login/handler.rs b/src/auth/adapter/input/web/login/handler.rs similarity index 88% rename from src/forge/auth/adapter/input/web/login/handler.rs rename to src/auth/adapter/input/web/login/handler.rs index ef3e549..1dc094e 100644 --- a/src/forge/auth/adapter/input/web/login/handler.rs +++ b/src/auth/adapter/input/web/login/handler.rs @@ -3,12 +3,12 @@ use std::sync::Arc; use actix_web::{get, http::header, post, web, HttpResponse}; use url::Url; -use crate::forge::auth::adapter::input::web::routes::RoutesRepository; -use crate::forge::auth::adapter::out::forge::SupportedForges; -use crate::forge::auth::application::port::input::ui::{ +use crate::auth::adapter::input::web::routes::RoutesRepository; +use crate::auth::adapter::out::forge::SupportedForges; +use crate::auth::application::port::input::ui::{ errors::*, login::RequestAuthorizationInterface, }; -use crate::forge::auth::application::port::out::db::save_oauth_state::SaveOAuthState; +use crate::auth::application::port::out::db::save_oauth_state::SaveOAuthState; use super::template::{LoginCtxFactory, LoginPageInterface}; use crate::ForgeRepository; diff --git a/src/forge/auth/adapter/input/web/login/mod.rs b/src/auth/adapter/input/web/login/mod.rs similarity index 100% rename from src/forge/auth/adapter/input/web/login/mod.rs rename to src/auth/adapter/input/web/login/mod.rs diff --git a/src/forge/auth/adapter/input/web/login/page.html b/src/auth/adapter/input/web/login/page.html similarity index 100% rename from src/forge/auth/adapter/input/web/login/page.html rename to src/auth/adapter/input/web/login/page.html diff --git a/src/forge/auth/adapter/input/web/login/template.rs b/src/auth/adapter/input/web/login/template.rs similarity index 88% rename from src/forge/auth/adapter/input/web/login/template.rs rename to src/auth/adapter/input/web/login/template.rs index 785a6dd..d94db15 100644 --- a/src/forge/auth/adapter/input/web/login/template.rs +++ b/src/auth/adapter/input/web/login/template.rs @@ -3,10 +3,10 @@ use std::sync::Arc; use actix_web::web; use serde::{Deserialize, Serialize}; -use crate::forge::auth::adapter::input::web::routes::RoutesRepository; -use crate::forge::auth::adapter::out::forge::SupportedForges; +use crate::auth::adapter::input::web::routes::RoutesRepository; +use crate::auth::adapter::out::forge::SupportedForges; -use crate::forge::auth::adapter::input::web::template::{tera_context, TemplateFile, TEMPLATES}; +use crate::auth::adapter::input::web::template::{tera_context, TemplateFile, TEMPLATES}; pub trait LoginPageInterface: Send + Sync { fn get_login_page(&self, ctx: LoginCtx) -> Result>; diff --git a/src/forge/auth/adapter/input/web/mod.rs b/src/auth/adapter/input/web/mod.rs similarity index 100% rename from src/forge/auth/adapter/input/web/mod.rs rename to src/auth/adapter/input/web/mod.rs diff --git a/src/forge/auth/adapter/input/web/routes.rs b/src/auth/adapter/input/web/routes.rs similarity index 93% rename from src/forge/auth/adapter/input/web/routes.rs rename to src/auth/adapter/input/web/routes.rs index bb281e9..9540074 100644 --- a/src/forge/auth/adapter/input/web/routes.rs +++ b/src/auth/adapter/input/web/routes.rs @@ -1,4 +1,4 @@ -use crate::forge::auth::adapter::out::forge::SupportedForges; +use crate::auth::adapter::out::forge::SupportedForges; #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] pub struct RoutesRepository { diff --git a/src/forge/auth/adapter/input/web/template.rs b/src/auth/adapter/input/web/template.rs similarity index 97% rename from src/forge/auth/adapter/input/web/template.rs rename to src/auth/adapter/input/web/template.rs index 313366c..f9a964b 100644 --- a/src/forge/auth/adapter/input/web/template.rs +++ b/src/auth/adapter/input/web/template.rs @@ -48,7 +48,7 @@ lazy_static! { } #[derive(RustEmbed)] -#[folder = "src/forge/auth/adapter/input/web/"] +#[folder = "src/auth/adapter/input/web/"] #[include = "*.html"] #[exclude = "*.rs"] struct Templates; diff --git a/src/forge/auth/adapter/mod.rs b/src/auth/adapter/mod.rs similarity index 100% rename from src/forge/auth/adapter/mod.rs rename to src/auth/adapter/mod.rs diff --git a/src/forge/auth/adapter/out/db/mod.rs b/src/auth/adapter/out/db/mod.rs similarity index 87% rename from src/forge/auth/adapter/out/db/mod.rs rename to src/auth/adapter/out/db/mod.rs index 2105f94..2788cf4 100644 --- a/src/forge/auth/adapter/out/db/mod.rs +++ b/src/auth/adapter/out/db/mod.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use sqlx::PgPool; use crate::db::migrate::RunMigrations; -use crate::forge::auth::application::port::out::db::save_oauth_state::SaveOAuthState; +use crate::auth::application::port::out::db::save_oauth_state::SaveOAuthState; pub mod postgres; diff --git a/src/forge/auth/adapter/out/db/postgres/errors.rs b/src/auth/adapter/out/db/postgres/errors.rs similarity index 91% rename from src/forge/auth/adapter/out/db/postgres/errors.rs rename to src/auth/adapter/out/db/postgres/errors.rs index 32fb7c5..79e71eb 100644 --- a/src/forge/auth/adapter/out/db/postgres/errors.rs +++ b/src/auth/adapter/out/db/postgres/errors.rs @@ -2,7 +2,7 @@ use derive_more::Display; use serde::{Deserialize, Serialize}; use sqlx::Error as SqlxError; -use crate::forge::auth::application::port::out::db::errors::OutDBPortError; +use crate::auth::application::port::out::db::errors::OutDBPortError; impl From for OutDBPortError { fn from(value: SqlxError) -> Self { diff --git a/src/forge/auth/adapter/out/db/postgres/mod.rs b/src/auth/adapter/out/db/postgres/mod.rs similarity index 83% rename from src/forge/auth/adapter/out/db/postgres/mod.rs rename to src/auth/adapter/out/db/postgres/mod.rs index 6460c6e..bdef94d 100644 --- a/src/forge/auth/adapter/out/db/postgres/mod.rs +++ b/src/auth/adapter/out/db/postgres/mod.rs @@ -1,4 +1,4 @@ -//use crate::forge::auth::application::port::out::db::save_oauth_state::SaveOAuthState; +//use crate::auth::application::port::out::db::save_oauth_state::SaveOAuthState; use std::sync::Arc; use sqlx::postgres::PgPool; diff --git a/src/forge/auth/adapter/out/db/postgres/save_oauth_state.rs b/src/auth/adapter/out/db/postgres/save_oauth_state.rs similarity index 96% rename from src/forge/auth/adapter/out/db/postgres/save_oauth_state.rs rename to src/auth/adapter/out/db/postgres/save_oauth_state.rs index a294df3..79778ae 100644 --- a/src/forge/auth/adapter/out/db/postgres/save_oauth_state.rs +++ b/src/auth/adapter/out/db/postgres/save_oauth_state.rs @@ -1,7 +1,7 @@ use url::Url; use super::DBOutPostgresAdapter; -use crate::forge::auth::application::port::out::db::{ +use crate::auth::application::port::out::db::{ errors::OutDBPortResult, save_oauth_state::SaveOAuthState, }; diff --git a/src/forge/auth/adapter/out/forge/forgejo/mod.rs b/src/auth/adapter/out/forge/forgejo/mod.rs similarity index 100% rename from src/forge/auth/adapter/out/forge/forgejo/mod.rs rename to src/auth/adapter/out/forge/forgejo/mod.rs diff --git a/src/forge/auth/adapter/out/forge/forgejo/oauth_auth_req_uri.rs b/src/auth/adapter/out/forge/forgejo/oauth_auth_req_uri.rs similarity index 96% rename from src/forge/auth/adapter/out/forge/forgejo/oauth_auth_req_uri.rs rename to src/auth/adapter/out/forge/forgejo/oauth_auth_req_uri.rs index e5d62e8..cdb3867 100644 --- a/src/forge/auth/adapter/out/forge/forgejo/oauth_auth_req_uri.rs +++ b/src/auth/adapter/out/forge/forgejo/oauth_auth_req_uri.rs @@ -1,7 +1,7 @@ use url::Url; use super::Forgejo; -use crate::forge::auth::application::port::out::forge::{ +use crate::auth::application::port::out::forge::{ errors::OutForgePortResult, oauth_auth_req_uri::OAuthAuthReqUri, }; diff --git a/src/forge/auth/adapter/out/forge/mod.rs b/src/auth/adapter/out/forge/mod.rs similarity index 96% rename from src/forge/auth/adapter/out/forge/mod.rs rename to src/auth/adapter/out/forge/mod.rs index 042d501..d6452cc 100644 --- a/src/forge/auth/adapter/out/forge/mod.rs +++ b/src/auth/adapter/out/forge/mod.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use derive_more::Display; use serde::{Deserialize, Serialize}; -use crate::forge::auth::application::port::out::forge::oauth_auth_req_uri::OAuthAuthReqUri; +use crate::auth::application::port::out::forge::oauth_auth_req_uri::OAuthAuthReqUri; use self::forgejo::Forgejo; diff --git a/src/forge/auth/adapter/out/mod.rs b/src/auth/adapter/out/mod.rs similarity index 100% rename from src/forge/auth/adapter/out/mod.rs rename to src/auth/adapter/out/mod.rs diff --git a/src/forge/auth/application/port/input/ui/errors.rs b/src/auth/application/port/input/ui/errors.rs similarity index 97% rename from src/forge/auth/application/port/input/ui/errors.rs rename to src/auth/application/port/input/ui/errors.rs index 48bcf0c..1cd373a 100644 --- a/src/forge/auth/application/port/input/ui/errors.rs +++ b/src/auth/application/port/input/ui/errors.rs @@ -5,7 +5,7 @@ use actix_web::{ use derive_more::Display; use serde::{Deserialize, Serialize}; -use crate::forge::auth::application::services::{ +use crate::auth::application::services::{ process_authorization_response::errors::ProcessAuthorizationServiceError, request_authorization::errors::RequestAuthorizationServiceError, }; diff --git a/src/forge/auth/application/port/input/ui/login.rs b/src/auth/application/port/input/ui/login.rs similarity index 100% rename from src/forge/auth/application/port/input/ui/login.rs rename to src/auth/application/port/input/ui/login.rs diff --git a/src/forge/auth/application/port/input/ui/mod.rs b/src/auth/application/port/input/ui/mod.rs similarity index 100% rename from src/forge/auth/application/port/input/ui/mod.rs rename to src/auth/application/port/input/ui/mod.rs diff --git a/src/forge/auth/application/port/out/db/delete_oauth_state.rs b/src/auth/application/port/out/db/delete_oauth_state.rs similarity index 100% rename from src/forge/auth/application/port/out/db/delete_oauth_state.rs rename to src/auth/application/port/out/db/delete_oauth_state.rs diff --git a/src/forge/auth/application/port/out/db/errors.rs b/src/auth/application/port/out/db/errors.rs similarity index 100% rename from src/forge/auth/application/port/out/db/errors.rs rename to src/auth/application/port/out/db/errors.rs diff --git a/src/forge/auth/application/port/out/db/get_state.rs b/src/auth/application/port/out/db/get_state.rs similarity index 100% rename from src/forge/auth/application/port/out/db/get_state.rs rename to src/auth/application/port/out/db/get_state.rs diff --git a/src/forge/auth/application/port/out/db/mod.rs b/src/auth/application/port/out/db/mod.rs similarity index 100% rename from src/forge/auth/application/port/out/db/mod.rs rename to src/auth/application/port/out/db/mod.rs diff --git a/src/forge/auth/application/port/out/db/oauth_state_exists.rs b/src/auth/application/port/out/db/oauth_state_exists.rs similarity index 100% rename from src/forge/auth/application/port/out/db/oauth_state_exists.rs rename to src/auth/application/port/out/db/oauth_state_exists.rs diff --git a/src/forge/auth/application/port/out/db/save_oauth_state.rs b/src/auth/application/port/out/db/save_oauth_state.rs similarity index 100% rename from src/forge/auth/application/port/out/db/save_oauth_state.rs rename to src/auth/application/port/out/db/save_oauth_state.rs diff --git a/src/forge/auth/application/port/out/forge/errors.rs b/src/auth/application/port/out/forge/errors.rs similarity index 100% rename from src/forge/auth/application/port/out/forge/errors.rs rename to src/auth/application/port/out/forge/errors.rs diff --git a/src/forge/auth/application/port/out/forge/mod.rs b/src/auth/application/port/out/forge/mod.rs similarity index 100% rename from src/forge/auth/application/port/out/forge/mod.rs rename to src/auth/application/port/out/forge/mod.rs diff --git a/src/forge/auth/application/port/out/forge/oauth_auth_req_uri.rs b/src/auth/application/port/out/forge/oauth_auth_req_uri.rs similarity index 100% rename from src/forge/auth/application/port/out/forge/oauth_auth_req_uri.rs rename to src/auth/application/port/out/forge/oauth_auth_req_uri.rs diff --git a/src/forge/auth/application/services/request_authorization/command.rs b/src/auth/application/services/request_authorization/command.rs similarity index 100% rename from src/forge/auth/application/services/request_authorization/command.rs rename to src/auth/application/services/request_authorization/command.rs diff --git a/src/forge/auth/application/services/request_authorization/errors.rs b/src/auth/application/services/request_authorization/errors.rs similarity index 82% rename from src/forge/auth/application/services/request_authorization/errors.rs rename to src/auth/application/services/request_authorization/errors.rs index 76d4162..ea2690d 100644 --- a/src/forge/auth/application/services/request_authorization/errors.rs +++ b/src/auth/application/services/request_authorization/errors.rs @@ -1,8 +1,8 @@ use derive_more::Display; use serde::{Deserialize, Serialize}; -use crate::forge::auth::application::port::out::db::errors::OutDBPortError; -use crate::forge::auth::application::port::out::forge::errors::OutForgePortError; +use crate::auth::application::port::out::db::errors::OutDBPortError; +use crate::auth::application::port::out::forge::errors::OutForgePortError; pub type RequestAuthorizationServiceResult = Result; diff --git a/src/forge/auth/application/services/request_authorization/mod.rs b/src/auth/application/services/request_authorization/mod.rs similarity index 100% rename from src/forge/auth/application/services/request_authorization/mod.rs rename to src/auth/application/services/request_authorization/mod.rs diff --git a/src/forge/auth/application/services/request_authorization/service.rs b/src/auth/application/services/request_authorization/service.rs similarity index 91% rename from src/forge/auth/application/services/request_authorization/service.rs rename to src/auth/application/services/request_authorization/service.rs index 473293b..8a04587 100644 --- a/src/forge/auth/application/services/request_authorization/service.rs +++ b/src/auth/application/services/request_authorization/service.rs @@ -2,9 +2,9 @@ use std::sync::Arc; use url::Url; -use crate::forge::auth::application::port::out::db::errors::OutDBPortError; -use crate::forge::auth::application::port::out::db::save_oauth_state::SaveOAuthState; -use crate::forge::auth::application::port::out::forge::oauth_auth_req_uri::OAuthAuthReqUri; +use crate::auth::application::port::out::db::errors::OutDBPortError; +use crate::auth::application::port::out::db::save_oauth_state::SaveOAuthState; +use crate::auth::application::port::out::forge::oauth_auth_req_uri::OAuthAuthReqUri; use crate::utils; use super::{errors::*, RequestAuthorizationUserCase}; @@ -68,7 +68,7 @@ impl RequestAuthorizationUserCase for RequestAuthorizationService { mod tests { use std::sync::Arc; - use crate::forge::auth::application::{ + use crate::auth::application::{ port::out::{db::tests::MockDB, forge::tests::MockForge}, services::request_authorization::command::RequestAuthorizationCommand, }; diff --git a/src/main.rs b/src/main.rs index 0283d94..257089a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,11 +4,11 @@ use actix_web::{middleware, App, HttpServer}; use db::migrate::RunMigrations; mod db; -mod forge; +mod auth; mod settings; mod utils; -pub use crate::forge::auth::adapter::out::{ +pub use crate::auth::adapter::out::{ db::DBAdapter, forge::{forgejo::Forgejo, ForgeRepository}, }; @@ -39,7 +39,7 @@ async fn main() { .wrap( middleware::DefaultHeaders::new().add(("Permissions-Policy", "interest-cohort=()")), ) - .configure(forge::auth::adapter::load_adapters( + .configure(auth::adapter::load_adapters( db.pool.clone(), &settings, ))