Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/routers/iri_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import logging
import importlib
from fastapi import Request, Depends, HTTPException, APIRouter
from fastapi.security import APIKeyHeader
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
from .account.models import User


bearer_token = APIKeyHeader(name="Authorization")
bearer_scheme = HTTPBearer()


def get_client_ip(request: Request) -> str | None:
Expand Down Expand Up @@ -76,19 +76,21 @@ def create_adapter(router_name, router_adapter):
async def current_user(
self,
request: Request,
api_key: str = Depends(bearer_token),
credentials: HTTPAuthorizationCredentials = Depends(bearer_scheme),
):
token = credentials.credentials

user_id = None
try:
user_id = await self.adapter.get_current_user(api_key, get_client_ip(request))
user_id = await self.adapter.get_current_user(token, get_client_ip(request))
except Exception as exc:
logging.getLogger().error(f"Error parsing IRI_API_PARAMS: {exc}")
traceback.print_exc()
raise HTTPException(status_code=401, detail="Invalid or malformed Authorization parameters") from exc
if not user_id:
raise HTTPException(status_code=403, detail="Unauthorized access")
request.state.current_user_id = user_id
request.state.api_key = api_key
request.state.api_key = token


class AuthenticatedAdapter(ABC):
Expand Down