rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: init roles & user reengineering

Browse source
This commit is contained in:
swve 2023-03-19 15:01:27 +01:00
parent 40404cc852
commit 9384cbe85d
38 changed files with 671 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/routers/users.py
View file

@ -2,7 +2,9 @@ from fastapi import Depends, FastAPI, APIRouter
from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
from pydantic import BaseModel
from src.dependencies.auth import *
from src.services.users import *
from src.services.users.schemas.users import PasswordChangeForm, PublicUser, User, UserWithPassword
from src.services.users.users import create_user, delete_user, get_profile_metadata, get_user_by_userid, read_user, update_user, update_user_password
@ -25,13 +27,6 @@ async def api_get_current_user_metadata(request: Request,current_user: User = De
return await get_profile_metadata(request , current_user.dict())
@router.get("/username/{username}")
async def api_get_user_by_username(request: Request, username: str):
"""
Get single user by username
"""
return await get_user(request, username)
@router.get("/user_id/{user_id}")
async def api_get_user_by_userid(request: Request,user_id: str):
@ -42,32 +37,32 @@ async def api_get_user_by_userid(request: Request,user_id: str):
@router.post("/")
async def api_create_user(request: Request,user_object: UserWithPassword):
async def api_create_user(request: Request,user_object: UserWithPassword, org_id: str ):
"""
Create new user
"""
return await create_user(request, user_object)
return await create_user(request, None, user_object, org_id)
@router.delete("/user_id/{user_id}")
async def api_delete_user(request: Request, user_id: str):
async def api_delete_user(request: Request, user_id: str, current_user: PublicUser = Depends(get_current_user)):
"""
Delete user by ID
"""
return await delete_user(request, user_id)
return await delete_user(request, current_user, user_id)
@router.put("/user_id/{user_id}")
async def api_update_user(request: Request, user_object: User, user_id: str):
async def api_update_user(request: Request, user_object: User, user_id: str, current_user: PublicUser = Depends(get_current_user)):
"""
Update user by ID
"""
return await update_user(request, user_id, user_object)
return await update_user(request, user_id, user_object, current_user)
@router.put("/password/user_id/{user_id}")
async def api_update_user_password(request: Request, user_id: str , passwordChangeForm : PasswordChangeForm):
async def api_update_user_password(request: Request, user_id: str , passwordChangeForm : PasswordChangeForm, current_user: PublicUser = Depends(get_current_user)):
"""
Update user password by ID
"""
return await update_user_password(request, user_id, passwordChangeForm)
return await update_user_password(request,current_user, user_id, passwordChangeForm)