This commit is contained in:
Timothy J. Baek 2024-06-19 14:49:35 -07:00
parent 1e0453221d
commit ab270c1682
2 changed files with 9 additions and 6 deletions

View File

@ -325,6 +325,7 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
data = json.loads(body_str) if body_str else {}
user = get_current_user(
request,
get_http_authorization_cred(request.headers.get("Authorization"))
)
@ -558,6 +559,7 @@ class PipelineMiddleware(BaseHTTPMiddleware):
data = json.loads(body_str) if body_str else {}
user = get_current_user(
request,
get_http_authorization_cred(request.headers.get("Authorization"))
)

View File

@ -25,7 +25,6 @@ ALGORITHM = "HS256"
##############
bearer_security = HTTPBearer(auto_error=False)
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
@ -79,15 +78,17 @@ def get_current_user(
request: Request,
auth_token: HTTPAuthorizationCredentials = Depends(bearer_security),
):
# get token from cookie
token = request.cookies.get("token")
if auth_token is None and token is None:
raise HTTPException(status_code=403, detail="Not authenticated")
token = None
if auth_token is not None:
token = auth_token.credentials
if token is None and "token" in request.cookies:
token = request.cookies.get("token")
if token is None:
raise HTTPException(status_code=403, detail="Not authenticated")
# auth by api key
if token.startswith("sk-"):
return get_current_user_by_api_key(token)