Add events to make it posible to do some basic admin and rights
This commit is contained in:
@@ -1,6 +1,12 @@
|
||||
from fastapi import APIRouter
|
||||
|
||||
from app.api.routes import login, private, users, utils
|
||||
from app.api.routes import (
|
||||
events,
|
||||
login,
|
||||
private,
|
||||
users,
|
||||
utils,
|
||||
)
|
||||
from app.core.config import settings
|
||||
|
||||
api_router = APIRouter()
|
||||
@@ -9,5 +15,8 @@ api_router.include_router(users.router)
|
||||
api_router.include_router(utils.router)
|
||||
|
||||
|
||||
api_router.include_router(events.router)
|
||||
|
||||
|
||||
if settings.ENVIRONMENT == "local":
|
||||
api_router.include_router(private.router)
|
||||
|
||||
229
backend/app/api/routes/events.py
Normal file
229
backend/app/api/routes/events.py
Normal file
@@ -0,0 +1,229 @@
|
||||
from typing import Any
|
||||
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from sqlmodel import func, select
|
||||
|
||||
from app.api.deps import CurrentUser, SessionDep
|
||||
from app.models.base import Message, RowId
|
||||
from app.models.event import (
|
||||
Event,
|
||||
EventCreate,
|
||||
EventPublic,
|
||||
EventsPublic,
|
||||
EventUpdate,
|
||||
EventUserLink,
|
||||
)
|
||||
from app.models.user import (
|
||||
PermissionModule,
|
||||
PermissionPart,
|
||||
PermissionRight,
|
||||
PermissionRightObject,
|
||||
User,
|
||||
)
|
||||
|
||||
router = APIRouter(prefix="/events", tags=["events"])
|
||||
|
||||
# region # Events ##############################################################
|
||||
|
||||
|
||||
@router.get("/", response_model=EventsPublic)
|
||||
def read_events(
|
||||
session: SessionDep, current_user: CurrentUser, skip: int = 0, limit: int = 100
|
||||
) -> Any:
|
||||
"""
|
||||
Retrieve events.
|
||||
"""
|
||||
|
||||
if current_user.has_permission(
|
||||
module=PermissionModule.EVENT,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.READ,
|
||||
):
|
||||
count_statement = select(func.count()).select_from(Event)
|
||||
count = session.exec(count_statement).one()
|
||||
statement = select(Event).offset(skip).limit(limit)
|
||||
events = session.exec(statement).all()
|
||||
else:
|
||||
count_statement = (
|
||||
select(func.count())
|
||||
.select_from(Event)
|
||||
.where(
|
||||
EventUserLink.user_id == current_user.id,
|
||||
(EventUserLink.rights & PermissionRight.READ) == PermissionRight.READ,
|
||||
)
|
||||
)
|
||||
count = session.exec(count_statement).one()
|
||||
statement = (
|
||||
select(Event)
|
||||
.where(
|
||||
EventUserLink.user_id == current_user.id,
|
||||
(EventUserLink.rights & PermissionRight.READ) == PermissionRight.READ,
|
||||
)
|
||||
.offset(skip)
|
||||
.limit(limit)
|
||||
)
|
||||
events = session.exec(statement).all()
|
||||
|
||||
return EventsPublic(data=events, count=count)
|
||||
|
||||
|
||||
@router.get("/{id}", response_model=EventPublic)
|
||||
def read_event(session: SessionDep, current_user: CurrentUser, id: RowId) -> Any:
|
||||
"""
|
||||
Get event by ID.
|
||||
"""
|
||||
event = session.get(Event, id)
|
||||
if not event:
|
||||
raise HTTPException(status_code=404, detail="Event not found")
|
||||
|
||||
if not current_user.has_permission(
|
||||
module=PermissionModule.EVENT,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.READ,
|
||||
) and (event.user_has_rights(user=current_user, rights=PermissionRight.READ)):
|
||||
raise HTTPException(status_code=400, detail="Not enough permissions")
|
||||
return event
|
||||
|
||||
|
||||
@router.post("/", response_model=EventPublic)
|
||||
def create_event(
|
||||
*, session: SessionDep, current_user: CurrentUser, event_in: EventCreate
|
||||
) -> Any:
|
||||
"""
|
||||
Create new event.
|
||||
"""
|
||||
if not current_user.has_permission(
|
||||
module=PermissionModule.EVENT,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.CREATE,
|
||||
):
|
||||
raise HTTPException(status_code=403, detail="Not enough permissions")
|
||||
|
||||
event = Event.create(create_obj=event_in, session=session)
|
||||
event.add_user(user=current_user, rights=PermissionRight.ADMIN, session=session)
|
||||
return event
|
||||
|
||||
|
||||
@router.put("/{id}", response_model=EventPublic)
|
||||
def update_event(
|
||||
*,
|
||||
session: SessionDep,
|
||||
current_user: CurrentUser,
|
||||
id: RowId,
|
||||
event_in: EventUpdate,
|
||||
) -> Any:
|
||||
"""
|
||||
Update an event.
|
||||
"""
|
||||
event = session.get(Event, id)
|
||||
if not event:
|
||||
raise HTTPException(status_code=404, detail="Event not found")
|
||||
|
||||
if not current_user.has_permission(
|
||||
module=PermissionModule.EVENT,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.UPDATE,
|
||||
) and (event.user_has_rights(user=current_user, rights=PermissionRight.UPDATE)):
|
||||
raise HTTPException(status_code=400, detail="Not enough permissions")
|
||||
|
||||
return Event.update(db_obj=event, in_obj=event_in, session=session)
|
||||
|
||||
|
||||
@router.delete("/{id}")
|
||||
def delete_event(
|
||||
session: SessionDep,
|
||||
current_user: CurrentUser,
|
||||
id: RowId,
|
||||
) -> Message:
|
||||
"""
|
||||
Delete an event.
|
||||
"""
|
||||
event = session.get(Event, id)
|
||||
if not event:
|
||||
raise HTTPException(status_code=404, detail="Event not found")
|
||||
|
||||
if not current_user.has_permission(
|
||||
module=PermissionModule.EVENT,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.DELETE,
|
||||
) and (event.user_has_rights(user=current_user, rights=PermissionRight.DELETE)):
|
||||
raise HTTPException(status_code=400, detail="Not enough permissions")
|
||||
|
||||
session.delete(event)
|
||||
session.commit()
|
||||
return Message(message="Event deleted successfully")
|
||||
|
||||
|
||||
# endregion
|
||||
|
||||
|
||||
# region # Events / Users ######################################################
|
||||
|
||||
|
||||
@router.post("/{id}/users/{user_id}", tags=["users"])
|
||||
def add_user_to_event(
|
||||
session: SessionDep,
|
||||
current_user: CurrentUser,
|
||||
id: RowId,
|
||||
user_id: RowId,
|
||||
rights_in: PermissionRightObject,
|
||||
) -> Message:
|
||||
"""
|
||||
Add or update a user to an event.
|
||||
"""
|
||||
event = session.get(Event, id)
|
||||
if not event:
|
||||
raise HTTPException(status_code=404, detail="Event not found")
|
||||
|
||||
if not current_user.has_permission(
|
||||
module=PermissionModule.EVENT,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.MANAGE_USERS,
|
||||
) and (
|
||||
event.user_has_rights(
|
||||
user=current_user, rights=(PermissionRight.MANAGE_USERS | rights_in.rights)
|
||||
)
|
||||
):
|
||||
raise HTTPException(status_code=400, detail="Not enough permissions")
|
||||
|
||||
user = session.get(User, user_id)
|
||||
if not event:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
|
||||
event.add_user(user=user, rights=rights_in.rights, session=session)
|
||||
return Message(
|
||||
message="User added successfully"
|
||||
) # TODO: Return event or event_users
|
||||
|
||||
|
||||
@router.delete("/{id}/users/{user_id}", tags=["users"])
|
||||
def remove_user_from_event(
|
||||
session: SessionDep, current_user: CurrentUser, id: RowId, user_id: RowId
|
||||
) -> Message:
|
||||
"""
|
||||
Remove a user from an event.
|
||||
"""
|
||||
event = session.get(Event, id)
|
||||
if not event:
|
||||
raise HTTPException(status_code=404, detail="Event not found")
|
||||
|
||||
if not current_user.has_permission(
|
||||
module=PermissionModule.EVENT,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.MANAGE_USERS,
|
||||
) and not event.user_has_rights(
|
||||
user=current_user, rights=PermissionRight.MANAGE_USERS
|
||||
):
|
||||
raise HTTPException(status_code=403, detail="Not enough permissions")
|
||||
|
||||
user = session.get(User, user_id)
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
|
||||
event.remove_user(user=user, session=session)
|
||||
return Message(
|
||||
message="User removed successfully"
|
||||
) # TODO: Return event or event_users
|
||||
|
||||
|
||||
# endregion
|
||||
@@ -9,9 +9,9 @@ from app.api.deps import CurrentUser, SessionDep, get_current_system_admin
|
||||
from app.core import security
|
||||
from app.core.config import settings
|
||||
from app.core.security import get_password_hash
|
||||
from app.models.base import Message
|
||||
from app.models.user import User, NewPassword, Token, UserPublic
|
||||
from app.models.apikey import ApiKey
|
||||
from app.models.base import Message
|
||||
from app.models.user import NewPassword, Token, User, UserPublic
|
||||
from app.utils import (
|
||||
generate_password_reset_token,
|
||||
generate_reset_password_email,
|
||||
|
||||
@@ -2,7 +2,7 @@ import uuid
|
||||
from typing import Any
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlmodel import col, delete, func, select
|
||||
from sqlmodel import func, select
|
||||
|
||||
from app.api.deps import (
|
||||
CurrentUser,
|
||||
@@ -11,8 +11,18 @@ from app.api.deps import (
|
||||
)
|
||||
from app.core.config import settings
|
||||
from app.core.security import get_password_hash, verify_password
|
||||
from app.models.apikey import (
|
||||
ApiKey,
|
||||
ApiKeyCreate,
|
||||
ApiKeyGenerate,
|
||||
ApiKeyPublic,
|
||||
ApiKeysPublic,
|
||||
)
|
||||
from app.models.base import Message, RowId
|
||||
from app.models.user import (
|
||||
PermissionModule,
|
||||
PermissionPart,
|
||||
PermissionRight,
|
||||
UpdatePassword,
|
||||
User,
|
||||
UserCreate,
|
||||
@@ -21,16 +31,6 @@ from app.models.user import (
|
||||
UsersPublic,
|
||||
UserUpdate,
|
||||
UserUpdateMe,
|
||||
PermissionModule,
|
||||
PermissionPart,
|
||||
PermissionRight,
|
||||
)
|
||||
from app.models.apikey import (
|
||||
ApiKey,
|
||||
ApiKeyCreate,
|
||||
ApiKeyPublic,
|
||||
ApiKeysPublic,
|
||||
ApiKeyGenerate,
|
||||
)
|
||||
from app.utils import generate_new_account_email, send_email
|
||||
|
||||
@@ -239,7 +239,11 @@ def read_user_by_id(
|
||||
user = session.get(User, user_id)
|
||||
if user == current_user:
|
||||
return user
|
||||
if not current_user.has_permission(module=PermissionModule.USER, part=PermissionPart.ADMIN, rights=PermissionRight.READ):
|
||||
if not current_user.has_permission(
|
||||
module=PermissionModule.USER,
|
||||
part=PermissionPart.ADMIN,
|
||||
rights=PermissionRight.READ,
|
||||
):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail="The user doesn't have enough privileges",
|
||||
|
||||
Reference in New Issue
Block a user