cleanup + tiny fixes

Author: ImShyMike

README.md

@@ -78,4 +78,4 @@ When using a WakaTime client, point your requests to `http://localhost:3000/api/
 
 ## License
 
-This project is licensed under the [GNU AGPLv3](./LICENSE)
+This project is licensed under the [GNU AGPLv3](https://github.com/ImShyMike/rustytime/blob/HEAD/LICENSE)

frontend/src/lib/utils/serverApi.ts

@@ -30,7 +30,6 @@ class ServerApiClient {
 
 		// Forward cookies from the incoming request
 		const cookieHeader = event.request.headers.get('cookie');
-		console.error('Requesting', url, 'with cookies:', cookieHeader);
 
 		const config: RequestInit = {
 			credentials: 'include',

frontend/src/routes/admin/+page.server.ts

@@ -9,8 +9,6 @@ export const load: PageServerLoad = async (event) => {
 		const adminData = await serverApi.get<AdminResponse>('/page/admin', event);
 
 		if (adminData && adminData.auth_url) {
-			console.error('Unauthorized access to admin, redirecting to home.');
-			console.error(adminData);
 			throw redirect(302, '/?auth_error=unauthorized');
 		}
 

frontend/src/routes/dashboard/+page.server.ts

@@ -9,8 +9,6 @@ export const load: PageServerLoad = async (event) => {
 		const dashboardData = await serverApi.get<DashboardResponse>('/page/dashboard', event);
 
 		if (dashboardData && dashboardData.auth_url) {
-			console.error('Unauthorized access to dashboard, redirecting to home.');
-			console.error(dashboardData);
 			throw redirect(302, '/?auth_error=unauthorized');
 		}
 

rustytime/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "rustytime-server"
 description = "🕒 blazingly fast time tracking for developers"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2024"
 authors = ["ImShyMike"]
 readme = "../README.md"

rustytime/Cargo.toml

@@ -1,6 +1,6 @@
 use crate::models::user::User;
 use crate::state::AppState;
-use axum::{Extension, Json, extract::State, response::Response};
+use axum::{extract::State, response::Redirect};
 use serde::Serialize;
 
 #[derive(Serialize)]
@@ -12,14 +12,7 @@ pub struct HomePageResponse {
 /// Handler for the homepage
 pub async fn home_page(
     State(_app_state): State<AppState>,
-    user: Option<Extension<User>>,
-) -> Result<Json<HomePageResponse>, Response> {
-    // check if user is authenticated
-    let is_authenticated = user.is_some();
-    let user = user.map(|ext| ext.0);
-
-    Ok(Json(HomePageResponse {
-        is_authenticated,
-        user,
-    }))
+) -> Result<Redirect, Redirect> {
+    let frontend_url = std::env::var("FRONTEND_URL").unwrap_or_else(|_| "http://localhost:5173".to_string());
+    Ok(Redirect::to(&frontend_url))
 }

rustytime/src/handlers/homepage.rs

@@ -20,7 +20,7 @@ pub fn create_app_router(app_state: AppState) -> Router {
         // required authentication
         .merge(protected_routes(app_state.clone()))
         // optional authentication
-        .merge(semi_protected_routes(app_state.clone()))
+        // .merge(semi_protected_routes(app_state.clone()))
         // admin routes
         .merge(create_admin_routes(app_state.clone()))
         // API routes
@@ -44,6 +44,7 @@ async fn not_found() -> impl IntoResponse {
 /// Public routes that don't require authentication
 fn public_routes() -> Router<AppState> {
     Router::new()
+        .route("/", get(home_page))
 }
 
 /// Protected routes that require authentication
@@ -57,14 +58,13 @@ fn protected_routes(app_state: AppState) -> Router<AppState> {
 }
 
 /// Routes that work with and without authentication
-fn semi_protected_routes(app_state: AppState) -> Router<AppState> {
-    Router::new()
-        .route("/", get(home_page))
-        .layer(axum_middleware::from_fn_with_state(
-            app_state,
-            middleware::optional_auth,
-        ))
-}
+// fn semi_protected_routes(app_state: AppState) -> Router<AppState> {
+//     Router::new()
+//         .layer(axum_middleware::from_fn_with_state(
+//             app_state,
+//             middleware::optional_auth,
+//         ))
+// }
 
 /// Admin routes that require admin privileges
 pub fn create_admin_routes(app_state: AppState) -> Router<AppState> {

rustytime/src/routes/mod.rs

@@ -28,19 +28,19 @@ pub async fn require_auth(
 }
 
 /// Middleware to inject the user if authenticated
-pub async fn optional_auth(
-    State(app_state): State<AppState>,
-    cookies: Cookies,
-    mut request: Request,
-    next: Next,
-) -> Response {
-    // try to get current user and add to request extensions
-    if let Ok(Some(user)) = SessionManager::get_current_user(&cookies, &app_state.db_pool).await {
-        request.extensions_mut().insert(user);
-    }
+// pub async fn optional_auth(
+//     State(app_state): State<AppState>,
+//     cookies: Cookies,
+//     mut request: Request,
+//     next: Next,
+// ) -> Response {
+//     // try to get current user and add to request extensions
+//     if let Ok(Some(user)) = SessionManager::get_current_user(&cookies, &app_state.db_pool).await {
+//         request.extensions_mut().insert(user);
+//     }
 
-    next.run(request).await
-}
+//     next.run(request).await
+// }
 
 /// Middleware to require admin privileges
 pub async fn require_admin(