(fix) user_custom_auth

This commit is contained in:
ishaan-jaff 2024-02-01 13:37:14 -08:00
parent 42efa2a608
commit b93a355b05

View file

@ -252,12 +252,13 @@ async def user_api_key_auth(
) -> UserAPIKeyAuth: ) -> UserAPIKeyAuth:
global master_key, prisma_client, llm_model_list, user_custom_auth, custom_db_client global master_key, prisma_client, llm_model_list, user_custom_auth, custom_db_client
try: try:
if isinstance(api_key, str): ### USER-DEFINED AUTH FUNCTION -> This should always be run first if a user has defined it ###
api_key = _get_bearer_token(api_key=api_key)
### USER-DEFINED AUTH FUNCTION ###
if user_custom_auth is not None: if user_custom_auth is not None:
response = await user_custom_auth(request=request, api_key=api_key) response = await user_custom_auth(request=request, api_key=api_key)
return UserAPIKeyAuth.model_validate(response) return UserAPIKeyAuth.model_validate(response)
if isinstance(api_key, str):
api_key = _get_bearer_token(api_key=api_key)
### LITELLM-DEFINED AUTH FUNCTION ### ### LITELLM-DEFINED AUTH FUNCTION ###
if master_key is None: if master_key is None:
if isinstance(api_key, str): if isinstance(api_key, str):