diff --git a/src/config/oauth.rs b/src/config/oauth.rs index 30f9c85..eb62d91 100644 --- a/src/config/oauth.rs +++ b/src/config/oauth.rs @@ -1,7 +1,4 @@ -use oauth2::{ - AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl, - basic::BasicClient, AuthorizationCode, CsrfToken, Scope, TokenResponse, -}; +use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl}; use serde::{Deserialize, Serialize}; use std::env; @@ -18,17 +15,17 @@ impl GiteaOAuthConfig { /// Creates a new Gitea OAuth configuration pub fn new() -> Self { // Get configuration from environment variables - let client_id = env::var("GITEA_CLIENT_ID") - .expect("Missing GITEA_CLIENT_ID environment variable"); + let client_id = + env::var("GITEA_CLIENT_ID").expect("Missing GITEA_CLIENT_ID environment variable"); let client_secret = env::var("GITEA_CLIENT_SECRET") .expect("Missing GITEA_CLIENT_SECRET environment variable"); let instance_url = env::var("GITEA_INSTANCE_URL") .expect("Missing GITEA_INSTANCE_URL environment variable"); - + // Create OAuth client let auth_url = format!("{}/login/oauth/authorize", instance_url); let token_url = format!("{}/login/oauth/access_token", instance_url); - + let client = BasicClient::new( ClientId::new(client_id), Some(ClientSecret::new(client_secret)), @@ -36,9 +33,13 @@ impl GiteaOAuthConfig { Some(TokenUrl::new(token_url).unwrap()), ) .set_redirect_uri( - RedirectUrl::new(format!("{}/auth/gitea/callback", env::var("APP_URL").unwrap_or_else(|_| "http://localhost:9999".to_string()))).unwrap(), + RedirectUrl::new(format!( + "{}/auth/gitea/callback", + env::var("APP_URL").unwrap_or_else(|_| "http://localhost:9999".to_string()) + )) + .unwrap(), ); - + Self { client, instance_url, diff --git a/src/controllers/auth.rs b/src/controllers/auth.rs index 3297ec5..90eff2e 100644 --- a/src/controllers/auth.rs +++ b/src/controllers/auth.rs @@ -3,7 +3,7 @@ use actix_session::Session; use tera::Tera; use crate::models::user::{User, LoginCredentials, RegistrationData, UserRole}; use crate::utils::render_template; -use jsonwebtoken::{encode, decode, Header, Algorithm, Validation, EncodingKey, DecodingKey}; +use jsonwebtoken::{encode, Header, EncodingKey}; use serde::{Deserialize, Serialize}; use chrono::{Utc, Duration}; use lazy_static::lazy_static; @@ -52,28 +52,11 @@ impl AuthController { ) } - /// Validate a JWT token - pub fn validate_token(token: &str) -> Result { - let validation = Validation::new(Algorithm::HS256); - - let token_data = decode::( - token, - &DecodingKey::from_secret(JWT_SECRET.as_bytes()), - &validation - )?; - - Ok(token_data.claims) - } - - /// Extract token from session - pub fn extract_token_from_session(session: &Session) -> Option { - session.get::("auth_token").ok().flatten() - } - - /// Extract token from cookie - pub fn extract_token_from_cookie(req: &actix_web::HttpRequest) -> Option { - req.cookie("auth_token").map(|c| c.value().to_string()) - } + // Note: The following functions were removed as they were not being used: + // - validate_token + // - extract_token_from_session + // - extract_token_from_cookie + // They can be re-implemented if needed in the future. /// Renders the login page pub async fn login_page(tmpl: web::Data, session: Session) -> Result { @@ -86,8 +69,15 @@ impl AuthController { ctx.insert("user_json", &user_json); // Parse the JSON into a User object - if let Ok(user) = serde_json::from_str::(&user_json) { - ctx.insert("user", &user); + match serde_json::from_str::(&user_json) { + Ok(user) => { + log::info!("Successfully parsed user in login_page: {:?}", user); + ctx.insert("user", &user); + }, + Err(e) => { + log::error!("Failed to parse user JSON in login_page: {}", e); + log::error!("User JSON: {}", user_json); + } } } @@ -117,6 +107,8 @@ impl AuthController { // Store user data in session let user_json = serde_json::to_string(&test_user).unwrap(); + log::info!("Storing user in session (login): {}", user_json); + log::info!("User object: {:?}", test_user); session.insert("user", &user_json)?; session.insert("auth_token", &token)?; @@ -146,8 +138,15 @@ impl AuthController { ctx.insert("user_json", &user_json); // Parse the JSON into a User object - if let Ok(user) = serde_json::from_str::(&user_json) { - ctx.insert("user", &user); + match serde_json::from_str::(&user_json) { + Ok(user) => { + log::info!("Successfully parsed user in register_page: {:?}", user); + ctx.insert("user", &user); + }, + Err(e) => { + log::error!("Failed to parse user JSON in register_page: {}", e); + log::error!("User JSON: {}", user_json); + } } } @@ -176,6 +175,8 @@ impl AuthController { // Store user data in session let user_json = serde_json::to_string(&user).unwrap(); + log::info!("Storing user in session (register): {}", user_json); + log::info!("User object: {:?}", user); session.insert("user", &user_json)?; session.insert("auth_token", &token)?; diff --git a/src/controllers/home.rs b/src/controllers/home.rs index 6c4bf6f..5eb7796 100644 --- a/src/controllers/home.rs +++ b/src/controllers/home.rs @@ -18,8 +18,15 @@ impl HomeController { ctx.insert("user_json", &user_json); // Parse the JSON into a User object - if let Ok(user) = serde_json::from_str::(&user_json) { - ctx.insert("user", &user); + match serde_json::from_str::(&user_json) { + Ok(user) => { + log::info!("Successfully parsed user: {:?}", user); + ctx.insert("user", &user); + }, + Err(e) => { + log::error!("Failed to parse user JSON: {}", e); + log::error!("User JSON: {}", user_json); + } } } @@ -37,8 +44,15 @@ impl HomeController { ctx.insert("user_json", &user_json); // Parse the JSON into a User object - if let Ok(user) = serde_json::from_str::(&user_json) { - ctx.insert("user", &user); + match serde_json::from_str::(&user_json) { + Ok(user) => { + log::info!("Successfully parsed user: {:?}", user); + ctx.insert("user", &user); + }, + Err(e) => { + log::error!("Failed to parse user JSON: {}", e); + log::error!("User JSON: {}", user_json); + } } } diff --git a/src/models/user.rs b/src/models/user.rs index 09a7e12..b859c25 100644 --- a/src/models/user.rs +++ b/src/models/user.rs @@ -1,5 +1,5 @@ -use serde::{Deserialize, Serialize}; use chrono::{DateTime, Utc}; +use serde::{Deserialize, Serialize}; /// Represents a user in the system #[derive(Debug, Clone, Serialize, Deserialize)] @@ -10,9 +10,6 @@ pub struct User { pub name: String, /// User's email address pub email: String, - /// User's hashed password - #[serde(skip_serializing)] - pub password_hash: Option, /// User's role in the system pub role: UserRole, /// When the user was created @@ -37,7 +34,6 @@ impl User { id: None, name, email, - password_hash: None, role: UserRole::User, created_at: Some(Utc::now()), updated_at: Some(Utc::now()), @@ -49,7 +45,6 @@ impl User { #[derive(Debug, Deserialize)] pub struct LoginCredentials { pub email: String, - pub password: String, } /// Represents user registration data @@ -57,6 +52,4 @@ pub struct LoginCredentials { pub struct RegistrationData { pub name: String, pub email: String, - pub password: String, - pub password_confirmation: String, } diff --git a/src/views/base.html b/src/views/base.html index 787b309..fb0626b 100644 --- a/src/views/base.html +++ b/src/views/base.html @@ -32,7 +32,8 @@
    {% if user_json %}
  • - Hello, {{ user.name }} + Hello, {% if user is defined %}{{ user.email }}{% else %}User{% endif + %}
  • Logout @@ -53,6 +54,20 @@
    + + {% if user_json %} +
    +
    + Debug Info + 
    user_json: {{ user_json }}
    + 
    user object exists: {{ user is defined }}
    + {% if user is defined %} + 
    user.name: {{ user.name }}
    + {% endif %} +
    +
    + {% endif %} + {% block content %}{% endblock %}