rsw/score
1
0
Fork 0
Code Issues 2 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct api-key check

Browse Source
This commit is contained in:
Sebastiaan
2025-06-09 14:25:25 +02:00
parent ad1a250e62
commit 0512973779
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/app/models/apikey.py
View File

@@ -51,15 +51,18 @@ class ApiKey(mixin.RowId, ApiKeyBase, table=True):
@classmethod @classmethod
def create(cls, *, session: Session, create_obj: ApiKeyCreate) -> "ApiKey": def create(cls, *, session: Session, create_obj: ApiKeyCreate) -> "ApiKey":
# TODO: User id
data_obj = create_obj.model_dump(exclude_unset=True) data_obj = create_obj.model_dump(exclude_unset=True)
# Generate new api key # Generate new api key
extra_data = { extra_data = {
"api_key": ApiKey.generate(), "api_key": ApiKey.generate(),
} }
while cls.authenticate(session=session, api_key=extra_data["api_key"]): while True:
extra_data["api_key"] = ApiKey.generate() extra_data["api_key"] = ApiKey.generate()
statement = select(cls).where(cls.api_key == extra_data["api_key"])
db_obj = session.exec(statement).first()
if not db_obj:
break
db_obj = cls.model_validate(data_obj, update=extra_data) db_obj = cls.model_validate(data_obj, update=extra_data)
session.add(db_obj) session.add(db_obj)
@@ -80,12 +83,14 @@ class ApiKey(mixin.RowId, ApiKeyBase, table=True):
@classmethod @classmethod
def authenticate(cls, *, session: Session, api_key: str) -> "User | None": def authenticate(cls, *, session: Session, api_key: str) -> "User | None":
statement = select(cls).where(cls.api_key == api_key and cls.is_active) statement = select(cls).where(cls.api_key == api_key)
db_obj = session.exec(statement).first() db_obj = session.exec(statement).first()
if not db_obj: if not db_obj:
return None return None
if not db_obj.user: elif not db_obj.is_active:
return None
elif not db_obj.user:
return None return None
return db_obj.user return db_obj.user