Hello {email}
+You have been invited to {org.name} by @{user.username}. Your invite code is {invite['invite_code']}.
+Click here to sign up.
+Thank you
+ + +""", + ) + + return True + + else: + return False diff --git a/apps/api/src/services/orgs/users.py b/apps/api/src/services/orgs/users.py index 28422fb5..207508a8 100644 --- a/apps/api/src/services/orgs/users.py +++ b/apps/api/src/services/orgs/users.py @@ -5,6 +5,7 @@ import logging import redis from fastapi import HTTPException, Request from sqlmodel import Session, select +from src.services.orgs.invites import send_invite_email from config.config import get_learnhouse_config from src.services.orgs.orgs import rbac_check from src.db.roles import Role, RoleRead @@ -12,6 +13,7 @@ from src.db.users import AnonymousUser, PublicUser, User, UserRead from src.db.user_organizations import UserOrganization from src.db.organizations import ( Organization, + OrganizationRead, OrganizationUser, ) @@ -234,6 +236,7 @@ async def invite_batch_users( request: Request, org_id: int, emails: str, + invite_code_uuid: str, db_session: Session, current_user: PublicUser | AnonymousUser, ): @@ -258,6 +261,10 @@ async def invite_batch_users( detail="Organization not found", ) + # get User sender + statement = select(User).where(User.id == current_user.id) + user = db_session.exec(statement).first() + # RBAC check await rbac_check(request, org.org_uuid, current_user, "create", db_session) @@ -272,8 +279,8 @@ async def invite_batch_users( invite_list = emails.split(",") - # invitations expire after 30 days - ttl = int(timedelta(days=365).total_seconds()) + # invitations expire after 60 days + ttl = int(timedelta(days=60).total_seconds()) for email in invite_list: email = email.strip() @@ -286,11 +293,22 @@ async def invite_batch_users( # skip this user continue + org = OrganizationRead.from_orm(org) + user = UserRead.from_orm(user) + + isEmailSent = send_invite_email( + org, + invite_code_uuid, + user, + email, + ) + invited_user_object = { "email": email, "org_id": org.id, + "invite_code_uuid": invite_code_uuid, "pending": True, - "email_sent": False, + "email_sent": isEmailSent, "expires": ttl, "created_at": datetime.now().isoformat(), "created_by": current_user.user_uuid, diff --git a/apps/api/src/services/users/users.py b/apps/api/src/services/users/users.py index 8d208b32..279a9aec 100644 --- a/apps/api/src/services/users/users.py +++ b/apps/api/src/services/users/users.py @@ -104,6 +104,7 @@ async def create_user( return user + async def create_user_with_invite( request: Request, db_session: Session, @@ -112,20 +113,23 @@ async def create_user_with_invite( org_id: int, invite_code: str, ): - + # Check if invite code exists - isInviteCodeCorrect = await get_invite_code(request, org_id, invite_code, current_user, db_session) + isInviteCodeCorrect = await get_invite_code( + request, org_id, invite_code, current_user, db_session + ) if not isInviteCodeCorrect: raise HTTPException( status_code=400, detail="Invite code is incorrect", ) - + user = await create_user(request, db_session, current_user, user_object, org_id) return user + async def create_user_without_org( request: Request, db_session: Session, @@ -201,6 +205,32 @@ async def update_user( # RBAC check await rbac_check(request, current_user, "update", user.user_uuid, db_session) + # Verifications + + # Username + statement = select(User).where(User.username == user_object.username) + username_user = db_session.exec(statement).first() + + if username_user: + isSameUser = username_user.id == current_user.id + if not isSameUser: + raise HTTPException( + status_code=400, + detail="Username already exists", + ) + + # Email + statement = select(User).where(User.email == user_object.email) + email_user = db_session.exec(statement).first() + + if email_user: + isSameUser = email_user.id == current_user.id + if not isSameUser: + raise HTTPException( + status_code=400, + detail="Email already exists", + ) + # Update user user_data = user_object.dict(exclude_unset=True) for key, value in user_data.items(): @@ -239,7 +269,9 @@ async def update_user_avatar( # Upload thumbnail if avatar_file and avatar_file.filename: - name_in_disk = f"{user.user_uuid}_avatar_{uuid4()}.{avatar_file.filename.split('.')[-1]}" + name_in_disk = ( + f"{user.user_uuid}_avatar_{uuid4()}.{avatar_file.filename.split('.')[-1]}" + ) await upload_avatar(avatar_file, name_in_disk, user.user_uuid) # Update course diff --git a/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx index 16bc5c5e..e5af8896 100644 --- a/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx @@ -9,6 +9,7 @@ import { useSession } from '@components/Contexts/SessionContext' import { useOrg } from '@components/Contexts/OrgContext' import OrgUsers from '@components/Dashboard/Users/OrgUsers/OrgUsers' import OrgAccess from '@components/Dashboard/Users/OrgAccess/OrgAccess' +import OrgUsersAdd from '@components/Dashboard/Users/OrgUsersAdd/OrgUsersAdd' export type SettingsParams = { subpage: string @@ -120,6 +121,7 @@ function UsersSettingsPage({ params }: { params: SettingsParams }) { > {params.subpage == 'users' ?Invite Code
+ +| Signup Status | +Email sent | +|
|---|---|---|
| {invited_user.email} | +{invited_user.pending ? Pending : Signed } |
+ {invited_user.email_sent ? Sent : No } |
+
+
+