Upload 10 files

app/api/routes/auth_router.py

@@ -87,7 +87,7 @@ async def get_current_user(request: Request, token: str = Depends(oauth2_scheme)
         token_data = TokenData(user_id=user_id)
     except JWTError:
         raise credentials_exception
-    
+
     query = "SELECT * FROM users WHERE id = ?"
     user = request.app.db_conn.execute(query, (token_data.user_id,)).fetchone()
     if user is None:
@@ -97,70 +97,121 @@ async def get_current_user(request: Request, token: str = Depends(oauth2_scheme)
 # Routes
 @router.post("/register", response_model=UserResponse)
 async def register(request: Request, user: UserCreate):
-    # Check if user already exists
-    query = "SELECT * FROM users WHERE email = ?"
-    existing_user = request.app.db_conn.execute(query, (user.email,)).fetchone()
-    if existing_user:
+    import logging
+    logger = logging.getLogger("auth-server")
+
+    try:
+        # Check if user already exists
+        query = "SELECT * FROM users WHERE email = ?"
+        logger.info(f"Checking if user with email {user.email} already exists")
+        existing_user = request.app.db_conn.execute(query, (user.email,)).fetchone()
+        if existing_user:
+            logger.warning(f"User with email {user.email} already exists")
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail="Email already registered"
+            )
+
+        # Hash the password
+        logger.info("Hashing password")
+        hashed_password = get_password_hash(user.password)
+
+        # Insert the new user
+        logger.info(f"Inserting new user with email {user.email}")
+        insert_query = "INSERT INTO users (email, hashed_password) VALUES (?, ?)"
+        cursor = request.app.db_conn.execute(insert_query, (user.email, hashed_password))
+        request.app.db_conn.commit()
+
+        # Get the last inserted row ID
+        last_row_id = cursor.lastrowid
+        logger.info(f"User inserted with ID: {last_row_id}")
+
+        # Get the newly created user by ID (more reliable than by email)
+        logger.info(f"Retrieving user with ID {last_row_id}")
+        new_user = request.app.db_conn.execute(
+            "SELECT * FROM users WHERE id = ?",
+            (last_row_id,)
+        ).fetchone()
+
+        if new_user is None:
+            logger.error(f"Failed to retrieve newly created user with ID {last_row_id}")
+            # Try to get by email as fallback
+            logger.info(f"Trying to retrieve user by email {user.email}")
+            new_user = request.app.db_conn.execute(
+                "SELECT * FROM users WHERE email = ?",
+                (user.email,)
+            ).fetchone()
+
+            if new_user is None:
+                logger.error(f"Failed to retrieve newly created user with email {user.email}")
+                raise HTTPException(
+                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                    detail="User was created but could not be retrieved"
+                )
+
+        # Log the user data for debugging (excluding password)
+        logger.info(f"User retrieved: ID={new_user[0]}, Email={new_user[1]}")
+
+        # Check if the user has the expected fields
+        if len(new_user) < 6:
+            logger.error(f"User record has unexpected format: {new_user}")
+            # Return what we can
+            return {
+                "id": new_user[0],
+                "email": new_user[1],
+                "is_admin": False,  # Default value
+                "created_at": str(new_user[3] if len(new_user) > 3 else "")
+            }
+
+        return {
+            "id": new_user[0],
+            "email": new_user[1],
+            "is_admin": bool(new_user[5]) if new_user[5] is not None else False,
+            "created_at": str(new_user[3]) if new_user[3] is not None else ""
+        }
+    except Exception as e:
+        logger.error(f"Error during user registration: {str(e)}")
+        if isinstance(e, HTTPException):
+            raise
         raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Email already registered"
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Registration failed: {str(e)}"
         )
-    
-    # Hash the password
-    hashed_password = get_password_hash(user.password)
-    
-    # Insert the new user
-    insert_query = "INSERT INTO users (email, hashed_password) VALUES (?, ?)"
-    request.app.db_conn.execute(insert_query, (user.email, hashed_password))
-    request.app.db_conn.commit()
-    
-    # Get the newly created user
-    new_user = request.app.db_conn.execute(
-        "SELECT * FROM users WHERE email = ?", 
-        (user.email,)
-    ).fetchone()
-    
-    return {
-        "id": new_user[0],
-        "email": new_user[1],
-        "is_admin": new_user[5],
-        "created_at": new_user[3]
-    }
 
 @router.post("/login", response_model=Token)
 async def login(
-    request: Request, 
+    request: Request,
     form_data: OAuth2PasswordRequestForm = Depends()
 ):
     # Find the user
     query = "SELECT * FROM users WHERE email = ?"
     user = request.app.db_conn.execute(query, (form_data.username,)).fetchone()
-    
+
     if not user or not verify_password(form_data.password, user[2]):
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect email or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    
+
     # Update last login
     update_query = "UPDATE users SET last_login = CURRENT_TIMESTAMP WHERE id = ?"
     request.app.db_conn.execute(update_query, (user[0],))
     request.app.db_conn.commit()
-    
+
     # Create tokens
     access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
     access_token = create_access_token(
-        data={"sub": user[0]}, 
+        data={"sub": user[0]},
         expires_delta=access_token_expires
     )
-    
+
     refresh_token_expires = timedelta(days=REFRESH_TOKEN_EXPIRE_DAYS)
     refresh_token = create_refresh_token(
-        data={"sub": user[0]}, 
+        data={"sub": user[0]},
         expires_delta=refresh_token_expires
     )
-    
+
     return {
         "access_token": access_token,
         "refresh_token": refresh_token,
@@ -184,7 +235,7 @@ async def refresh_token(request: Request, refresh_token: str):
             detail="Invalid refresh token",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    
+
     # Check if user exists
     query = "SELECT * FROM users WHERE id = ?"
     user = request.app.db_conn.execute(query, (user_id,)).fetchone()
@@ -194,20 +245,20 @@ async def refresh_token(request: Request, refresh_token: str):
             detail="User not found",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    
+
     # Create new tokens
     access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
     access_token = create_access_token(
-        data={"sub": user_id}, 
+        data={"sub": user_id},
         expires_delta=access_token_expires
     )
-    
+
     refresh_token_expires = timedelta(days=REFRESH_TOKEN_EXPIRE_DAYS)
     new_refresh_token = create_refresh_token(
-        data={"sub": user_id}, 
+        data={"sub": user_id},
         expires_delta=refresh_token_expires
     )
-    
+
     return {
         "access_token": access_token,
         "refresh_token": new_refresh_token,
@@ -222,3 +273,101 @@ async def get_current_user_info(request: Request, current_user = Depends(get_cur
         "is_admin": current_user[5],
         "created_at": current_user[3]
     }
+
+@router.get("/test-db")
+async def test_database(request: Request):
+    """
+    Test endpoint to verify database operations.
+    This is for debugging purposes only.
+    """
+    import logging
+    logger = logging.getLogger("auth-server")
+
+    results = {
+        "connection_type": getattr(request.app, "db_type", "unknown"),
+        "operations": []
+    }
+
+    try:
+        # Test 1: Simple SELECT
+        logger.info("Test 1: Simple SELECT")
+        test_query = "SELECT 1 as test"
+        result = request.app.db_conn.execute(test_query).fetchone()
+        results["operations"].append({
+            "name": "Simple SELECT",
+            "success": result is not None,
+            "result": str(result) if result is not None else None
+        })
+        logger.info(f"Test 1 result: {result}")
+
+        # Test 2: Create a temporary table
+        logger.info("Test 2: Create a temporary table")
+        create_temp_table = """
+        CREATE TABLE IF NOT EXISTS test_table (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            name TEXT NOT NULL,
+            created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+        )
+        """
+        request.app.db_conn.execute(create_temp_table)
+        request.app.db_conn.commit()
+        results["operations"].append({
+            "name": "Create temporary table",
+            "success": True
+        })
+        logger.info("Test 2 completed successfully")
+
+        # Test 3: Insert into the temporary table
+        logger.info("Test 3: Insert into the temporary table")
+        test_name = f"test_user_{datetime.utcnow().strftime('%Y%m%d%H%M%S')}"
+        insert_query = "INSERT INTO test_table (name) VALUES (?)"
+        cursor = request.app.db_conn.execute(insert_query, (test_name,))
+        request.app.db_conn.commit()
+
+        # Check if lastrowid is available
+        last_id = getattr(cursor, "lastrowid", None)
+        results["operations"].append({
+            "name": "Insert into temporary table",
+            "success": True,
+            "last_id": last_id
+        })
+        logger.info(f"Test 3 completed successfully. Last ID: {last_id}")
+
+        # Test 4: Select from the temporary table
+        logger.info("Test 4: Select from the temporary table")
+        select_query = "SELECT * FROM test_table WHERE name = ?"
+        result = request.app.db_conn.execute(select_query, (test_name,)).fetchone()
+        results["operations"].append({
+            "name": "Select from temporary table",
+            "success": result is not None,
+            "result": str(result) if result is not None else None
+        })
+        logger.info(f"Test 4 result: {result}")
+
+        # Test 5: Check if users table exists and has the expected structure
+        logger.info("Test 5: Check users table structure")
+        try:
+            table_info = request.app.db_conn.execute("PRAGMA table_info(users)").fetchall()
+            results["operations"].append({
+                "name": "Check users table structure",
+                "success": len(table_info) > 0,
+                "columns": [col[1] for col in table_info] if table_info else []
+            })
+            logger.info(f"Test 5 result: {table_info}")
+        except Exception as e:
+            logger.error(f"Error checking users table structure: {str(e)}")
+            results["operations"].append({
+                "name": "Check users table structure",
+                "success": False,
+                "error": str(e)
+            })
+
+        return results
+    except Exception as e:
+        logger.error(f"Database test failed: {str(e)}")
+        results["operations"].append({
+            "name": "Error during tests",
+            "success": False,
+            "error": str(e)
+        })
+        return results