From f497369a1c608e6acae589d76c37b35ec0bfd527 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 25 Sep 2023 18:06:52 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(users.py):=20remove=20unus?= =?UTF-8?q?ed=20current=5Fuser=20variable=20in=20read=5Fall=5Fusers=20func?= =?UTF-8?q?tion=20=F0=9F=94=A7=20chore(api=5Fkey.py):=20add=20cascade=20de?= =?UTF-8?q?lete=20to=20user-api=5Fkey=20relationship=20to=20ensure=20API?= =?UTF-8?q?=20keys=20are=20deleted=20when=20user=20is=20deleted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/users.py | 2 +- .../langflow/services/database/models/api_key/api_key.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index 9541bb2d4..aef639b0a 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -67,7 +67,7 @@ def read_current_user( def read_all_users( skip: int = 0, limit: int = 10, - current_user: Session = Depends(get_current_active_superuser), + _: Session = Depends(get_current_active_superuser), session: Session = Depends(get_session), ) -> UsersResponse: """ diff --git a/src/backend/langflow/services/database/models/api_key/api_key.py b/src/backend/langflow/services/database/models/api_key/api_key.py index 5d5bab0f4..0f0d2f889 100644 --- a/src/backend/langflow/services/database/models/api_key/api_key.py +++ b/src/backend/langflow/services/database/models/api_key/api_key.py @@ -22,8 +22,12 @@ class ApiKey(ApiKeyBase, table=True): api_key: str = Field(index=True, unique=True) # User relationship + # Delete API keys when user is deleted user_id: UUID = Field(index=True, foreign_key="user.id") - user: "User" = Relationship(back_populates="api_keys") + user: "User" = Relationship( + back_populates="api_keys", + sa_relationship_kwargs={"cascade": "delete"}, + ) class ApiKeyCreate(ApiKeyBase):