clean up user exporting and fix utoipa

I had broken the user login part of rapidoc a while back. This fixes it

Author: calebbourg

domain/src/lib.rs

@@ -9,8 +9,7 @@ pub use entity_api::{
     query::{IntoQueryFilterMap, QueryFilterMap},
 };
 
-// Re-exports from `entity`
-pub use entity_api::user::{AuthSession, Backend, Credentials};
+// Re-exports from `entity` crate
 pub use entity_api::{
     actions, agreements, coachees, coaches, coaching_relationships, coaching_sessions, jwts, notes,
     organizations, overarching_goals, users, Id,

domain/src/user.rs

@@ -3,7 +3,7 @@ use entity_api::mutate;
 use sea_orm::DatabaseConnection;
 use sea_orm::IntoActiveModel;
 
-pub use entity_api::user::{create, find_by_email, find_by_id};
+pub use entity_api::user::{create, find_by_email, find_by_id, AuthSession, Backend, Credentials};
 
 pub async fn update(
     db: &DatabaseConnection,

entity_api/src/user.rs

@@ -69,7 +69,7 @@ pub struct Backend {
 }
 
 #[derive(Debug, Clone, ToSchema, IntoParams, Deserialize)]
-#[schema(as = entity_api::user::Credentials)] // OpenAPI schema
+#[schema(as = domain::user::Credentials)] // OpenAPI schema
 pub struct Credentials {
     pub email: String,
     pub password: String,

web/src/controller/user_session_controller.rs

@@ -1,6 +1,6 @@
 use crate::controller::ApiResponse;
 use axum::{http::StatusCode, response::IntoResponse, Form, Json};
-use domain::{AuthSession, Credentials};
+use domain::user::{AuthSession, Credentials};
 use log::*;
 use serde::Deserialize;
 use serde_json::json;
@@ -37,7 +37,7 @@ pub async fn protected(auth_session: AuthSession) -> impl IntoResponse {
 #[utoipa::path(
     post,
     path = "/login",
-    request_body(content = Credentials, content_type = "application/x-www-form-urlencoded"),
+    request_body(content = domain::user::Credentials, content_type = "application/x-www-form-urlencoded"),
     responses(
         (status = 200, description = "Logs in and returns session authentication cookie"),
         (status = 401, description = "Unauthorized"),
@@ -94,7 +94,7 @@ security(
     ("cookie_auth" = [])
 )
 )]
-pub async fn logout(mut auth_session: domain::AuthSession) -> impl IntoResponse {
+pub async fn logout(mut auth_session: AuthSession) -> impl IntoResponse {
     debug!("UserSessionController::logout()");
     match auth_session.logout().await {
         Ok(_) => StatusCode::OK.into_response(),

web/src/extractors/authenticated_user.rs

@@ -19,7 +19,7 @@ where
     // This extractor wraps the AuthSession extractor from axum_login. It extracts the user from the AuthSession and returns an AuthenticatedUser.
     // If the user is authenticated. If the user is not authenticated, it returns an Unauthorized error.
     async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
-        let session: domain::AuthSession = AuthSession::from_request_parts(parts, state)
+        let session: domain::user::AuthSession = AuthSession::from_request_parts(parts, state)
             .await
             .map_err(|(status, msg)| (status, msg.to_string()))?;
         match session.user {

web/src/lib.rs

@@ -6,7 +6,7 @@ use axum_login::{
     tower_sessions::{Expiry, SessionManagerLayer},
     AuthManagerLayerBuilder,
 };
-use domain::Backend;
+use domain::user::Backend;
 use tower_sessions::session_store::ExpiredDeletion;
 use tower_sessions_sqlx_store::PostgresStore;
 

web/src/router.rs

@@ -5,7 +5,7 @@ use axum::{
     Router,
 };
 use axum_login::login_required;
-use domain::Backend;
+use domain::user::Backend;
 use tower_http::services::ServeDir;
 
 use crate::controller::{
@@ -76,7 +76,7 @@ use self::organization::coaching_relationship_controller;
                 domain::organizations::Model,
                 domain::overarching_goals::Model,
                 domain::users::Model,
-                domain::Credentials,
+                domain::user::Credentials,
                 params::user::UpdateUserParams,
 
             )