Skip to content
Snippets Groups Projects
Commit 26f863b1 authored by Tim Repke's avatar Tim Repke
Browse files

Merge branch 'master' into 'production'

Master

See merge request !33
parents eb6fbf5b fbaa6a61
No related branches found
No related tags found
1 merge request!33Master
Pipeline #1217 failed
...@@ -11,14 +11,14 @@ from nacsos_data.db.crud.users import \ ...@@ -11,14 +11,14 @@ from nacsos_data.db.crud.users import \
from server.data import db_engine from server.data import db_engine
from server.api.errors import DataNotFoundWarning, UserNotFoundError from server.api.errors import DataNotFoundWarning, UserNotFoundError
from server.util.logging import get_logger from server.util.logging import get_logger
from server.util.security import UserPermissionChecker, get_current_active_user, get_current_active_superuser from server.util.security import UserPermissionChecker, get_current_active_user
logger = get_logger('nacsos.api.route.admin.users') logger = get_logger('nacsos.api.route.admin.users')
router = APIRouter() router = APIRouter()
@router.get('/list/all', response_model=list[UserBaseModel]) @router.get('/list/all', response_model=list[UserBaseModel])
async def get_all_users(current_user: UserModel = Depends(get_current_active_superuser)) \ async def get_all_users(current_user: UserModel = Depends(get_current_active_user)) \
-> list[UserInDBModel]: -> list[UserInDBModel]:
result = await read_users(project_id=None, order_by_username=True, engine=db_engine) result = await read_users(project_id=None, order_by_username=True, engine=db_engine)
if result is None: if result is None:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment