mirror of
https://github.com/khoaliber/khoj.git
synced 2026-03-08 05:39:13 +00:00
Update format for return type of the generate token method
This commit is contained in:
@@ -64,9 +64,7 @@ async def create_khoj_token(user: KhojUser, name=None):
|
|||||||
"Create Khoj API key for user"
|
"Create Khoj API key for user"
|
||||||
token = f"kk-{secrets.token_urlsafe(32)}"
|
token = f"kk-{secrets.token_urlsafe(32)}"
|
||||||
name = name or f"{generate_random_name().title()}"
|
name = name or f"{generate_random_name().title()}"
|
||||||
api_config = await KhojApiUser.objects.acreate(token=token, user=user, name=name)
|
return await KhojApiUser.objects.acreate(token=token, user=user, name=name)
|
||||||
await api_config.asave()
|
|
||||||
return api_config
|
|
||||||
|
|
||||||
|
|
||||||
def get_khoj_tokens(user: KhojUser):
|
def get_khoj_tokens(user: KhojUser):
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ from google.auth.transport import requests as google_requests
|
|||||||
|
|
||||||
# Internal Packages
|
# Internal Packages
|
||||||
from database.adapters import get_khoj_tokens, get_or_create_user, create_khoj_token, delete_khoj_token
|
from database.adapters import get_khoj_tokens, get_or_create_user, create_khoj_token, delete_khoj_token
|
||||||
|
from database.models import KhojApiUser
|
||||||
from khoj.utils import state
|
from khoj.utils import state
|
||||||
|
|
||||||
|
|
||||||
@@ -50,12 +51,16 @@ async def login(request: Request):
|
|||||||
|
|
||||||
@auth_router.post("/token")
|
@auth_router.post("/token")
|
||||||
@requires(["authenticated"], redirect="login_page")
|
@requires(["authenticated"], redirect="login_page")
|
||||||
async def generate_token(request: Request, token_name: Optional[str] = None) -> str:
|
async def generate_token(request: Request, token_name: Optional[str] = None):
|
||||||
"Generate API token for given user"
|
"Generate API token for given user"
|
||||||
if token_name:
|
if token_name:
|
||||||
return await create_khoj_token(user=request.user.object, name=token_name)
|
token = await create_khoj_token(user=request.user.object, name=token_name)
|
||||||
else:
|
else:
|
||||||
return await create_khoj_token(user=request.user.object)
|
token = await create_khoj_token(user=request.user.object)
|
||||||
|
return {
|
||||||
|
"token": token.token,
|
||||||
|
"name": token.name,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@auth_router.get("/token")
|
@auth_router.get("/token")
|
||||||
|
|||||||
Reference in New Issue
Block a user