Fix calendar event fetching to use visible date range
Some checks failed
Build and Push Docker Image / docker (push) Failing after 1m7s
Some checks failed
Build and Push Docker Image / docker (push) Failing after 1m7s
Moved event fetching logic from CalendarView to Calendar component to properly use the visible date range instead of hardcoded current month. The Calendar component already tracks the current visible date through navigation, so events now load correctly for August and other months when navigating. Changes: - Calendar component now manages its own events state and fetching - Event fetching responds to current_date changes from navigation - CalendarView simplified to just render Calendar component - Fixed cargo fmt/clippy formatting across codebase 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -1,33 +1,38 @@
|
||||
use axum::{
|
||||
extract::State,
|
||||
http::HeaderMap,
|
||||
response::Json,
|
||||
};
|
||||
use axum::{extract::State, http::HeaderMap, response::Json};
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::{AppState, models::{CalDAVLoginRequest, AuthResponse, ApiError, UserInfo, CalendarInfo}};
|
||||
use crate::calendar::CalDAVClient;
|
||||
use crate::config::CalDAVConfig;
|
||||
use crate::{
|
||||
models::{ApiError, AuthResponse, CalDAVLoginRequest, CalendarInfo, UserInfo},
|
||||
AppState,
|
||||
};
|
||||
|
||||
pub fn extract_bearer_token(headers: &HeaderMap) -> Result<String, ApiError> {
|
||||
let auth_header = headers.get("authorization")
|
||||
let auth_header = headers
|
||||
.get("authorization")
|
||||
.ok_or_else(|| ApiError::Unauthorized("Missing Authorization header".to_string()))?;
|
||||
|
||||
let auth_str = auth_header.to_str()
|
||||
|
||||
let auth_str = auth_header
|
||||
.to_str()
|
||||
.map_err(|_| ApiError::BadRequest("Invalid Authorization header".to_string()))?;
|
||||
|
||||
|
||||
if let Some(token) = auth_str.strip_prefix("Bearer ") {
|
||||
Ok(token.to_string())
|
||||
} else {
|
||||
Err(ApiError::BadRequest("Authorization header must be Bearer token".to_string()))
|
||||
Err(ApiError::BadRequest(
|
||||
"Authorization header must be Bearer token".to_string(),
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
pub fn extract_password_header(headers: &HeaderMap) -> Result<String, ApiError> {
|
||||
let password_header = headers.get("x-caldav-password")
|
||||
let password_header = headers
|
||||
.get("x-caldav-password")
|
||||
.ok_or_else(|| ApiError::BadRequest("Missing X-CalDAV-Password header".to_string()))?;
|
||||
|
||||
password_header.to_str()
|
||||
|
||||
password_header
|
||||
.to_str()
|
||||
.map(|s| s.to_string())
|
||||
.map_err(|_| ApiError::BadRequest("Invalid X-CalDAV-Password header".to_string()))
|
||||
}
|
||||
@@ -40,32 +45,37 @@ pub async fn login(
|
||||
println!(" Server URL: {}", request.server_url);
|
||||
println!(" Username: {}", request.username);
|
||||
println!(" Password length: {}", request.password.len());
|
||||
|
||||
|
||||
// Basic validation
|
||||
if request.username.is_empty() || request.password.is_empty() || request.server_url.is_empty() {
|
||||
return Err(ApiError::BadRequest("Username, password, and server URL are required".to_string()));
|
||||
return Err(ApiError::BadRequest(
|
||||
"Username, password, and server URL are required".to_string(),
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
println!("✅ Input validation passed");
|
||||
|
||||
|
||||
// Create a token using the auth service
|
||||
println!("📝 Created CalDAV config");
|
||||
|
||||
|
||||
// First verify the credentials are valid by attempting to discover calendars
|
||||
let config = CalDAVConfig::new(
|
||||
request.server_url.clone(),
|
||||
request.username.clone(),
|
||||
request.password.clone()
|
||||
request.password.clone(),
|
||||
);
|
||||
let client = CalDAVClient::new(config);
|
||||
client.discover_calendars()
|
||||
client
|
||||
.discover_calendars()
|
||||
.await
|
||||
.map_err(|e| ApiError::Unauthorized(format!("Authentication failed: {}", e)))?;
|
||||
|
||||
let token = state.auth_service.generate_token(&request.username, &request.server_url)?;
|
||||
|
||||
|
||||
let token = state
|
||||
.auth_service
|
||||
.generate_token(&request.username, &request.server_url)?;
|
||||
|
||||
println!("🔗 Created CalDAV client, attempting to discover calendars...");
|
||||
|
||||
|
||||
Ok(Json(AuthResponse {
|
||||
token,
|
||||
username: request.username,
|
||||
@@ -79,7 +89,7 @@ pub async fn verify_token(
|
||||
) -> Result<Json<serde_json::Value>, ApiError> {
|
||||
let token = extract_bearer_token(&headers)?;
|
||||
let is_valid = state.auth_service.verify_token(&token).is_ok();
|
||||
|
||||
|
||||
Ok(Json(serde_json::json!({ "valid": is_valid })))
|
||||
}
|
||||
|
||||
@@ -89,26 +99,33 @@ pub async fn get_user_info(
|
||||
) -> Result<Json<UserInfo>, ApiError> {
|
||||
let token = extract_bearer_token(&headers)?;
|
||||
let password = extract_password_header(&headers)?;
|
||||
|
||||
|
||||
// Create CalDAV config from token and password
|
||||
let config = state.auth_service.caldav_config_from_token(&token, &password)?;
|
||||
let config = state
|
||||
.auth_service
|
||||
.caldav_config_from_token(&token, &password)?;
|
||||
let client = CalDAVClient::new(config.clone());
|
||||
|
||||
|
||||
// Discover calendars
|
||||
let calendar_paths = client.discover_calendars()
|
||||
let calendar_paths = client
|
||||
.discover_calendars()
|
||||
.await
|
||||
.map_err(|e| ApiError::Internal(format!("Failed to discover calendars: {}", e)))?;
|
||||
|
||||
println!("✅ Authentication successful! Found {} calendars", calendar_paths.len());
|
||||
|
||||
let calendars: Vec<CalendarInfo> = calendar_paths.iter().map(|path| {
|
||||
CalendarInfo {
|
||||
|
||||
println!(
|
||||
"✅ Authentication successful! Found {} calendars",
|
||||
calendar_paths.len()
|
||||
);
|
||||
|
||||
let calendars: Vec<CalendarInfo> = calendar_paths
|
||||
.iter()
|
||||
.map(|path| CalendarInfo {
|
||||
path: path.clone(),
|
||||
display_name: extract_calendar_name(path),
|
||||
color: generate_calendar_color(path),
|
||||
}
|
||||
}).collect();
|
||||
|
||||
})
|
||||
.collect();
|
||||
|
||||
Ok(Json(UserInfo {
|
||||
username: config.username,
|
||||
server_url: config.server_url,
|
||||
@@ -123,15 +140,14 @@ fn generate_calendar_color(path: &str) -> String {
|
||||
for byte in path.bytes() {
|
||||
hash = hash.wrapping_mul(31).wrapping_add(byte as u32);
|
||||
}
|
||||
|
||||
|
||||
// Define a set of pleasant colors
|
||||
let colors = [
|
||||
"#3B82F6", "#10B981", "#F59E0B", "#EF4444", "#8B5CF6",
|
||||
"#06B6D4", "#84CC16", "#F97316", "#EC4899", "#6366F1",
|
||||
"#14B8A6", "#F3B806", "#8B5A2B", "#6B7280", "#DC2626",
|
||||
"#7C3AED", "#059669", "#D97706", "#BE185D", "#4F46E5"
|
||||
"#3B82F6", "#10B981", "#F59E0B", "#EF4444", "#8B5CF6", "#06B6D4", "#84CC16", "#F97316",
|
||||
"#EC4899", "#6366F1", "#14B8A6", "#F3B806", "#8B5A2B", "#6B7280", "#DC2626", "#7C3AED",
|
||||
"#059669", "#D97706", "#BE185D", "#4F46E5",
|
||||
];
|
||||
|
||||
|
||||
colors[(hash as usize) % colors.len()].to_string()
|
||||
}
|
||||
|
||||
@@ -154,4 +170,4 @@ fn extract_calendar_name(path: &str) -> String {
|
||||
})
|
||||
.collect::<Vec<String>>()
|
||||
.join(" ")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user