Removed trash and optimized imports
This commit is contained in:
parent
335a497991
commit
3c245d8671
@ -1,4 +1,3 @@
|
|||||||
from os import path
|
|
||||||
from typing import Union
|
from typing import Union
|
||||||
from fastapi import FastAPI, Security, HTTPException
|
from fastapi import FastAPI, Security, HTTPException
|
||||||
from starlette.status import HTTP_401_UNAUTHORIZED, HTTP_403_FORBIDDEN
|
from starlette.status import HTTP_401_UNAUTHORIZED, HTTP_403_FORBIDDEN
|
||||||
@ -6,7 +5,7 @@ from fastapi.security import APIKeyQuery, APIKeyHeader, APIKeyCookie
|
|||||||
from fastapi.openapi.models import APIKey
|
from fastapi.openapi.models import APIKey
|
||||||
from fastapi.openapi.docs import get_swagger_ui_html, get_redoc_html
|
from fastapi.openapi.docs import get_swagger_ui_html, get_redoc_html
|
||||||
from starlette.status import HTTP_401_UNAUTHORIZED
|
from starlette.status import HTTP_401_UNAUTHORIZED
|
||||||
from modules.utils import configGet, jsonLoad
|
from modules.utils import configGet
|
||||||
from modules.security import passEncode
|
from modules.security import passEncode
|
||||||
from modules.database import col_apikeys, col_expired
|
from modules.database import col_apikeys, col_expired
|
||||||
|
|
||||||
@ -17,26 +16,6 @@ api_key_header = APIKeyHeader(name="apikey", auto_error=False)
|
|||||||
api_key_cookie = APIKeyCookie(name="apikey", auto_error=False)
|
api_key_cookie = APIKeyCookie(name="apikey", auto_error=False)
|
||||||
|
|
||||||
|
|
||||||
def get_all_api_keys() -> list:
|
|
||||||
return jsonLoad(path.join(configGet("data", "locations"), "api_keys.json"))
|
|
||||||
|
|
||||||
def get_all_expired_keys() -> list:
|
|
||||||
return jsonLoad(path.join(configGet("data", "locations"), "expired_keys.json"))
|
|
||||||
|
|
||||||
# def check_project_key(project: str, apikey: APIKey) -> bool:
|
|
||||||
# keys = jsonLoad(path.join(configGet("data", "locations"), "api_keys.json"))
|
|
||||||
# if apikey in keys:
|
|
||||||
# if keys[apikey] != []:
|
|
||||||
# if project in keys[apikey]:
|
|
||||||
# return True
|
|
||||||
# else:
|
|
||||||
# return False
|
|
||||||
# else:
|
|
||||||
# return False
|
|
||||||
# else:
|
|
||||||
# return False
|
|
||||||
|
|
||||||
|
|
||||||
async def get_api_key(
|
async def get_api_key(
|
||||||
api_key_query: str = Security(api_key_query),
|
api_key_query: str = Security(api_key_query),
|
||||||
api_key_header: str = Security(api_key_header),
|
api_key_header: str = Security(api_key_header),
|
||||||
@ -62,6 +41,7 @@ def user_by_key(apikey: Union[str, APIKey]) -> Union[str, None]:
|
|||||||
db_key = col_apikeys.find_one({"hash": passEncode(apikey)})
|
db_key = col_apikeys.find_one({"hash": passEncode(apikey)})
|
||||||
return db_key["user"] if db_key is not None else None
|
return db_key["user"] if db_key is not None else None
|
||||||
|
|
||||||
|
|
||||||
@app.get("/docs", include_in_schema=False)
|
@app.get("/docs", include_in_schema=False)
|
||||||
async def custom_swagger_ui_html():
|
async def custom_swagger_ui_html():
|
||||||
return get_swagger_ui_html(
|
return get_swagger_ui_html(
|
||||||
|
Loading…
Reference in New Issue
Block a user