Centralised error handling & convenience.

passkey/fastapi/api.py

@@ -30,78 +30,67 @@ def register_api_routes(app: FastAPI):
     @app.post("/auth/validate")
     async def validate_token(response: Response, auth=Cookie(None)):
         """Lightweight token validation endpoint."""
-        try:
+        s = await get_session(auth)
-            s = await get_session(auth)
+        return {
-            return {
+            "valid": True,
-                "valid": True,
+            "user_uuid": str(s.user_uuid),
-                "user_uuid": str(s.user_uuid),
+        }
-            }
-        except ValueError:
-            response.status_code = 401
-            return {"valid": False}
 
     @app.post("/auth/user-info")
     async def api_user_info(response: Response, auth=Cookie(None)):
         """Get full user information for the authenticated user."""
-        try:
+        reset = passphrase.is_well_formed(auth)
-            reset = passphrase.is_well_formed(auth)
+        s = await (get_reset if reset else get_session)(auth)
-            s = await (get_reset if reset else get_session)(auth)
+        u = await db.instance.get_user_by_uuid(s.user_uuid)
-            u = await db.instance.get_user_by_uuid(s.user_uuid)
+        # Get all credentials for the user
-            # Get all credentials for the user
+        credential_ids = await db.instance.get_credentials_by_user_uuid(s.user_uuid)
-            credential_ids = await db.instance.get_credentials_by_user_uuid(s.user_uuid)
 
-            credentials = []
+        credentials = []
-            user_aaguids = set()
+        user_aaguids = set()
 
-            for cred_id in credential_ids:
+        for cred_id in credential_ids:
-                c = await db.instance.get_credential_by_id(cred_id)
+            c = await db.instance.get_credential_by_id(cred_id)
 
-                # Convert AAGUID to string format
+            # Convert AAGUID to string format
-                aaguid_str = str(c.aaguid)
+            aaguid_str = str(c.aaguid)
-                user_aaguids.add(aaguid_str)
+            user_aaguids.add(aaguid_str)
 
-                # Check if this is the current session credential
+            # Check if this is the current session credential
-                is_current_session = s.credential_uuid == c.uuid
+            is_current_session = s.credential_uuid == c.uuid
 
-                credentials.append(
+            credentials.append(
-                    {
+                {
-                        "credential_uuid": str(c.uuid),
+                    "credential_uuid": str(c.uuid),
-                        "aaguid": aaguid_str,
+                    "aaguid": aaguid_str,
-                        "created_at": c.created_at.isoformat(),
+                    "created_at": c.created_at.isoformat(),
-                        "last_used": c.last_used.isoformat() if c.last_used else None,
+                    "last_used": c.last_used.isoformat() if c.last_used else None,
-                        "last_verified": c.last_verified.isoformat()
+                    "last_verified": c.last_verified.isoformat()
-                        if c.last_verified
+                    if c.last_verified
-                        else None,
+                    else None,
-                        "sign_count": c.sign_count,
+                    "sign_count": c.sign_count,
-                        "is_current_session": is_current_session,
+                    "is_current_session": is_current_session,
-                    }
+                }
-                )
+            )
 
-            # Get AAGUID information for only the AAGUIDs that the user has
+        # Get AAGUID information for only the AAGUIDs that the user has
-            aaguid_info = aaguid.filter(user_aaguids)
+        aaguid_info = aaguid.filter(user_aaguids)
 
-            # Sort credentials by creation date (earliest first, most recently created last)
+        # Sort credentials by creation date (earliest first, most recently created last)
-            credentials.sort(key=lambda cred: cred["created_at"])
+        credentials.sort(key=lambda cred: cred["created_at"])
 
-            return {
+        return {
-                "authenticated": not reset,
+            "authenticated": not reset,
-                "session_type": s.info["type"],
+            "session_type": s.info["type"],
-                "user": {
+            "user": {
-                    "user_uuid": str(u.uuid),
+                "user_uuid": str(u.uuid),
-                    "user_name": u.display_name,
+                "user_name": u.display_name,
-                    "created_at": u.created_at.isoformat() if u.created_at else None,
+                "created_at": u.created_at.isoformat() if u.created_at else None,
-                    "last_seen": u.last_seen.isoformat() if u.last_seen else None,
+                "last_seen": u.last_seen.isoformat() if u.last_seen else None,
-                    "visits": u.visits,
+                "visits": u.visits,
-                },
+            },
-                "credentials": credentials,
+            "credentials": credentials,
-                "aaguid_info": aaguid_info,
+            "aaguid_info": aaguid_info,
-            }
+        }
-        except ValueError as e:
-            response.status_code = 400
-            return {"detail": f"Failed to get user info: {e}"}
-        except Exception:
-            response.status_code = 500
-            return {"detail": "Failed to get user info"}
 
     @app.post("/auth/logout")
     async def api_logout(response: Response, auth=Cookie(None)):
@@ -119,36 +108,20 @@ def register_api_routes(app: FastAPI):
     @app.post("/auth/set-session")
     async def api_set_session(response: Response, auth=Depends(bearer_auth)):
         """Set session cookie from Authorization header. Fetched after login by WebSocket."""
-        try:
+        user = await get_session(auth.credentials)
-            user = await get_session(auth.credentials)
+        if not user:
-            if not user:
+            raise ValueError("Invalid Authorization header.")
-                raise ValueError("Invalid Authorization header.")
+        session.set_session_cookie(response, auth.credentials)
-            session.set_session_cookie(response, auth.credentials)
 
-            return {
+        return {
-                "message": "Session cookie set successfully",
+            "message": "Session cookie set successfully",
-                "user_uuid": str(user.user_uuid),
+            "user_uuid": str(user.user_uuid),
-            }
+        }
-
-        except ValueError as e:
-            response.status_code = 400
-            return {"detail": str(e)}
-        except Exception:
-            response.status_code = 500
-            return {"detail": "Failed to set session"}
 
     @app.delete("/auth/credential/{uuid}")
     async def api_delete_credential(
         response: Response, uuid: UUID, auth: str = Cookie(None)
     ):
         """Delete a specific credential for the current user."""
-        try:
+        await delete_credential(uuid, auth)
-            await delete_credential(uuid, auth)
+        return {"message": "Credential deleted successfully"}
-            return {"message": "Credential deleted successfully"}
-
-        except ValueError as e:
-            response.status_code = 400
-            return {"detail": str(e)}
-        except Exception:
-            response.status_code = 500
-            return {"detail": "Failed to delete credential"}

passkey/fastapi/mainapp.py

@@ -1,9 +1,10 @@
 import contextlib
+import logging
 from contextlib import asynccontextmanager
 from pathlib import Path
 
 from fastapi import Cookie, FastAPI, Request, Response
-from fastapi.responses import FileResponse
+from fastapi.responses import FileResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 
 from ..authsession import get_session
@@ -30,6 +31,21 @@ async def lifespan(app: FastAPI):
 
 app = FastAPI(lifespan=lifespan)
 
+
+# Global exception handlers
+@app.exception_handler(ValueError)
+async def value_error_handler(request: Request, exc: ValueError):
+    """Handle ValueError exceptions globally with 400 status code."""
+    return JSONResponse(status_code=400, content={"detail": str(exc)})
+
+
+@app.exception_handler(Exception)
+async def general_exception_handler(request: Request, exc: Exception):
+    """Handle all other exceptions globally with 500 status code."""
+    logging.exception("Internal Server Error")
+    return JSONResponse(status_code=500, content={"detail": "Internal server error"})
+
+
 # Mount the WebSocket subapp
 app.mount("/auth/ws", ws.app)
 

passkey/fastapi/reset.py

@@ -15,35 +15,27 @@ def register_reset_routes(app):
     @app.post("/auth/create-link")
     async def api_create_link(request: Request, response: Response, auth=Cookie(None)):
         """Create a device addition link for the authenticated user."""
-        try:
+        # Require authentication
-            # Require authentication
+        s = await get_session(auth)
-            s = await get_session(auth)
 
-            # Generate a human-readable token
+        # Generate a human-readable token
-            token = passphrase.generate()  # e.g., "cross.rotate.yin.note.evoke"
+        token = passphrase.generate()  # e.g., "cross.rotate.yin.note.evoke"
-            await db.instance.create_session(
+        await db.instance.create_session(
-                user_uuid=s.user_uuid,
+            user_uuid=s.user_uuid,
-                key=tokens.reset_key(token),
+            key=tokens.reset_key(token),
-                expires=expires(),
+            expires=expires(),
-                info=session.infodict(request, "device addition"),
+            info=session.infodict(request, "device addition"),
-            )
+        )
 
-            # Generate the device addition link with pretty URL
+        # Generate the device addition link with pretty URL
-            path = request.url.path.removesuffix("create-link") + token
+        path = request.url.path.removesuffix("create-link") + token
-            url = f"{request.headers['origin']}{path}"
+        url = f"{request.headers['origin']}{path}"
 
-            return {
+        return {
-                "message": "Registration link generated successfully",
+            "message": "Registration link generated successfully",
-                "url": url,
+            "url": url,
-                "expires": expires().isoformat(),
+            "expires": expires().isoformat(),
-            }
+        }
-
-        except ValueError:
-            response.status_code = 401
-            return {"detail": "Authentication required"}
-        except Exception as e:
-            response.status_code = 500
-            return {"detail": f"Failed to create registration link: {str(e)}"}
 
     @app.get("/auth/{reset_token}")
     async def reset_authentication(