Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: delete brain on users click in brains management #1638

Merged
merged 4 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backend/modules/user/repository/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from .get_user_identity import get_user_identity
from .create_user_identity import create_user_identity
from .update_user_properties import update_user_properties, UserUpdatableProperties
from .get_user_id_by_user_email import get_user_id_by_user_email
from .get_user_id_by_user_email import get_user_id_by_user_email
from .get_user_email_by_user_id import get_user_email_by_user_id
11 changes: 11 additions & 0 deletions backend/modules/user/repository/get_user_email_by_user_id.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from uuid import UUID

from models import get_supabase_client


def get_user_email_by_user_id(user_id: UUID) -> str:
supabase_client = get_supabase_client()
response = supabase_client.rpc(
"get_user_email_by_user_id", {"user_id": str(user_id)}
).execute()
return response.data[0]["email"]
3 changes: 2 additions & 1 deletion backend/modules/user/repository/get_user_identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

from models import get_supabase_client
from modules.user.entity.user_identity import UserIdentity
from modules.user.repository import create_user_identity

from .create_user_identity import create_user_identity

logger = get_logger()

Expand Down
3 changes: 2 additions & 1 deletion backend/modules/user/service/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from .get_user_id_by_email import get_user_id_by_email
from .get_user_id_by_email import get_user_id_by_email
from modules.user.repository import get_user_email_by_user_id
24 changes: 24 additions & 0 deletions backend/routes/subscription_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from middlewares.auth.auth_bearer import AuthBearer, get_current_user
from models import BrainSubscription, PromptStatusEnum
from modules.user.entity.user_identity import UserIdentity
from modules.user.service import get_user_email_by_user_id
from modules.user.service.get_user_id_by_email import get_user_id_by_email
from pydantic import BaseModel
from repository.api_brain_definition.get_api_brain_definition import (
Expand Down Expand Up @@ -103,6 +104,29 @@ def invite_users_to_brain(
Depends(has_brain_authorization([RoleEnum.Owner, RoleEnum.Editor])),
],
)
def get_users_with_brain_access(
brain_id: UUID,
):
"""
Get all users for a brain
"""

brain_users = get_brain_users(
brain_id=brain_id,
)

brain_access_list = []

for brain_user in brain_users:
brain_access = {}
# TODO: find a way to fetch user email concurrently
brain_access["email"] = get_user_email_by_user_id(brain_user.user_id)
brain_access["rights"] = brain_user.rights
brain_access_list.append(brain_access)

return brain_access_list


@subscription_router.delete(
"/brains/{brain_id}/subscription",
)
Expand Down
4 changes: 2 additions & 2 deletions frontend/public/locales/en/chat.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"back_to_chat": "Back to chat",
"onboarding": {
"title": "Hi 👋🏻 Want to discover Quivr ? 😇",
"step_1_1": "1. Drap and drop file on the chat or in the 📎.",
"step_1_1": "1. Drag and drop file on the chat or in the 📎.",
"step_1_2": "Don't have a file ? Download 'Quivr documentation'",
"step_2": "2. Start chatting with your file",
"step_3": "3. Enjoy !",
Expand All @@ -51,4 +51,4 @@
}
},
"welcome": "Welcome"
}
}
17 changes: 17 additions & 0 deletions scripts/20231116102600_add_get_user_email_by_user_id.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
CREATE OR REPLACE FUNCTION public.get_user_email_by_user_id(user_id uuid)
RETURNS TABLE (email text)
SECURITY definer
AS $$
BEGIN
RETURN QUERY SELECT au.email::text FROM auth.users au WHERE au.id = user_id;
END;
$$ LANGUAGE plpgsql;

-- Update migrations table
INSERT INTO migrations (name)
SELECT '20231116102600_add_get_user_email_by_user_id'
WHERE NOT EXISTS (
SELECT 1 FROM migrations WHERE name = '20231116102600_add_get_user_email_by_user_id'
);

COMMIT;
12 changes: 10 additions & 2 deletions scripts/tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,14 @@ CREATE TABLE IF NOT EXISTS api_brain_definition (
secrets JSON
);

CREATE OR REPLACE FUNCTION public.get_user_email_by_user_id(user_id uuid)
RETURNS TABLE (email text)
SECURITY definer
AS $$
BEGIN
RETURN QUERY SELECT au.email::text FROM auth.users au WHERE au.id = user_id;
END;
$$ LANGUAGE plpgsql;

CREATE OR REPLACE FUNCTION public.get_user_id_by_user_email(user_email text)
RETURNS TABLE (user_id uuid)
Expand Down Expand Up @@ -436,7 +444,7 @@ $$;


INSERT INTO migrations (name)
SELECT '20231114162700_drop_get_user_email_by_user_id'
SELECT '20231116102600_add_get_user_email_by_user_id'
WHERE NOT EXISTS (
SELECT 1 FROM migrations WHERE name = '20231114162700_drop_get_user_email_by_user_id'
SELECT 1 FROM migrations WHERE name = '20231116102600_add_get_user_email_by_user_id'
);