added env vars

src/baby_monitor/main.py

@@ -143,12 +143,6 @@ def serve_menu_js() -> FileResponse:
     return FileResponse(static_path / "menu.js")
 
 
-@app.get("/auth-utils.js", include_in_schema=False)
-def serve_auth_utils_js() -> FileResponse:
-    """Serve the shared auth utilities JavaScript."""
-    return FileResponse(static_path / "auth-utils.js")
-
-
 @app.get("/api/")
 def read_root(token: Annotated[str, Depends(verify_token)]) -> dict:
     """API root endpoint (requires authentication)."""

src/baby_monitor/repositories/dependencies/get_token_repository.py

@@ -6,7 +6,7 @@ import logging
 from baby_monitor.repositories.interfaces import (
     TokenRepositoryInterface,
 )
-from baby_monitor.repositories.token import (
+from baby_monitor.repositories.token.memory_token import (
     InMemoryTokenRepository,
 )
 
@@ -43,7 +43,7 @@ def _initialize_token_repository() -> TokenRepositoryInterface:
         ) from e
 
     try:
-        from baby_monitor.repositories.token import (
+        from baby_monitor.repositories.token.redis_token import (
             RedisTokenRepository,
         )
 

src/baby_monitor/repositories/token/__init__.py

@@ -1,11 +0,0 @@
-"""Token repository implementations and configurations."""
-
-from .default_ttl import DEFAULT_TTL
-from .memory_token import InMemoryTokenRepository
-from .redis_token import RedisTokenRepository
-
-__all__ = [
-    "DEFAULT_TTL",
-    "InMemoryTokenRepository",
-    "RedisTokenRepository",
-]

src/baby_monitor/repositories/token/default_ttl.py

@@ -1,3 +0,0 @@
-"""Definition of Token default TTL."""
-
-DEFAULT_TTL = 28800  # seconds -> 8 hours

src/baby_monitor/repositories/token/memory_token.py

@@ -3,7 +3,6 @@
 from datetime import datetime, timedelta, UTC
 
 from baby_monitor.repositories.interfaces import TokenRepositoryInterface
-from baby_monitor.repositories.token import DEFAULT_TTL
 
 
 class InMemoryTokenRepository(TokenRepositoryInterface):
@@ -17,8 +16,9 @@ class InMemoryTokenRepository(TokenRepositoryInterface):
     def __init__(self) -> None:
         # token -> (user_id, expiry_time)
         self._tokens: dict[str, tuple[int, datetime]] = {}
+        self._default_ttl = 3600  # Store default TTL for sliding expiration
 
-    def store(self, token: str, user_id: int, ttl: int = DEFAULT_TTL) -> None:
+    def store(self, token: str, user_id: int, ttl: int = 3600) -> None:
         """Store a token with TTL (time to live in seconds)."""
         expiry = datetime.now(UTC) + timedelta(seconds=ttl)
         self._tokens[token] = (user_id, expiry)
@@ -39,7 +39,7 @@ class InMemoryTokenRepository(TokenRepositoryInterface):
             return None
 
         # Sliding expiration: extend the token lifetime
-        new_expiry = datetime.now(UTC) + timedelta(seconds=DEFAULT_TTL)
+        new_expiry = datetime.now(UTC) + timedelta(seconds=self._default_ttl)
         self._tokens[token] = (user_id, new_expiry)
 
         return user_id

src/baby_monitor/repositories/token/redis_token.py

@@ -3,14 +3,14 @@
 from typing import Any
 
 from baby_monitor.repositories.interfaces import TokenRepositoryInterface
-from baby_monitor.repositories.token import DEFAULT_TTL
 
 
 class RedisTokenRepository(TokenRepositoryInterface):
     """
     Redis-based token storage.
 
-    This implementation uses Redis to store tokens with TTL. Implements sliding expiration.
+    Requires redis package: pip install redis
+    Set REDIS_URI environment variable (e.g., redis://localhost:6379/0)
     """
 
     def __init__(self, redis_client: Any) -> None:
@@ -21,8 +21,9 @@ class RedisTokenRepository(TokenRepositoryInterface):
             redis_client: Redis client instance from redis.from_url()
         """
         self.redis = redis_client
+        self.default_ttl = 3600  # Store default TTL for sliding expiration
 
-    def store(self, token: str, user_id: int, ttl: int = DEFAULT_TTL) -> None:
+    def store(self, token: str, user_id: int, ttl: int = 3600) -> None:
         """Store a token with TTL (time to live in seconds)."""
         key = f"token:{token}"
         self.redis.setex(key, ttl, str(user_id))
@@ -36,7 +37,7 @@ class RedisTokenRepository(TokenRepositoryInterface):
         user_id_str = self.redis.get(key)
         if user_id_str:
             # Sliding expiration: extend the token lifetime
-            self.redis.expire(key, DEFAULT_TTL)
+            self.redis.expire(key, self.default_ttl)
             return int(user_id_str)
         return None
 

src/baby_monitor/static/add-child.html

@@ -211,10 +211,12 @@
       </div>
     </div>
 
-    <script src="/auth-utils.js"></script>
     <script>
       // Check if user is authenticated
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Get child ID from URL if editing
       const urlParams = new URLSearchParams(window.location.search);

src/baby_monitor/static/admin.html

@@ -424,33 +424,35 @@
       </div>
     </div>
 
-    <script src="/auth-utils.js"></script>
     <script>
       // Check if user is authenticated and is admin
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       let allUsers = [];
       let userToDelete = null;
 
-      // Load data
+      // Verify user is admin and load data
       fetch("/api/me", {
         headers: {
           Authorization: `Bearer ${token}`,
         },
       })
-      .then((response) => response.json())
+        .then((response) => response.json())
-      .then((user) => {
+        .then((user) => {
-        if (!user.is_admin) {
+          if (!user.is_admin) {
-          alert("Access denied. Admin privileges required.");
+            alert("Access denied. Admin privileges required.");
-          window.location.href = "/";
+            window.location.href = "/";
-        }
+          }
-        // Load users after verifying admin status
+          // Load users after verifying admin status
-        loadUsers();
+          loadUsers();
-      })
+        })
-      .catch((error) => {
+        .catch((error) => {
-        console.error("Error verifying admin status:", error);
+          console.error("Error verifying admin status:", error);
-        window.location.href = "/login.html";
+          window.location.href = "/login.html";
-      });
+        });
 
       async function loadUsers() {
         const container = document.getElementById("userListContainer");

src/baby_monitor/static/auth-utils.js

@@ -1,21 +0,0 @@
-/**
- * Redirect to login page with return URL
- * @param {string} returnUrl - The URL to return to after login (defaults to current page)
- */
-function redirectToLogin(returnUrl) {
-  const url = returnUrl || window.location.pathname + window.location.search;
-  window.location.href = `/login.html?return=${encodeURIComponent(url)}`;
-}
-
-/**
- * Check if user has valid token, redirect to login if not
- * @returns {string|null} - Returns token if valid, redirects to login if not
- */
-function getToken() {
-  const token = localStorage.getItem("access_token");
-  if (!token) {
-    redirectToLogin();
-    return null;
-  }
-  return token;
-}

src/baby_monitor/static/diapers.html

@@ -266,10 +266,12 @@
 
     <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js"></script>
     <script src="/menu.js"></script>
-    <script src="/auth-utils.js"></script>
     <script>
       // Check if user is authenticated
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Initialize burger menu
       initBurgerMenu({ includeHome: true });

src/baby_monitor/static/feedings.html

@@ -303,10 +303,12 @@
 
     <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js"></script>
     <script src="/menu.js"></script>
-    <script src="/auth-utils.js"></script>
     <script>
       // Check if user is authenticated
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Initialize burger menu
       initBurgerMenu({ includeHome: true });

src/baby_monitor/static/index.html

@@ -236,47 +236,59 @@
     </div>
 
     <script src="/menu.js"></script>
-    <script src="/auth-utils.js"></script>
     <script>
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
       const username = localStorage.getItem("username");
 
-      // Fetch current user info including admin status
+      // Check if user is logged in
-      fetch("/api/me", {
+      if (!token) {
-        headers: {
+        window.location.href = "/login.html";
-          Authorization: `Bearer ${token}`,
+      } else {
-        },
+        // Fetch current user info including admin status
-      })
+        fetch("/api/me", {
-      .then((response) => response.json())
-      .then((user) => {
-        if (!user) return; // Early exit if redirected
-
-        // Initialize burger menu
-        initBurgerMenu({
-          includeHome: true,
-        });
-
-        // Check if user has any children
-        return fetch("/api/children", {
           headers: {
             Authorization: `Bearer ${token}`,
           },
         })
-          .then((response) => response.json())
+          .then((response) => {
-          .then((children) => {
+            if (response.ok) {
-            // If no children, show welcome message with option to add
+              return response.json();
-            if (children.length === 0) {
+            } else {
-              showNoChildrenMessage();
+              // Token invalid, redirect to login
-              return;
+              localStorage.removeItem("access_token");
+              localStorage.removeItem("username");
+              window.location.href = "/login.html";
+              throw new Error("Authentication failed");
             }
+          })
+          .then((user) => {
+            // Initialize burger menu
+            initBurgerMenu({
+              includeHome: true,
+            });
 
-            // Load feeding status and show content
+            // Check if user has any children
-            loadFeedingStatus(children);
+            return fetch("/api/children", {
+              headers: {
+                Authorization: `Bearer ${token}`,
+              },
+            })
+              .then((response) => response.json())
+              .then((children) => {
+                // If no children, show welcome message with option to add
+                if (children.length === 0) {
+                  showNoChildrenMessage();
+                  return;
+                }
+
+                // Load feeding status and show content
+                loadFeedingStatus(children);
+              });
+          })
+          .catch((error) => {
+            console.error("Error:", error);
           });
-      })
+      }
-      .catch((error) => {
-        console.error("Error:", error);
-      });
 
       function showNoChildrenMessage() {
         const content = document.getElementById("content");

src/baby_monitor/static/log-diaper.html

@@ -242,10 +242,12 @@
       </form>
     </div>
 
-    <script src="/auth-utils.js"></script>
     <script>
       // Check if user is authenticated
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Determine return URL based on referrer
       function getReturnUrl() {

src/baby_monitor/static/log-feeding.html

@@ -199,10 +199,12 @@
       </form>
     </div>
 
-    <script src="/auth-utils.js"></script>
     <script>
       // Check if user is authenticated
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Determine return URL based on referrer
       function getReturnUrl() {

src/baby_monitor/static/log-sleep.html

@@ -189,10 +189,12 @@
       </form>
     </div>
 
-    <script src="/auth-utils.js"></script>
     <script>
       // Check if user is authenticated
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Determine return URL based on referrer
       function getReturnUrl() {

src/baby_monitor/static/login.html

@@ -82,36 +82,10 @@
     </div>
 
     <script>
-      // Check if redirected due to expired session
-      const params = new URLSearchParams(window.location.search);
-      const returnUrl = params.get("return");
-      
       const form = document.getElementById("loginForm");
       const messageDiv = document.getElementById("message");
       const loginButton = document.getElementById("loginButton");
 
-      // Show session expired message if redirected from another page
-      if (returnUrl) {
-        showMessage("Your session has expired. Please log in again.", "error");
-      }
-
-      // Clear user-specific cache data on login
-      function clearUserCache() {
-        const keysToRemove = [
-          'lastDiaperChildFilter',
-          'lastFeedingChildFilter',
-          'lastSleepChildFilter',
-          'lastDiaperTimeRange',
-          'lastFeedingTimeRange'
-        ];
-        
-        keysToRemove.forEach(key => {
-          localStorage.removeItem(key);
-        });
-        
-        console.log('Cleared user cache on login');
-      }
-
       form.addEventListener("submit", async (e) => {
         e.preventDefault();
 
@@ -135,23 +109,13 @@
 
           if (response.ok) {
             showMessage(data.message, "success");
-            
             // Store token in localStorage
             localStorage.setItem("access_token", data.access_token);
             localStorage.setItem("username", data.username);
 
-            // Clear stale user preferences from previous sessions
+            // Redirect based on is_admin from login response
-            clearUserCache();
-
-            // Check for return URL parameter
-            const params = new URLSearchParams(window.location.search);
-            const returnUrl = params.get("return");
-            
-            // Redirect based on return URL or is_admin from login response
             setTimeout(() => {
-              if (returnUrl) {
+              if (data.is_admin === true) {
-                window.location.href = returnUrl;
-              } else if (data.is_admin === true) {
                 window.location.href = "/admin.html";
               } else {
                 window.location.href = "/";

src/baby_monitor/static/settings.html

@@ -469,9 +469,11 @@
     </div>
 
     <script src="/menu.js"></script>
-    <script src="/auth-utils.js"></script>
     <script>
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Initialize burger menu
       initBurgerMenu({ includeHome: true });
@@ -493,7 +495,7 @@
             currentUser = await userResponse.json();
             document.getElementById("username").value = currentUser.username;
           } else {
-            redirectToLogin();
+            window.location.href = "/login.html";
             return;
           }
 
@@ -850,10 +852,8 @@
           }
         });
 
-      // Load data on page load (only if authenticated)
+      // Load data on page load
-      if (token) {
+      loadData();
-        loadData();
-      }
     </script>
   </body>
 </html>

src/baby_monitor/static/sleep.html

@@ -313,9 +313,13 @@
 
     <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js"></script>
     <script src="/menu.js"></script>
-    <script src="/auth-utils.js"></script>
     <script>
-      const token = getToken();
+      const token = localStorage.getItem("access_token");
+
+      // Check if user is logged in
+      if (!token) {
+        window.location.href = "/login.html";
+      }
 
       // Initialize burger menu
       initBurgerMenu({ includeHome: true });
@@ -341,16 +345,13 @@
         }
       }
 
-      function attachTimeRangeListener() {
+      document
-        const timeRangeFilter = document.getElementById("timeRangeFilter");
+        .getElementById("timeRangeFilter")
-        if (timeRangeFilter) {
+        .addEventListener("change", function () {
-          timeRangeFilter.addEventListener("change", function () {
+          // Save selection to localStorage
-            // Save selection to localStorage
+          localStorage.setItem("lastSleepTimeRange", this.value);
-            localStorage.setItem("lastSleepTimeRange", this.value);
+          loadData();
-            renderCharts();
+        });
-          });
-        }
-      }
 
       async function loadData() {
         try {
@@ -442,9 +443,6 @@
             attachChildFilterListener();
           }
 
-          // Always attach time range listener after recreating the controls
-          attachTimeRangeListener();
-
           renderCharts();
         } catch (error) {
           console.error("Error loading data:", error);