mirror of
https://github.com/rzmk/learnhouse.git
synced 2025-12-19 04:19:25 +00:00
feat: add org_id to a user when signing up
This commit is contained in:
parent
b88ee6643e
commit
2b886ec2c2
5 changed files with 28 additions and 12 deletions
|
|
@ -37,11 +37,11 @@ async def api_get_user_by_userid(request: Request,user_id: str):
|
|||
|
||||
|
||||
@router.post("/")
|
||||
async def api_create_user(request: Request,user_object: UserWithPassword, org_id: str ):
|
||||
async def api_create_user(request: Request,user_object: UserWithPassword, org_slug: str ):
|
||||
"""
|
||||
Create new user
|
||||
"""
|
||||
return await create_user(request, None, user_object, org_id)
|
||||
return await create_user(request, None, user_object, org_slug)
|
||||
|
||||
|
||||
@router.delete("/user_id/{user_id}")
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from src.security.security import security_hash_password, security_verify_passwo
|
|||
from src.services.users.schemas.users import PasswordChangeForm, PublicUser, User, UserOrganization, UserWithPassword, UserInDB
|
||||
|
||||
|
||||
async def create_user(request: Request, current_user: PublicUser | None, user_object: UserWithPassword, org_id: str):
|
||||
async def create_user(request: Request, current_user: PublicUser | None, user_object: UserWithPassword, org_slug: str):
|
||||
users = request.app.db["users"]
|
||||
|
||||
isUsernameAvailable = await users.find_one({"username": user_object.username})
|
||||
|
|
@ -34,11 +34,25 @@ async def create_user(request: Request, current_user: PublicUser | None, user_o
|
|||
user_object.username = user_object.username.lower()
|
||||
user_object.password = await security_hash_password(user_object.password)
|
||||
|
||||
# Get org_id from org_slug
|
||||
orgs = request.app.db["organizations"]
|
||||
|
||||
# Check if the org exists
|
||||
isOrgExists = await orgs.find_one({"slug": org_slug})
|
||||
|
||||
# If the org does not exist, raise an error
|
||||
if not isOrgExists:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_409_CONFLICT, detail="You are trying to create a user in an organization that does not exist")
|
||||
|
||||
org_id = isOrgExists["org_id"]
|
||||
|
||||
|
||||
# Create initial orgs list with the org_id passed in
|
||||
orgs = [UserOrganization(org_id=org_id, org_role="member")]
|
||||
|
||||
# Give role
|
||||
roles = ["role_1"]
|
||||
roles = ["role_member"]
|
||||
|
||||
# Create the user
|
||||
user = UserInDB(user_id=user_id, creation_date=str(datetime.now()),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue