chore: mv src/forge/auth src/auth

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<dyn SaveOAuthState>,

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;

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<String, Box<dyn std::error::Error>>;

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 {

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;

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;
 

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<SqlxError> for OutDBPortError {
     fn from(value: SqlxError) -> Self {

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;

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,
 };
 

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,
 };
 

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;
 

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,
 };

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<V> = Result<V, RequestAuthorizationServiceError>;
 

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,
     };

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,
             ))